diff options
| -rw-r--r-- | libraries/gtkhtml/glib-single-include.patch | 52 | ||||
| -rw-r--r-- | libraries/gtkhtml/gtkhtml.SlackBuild | 8 |
2 files changed, 57 insertions, 3 deletions
diff --git a/libraries/gtkhtml/glib-single-include.patch b/libraries/gtkhtml/glib-single-include.patch new file mode 100644 index 0000000000..4a4d50362f --- /dev/null +++ b/libraries/gtkhtml/glib-single-include.patch @@ -0,0 +1,52 @@ +Index: gtkhtml-3.18.3/a11y/text.c +=================================================================== +--- gtkhtml-3.18.3.orig/a11y/text.c ++++ gtkhtml-3.18.3/a11y/text.c +@@ -27,7 +27,7 @@ + #include <atk/atkhypertext.h> + #include <atk/atkhyperlink.h> + #include <glib/gi18n-lib.h> +-#include <glib/gmacros.h> ++#include <glib.h> + #include <pango/pango.h> + #include "gtkhtml.h" + #include "htmlengine.h" +Index: gtkhtml-3.18.3/gtkhtml/htmlobject.c +=================================================================== +--- gtkhtml-3.18.3.orig/gtkhtml/htmlobject.c ++++ gtkhtml-3.18.3/gtkhtml/htmlobject.c +@@ -23,8 +23,7 @@ + + #include <config.h> + #include <string.h> +-#include <glib/gdataset.h> +-#include <glib/gquark.h> ++#include <glib.h> + + #include "htmlclue.h" + #include "htmlclueflow.h" +Index: gtkhtml-3.18.3/gtkhtml/test-stress.c +=================================================================== +--- gtkhtml-3.18.3.orig/gtkhtml/test-stress.c ++++ gtkhtml-3.18.3/gtkhtml/test-stress.c +@@ -1,7 +1,7 @@ + #include <string.h> + #include <stdio.h> + #include <stdlib.h> +-#include <glib/gstring.h> ++#include <glib.h> + #include <gtk/gtkmain.h> + #include <gtk/gtkscrolledwindow.h> + #include <gtk/gtkwindow.h> +Index: gtkhtml-3.18.3/gtkhtml/test-suite.c +=================================================================== +--- gtkhtml-3.18.3.orig/gtkhtml/test-suite.c ++++ gtkhtml-3.18.3/gtkhtml/test-suite.c +@@ -1,6 +1,6 @@ + #include <string.h> + #include <stdio.h> +-#include <glib/gstring.h> ++#include <glib.h> + #include <gtk/gtkmain.h> + #include <gtk/gtkscrolledwindow.h> + #include <gtk/gtkwindow.h> diff --git a/libraries/gtkhtml/gtkhtml.SlackBuild b/libraries/gtkhtml/gtkhtml.SlackBuild index cd85543379..1b1bdf5350 100644 --- a/libraries/gtkhtml/gtkhtml.SlackBuild +++ b/libraries/gtkhtml/gtkhtml.SlackBuild @@ -24,15 +24,13 @@ PRGNAM=gtkhtml VERSION=3.18.3 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -74,6 +72,10 @@ find . \ # Allow deprecated functions so the build can finish patch -p1 < $CWD/gtkhtml-3.18.3-allow_deprecated_functions.diff || exit 1 +# 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 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |