From 4546743ec059ade0b1a4fffdb2415565e2a59a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikko=20V=C3=A4rri?= Date: Tue, 11 Sep 2012 08:30:23 -0500 Subject: libraries/gtksourceview: Fix several build issues. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mikko Värri Signed-off-by: Robby Workman --- .../allow-deprecated-glib-symbols.patch | 10 +++++ .../fix-pkg-config-use-before-set.patch | 47 ++++++++++++++++++++++ libraries/gtksourceview/force-gtk2.patch | 13 ++++++ libraries/gtksourceview/gtksourceview.SlackBuild | 22 +++++++++- 4 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 libraries/gtksourceview/allow-deprecated-glib-symbols.patch create mode 100644 libraries/gtksourceview/fix-pkg-config-use-before-set.patch create mode 100644 libraries/gtksourceview/force-gtk2.patch (limited to 'libraries/gtksourceview') diff --git a/libraries/gtksourceview/allow-deprecated-glib-symbols.patch b/libraries/gtksourceview/allow-deprecated-glib-symbols.patch new file mode 100644 index 0000000000000..6191aadd1749d --- /dev/null +++ b/libraries/gtksourceview/allow-deprecated-glib-symbols.patch @@ -0,0 +1,10 @@ +--- configure.orig 2012-09-11 11:07:07.750998010 +0300 ++++ configure 2012-09-11 11:07:25.848998458 +0300 +@@ -10955,7 +10955,6 @@ + + if test "$enable_deprecations" = "yes"; then + DISABLE_DEPRECATED_CFLAGS="\ +--DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ diff --git a/libraries/gtksourceview/fix-pkg-config-use-before-set.patch b/libraries/gtksourceview/fix-pkg-config-use-before-set.patch new file mode 100644 index 0000000000000..72c7697f9ab68 --- /dev/null +++ b/libraries/gtksourceview/fix-pkg-config-use-before-set.patch @@ -0,0 +1,47 @@ +--- configure.orig 2012-09-11 02:15:41.304005832 +0300 ++++ configure 2012-09-11 02:17:41.957003984 +0300 +@@ -10820,23 +10820,6 @@ + fi + + +-if test "$enable_deprecations" = "yes"; then +- DISABLE_DEPRECATED_CFLAGS="\ +--DG_DISABLE_DEPRECATED \ +--DGDK_DISABLE_DEPRECATED \ +--DGTK_DISABLE_DEPRECATED \ +--DGDK_PIXBUF_DISABLE_DEPRECATED \ +--DGNOME_DISABLE_DEPRECATED" +- +- if $PKG_CONFIG --atleast-version 2.90 $GTK_REQUIRED; then +- DISABLE_DEPRECATED_CFLAGS="$DISABLE_DEPRECATED_CFLAGS -DGSEAL_ENABLE" +- fi +- +- +-fi +- +- +- + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +@@ -10970,6 +10953,20 @@ + + fi + ++if test "$enable_deprecations" = "yes"; then ++ DISABLE_DEPRECATED_CFLAGS="\ ++-DG_DISABLE_DEPRECATED \ ++-DGDK_DISABLE_DEPRECATED \ ++-DGTK_DISABLE_DEPRECATED \ ++-DGDK_PIXBUF_DISABLE_DEPRECATED \ ++-DGNOME_DISABLE_DEPRECATED" ++ ++ if $PKG_CONFIG --atleast-version 2.90 $GTK_REQUIRED; then ++ DISABLE_DEPRECATED_CFLAGS="$DISABLE_DEPRECATED_CFLAGS -DGSEAL_ENABLE" ++ fi ++ ++ ++fi + + + pkg_failed=no diff --git a/libraries/gtksourceview/force-gtk2.patch b/libraries/gtksourceview/force-gtk2.patch new file mode 100644 index 0000000000000..69fdc85687ee8 --- /dev/null +++ b/libraries/gtksourceview/force-gtk2.patch @@ -0,0 +1,13 @@ +--- configure.orig 2012-09-11 03:34:25.354997735 +0300 ++++ configure 2012-09-11 03:35:50.618000004 +0300 +@@ -10935,8 +10935,8 @@ + + fi + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 2.90\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.90") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.5\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.5") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then diff --git a/libraries/gtksourceview/gtksourceview.SlackBuild b/libraries/gtksourceview/gtksourceview.SlackBuild index 676c1f8a8aca1..a457b9a05660b 100644 --- a/libraries/gtksourceview/gtksourceview.SlackBuild +++ b/libraries/gtksourceview/gtksourceview.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=gtksourceview VERSION=${VERSION:-2.11.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} # Automatically determine the architecture we're building on: @@ -73,6 +73,22 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# In configure.ac, PKG_CONFIG environment variable is used before it +# is set. Instead of fixing configure.ac and regenerating all of the +# build framework, let's just monkey patch the configure script. +patch -p0 <$CWD/fix-pkg-config-use-before-set.patch + +# gtksourceview 2.11.2 seems to claim to be compatible with gtk3 => +# 2.90, but in reality is not compatible with the one in Slackware +# 14.0. Let's force the configure script to pick up gtk2 instead by +# raising the minimum gtk3 version. +patch -p0 <$CWD/force-gtk2.patch + +# Code is still using G_CONST_RETURN which is deprecated in the +# version of glib shipping with Slackware 14.0. Let's remove the +# G_DISABLE_DEPRECATED from C preprocessor flags. +patch -p0 <$CWD/allow-deprecated-glib-symbols.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -85,7 +101,9 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-glade-catalog \ --build=$ARCH-slackware-linux -make +# At the end of build process, the uninstalled gtksourceview.pc is +# used. Let's make sure pkg-config can find it. +PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TMP/$PRGNAM-$VERSION make make install-strip DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ -- cgit v1.2.3