diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | gq-1.3.4-typedef.patch | 25 |
3 files changed, 45 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = gq pkgdesc = interactive graphical LDAP browser pkgver = 1.3.4 - pkgrel = 8 + pkgrel = 9 url = https://sourceforge.net/projects/gqclient/ arch = x86_64 license = GPL @@ -24,6 +24,7 @@ pkgbase = gq source = gq-1.3.4-errorchain.patch source = gq-1.3.4-strcmp-null-safe.patch source = gq-1.3.4-sanity-check.patch + source = gq-1.3.4-typedef.patch sha256sums = 2ac77f3233ddaef718f89c9371ab5165af29cf9738ed46b6bea64b37e45d4b60 sha256sums = bc985d3a59ff08747a58c53112cc2903b0cba438ee3b328b9bbf4976226c5402 sha256sums = a3ba1a50c19469834170632d6f5289cada81f04b7921fb16c37327a5f946f770 @@ -32,6 +33,6 @@ pkgbase = gq sha256sums = 983d2ca845306d76b2fe4167eb1f479f3ee2ad81f3318602be9e99ab117689e6 sha256sums = 396098fe4b4550c3260c97fe4de209088860e1fe3acf6aaa9574b67a4d9b85b8 sha256sums = 1c65f6ecb1fedb1a06f3c52f48d0dc8456c386e86ef5a629fc4ddfc1259ec613 + sha256sums = d5cc24befa0abb2ed2ad08973c7b1bc9917f3b3ef01af4b4a2143dcb73f4c8ba pkgname = gq - @@ -1,10 +1,11 @@ # $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Gergely Tamas <dice@mfa.kfki.hu> pkgname=gq pkgver=1.3.4 -pkgrel=8 +pkgrel=9 pkgdesc="interactive graphical LDAP browser" url="https://sourceforge.net/projects/gqclient/" license=("GPL") @@ -18,7 +19,8 @@ source=(https://downloads.sourceforge.net/sourceforge/gqclient/$pkgname-$pkgver. gq-1.3.4-glibfix.patch gq-1.3.4-errorchain.patch gq-1.3.4-strcmp-null-safe.patch - gq-1.3.4-sanity-check.patch) + gq-1.3.4-sanity-check.patch + gq-1.3.4-typedef.patch) sha256sums=('2ac77f3233ddaef718f89c9371ab5165af29cf9738ed46b6bea64b37e45d4b60' 'bc985d3a59ff08747a58c53112cc2903b0cba438ee3b328b9bbf4976226c5402' 'a3ba1a50c19469834170632d6f5289cada81f04b7921fb16c37327a5f946f770' @@ -26,9 +28,11 @@ sha256sums=('2ac77f3233ddaef718f89c9371ab5165af29cf9738ed46b6bea64b37e45d4b60' 'ce2b395da210fd5f68d2afb80de2d15f77d4161fbb9911fe876d891cf21cf057' '983d2ca845306d76b2fe4167eb1f479f3ee2ad81f3318602be9e99ab117689e6' '396098fe4b4550c3260c97fe4de209088860e1fe3acf6aaa9574b67a4d9b85b8' - '1c65f6ecb1fedb1a06f3c52f48d0dc8456c386e86ef5a629fc4ddfc1259ec613') + '1c65f6ecb1fedb1a06f3c52f48d0dc8456c386e86ef5a629fc4ddfc1259ec613' + 'd5cc24befa0abb2ed2ad08973c7b1bc9917f3b3ef01af4b4a2143dcb73f4c8ba') prepare() { + set -x cd "$srcdir"/$pkgname-$pkgver patch -Np1 -i ../gq-1.3.4-kerberos.patch patch -Np0 -i ../gq-1.3.4-configure.patch @@ -37,13 +41,21 @@ prepare() { patch -Np1 -i ../gq-1.3.4-errorchain.patch patch -Np1 -i ../gq-1.3.4-strcmp-null-safe.patch patch -Np1 -i ../gq-1.3.4-sanity-check.patch + patch -Np1 -i ../gq-1.3.4-typedef.patch + + sed -i 's/error_push(error_context, ldap_err2string/error_push(error_context, _("%s"), ldap_err2string/' \ + 'src/gq-browser-node-dn.c' + sed -i 's/error_push(context, message)/error_push(context, _("%s"), message)/' 'src/errorchain.c' + sed -i 's/statusbar_msg(message)/statusbar_msg(_("%s"), message)/' 'src/gq-browser-node-dn.c' + sed -i 's/error_push(comm->error_context, buf)/error_push(comm->error_context, _("%s"), buf)/' 'src/xmlutil.c' + sed -i 's/error_push(create_context, gmessage->str)/error_push(create_context, _("%s"), gmessage->str)/' 'src/template.c' } build() { cd "$srcdir"/$pkgname-$pkgver PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig \ CFLAGS+=" -I/usr/include/openssl-1.0" \ - LDFLAGS+="-I/usr/lib/openssl-1.0" \ + LDFLAGS+=" -I/usr/lib/openssl-1.0" \ ./configure --prefix=/usr --disable-debugging --disable-update-mimedb make } diff --git a/gq-1.3.4-typedef.patch b/gq-1.3.4-typedef.patch new file mode 100644 index 000000000000..19c9ace53358 --- /dev/null +++ b/gq-1.3.4-typedef.patch @@ -0,0 +1,25 @@ +diff -u -r gq-1.3.4.orig/src/dt_entry.h gq-1.3.4/src/dt_entry.h +--- gq-1.3.4.orig/src/dt_entry.h 2008-01-09 17:35:12.000000000 +0100 ++++ gq-1.3.4/src/dt_entry.h 2021-01-06 16:28:13.565049312 +0100 +@@ -39,7 +39,7 @@ + + GType gq_display_entry_get_type(void); + +-struct _dt_entry_handler { ++typedef struct _dt_entry_handler { + GQTypeDisplayClass dt_handler; + + GByteArray* (*encode)(const char *val, int len); + +diff -u -r gq-1.3.4.orig/src/gq-browser-node-reference.h gq-1.3.4/src/gq-browser-node-reference.h +--- gq-1.3.4.orig/src/gq-browser-node-reference.h 2008-01-09 15:55:46.000000000 +0100 ++++ gq-1.3.4/src/gq-browser-node-reference.h 2021-01-06 16:29:16.084512799 +0100 +@@ -44,7 +44,7 @@ + + GqBrowserNode *gq_browser_node_reference_new(const char *uri); + +-struct _GqBrowserNodeReference { ++typedef struct _GqBrowserNodeReference { + GqBrowserNode base_instance; + + /* specific */ |