libraries/gconfmm: add patch to fix build

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 74 insertions, 7 deletions

diff --git a/libraries/gconfmm/gconfmm-2.28.3-no-extern-c-glib-includes.patch b/libraries/gconfmm/gconfmm-2.28.3-no-extern-c-glib-includes.patch
new file mode 100644
index 000000000000..026a28aab02b
--- /dev/null
+++ b/libraries/gconfmm/gconfmm-2.28.3-no-extern-c-glib-includes.patch
@@ -0,0 +1,45 @@
+diff -Naur gconfmm-2.28.3-original/gconf/gconfmm/callback.h gconfmm-2.28.3/gconf/gconfmm/callback.h
+--- gconfmm-2.28.3-original/gconf/gconfmm/callback.h	2011-10-18 11:33:49.000000000 -0400
++++ gconfmm-2.28.3/gconf/gconfmm/callback.h	2021-02-13 09:21:06.167235506 -0500
+@@ -22,10 +22,7 @@
+ #ifndef GCONFMM_CALLBACK_H
+ #define GCONFMM_CALLBACK_H
+ 
+-extern "C"
+-{
+ #include <gconf/gconf-client.h>
+-}
+ 
+ #include <glibmm/object.h>
+ #include <gconfmm/entry.h>
+diff -Naur gconfmm-2.28.3-original/gconf/gconfmm/schema.h gconfmm-2.28.3/gconf/gconfmm/schema.h
+--- gconfmm-2.28.3-original/gconf/gconfmm/schema.h	2011-10-21 04:51:27.000000000 -0400
++++ gconfmm-2.28.3/gconf/gconfmm/schema.h	2021-02-13 09:21:24.616354041 -0500
+@@ -31,10 +31,8 @@
+ #include <gconfmm/value.h>
+ 
+ 
+-extern "C" {
+-    // TODO: do not include this.
++// TODO: do not include this.
+ #include <gconf/gconf-schema.h>
+-}
+ 
+ namespace Gnome
+ {
+diff -Naur gconfmm-2.28.3-original/gconf/src/schema.hg gconfmm-2.28.3/gconf/src/schema.hg
+--- gconfmm-2.28.3-original/gconf/src/schema.hg	2011-10-18 11:33:49.000000000 -0400
++++ gconfmm-2.28.3/gconf/src/schema.hg	2021-02-13 09:21:58.002568546 -0500
+@@ -24,10 +24,8 @@
+ 
+ _DEFS(gconfmm,gconf)
+ 
+-extern "C" {
+-    // TODO: do not include this.
++// TODO: do not include this.
+ #include <gconf/gconf-schema.h>
+-}
+ 
+ namespace Gnome
+ {
+ 
\ No newline at end of file
diff --git a/libraries/gconfmm/gconfmm.SlackBuild b/libraries/gconfmm/gconfmm.SlackBuild
index eceae4c5a1d0..d489d1a55912 100644
--- a/libraries/gconfmm/gconfmm.SlackBuild
+++ b/libraries/gconfmm/gconfmm.SlackBuild
@@ -2,8 +2,27 @@
 
 # Slackware build script for gconfmm
 
+# Updated 2021 Petar Petrov slackalaxy@gmail.com
 # Written by crocket (crockabiscuit@gmail.com)
 # Maintained by Christoph Willing <chris.willing@linux.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gconfmm
 VERSION=${VERSION:-2.28.3}
@@ -12,7 +31,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -23,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -47,10 +66,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Thanks to Gentoo!
+patch -p1 -i $CWD/gconfmm-2.28.3-no-extern-c-glib-includes.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=c++11" \