From 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 4 Nov 2013 17:08:47 +0000 Subject: Slackware 14.1 Mon Nov 4 17:08:47 UTC 2013 Slackware 14.1 x86_64 stable is released! It's been another interesting release cycle here at Slackware bringing new features like support for UEFI machines, updated compilers and development tools, the switch from MySQL to MariaDB, and many more improvements throughout 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! :-) --- source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff | 14 ++--- source/l/gtk+2/gtk+-2.24.x.icon-compat.diff | 15 +++-- source/l/gtk+2/gtk+2.SlackBuild | 12 +--- source/l/gtk+2/update-gtk-immodules-2.0 | 64 +++++----------------- .../gtk+2/use_host_triplet_for_gtk_immodules.diff | 23 -------- 5 files changed, 30 insertions(+), 98 deletions(-) delete mode 100644 source/l/gtk+2/use_host_triplet_for_gtk_immodules.diff (limited to 'source/l/gtk+2') diff --git a/source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff b/source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff index 0464648a..3fc35dca 100644 --- a/source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff +++ b/source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff @@ -1,11 +1,11 @@ ---- ./gtk/Makefile.am.orig 2011-04-01 15:44:12.000000000 -0500 -+++ ./gtk/Makefile.am 2011-04-02 12:20:03.000000000 -0500 -@@ -1324,7 +1324,171 @@ +--- gtk+-2.24.14.orig/gtk/Makefile.am 2012-08-24 18:38:09.000000000 -0500 ++++ gtk+-2.24.14/gtk/Makefile.am 2012-12-12 19:03:36.039889640 -0600 +@@ -1339,7 +1339,171 @@ + stock-icons/24/document-save.png \ stock-icons/24/folder-remote.png \ stock-icons/24/user-home.png \ - stock-icons/24/user-desktop.png \ -- stock-icons/24/text-x-generic.png -+ stock-icons/24/text-x-generic.png \ +- stock-icons/24/user-desktop.png ++ stock-icons/24/user-desktop.png \ + stock-icons/16/gtk-quit.png \ + stock-icons/16/gtk-info.png \ + stock-icons/16/gtk-file.png \ @@ -173,7 +173,7 @@ # need to copy the icons so that we can replace the generated ones with # symlinks, even in the readonly srcdir case -@@ -1364,6 +1528,88 @@ +@@ -1379,6 +1543,88 @@ && $(LN_S) folder.png user-desktop.png \ && $(RM) user-home.png \ && $(LN_S) folder.png user-home.png \ diff --git a/source/l/gtk+2/gtk+-2.24.x.icon-compat.diff b/source/l/gtk+2/gtk+-2.24.x.icon-compat.diff index d4df76a7..ff9a444b 100644 --- a/source/l/gtk+2/gtk+-2.24.x.icon-compat.diff +++ b/source/l/gtk+2/gtk+-2.24.x.icon-compat.diff @@ -1,12 +1,11 @@ ---- ./gtk/Makefile.in.orig 2011-04-01 16:41:08.000000000 -0500 -+++ ./gtk/Makefile.in 2011-04-02 12:21:32.000000000 -0500 -@@ -1614,7 +1614,172 @@ +--- gtk+-2.24.14.orig/gtk/Makefile.in 2012-12-05 21:46:20.000000000 -0600 ++++ gtk+-2.24.14/gtk/Makefile.in 2012-12-12 18:59:17.734970161 -0600 +@@ -1938,7 +1938,171 @@ + stock-icons/24/document-save.png \ stock-icons/24/folder-remote.png \ stock-icons/24/user-home.png \ - stock-icons/24/user-desktop.png \ -- stock-icons/24/text-x-generic.png -+ stock-icons/24/text-x-generic.png \ -+ stock-icons/24/text-x-generic.png \ +- stock-icons/24/user-desktop.png ++ stock-icons/24/user-desktop.png \ + stock-icons/16/gtk-quit.png \ + stock-icons/16/gtk-info.png \ + stock-icons/16/gtk-file.png \ @@ -174,7 +173,7 @@ @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache -@@ -2885,6 +3050,88 @@ +@@ -5401,6 +5565,88 @@ && $(LN_S) folder.png user-desktop.png \ && $(RM) user-home.png \ && $(LN_S) folder.png user-home.png \ diff --git a/source/l/gtk+2/gtk+2.SlackBuild b/source/l/gtk+2/gtk+2.SlackBuild index 9fff68c4..cc8f1651 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 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=${VERSION:-$(echo gtk+-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -75,9 +75,6 @@ zcat $CWD/fix_build_issues_on_tutorial_and_faq.diff.gz | patch -p1 --verbose || # warnings (most noticable when using Firefox and Flash): zcat $CWD/gtk.xid.nowarningflood.diff.gz | patch -p1 --verbose || exit 1 -# Use /etc/gtk-2.0/$ARCH-slackware-linux instead of /etc/gtk-2.0/ for gtk.immodules -zcat $CWD/use_host_triplet_for_gtk_immodules.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 @@ -91,7 +88,7 @@ autoreconf -vif # Our host is $ARCH-slackware-linux not $ARCH-slackware-linux-gnu: sed -i -e 's#linux|linux-gnu|#linux|linux|#' config.sub -CFLAGS="$SLKCFLAGS -DHOST='"'"${ARCH}-slackware-linux"'"'" \ +CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -116,9 +113,6 @@ make install \ DESTDIR=$PKG \ || exit 1 -mkdir -p $PKG/etc/gtk-2.0/$host -mv $PKG/etc/gtk-2.0/gtk.immodules $PKG/etc/gtk-2.0/$host/ - # Don't clobber im-multipress.conf mv $PKG/etc/gtk-2.0/im-multipress.conf $PKG/etc/gtk-2.0/im-multipress.conf.new || exit 1 diff --git a/source/l/gtk+2/update-gtk-immodules-2.0 b/source/l/gtk+2/update-gtk-immodules-2.0 index d913f69f..f12353fb 100644 --- a/source/l/gtk+2/update-gtk-immodules-2.0 +++ b/source/l/gtk+2/update-gtk-immodules-2.0 @@ -1,5 +1,5 @@ #! /bin/sh -# Updates the immodules in /etc/gtk-2.0/$host +# Updates the immodules cache at /usr/lib(64)/gtk-2.0/2.10.0/immodules.cache umask 022 @@ -11,75 +11,37 @@ case "$host" in arm*) host=arm-slackware-linux-gnueabi ;; esac -# Deriving /etc/gtk-2.0/$host location -# -# We have had problems in the past with build systems -# changing host from i386 to i686 and appending/dropping -# the -gnu suffix, so try to match up the $host we got -# with whats actually there. -if [ ! -d /etc/gtk-2.0/$host ]; then - case "$host" in - i?86*) - for d in $(ls -d /etc/gtk-2.0/i?86*); do - host=$(basename $d) - break - done - ;; - esac -fi - -FILE=/etc/gtk-2.0/$host/gtk.immodules - case "$host" in s390x*|x86_64*) if [ -x /usr/bin/gtk-query-immodules-2.0-64 ]; then if [ "$1" = "--verbose" ]; then echo "Updating gtk.immodules for ${host}:" - echo " /usr/bin/gtk-query-immodules-2.0-64 \\" - echo " > $FILE" + echo " /usr/bin/gtk-query-immodules-2.0-64 --update-cache" fi - /usr/bin/gtk-query-immodules-2.0-64 > $FILE - # Check for x86_64 multilib: - if ls -d /etc/gtk-2.0/i?86* 1> /dev/null 2> /dev/null ; then - for d in $(ls -d /etc/gtk-2.0/i?86*); do - mlhost=$(basename $d) - break - done - if [ -r /etc/gtk-2.0/$mlhost/gtk.immodules -a \ - -x /usr/bin/gtk-query-immodules-2.0-32 ]; then - FILE=/etc/gtk-2.0/$mlhost/gtk.immodules - if [ "$1" = "--verbose" ]; then - echo "Updating gtk.immodules for ${mlhost}:" - echo " /usr/bin/gtk-query-immodules-2.0-32 \\" - echo " > $FILE" - fi - /usr/bin/gtk-query-immodules-2.0-32 > $FILE + /usr/bin/gtk-query-immodules-2.0-64 --update-cache 2>/dev/null + # Check for multilib + if [ -x /usr/bin/gtk-query-immodules-2.0-32 ]; then + if [ "$1" = "--verbose" ]; then + echo "Updating 32bit gtk.immodules: " + echo " /usr/bin/gtk-query-immodules-2.0-32 --update-cache" fi + /usr/bin/gtk-query-immodules-2.0-32 --update-cache 2>/dev/null fi - else - if [ "$1" = "--verbose" ]; then - echo "Updating gtk.immodules for ${host}:" - echo " /usr/bin/gtk-query-immodules-2.0 \\" - echo " > $FILE" - fi - /usr/bin/gtk-query-immodules-2.0 > $FILE fi ;; *) if [ -x /usr/bin/gtk-query-immodules-2.0-32 ]; then if [ "$1" = "--verbose" ]; then echo "Updating gtk.immodules for ${host}:" - echo " /usr/bin/gtk-query-immodules-2.0-32 \\" - echo " > $FILE" + echo " /usr/bin/gtk-query-immodules-2.0-32 --update-cache" fi - /usr/bin/gtk-query-immodules-2.0-32 > $FILE + /usr/bin/gtk-query-immodules-2.0-32 --update-cache 2>/dev/null else if [ "$1" = "--verbose" ]; then echo "Updating gtk.immodules for ${host}:" - echo " /usr/bin/gtk-query-immodules-2.0 \\" - echo " > $FILE" + echo " /usr/bin/gtk-query-immodules-2.0 --update-cache" fi - /usr/bin/gtk-query-immodules-2.0 > $FILE + /usr/bin/gtk-query-immodules-2.0 --update-cache 2>/dev/null fi ;; esac diff --git a/source/l/gtk+2/use_host_triplet_for_gtk_immodules.diff b/source/l/gtk+2/use_host_triplet_for_gtk_immodules.diff deleted file mode 100644 index 7f86d38d..00000000 --- a/source/l/gtk+2/use_host_triplet_for_gtk_immodules.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur gtk+-2.24.0.orig/gtk/Makefile.am gtk+-2.24.0/gtk/Makefile.am ---- gtk+-2.24.0.orig/gtk/Makefile.am 2011-01-06 22:41:26.000000000 -0600 -+++ gtk+-2.24.0/gtk/Makefile.am 2011-02-11 08:52:32.734533831 -0600 -@@ -38,6 +38,7 @@ - -DGTK_DATADIR=\"$(datadir)\" \ - -DGTK_DATA_PREFIX=\"$(prefix)\" \ - -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DHOST=\"$(host_triplet)\" \ - -DGTK_VERSION=\"$(GTK_VERSION)\" \ - -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ - -DGTK_HOST=\"$(host)\" \ -diff -Nur gtk+-2.24.0.orig/gtk/gtkrc.c gtk+-2.24.0/gtk/gtkrc.c ---- gtk+-2.24.0.orig/gtk/gtkrc.c 2011-01-26 13:46:37.000000000 -0600 -+++ gtk+-2.24.0/gtk/gtkrc.c 2011-02-11 08:54:35.145348489 -0600 -@@ -450,7 +450,7 @@ - if (im_module_file) - result = g_strdup (im_module_file); - else -- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", HOST, "gtk.immodules", NULL); - } - - return result; -- cgit v1.2.3