summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2012-09-06 21:48:00 -0400
committerRobby Workman <rworkman@slackbuilds.org>2012-09-06 21:42:28 -0500
commitcff2f8f628c2a44187cadc5f84ace88f9952c903 (patch)
tree8775b8341786acaa77c6af2ff32bb019df42d74b
parentb171a92cd86af7dd34c640fec350997d88608fb7 (diff)
downloadslackbuilds-cff2f8f628c2a44187cadc5f84ace88f9952c903.tar.gz
academic/gelemental: Patched for glib 2.32+.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--academic/gelemental/gelemental.SlackBuild6
-rw-r--r--academic/gelemental/glib-single-include.patch40
2 files changed, 45 insertions, 1 deletions
diff --git a/academic/gelemental/gelemental.SlackBuild b/academic/gelemental/gelemental.SlackBuild
index da065fbbff..c477836766 100644
--- a/academic/gelemental/gelemental.SlackBuild
+++ b/academic/gelemental/gelemental.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=gelemental
VERSION=${VERSION:-1.2.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -80,6 +80,10 @@ sed -i "s:Categories=GTK;Utility;Science;Chemistry;:Categories=Education;:" data
# Increase the info button size
sed -i "s:set_size_request (50, 50):set_size_request (64, 64):" src/buttons.cc
+# 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 \
diff --git a/academic/gelemental/glib-single-include.patch b/academic/gelemental/glib-single-include.patch
new file mode 100644
index 0000000000..da0c6b4bcf
--- /dev/null
+++ b/academic/gelemental/glib-single-include.patch
@@ -0,0 +1,40 @@
+Index: gelemental-1.2.0/libelemental/misc/extras.cc
+===================================================================
+--- gelemental-1.2.0.orig/libelemental/misc/extras.cc
++++ gelemental-1.2.0/libelemental/misc/extras.cc
+@@ -21,7 +21,7 @@
+
+ #include <algorithm>
+ #include <stdexcept>
+-#include <glib/gmem.h>
++#include <glib.h>
+ #include <glibmm/utility.h>
+
+ namespace misc {
+Index: gelemental-1.2.0/libelemental/misc/widgets.cc
+===================================================================
+--- gelemental-1.2.0.orig/libelemental/misc/widgets.cc
++++ gelemental-1.2.0/libelemental/misc/widgets.cc
+@@ -20,7 +20,7 @@
+ #include "macros.hh"
+ #include "widgets.hh"
+
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtkmm/alignment.h>
+ #include <gtkmm/image.h>
+ #include <gtkmm/label.h>
+Index: gelemental-1.2.0/src/main.cc
+===================================================================
+--- gelemental-1.2.0.orig/src/main.cc
++++ gelemental-1.2.0/src/main.cc
+@@ -26,8 +26,7 @@
+ #include <clocale>
+ #include <iostream>
+ #include <locale>
+-#include <glib/goption.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <glibmm/optionentry.h>
+ #include <gtk/gtkaboutdialog.h>
+ #include <gtk/gtkversion.h>