summaryrefslogtreecommitdiff
path: root/source/l/gtk+2
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2016-06-30 20:26:57 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:31:18 +0200
commitd31c50870d0bee042ce660e445c9294a59a3a65b (patch)
tree6bfc0de3c95267b401b620c2c67859557dc60f97 /source/l/gtk+2
parent76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff)
downloadcurrent-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
Diffstat (limited to 'source/l/gtk+2')
-rw-r--r--source/l/gtk+2/doinst.sh2
-rw-r--r--source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff50
-rwxr-xr-xsource/l/gtk+2/gtk+2.SlackBuild20
-rw-r--r--source/l/gtk+2/gtk.gtk-faq.diff11
-rw-r--r--source/l/gtk+2/gtk.gtk-tut.diff11
5 files changed, 61 insertions, 33 deletions
diff --git a/source/l/gtk+2/doinst.sh b/source/l/gtk+2/doinst.sh
index 18d5fb27..ee74ab9c 100644
--- a/source/l/gtk+2/doinst.sh
+++ b/source/l/gtk+2/doinst.sh
@@ -10,9 +10,7 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
-config etc/gtk-2.0/gtkrc.new
config etc/gtk-2.0/im-multipress.conf.new
-rm -f etc/gtk-2.0/gtkrc.new
chroot . rm -f /usr/share/icons/*/icon-theme.cache 1> /dev/null 2> /dev/null
diff --git a/source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff b/source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff
index 6d6ad4d2..6c352351 100644
--- a/source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff
+++ b/source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff
@@ -1,26 +1,26 @@
-diff -Nur gtk+-2.24.0.orig/docs/faq/Makefile.am gtk+-2.24.0/docs/faq/Makefile.am
---- gtk+-2.24.0.orig/docs/faq/Makefile.am 2011-01-05 09:51:19.000000000 -0600
-+++ gtk+-2.24.0/docs/faq/Makefile.am 2011-02-11 10:41:13.383824443 -0600
-@@ -9,7 +9,8 @@
- (cd $(srcdir); \
- db2html gtk-faq.sgml; \
- test -d html && rm -r html; \
-- mv gtk-faq html); \
-+ mkdir html; \
-+ mv *.html html); \
- fi
+diff -Nur gtk+-2.24.27.orig/docs/faq/Makefile.in gtk+-2.24.27/docs/faq/Makefile.in
+--- gtk+-2.24.27.orig/docs/faq/Makefile.in 2015-03-03 10:41:21.000000000 -0600
++++ gtk+-2.24.27/docs/faq/Makefile.in 2015-03-05 20:21:08.037167566 -0600
+@@ -644,7 +644,8 @@
+ @HAVE_DOCBOOK_TRUE@ (cd $(srcdir); \
+ @HAVE_DOCBOOK_TRUE@ db2html gtk-faq.sgml; \
+ @HAVE_DOCBOOK_TRUE@ test -d html && rm -r html; \
+-@HAVE_DOCBOOK_TRUE@ mv gtk-faq html); \
++@HAVE_DOCBOOK_TRUE@ mkdir html; \
++@HAVE_DOCBOOK_TRUE@ mv *.html html); \
+ @HAVE_DOCBOOK_TRUE@ fi
- pdf:
-diff -Nur gtk+-2.24.0.orig/docs/tutorial/Makefile.am gtk+-2.24.0/docs/tutorial/Makefile.am
---- gtk+-2.24.0.orig/docs/tutorial/Makefile.am 2011-01-05 09:51:20.000000000 -0600
-+++ gtk+-2.24.0/docs/tutorial/Makefile.am 2011-02-11 10:42:04.541622883 -0600
-@@ -42,7 +42,8 @@
- (cd $(srcdir); \
- db2html gtk-tut.sgml; \
- test -d html && rm -r html; \
-- mv gtk-tut html; \
-+ mkdir html; \
-+ mv *.html html; \
- mkdir html/images; \
- cp images/*.png html/images); \
- fi
+ @HAVE_DOCBOOK_TRUE@pdf:
+diff -Nur gtk+-2.24.27.orig/docs/tutorial/Makefile.in gtk+-2.24.27/docs/tutorial/Makefile.in
+--- gtk+-2.24.27.orig/docs/tutorial/Makefile.in 2015-03-03 10:41:21.000000000 -0600
++++ gtk+-2.24.27/docs/tutorial/Makefile.in 2015-03-05 20:19:52.973017063 -0600
+@@ -657,7 +657,8 @@
+ @HAVE_DOCBOOK_TRUE@ (cd $(srcdir); \
+ @HAVE_DOCBOOK_TRUE@ db2html gtk-tut.sgml; \
+ @HAVE_DOCBOOK_TRUE@ test -d html && rm -r html; \
+-@HAVE_DOCBOOK_TRUE@ mv gtk-tut html; \
++@HAVE_DOCBOOK_TRUE@ mkdir html; \
++@HAVE_DOCBOOK_TRUE@ mv *.html html; \
+ @HAVE_DOCBOOK_TRUE@ mkdir html/images; \
+ @HAVE_DOCBOOK_TRUE@ cp images/*.png html/images); \
+ @HAVE_DOCBOOK_TRUE@ fi
diff --git a/source/l/gtk+2/gtk+2.SlackBuild b/source/l/gtk+2/gtk+2.SlackBuild
index cc8f1651..92f95449 100755
--- a/source/l/gtk+2/gtk+2.SlackBuild
+++ b/source/l/gtk+2/gtk+2.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2016 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,7 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
@@ -40,8 +40,8 @@ CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-gtk2
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -77,8 +77,13 @@ zcat $CWD/gtk.xid.nowarningflood.diff.gz | patch -p1 --verbose || exit 1
# Patch to restore commonly used icon names, otherwise everything breaks.
# I fail to see the point of this "cleanup"
-zcat $CWD/gtk+-2.24.x.icon-compat.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/gtk+-2.24.x.icon-compat.am.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-2.24.x.icon-compat.diff.gz | patch -p1 --verbose || exit 1
+
+# Prevents build failures in the docs. Found online.
+# Only needed if autoreconf is used... ?
+zcat $CWD/gtk.gtk-faq.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk.gtk-tut.diff.gz | patch -p1 --verbose || exit 1
# Regenerate ./configure:
libtoolize --force
@@ -117,7 +122,10 @@ make install \
mv $PKG/etc/gtk-2.0/im-multipress.conf $PKG/etc/gtk-2.0/im-multipress.conf.new || exit 1
# Install a "starter" gtkrc
-echo 'gtk-theme-name="GTK+"' > $PKG/etc/gtk-2.0/gtkrc.new
+# /etc/gtk-2.0/gtkrc overrides this --rworkman
+echo 'gtk-theme-name="GTK+"' > $PKG/usr/share/gtk-2.0/gtkrc
+echo 'gtk-icon-theme-name="Adwaita"' >> $PKG/usr/share/gtk-2.0/gtkrc
+echo 'gtk-fallback-icon-theme = "Tango"' >> $PKG/usr/share/gtk-2.0/gtkrc
# We need to have separate 32-bit and 64-bit binaries
# for places where we have two copies of the GTK+ package installed.
diff --git a/source/l/gtk+2/gtk.gtk-faq.diff b/source/l/gtk+2/gtk.gtk-faq.diff
new file mode 100644
index 00000000..f3307d51
--- /dev/null
+++ b/source/l/gtk+2/gtk.gtk-faq.diff
@@ -0,0 +1,11 @@
+--- ./docs/faq/Makefile.am.orig 2014-09-29 15:02:16.000000000 -0500
++++ ./docs/faq/Makefile.am 2015-03-18 22:11:42.692413132 -0500
+@@ -7,7 +7,7 @@
+ html:
+ if test -w $(srcdir); then \
+ (cd $(srcdir); \
+- db2html gtk-faq.sgml; \
++ db2html -o gtk-faq gtk-faq.sgml; \
+ test -d html && rm -r html; \
+ mv gtk-faq html); \
+ fi
diff --git a/source/l/gtk+2/gtk.gtk-tut.diff b/source/l/gtk+2/gtk.gtk-tut.diff
new file mode 100644
index 00000000..ee363a26
--- /dev/null
+++ b/source/l/gtk+2/gtk.gtk-tut.diff
@@ -0,0 +1,11 @@
+--- ./docs/tutorial/Makefile.am.orig 2014-09-29 15:02:16.000000000 -0500
++++ ./docs/tutorial/Makefile.am 2015-03-18 22:04:36.171382357 -0500
+@@ -40,7 +40,7 @@
+ html: gtk-tut.sgml
+ if test -w $(srcdir); then \
+ (cd $(srcdir); \
+- db2html gtk-tut.sgml; \
++ db2html -o gtk-tut gtk-tut.sgml; \
+ test -d html && rm -r html; \
+ mv gtk-tut html; \
+ mkdir html/images; \