From 031b54d0d3beb1846bf599cbe1dbc84364d718de Mon Sep 17 00:00:00 2001 From: dsomero Date: Mon, 24 Sep 2012 22:01:44 -0400 Subject: business/gnucash: Patched for glib 2.32+ Signed-off-by: dsomero --- business/gnucash/glib-single-include.patch | 37 ++++++++++++++++++++++++++++++ business/gnucash/gnucash.SlackBuild | 6 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 business/gnucash/glib-single-include.patch diff --git a/business/gnucash/glib-single-include.patch b/business/gnucash/glib-single-include.patch new file mode 100644 index 0000000000..5213f5dfed --- /dev/null +++ b/business/gnucash/glib-single-include.patch @@ -0,0 +1,37 @@ +Index: gnucash-2.4.5/src/core-utils/gnc-filepath-utils.c +=================================================================== +--- gnucash-2.4.5.orig/src/core-utils/gnc-filepath-utils.c ++++ gnucash-2.4.5/src/core-utils/gnc-filepath-utils.c +@@ -47,7 +47,6 @@ + #include "gnc-filepath-utils.h" + + #ifdef _MSC_VER +-#include + #define PATH_MAX MAXPATHLEN + #endif + +Index: gnucash-2.4.5/src/gnome-utils/gnc-frequency.c +=================================================================== +--- gnucash-2.4.5.orig/src/gnome-utils/gnc-frequency.c ++++ gnucash-2.4.5/src/gnome-utils/gnc-frequency.c +@@ -26,7 +26,7 @@ + #include "config.h" + + #include +-#include ++#include + #include + #include + +Index: gnucash-2.4.5/src/libqof/qof/gnc-date.c +=================================================================== +--- gnucash-2.4.5.orig/src/libqof/qof/gnc-date.c ++++ gnucash-2.4.5/src/libqof/qof/gnc-date.c +@@ -40,7 +40,6 @@ + #include + #include + +-#include + #include + + #include "gnc-date-p.h" diff --git a/business/gnucash/gnucash.SlackBuild b/business/gnucash/gnucash.SlackBuild index 8b597ffda0..fe63a32226 100644 --- a/business/gnucash/gnucash.SlackBuild +++ b/business/gnucash/gnucash.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=gnucash VERSION=2.4.5 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -92,6 +92,10 @@ 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 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ -- cgit v1.2.3