network/gq: Patched for glib 2.32 and gcc 4.7

3 files changed, 69 insertions, 2 deletions

diff --git a/network/gq/gcc-4.7.patch b/network/gq/gcc-4.7.patch
new file mode 100644
index 0000000000..4e6da28e65
--- /dev/null
+++ b/network/gq/gcc-4.7.patch
@@ -0,0 +1,22 @@
+Index: gq-1.2.3/configure
+===================================================================
+--- gq-1.2.3.orig/configure
++++ gq-1.2.3/configure
+@@ -6167,7 +6167,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lssl  $LIBS"
++LIBS="`pkg-config --libs openssl` $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -6223,7 +6223,7 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_new" >&5
+ echo "${ECHO_T}$ac_cv_lib_ssl_SSL_new" >&6; }
+ if test $ac_cv_lib_ssl_SSL_new = yes; then
+-  LIBS="-lssl $LIBS"
++  LIBS="`pkg-config --libs openssl` $LIBS"
+ 
+ fi
+ 
diff --git a/network/gq/glib-single-include.patch b/network/gq/glib-single-include.patch
new file mode 100644
index 0000000000..f09733155e
--- /dev/null
+++ b/network/gq/glib-single-include.patch
@@ -0,0 +1,39 @@
+Index: gq-1.2.3/src/gq-hash.h
+===================================================================
+--- gq-1.2.3.orig/src/gq-hash.h
++++ gq-1.2.3/src/gq-hash.h
+@@ -24,7 +24,7 @@
+ #ifndef GQ_ENCRYPTION_H
+ #define GQ_ENCRYPTION_H
+ 
+-#include <glib/garray.h>
++#include <glib.h>
+ #include "util.h"
+ 
+ G_BEGIN_DECLS
+Index: gq-1.2.3/src/gq-server-list.h
+===================================================================
+--- gq-1.2.3.orig/src/gq-server-list.h
++++ gq-1.2.3/src/gq-server-list.h
+@@ -26,7 +26,7 @@
+ #ifndef GQ_SERVER_LIST_H
+ #define GQ_SERVER_LIST_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "gq-server.h" // for GqServer
+ 
+ G_BEGIN_DECLS
+Index: gq-1.2.3/src/state.c
+===================================================================
+--- gq-1.2.3.orig/src/state.c
++++ gq-1.2.3/src/state.c
+@@ -36,7 +36,7 @@
+ #include <errno.h>
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ #include "xmlparse.h"
diff --git a/network/gq/gq.SlackBuild b/network/gq/gq.SlackBuild
index f30203de1b..6cec583b27 100644
--- a/network/gq/gq.SlackBuild
+++ b/network/gq/gq.SlackBuild
@@ -22,7 +22,7 @@
 
 PRGNAM=gq
 VERSION=${VERSION:-1.2.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -52,7 +52,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -67,6 +67,12 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Starting with glib 2.32 it is now mandatory to
+# include glib.h instead of individual headers.
+patch -p1 -i $CWD/glib-single-include.patch
+# Fix for gcc 4.7
+patch -p1 -i $CWD/gcc-4.7.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \