diff options
Diffstat (limited to 'source/l/gtk+2')
| -rw-r--r-- | source/l/gtk+2/doinst.sh | 31 | ||||
| -rw-r--r-- | source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff | 26 | ||||
| -rw-r--r-- | source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff | 264 | ||||
| -rw-r--r-- | source/l/gtk+2/gtk+-2.24.x.icon-compat.diff | 265 | ||||
| -rwxr-xr-x | source/l/gtk+2/gtk+2.SlackBuild | 77 | ||||
| -rw-r--r-- | source/l/gtk+2/gtk.png14.diff | 19 | ||||
| -rw-r--r-- | source/l/gtk+2/gtk.pnglz.diff | 12 | ||||
| -rwxr-xr-x | source/l/gtk+2/profile.d/gtk+.sh | 1 | ||||
| -rw-r--r-- | source/l/gtk+2/update-gdk-pixbuf-loaders | 86 | ||||
| -rw-r--r-- | source/l/gtk+2/update-gtk-immodules | 90 | ||||
| -rw-r--r-- | source/l/gtk+2/update-gtk-immodules-2.0 | 86 | ||||
| -rw-r--r-- | source/l/gtk+2/use_host_triplet_for_gtk_immodules.diff | 23 |
12 files changed, 722 insertions, 258 deletions
diff --git a/source/l/gtk+2/doinst.sh b/source/l/gtk+2/doinst.sh index 1122e0cd7..18d5fb272 100644 --- a/source/l/gtk+2/doinst.sh +++ b/source/l/gtk+2/doinst.sh @@ -1,35 +1,18 @@ -#!/bin/sh config() { NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" + OLD="$(dirname $NEW)/$(basename $NEW .new)" # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy rm $NEW fi # Otherwise, we leave the .new copy for the admin to consider... } -if [ -d etc/gtk-2.0/$(uname -m)-slackware-linux ]; then - config etc/gtk-2.0/$(uname -m)-slackware-linux/im-multipress.conf.new -elif [ -d etc/gtk-2.0/i486-slackware-linux ]; then - config etc/gtk-2.0/i486-slackware-linux/im-multipress.conf.new -elif [ -d etc/gtk-2.0/*-slackware-linux ]; then - config etc/gtk-2.0/*-slackware-linux/im-multipress.conf.new -fi -# Since the use of icon caching is optional, and has to be kept in sync -# somehow (like a "registry" through a cron job, or whatever, I tend to -# think the user should be the one to choose if they really want to set -# this up or not: -# -# Example: -#for dir in /usr/share/icons/* ; do -# if [ -d $dir ]; then -# /usr/bin/gtk-update-icon-cache -f -t $dir 1> /dev/null 2> /dev/null -# fi -#done -mkdir -p etc/gtk-2.0 +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 @@ -39,3 +22,7 @@ if [ -x /usr/bin/update-gtk-immodules-2.0 ]; then /usr/bin/update-gtk-immodules fi +# In case this is the first run installing the standalone gdk-pixbuf, +# we will run this a second time to fix machines that will not reboot. +chroot . /usr/bin/update-gdk-pixbuf-loaders 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 new file mode 100644 index 000000000..6d6ad4d23 --- /dev/null +++ b/source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff @@ -0,0 +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 + + 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 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 new file mode 100644 index 000000000..0464648a0 --- /dev/null +++ b/source/l/gtk+2/gtk+-2.24.x.icon-compat.am.diff @@ -0,0 +1,264 @@ +--- ./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 @@ + 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/16/gtk-quit.png \ ++ stock-icons/16/gtk-info.png \ ++ stock-icons/16/gtk-file.png \ ++ stock-icons/16/gtk-open.png \ ++ stock-icons/16/gtk-print-preview.png \ ++ stock-icons/16/gtk-print.png \ ++ stock-icons/16/gtk-properties.png \ ++ stock-icons/16/gtk-revert-to-saved-ltr.png \ ++ stock-icons/16/gtk-revert-to-saved-rtl.png \ ++ stock-icons/16/gtk-save-as.png \ ++ stock-icons/16/gtk-new.png \ ++ stock-icons/16/gtk-harddisk.png \ ++ stock-icons/16/gtk-clear.png \ ++ stock-icons/16/gtk-copy.png \ ++ stock-icons/16/gtk-cut.png \ ++ stock-icons/16/gtk-delete.png \ ++ stock-icons/16/gtk-find-and-replace.png \ ++ stock-icons/16/gtk-find.png \ ++ stock-icons/16/gtk-paste.png \ ++ stock-icons/16/gtk-redo-ltr.png \ ++ stock-icons/16/gtk-redo-rtl.png \ ++ stock-icons/16/gtk-select-all.png \ ++ stock-icons/16/gtk-undo-ltr.png \ ++ stock-icons/16/gtk-undo-rtl.png \ ++ stock-icons/16/gtk-directory.png \ ++ stock-icons/16/gtk-unindent-ltr.png \ ++ stock-icons/16/gtk-unindent-rtl.png \ ++ stock-icons/16/gtk-indent-ltr.png \ ++ stock-icons/16/gtk-indent-rtl.png \ ++ stock-icons/16/gtk-justify-center.png \ ++ stock-icons/16/gtk-justify-fill.png \ ++ stock-icons/16/gtk-justify-left.png \ ++ stock-icons/16/gtk-justify-right.png \ ++ stock-icons/16/gtk-bold.png \ ++ stock-icons/16/gtk-italic.png \ ++ stock-icons/16/gtk-strikethrough.png \ ++ stock-icons/16/gtk-underline.png \ ++ stock-icons/16/gtk-goto-bottom.png \ ++ stock-icons/16/gtk-go-down.png \ ++ stock-icons/16/gtk-goto-first-ltr.png \ ++ stock-icons/16/gtk-home.png \ ++ stock-icons/16/gtk-jump-to-ltr.png \ ++ stock-icons/16/gtk-jump-to-rtl.png \ ++ stock-icons/16/gtk-goto-last-ltr.png \ ++ stock-icons/16/gtk-go-forward-ltr.png \ ++ stock-icons/16/gtk-go-back-ltr.png \ ++ stock-icons/16/gtk-goto-top.png \ ++ stock-icons/16/gtk-go-up.png \ ++ stock-icons/16/gtk-about.png \ ++ stock-icons/16/gtk-help.png \ ++ stock-icons/16/gtk-missing-image.png \ ++ stock-icons/16/gtk-add.png \ ++ stock-icons/16/gtk-remove.png \ ++ stock-icons/16/gtk-floppy.png \ ++ stock-icons/16/gtk-cdrom.png \ ++ stock-icons/16/gtk-media-pause.png \ ++ stock-icons/16/gtk-media-play-ltr.png \ ++ stock-icons/16/gtk-media-play-rtl.png \ ++ stock-icons/16/gtk-media-stop.png \ ++ stock-icons/16/gtk-media-record.png \ ++ stock-icons/16/gtk-media-rewind-ltr.png \ ++ stock-icons/16/gtk-media-forward-ltr.png \ ++ stock-icons/16/gtk-media-previous-ltr.png \ ++ stock-icons/16/gtk-media-next-ltr.png \ ++ stock-icons/16/gtk-network.png \ ++ stock-icons/16/gtk-print-error.png \ ++ stock-icons/16/gtk-print-report.png \ ++ stock-icons/16/gtk-print-paused.png \ ++ stock-icons/16/gtk-print-warning.png \ ++ stock-icons/16/gtk-stop.png \ ++ stock-icons/16/gtk-execute.png \ ++ stock-icons/16/gtk-spell-check.png \ ++ stock-icons/16/gtk-fullscreen.png \ ++ stock-icons/16/gtk-refresh.png \ ++ stock-icons/16/gtk-leave-fullscreen.png \ ++ stock-icons/16/gtk-sort-ascending.png \ ++ stock-icons/16/gtk-sort-descending.png \ ++ stock-icons/16/gtk-close.png \ ++ stock-icons/16/gtk-zoom-fit.png \ ++ stock-icons/16/gtk-zoom-in.png \ ++ stock-icons/16/gtk-zoom-100.png \ ++ stock-icons/16/gtk-zoom-out.png \ ++ stock-icons/24/gtk-quit.png \ ++ stock-icons/24/gtk-info.png \ ++ stock-icons/24/gtk-file.png \ ++ stock-icons/24/gtk-open.png \ ++ stock-icons/24/gtk-print-preview.png \ ++ stock-icons/24/gtk-print.png \ ++ stock-icons/24/gtk-properties.png \ ++ stock-icons/24/gtk-revert-to-saved-ltr.png \ ++ stock-icons/24/gtk-revert-to-saved-rtl.png \ ++ stock-icons/24/gtk-save-as.png \ ++ stock-icons/24/gtk-new.png \ ++ stock-icons/24/gtk-harddisk.png \ ++ stock-icons/24/gtk-clear.png \ ++ stock-icons/24/gtk-copy.png \ ++ stock-icons/24/gtk-cut.png \ ++ stock-icons/24/gtk-delete.png \ ++ stock-icons/24/gtk-find-and-replace.png \ ++ stock-icons/24/gtk-find.png \ ++ stock-icons/24/gtk-paste.png \ ++ stock-icons/24/gtk-redo-ltr.png \ ++ stock-icons/24/gtk-redo-rtl.png \ ++ stock-icons/24/gtk-select-all.png \ ++ stock-icons/24/gtk-undo-ltr.png \ ++ stock-icons/24/gtk-undo-rtl.png \ ++ stock-icons/24/gtk-directory.png \ ++ stock-icons/24/gtk-unindent-ltr.png \ ++ stock-icons/24/gtk-unindent-rtl.png \ ++ stock-icons/24/gtk-indent-ltr.png \ ++ stock-icons/24/gtk-indent-rtl.png \ ++ stock-icons/24/gtk-justify-center.png \ ++ stock-icons/24/gtk-justify-fill.png \ ++ stock-icons/24/gtk-justify-left.png \ ++ stock-icons/24/gtk-justify-right.png \ ++ stock-icons/24/gtk-bold.png \ ++ stock-icons/24/gtk-italic.png \ ++ stock-icons/24/gtk-strikethrough.png \ ++ stock-icons/24/gtk-underline.png \ ++ stock-icons/24/gtk-goto-bottom.png \ ++ stock-icons/24/gtk-go-down.png \ ++ stock-icons/24/gtk-goto-first-ltr.png \ ++ stock-icons/24/gtk-home.png \ ++ stock-icons/24/gtk-jump-to-ltr.png \ ++ stock-icons/24/gtk-jump-to-rtl.png \ ++ stock-icons/24/gtk-goto-last-ltr.png \ ++ stock-icons/24/gtk-go-forward-ltr.png \ ++ stock-icons/24/gtk-go-back-ltr.png \ ++ stock-icons/24/gtk-goto-top.png \ ++ stock-icons/24/gtk-go-up.png \ ++ stock-icons/24/gtk-about.png \ ++ stock-icons/24/gtk-help.png \ ++ stock-icons/24/gtk-missing-image.png \ ++ stock-icons/24/gtk-add.png \ ++ stock-icons/24/gtk-remove.png \ ++ stock-icons/24/gtk-floppy.png \ ++ stock-icons/24/gtk-cdrom.png \ ++ stock-icons/24/gtk-media-pause.png \ ++ stock-icons/24/gtk-media-play-ltr.png \ ++ stock-icons/24/gtk-media-play-rtl.png \ ++ stock-icons/24/gtk-media-stop.png \ ++ stock-icons/24/gtk-media-record.png \ ++ stock-icons/24/gtk-media-rewind-ltr.png \ ++ stock-icons/24/gtk-media-forward-ltr.png \ ++ stock-icons/24/gtk-media-previous-ltr.png \ ++ stock-icons/24/gtk-media-next-ltr.png \ ++ stock-icons/24/gtk-network.png \ ++ stock-icons/24/gtk-print-error.png \ ++ stock-icons/24/gtk-print-report.png \ ++ stock-icons/24/gtk-print-paused.png \ ++ stock-icons/24/gtk-print-warning.png \ ++ stock-icons/24/gtk-stop.png \ ++ stock-icons/24/gtk-execute.png \ ++ stock-icons/24/gtk-spell-check.png \ ++ stock-icons/24/gtk-fullscreen.png \ ++ stock-icons/24/gtk-refresh.png \ ++ stock-icons/24/gtk-leave-fullscreen.png \ ++ stock-icons/24/gtk-sort-ascending.png \ ++ stock-icons/24/gtk-sort-descending.png \ ++ stock-icons/24/gtk-close.png \ ++ stock-icons/24/gtk-zoom-fit.png \ ++ stock-icons/24/gtk-zoom-in.png \ ++ stock-icons/24/gtk-zoom-100.png \ ++ stock-icons/24/gtk-zoom-out.png + + # 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 @@ + && $(LN_S) folder.png user-desktop.png \ + && $(RM) user-home.png \ + && $(LN_S) folder.png user-home.png \ ++ && $(LN_S) application-exit.png gtk-quit.png \ ++ && $(LN_S) dialog-info.png gtk-info.png \ ++ && $(LN_S) document-new.png gtk-file.png \ ++ && $(LN_S) document-open.png gtk-open.png \ ++ && $(LN_S) document-print-preview.png gtk-print-preview.png \ ++ && $(LN_S) document-print.png gtk-print.png \ ++ && $(LN_S) document-properties.png gtk-properties.png \ ++ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \ ++ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \ ++ && $(LN_S) document-save-as.png gtk-save-as.png \ ++ && $(LN_S) document-x-generic.png gtk-new.png \ ++ && $(LN_S) drive-harddisk.png gtk-harddisk.png \ ++ && $(LN_S) edit-clear.png gtk-clear.png \ ++ && $(LN_S) edit-copy.png gtk-copy.png \ ++ && $(LN_S) edit-cut.png gtk-cut.png \ ++ && $(LN_S) edit-delete.png gtk-delete.png \ ++ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \ ++ && $(LN_S) edit-find.png gtk-find.png \ ++ && $(LN_S) edit-paste.png gtk-paste.png \ ++ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \ ++ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \ ++ && $(LN_S) edit-select-all.png gtk-select-all.png \ ++ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \ ++ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \ ++ && $(LN_S) folder.png gtk-directory.png \ ++ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \ ++ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \ ++ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \ ++ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \ ++ && $(LN_S) format-justify-center.png gtk-justify-center.png \ ++ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \ ++ && $(LN_S) format-justify-left.png gtk-justify-left.png \ ++ && $(LN_S) format-justify-right.png gtk-justify-right.png \ ++ && $(LN_S) format-text-bold.png gtk-bold.png \ ++ && $(LN_S) format-text-italic.png gtk-italic.png \ ++ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \ ++ && $(LN_S) format-text-underline.png gtk-underline.png \ ++ && $(LN_S) go-bottom.png gtk-goto-bottom.png \ ++ && $(LN_S) go-down.png gtk-go-down.png \ ++ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \ ++ && $(LN_S) go-home.png gtk-home.png \ ++ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \ ++ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \ ++ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \ ++ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \ ++ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \ ++ && $(LN_S) go-top.png gtk-goto-top.png \ ++ && $(LN_S) go-up.png gtk-go-up.png \ ++ && $(LN_S) help-about.png gtk-about.png \ ++ && $(LN_S) help-contents.png gtk-help.png \ ++ && $(LN_S) image-missing.png gtk-missing-image.png \ ++ && $(LN_S) list-add.png gtk-add.png \ ++ && $(LN_S) list-remove.png gtk-remove.png \ ++ && $(LN_S) media-floppy.png gtk-floppy.png \ ++ && $(LN_S) media-optical.png gtk-cdrom.png \ ++ && $(LN_S) media-playback-pause.png gtk-media-pause.png \ ++ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \ ++ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \ ++ && $(LN_S) media-playback-stop.png gtk-media-stop.png \ ++ && $(LN_S) media-record.png gtk-media-record.png \ ++ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \ ++ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \ ++ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \ ++ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \ ++ && $(LN_S) network-idle.png gtk-network.png \ ++ && $(LN_S) printer-error.png gtk-print-error.png \ ++ && $(LN_S) printer-info.png gtk-print-report.png \ ++ && $(LN_S) printer-paused.png gtk-print-paused.png \ ++ && $(LN_S) printer-warning.png gtk-print-warning.png \ ++ && $(LN_S) process-stop.png gtk-stop.png \ ++ && $(LN_S) system-run.png gtk-execute.png \ ++ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \ ++ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \ ++ && $(LN_S) view-refresh.png gtk-refresh.png \ ++ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \ ++ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \ ++ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \ ++ && $(LN_S) window-close.png gtk-close.png \ ++ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \ ++ && $(LN_S) zoom-in.png gtk-zoom-in.png \ ++ && $(LN_S) zoom-original.png gtk-zoom-100.png \ ++ && $(LN_S) zoom-out.png gtk-zoom-out.png \ + ) done \ + && touch stamp-icons + 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 new file mode 100644 index 000000000..d4df76a76 --- /dev/null +++ b/source/l/gtk+2/gtk+-2.24.x.icon-compat.diff @@ -0,0 +1,265 @@ +--- ./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 @@ + 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/16/gtk-quit.png \ ++ stock-icons/16/gtk-info.png \ ++ stock-icons/16/gtk-file.png \ ++ stock-icons/16/gtk-open.png \ ++ stock-icons/16/gtk-print-preview.png \ ++ stock-icons/16/gtk-print.png \ ++ stock-icons/16/gtk-properties.png \ ++ stock-icons/16/gtk-revert-to-saved-ltr.png \ ++ stock-icons/16/gtk-revert-to-saved-rtl.png \ ++ stock-icons/16/gtk-save-as.png \ ++ stock-icons/16/gtk-new.png \ ++ stock-icons/16/gtk-harddisk.png \ ++ stock-icons/16/gtk-clear.png \ ++ stock-icons/16/gtk-copy.png \ ++ stock-icons/16/gtk-cut.png \ ++ stock-icons/16/gtk-delete.png \ ++ stock-icons/16/gtk-find-and-replace.png \ ++ stock-icons/16/gtk-find.png \ ++ stock-icons/16/gtk-paste.png \ ++ stock-icons/16/gtk-redo-ltr.png \ ++ stock-icons/16/gtk-redo-rtl.png \ ++ stock-icons/16/gtk-select-all.png \ ++ stock-icons/16/gtk-undo-ltr.png \ ++ stock-icons/16/gtk-undo-rtl.png \ ++ stock-icons/16/gtk-directory.png \ ++ stock-icons/16/gtk-unindent-ltr.png \ ++ stock-icons/16/gtk-unindent-rtl.png \ ++ stock-icons/16/gtk-indent-ltr.png \ ++ stock-icons/16/gtk-indent-rtl.png \ ++ stock-icons/16/gtk-justify-center.png \ ++ stock-icons/16/gtk-justify-fill.png \ ++ stock-icons/16/gtk-justify-left.png \ ++ stock-icons/16/gtk-justify-right.png \ ++ stock-icons/16/gtk-bold.png \ ++ stock-icons/16/gtk-italic.png \ ++ stock-icons/16/gtk-strikethrough.png \ ++ stock-icons/16/gtk-underline.png \ ++ stock-icons/16/gtk-goto-bottom.png \ ++ stock-icons/16/gtk-go-down.png \ ++ stock-icons/16/gtk-goto-first-ltr.png \ ++ stock-icons/16/gtk-home.png \ ++ stock-icons/16/gtk-jump-to-ltr.png \ ++ stock-icons/16/gtk-jump-to-rtl.png \ ++ stock-icons/16/gtk-goto-last-ltr.png \ ++ stock-icons/16/gtk-go-forward-ltr.png \ ++ stock-icons/16/gtk-go-back-ltr.png \ ++ stock-icons/16/gtk-goto-top.png \ ++ stock-icons/16/gtk-go-up.png \ ++ stock-icons/16/gtk-about.png \ ++ stock-icons/16/gtk-help.png \ ++ stock-icons/16/gtk-missing-image.png \ ++ stock-icons/16/gtk-add.png \ ++ stock-icons/16/gtk-remove.png \ ++ stock-icons/16/gtk-floppy.png \ ++ stock-icons/16/gtk-cdrom.png \ ++ stock-icons/16/gtk-media-pause.png \ ++ stock-icons/16/gtk-media-play-ltr.png \ ++ stock-icons/16/gtk-media-play-rtl.png \ ++ stock-icons/16/gtk-media-stop.png \ ++ stock-icons/16/gtk-media-record.png \ ++ stock-icons/16/gtk-media-rewind-ltr.png \ ++ stock-icons/16/gtk-media-forward-ltr.png \ ++ stock-icons/16/gtk-media-previous-ltr.png \ ++ stock-icons/16/gtk-media-next-ltr.png \ ++ stock-icons/16/gtk-network.png \ ++ stock-icons/16/gtk-print-error.png \ ++ stock-icons/16/gtk-print-report.png \ ++ stock-icons/16/gtk-print-paused.png \ ++ stock-icons/16/gtk-print-warning.png \ ++ stock-icons/16/gtk-stop.png \ ++ stock-icons/16/gtk-execute.png \ ++ stock-icons/16/gtk-spell-check.png \ ++ stock-icons/16/gtk-fullscreen.png \ ++ stock-icons/16/gtk-refresh.png \ ++ stock-icons/16/gtk-leave-fullscreen.png \ ++ stock-icons/16/gtk-sort-ascending.png \ ++ stock-icons/16/gtk-sort-descending.png \ ++ stock-icons/16/gtk-close.png \ ++ stock-icons/16/gtk-zoom-fit.png \ ++ stock-icons/16/gtk-zoom-in.png \ ++ stock-icons/16/gtk-zoom-100.png \ ++ stock-icons/16/gtk-zoom-out.png \ ++ stock-icons/24/gtk-quit.png \ ++ stock-icons/24/gtk-info.png \ ++ stock-icons/24/gtk-file.png \ ++ stock-icons/24/gtk-open.png \ ++ stock-icons/24/gtk-print-preview.png \ ++ stock-icons/24/gtk-print.png \ ++ stock-icons/24/gtk-properties.png \ ++ stock-icons/24/gtk-revert-to-saved-ltr.png \ ++ stock-icons/24/gtk-revert-to-saved-rtl.png \ ++ stock-icons/24/gtk-save-as.png \ ++ stock-icons/24/gtk-new.png \ ++ stock-icons/24/gtk-harddisk.png \ ++ stock-icons/24/gtk-clear.png \ ++ stock-icons/24/gtk-copy.png \ ++ stock-icons/24/gtk-cut.png \ ++ stock-icons/24/gtk-delete.png \ ++ stock-icons/24/gtk-find-and-replace.png \ ++ stock-icons/24/gtk-find.png \ ++ stock-icons/24/gtk-paste.png \ ++ stock-icons/24/gtk-redo-ltr.png \ ++ stock-icons/24/gtk-redo-rtl.png \ ++ stock-icons/24/gtk-select-all.png \ ++ stock-icons/24/gtk-undo-ltr.png \ ++ stock-icons/24/gtk-undo-rtl.png \ ++ stock-icons/24/gtk-directory.png \ ++ stock-icons/24/gtk-unindent-ltr.png \ ++ stock-icons/24/gtk-unindent-rtl.png \ ++ stock-icons/24/gtk-indent-ltr.png \ ++ stock-icons/24/gtk-indent-rtl.png \ ++ stock-icons/24/gtk-justify-center.png \ ++ stock-icons/24/gtk-justify-fill.png \ ++ stock-icons/24/gtk-justify-left.png \ ++ stock-icons/24/gtk-justify-right.png \ ++ stock-icons/24/gtk-bold.png \ ++ stock-icons/24/gtk-italic.png \ ++ stock-icons/24/gtk-strikethrough.png \ ++ stock-icons/24/gtk-underline.png \ ++ stock-icons/24/gtk-goto-bottom.png \ ++ stock-icons/24/gtk-go-down.png \ ++ stock-icons/24/gtk-goto-first-ltr.png \ ++ stock-icons/24/gtk-home.png \ ++ stock-icons/24/gtk-jump-to-ltr.png \ ++ stock-icons/24/gtk-jump-to-rtl.png \ ++ stock-icons/24/gtk-goto-last-ltr.png \ ++ stock-icons/24/gtk-go-forward-ltr.png \ ++ stock-icons/24/gtk-go-back-ltr.png \ ++ stock-icons/24/gtk-goto-top.png \ ++ stock-icons/24/gtk-go-up.png \ ++ stock-icons/24/gtk-about.png \ ++ stock-icons/24/gtk-help.png \ ++ stock-icons/24/gtk-missing-image.png \ ++ stock-icons/24/gtk-add.png \ ++ stock-icons/24/gtk-remove.png \ ++ stock-icons/24/gtk-floppy.png \ ++ stock-icons/24/gtk-cdrom.png \ ++ stock-icons/24/gtk-media-pause.png \ ++ stock-icons/24/gtk-media-play-ltr.png \ ++ stock-icons/24/gtk-media-play-rtl.png \ ++ stock-icons/24/gtk-media-stop.png \ ++ stock-icons/24/gtk-media-record.png \ ++ stock-icons/24/gtk-media-rewind-ltr.png \ ++ stock-icons/24/gtk-media-forward-ltr.png \ ++ stock-icons/24/gtk-media-previous-ltr.png \ ++ stock-icons/24/gtk-media-next-ltr.png \ ++ stock-icons/24/gtk-network.png \ ++ stock-icons/24/gtk-print-error.png \ ++ stock-icons/24/gtk-print-report.png \ ++ stock-icons/24/gtk-print-paused.png \ ++ stock-icons/24/gtk-print-warning.png \ ++ stock-icons/24/gtk-stop.png \ ++ stock-icons/24/gtk-execute.png \ ++ stock-icons/24/gtk-spell-check.png \ ++ stock-icons/24/gtk-fullscreen.png \ ++ stock-icons/24/gtk-refresh.png \ ++ stock-icons/24/gtk-leave-fullscreen.png \ ++ stock-icons/24/gtk-sort-ascending.png \ ++ stock-icons/24/gtk-sort-descending.png \ ++ stock-icons/24/gtk-close.png \ ++ stock-icons/24/gtk-zoom-fit.png \ ++ stock-icons/24/gtk-zoom-in.png \ ++ stock-icons/24/gtk-zoom-100.png \ ++ stock-icons/24/gtk-zoom-out.png + + @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ + @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache +@@ -2885,6 +3050,88 @@ + && $(LN_S) folder.png user-desktop.png \ + && $(RM) user-home.png \ + && $(LN_S) folder.png user-home.png \ ++ && $(LN_S) application-exit.png gtk-quit.png \ ++ && $(LN_S) dialog-info.png gtk-info.png \ ++ && $(LN_S) document-new.png gtk-file.png \ ++ && $(LN_S) document-open.png gtk-open.png \ ++ && $(LN_S) document-print-preview.png gtk-print-preview.png \ ++ && $(LN_S) document-print.png gtk-print.png \ ++ && $(LN_S) document-properties.png gtk-properties.png \ ++ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \ ++ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \ ++ && $(LN_S) document-save-as.png gtk-save-as.png \ ++ && $(LN_S) document-x-generic.png gtk-new.png \ ++ && $(LN_S) drive-harddisk.png gtk-harddisk.png \ ++ && $(LN_S) edit-clear.png gtk-clear.png \ ++ && $(LN_S) edit-copy.png gtk-copy.png \ ++ && $(LN_S) edit-cut.png gtk-cut.png \ ++ && $(LN_S) edit-delete.png gtk-delete.png \ ++ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \ ++ && $(LN_S) edit-find.png gtk-find.png \ ++ && $(LN_S) edit-paste.png gtk-paste.png \ ++ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \ ++ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \ ++ && $(LN_S) edit-select-all.png gtk-select-all.png \ ++ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \ ++ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \ ++ && $(LN_S) folder.png gtk-directory.png \ ++ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \ ++ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \ ++ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \ ++ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \ ++ && $(LN_S) format-justify-center.png gtk-justify-center.png \ ++ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \ ++ && $(LN_S) format-justify-left.png gtk-justify-left.png \ ++ && $(LN_S) format-justify-right.png gtk-justify-right.png \ ++ && $(LN_S) format-text-bold.png gtk-bold.png \ ++ && $(LN_S) format-text-italic.png gtk-italic.png \ ++ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \ ++ && $(LN_S) format-text-underline.png gtk-underline.png \ ++ && $(LN_S) go-bottom.png gtk-goto-bottom.png \ ++ && $(LN_S) go-down.png gtk-go-down.png \ ++ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \ ++ && $(LN_S) go-home.png gtk-home.png \ ++ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \ ++ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \ ++ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \ ++ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \ ++ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \ ++ && $(LN_S) go-top.png gtk-goto-top.png \ ++ && $(LN_S) go-up.png gtk-go-up.png \ ++ && $(LN_S) help-about.png gtk-about.png \ ++ && $(LN_S) help-contents.png gtk-help.png \ ++ && $(LN_S) image-missing.png gtk-missing-image.png \ ++ && $(LN_S) list-add.png gtk-add.png \ ++ && $(LN_S) list-remove.png gtk-remove.png \ ++ && $(LN_S) media-floppy.png gtk-floppy.png \ ++ && $(LN_S) media-optical.png gtk-cdrom.png \ ++ && $(LN_S) media-playback-pause.png gtk-media-pause.png \ ++ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \ ++ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \ ++ && $(LN_S) media-playback-stop.png gtk-media-stop.png \ ++ && $(LN_S) media-record.png gtk-media-record.png \ ++ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \ ++ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \ ++ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \ ++ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \ ++ && $(LN_S) network-idle.png gtk-network.png \ ++ && $(LN_S) printer-error.png gtk-print-error.png \ ++ && $(LN_S) printer-info.png gtk-print-report.png \ ++ && $(LN_S) printer-paused.png gtk-print-paused.png \ ++ && $(LN_S) printer-warning.png gtk-print-warning.png \ ++ && $(LN_S) process-stop.png gtk-stop.png \ ++ && $(LN_S) system-run.png gtk-execute.png \ ++ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \ ++ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \ ++ && $(LN_S) view-refresh.png gtk-refresh.png \ ++ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \ ++ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \ ++ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \ ++ && $(LN_S) window-close.png gtk-close.png \ ++ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \ ++ && $(LN_S) zoom-in.png gtk-zoom-in.png \ ++ && $(LN_S) zoom-original.png gtk-zoom-100.png \ ++ && $(LN_S) zoom-out.png gtk-zoom-out.png \ + ) done \ + && touch stamp-icons + diff --git a/source/l/gtk+2/gtk+2.SlackBuild b/source/l/gtk+2/gtk+2.SlackBuild index f60d0a555..efda2839f 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 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -68,23 +68,20 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# There's been this long standing debate about PNG and -lz -# and this patch is the workaround. ;-) -zcat $CWD/gtk.pnglz.diff.gz | patch -p1 --verbose || exit 1 +# Fix build errors +zcat $CWD/fix_build_issues_on_tutorial_and_faq.diff.gz | patch -p1 --verbose || exit 1 # Do not flood the console or .xsession-errors with "trouble ahead" # 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/ -sed -i "s/GTK_SYSCONFDIR, \\\"gtk-2\\.0\\\"/GTK_SYSCONFDIR, \\\"gtk-2\\.0\\\", HOST/g" ./gtk/gtkrc.c ./gdk-pixbuf/gdk-pixbuf-io.c -sed -i 's/sysconfdir)\\"/& \\\n\t-DHOST=\\\"$(host_triplet)\\\"/g' \ -gdk-pixbuf/Makefile.am \ -gtk/Makefile.am \ -modules/input/Makefile.am +# 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 -# Use libpng-1.4.x: -zcat $CWD/gtk.png14.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 # Regenerate ./configure: libtoolize --force @@ -101,6 +98,8 @@ CFLAGS="$SLKCFLAGS -DHOST='"'"${ARCH}-slackware-linux"'"'" \ --sysconfdir=/etc \ --mandir=/usr/man \ --with-xinput=yes \ + --enable-xkb \ + --disable-introspection \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -112,18 +111,26 @@ if [ "x$compile_host" != "x$host" ]; then echo "Host mismatch: compile='$compile_host', SlackBuild='$host'" && exit 1 fi -make install DESTDIR=$PKG \ +make install \ RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_LOADER_TEST=false \ + DESTDIR=$PKG \ || exit 1 -# I'm spamming your root partition because /etc/gtk-2.0 won't install to $DESTDIR -make install || exit 1 +# You'll probably need to install the newly made package right away to +# fix the result of this next line, but we had to clear this. Sorry. +rm -rf /etc/gtk-2.0 +# I'm spamming your root partition because /etc/gtk-2.0 won't install to $DESTDIR... +make install cp -a /etc/gtk-2.0/* $PKG/etc/gtk-2.0/ || exit 1 rm -rf $PKG/etc/gtk-2.0/$host mkdir -p $PKG/etc/gtk-2.0/$host -mv $PKG/etc/gtk-2.0/* $PKG/etc/gtk-2.0/$host/ +mv $PKG/etc/gtk-2.0/gtk.immodules $PKG/etc/gtk-2.0/$host/ -mv $PKG/etc/gtk-2.0/$host/im-multipress.conf $PKG/etc/gtk-2.0/$host/im-multipress.conf.new || exit 1 +# 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 + +# Install a "starter" gtkrc +echo 'gtk-theme-name="GTK+"' > $PKG/etc/gtk-2.0/gtkrc.new # We need to have separate 32-bit and 64-bit binaries # for places where we have two copies of the GTK+ package installed. @@ -131,29 +138,33 @@ mv $PKG/etc/gtk-2.0/$host/im-multipress.conf $PKG/etc/gtk-2.0/$host/im-multipres case "$host" in s390x*|x86_64*) mv $PKG/usr/bin/gtk-query-immodules-2.0{,-64} - mv $PKG/usr/bin/gdk-pixbuf-query-loaders{,-64} ( cd $PKG/usr/bin ln -sf gtk-query-immodules-2.0-64 gtk-query-immodules-2.0 - ln -sf gdk-pixbuf-query-loaders-64 gdk-pixbuf-query-loaders ) ;; *) mv $PKG/usr/bin/gtk-query-immodules-2.0{,-32} - mv $PKG/usr/bin/gdk-pixbuf-query-loaders{,-32} ( cd $PKG/usr/bin ln -sf gtk-query-immodules-2.0-32 gtk-query-immodules-2.0 - ln -sf gdk-pixbuf-query-loaders-32 gdk-pixbuf-query-loaders ) ;; esac # Install wrappers for the binaries: -cp $CWD/update-gdk-pixbuf-loaders $PKG/usr/bin/update-gdk-pixbuf-loaders -cp $CWD/update-gtk-immodules $PKG/usr/bin/update-gtk-immodules +cp -a $CWD/update-gtk-immodules* $PKG/usr/bin +chown root:root $PKG/usr/bin/update-* chmod 0755 $PKG/usr/bin/update-* -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Add profile scripts to set up GTK+ environment: +mkdir -p $PKG/etc/profile.d +cp -a $CWD/profile.d/* $PKG/etc/profile.d +chmod 0755 $PKG/etc/profile.d/* + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) # Compress and if needed symlink the man pages: if [ -d $PKG/usr/man ]; then @@ -172,13 +183,12 @@ fi mkdir -p $PKG/usr/doc/gtk+-$VERSION cp -a \ - AUTHORS COPYING NEWS README TODO \ + AUTHORS COPYING* NEWS README* TODO \ $PKG/usr/doc/gtk+-$VERSION ( cd $PKG/usr/doc/gtk+-$VERSION - ln -s /usr/share/gtk-doc/html/gail-libgail-util . - ln -s /usr/share/gtk-doc/html/gdk . - ln -s /usr/share/gtk-doc/html/gdk-pixbuf . - ln -s /usr/share/gtk-doc/html/gtk . + ln -s ../../share/gtk-doc/html/gail-libgail-util . + ln -s ../../share/gtk-doc/html/gdk . + ln -s ../../share/gtk-doc/html/gtk . ) # If there's a ChangeLog, installing at least part of the recent history @@ -189,13 +199,6 @@ if [ -r ChangeLog ]; then touch -r ChangeLog $DOCSDIR/ChangeLog fi -# I'm almost inclined to think this stuff is obsolete but I don't know for sure. -# I do know that leaving it in doesn't hurt (aside from a few wasted bytes, but -# probably less than the comments here waste ;-) -mkdir -p $PKG/etc/profile.d -cp -a $CWD/profile.d/* $PKG/etc/profile.d -chmod 755 $PKG/etc/profile.d/* - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/l/gtk+2/gtk.png14.diff b/source/l/gtk+2/gtk.png14.diff deleted file mode 100644 index 20d709e4e..000000000 --- a/source/l/gtk+2/gtk.png14.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ./configure.in.orig 2010-01-11 14:57:36.000000000 -0600 -+++ ./configure.in 2010-02-12 00:48:04.000000000 -0600 -@@ -908,12 +908,12 @@ - - dnl Test for libpng - if test x$with_libpng != xno && test -z "$LIBPNG"; then -- AC_MSG_CHECKING(for libpng12) -- if $PKG_CONFIG --exists libpng12 ; then -+ AC_MSG_CHECKING(for libpng14) -+ if $PKG_CONFIG --exists libpng14 ; then - AC_MSG_RESULT(yes) - PNG='png' -- PNG_DEP_CFLAGS_PACKAGES=libpng12 -- LIBPNG=`$PKG_CONFIG --libs libpng12` -+ PNG_DEP_CFLAGS_PACKAGES=libpng14 -+ LIBPNG=`$PKG_CONFIG --libs libpng14` - else - AC_MSG_RESULT(no) - AC_CHECK_LIB(png, png_read_info, diff --git a/source/l/gtk+2/gtk.pnglz.diff b/source/l/gtk+2/gtk.pnglz.diff deleted file mode 100644 index 1f71bd841..000000000 --- a/source/l/gtk+2/gtk.pnglz.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur gtk+-2.18.4.orig/gdk-pixbuf/Makefile.in gtk+-2.18.4/gdk-pixbuf/Makefile.in ---- gtk+-2.18.4.orig/gdk-pixbuf/Makefile.in 2009-11-30 22:08:44.000000000 -0600 -+++ gtk+-2.18.4/gdk-pixbuf/Makefile.in 2009-12-03 21:57:10.541765261 -0600 -@@ -801,7 +801,7 @@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ - LIBOBJS = @LIBOBJS@ --LIBPNG = @LIBPNG@ -+LIBPNG = @LIBPNG@ -lz - LIBS = @LIBS@ - LIBTIFF = @LIBTIFF@ - LIBTOOL = @LIBTOOL@ diff --git a/source/l/gtk+2/profile.d/gtk+.sh b/source/l/gtk+2/profile.d/gtk+.sh index 40b910ad9..ff3d4927b 100755 --- a/source/l/gtk+2/profile.d/gtk+.sh +++ b/source/l/gtk+2/profile.d/gtk+.sh @@ -1,3 +1,4 @@ #!/bin/sh + GDK_USE_XFT=1 export GDK_USE_XFT diff --git a/source/l/gtk+2/update-gdk-pixbuf-loaders b/source/l/gtk+2/update-gdk-pixbuf-loaders deleted file mode 100644 index 942ca1862..000000000 --- a/source/l/gtk+2/update-gdk-pixbuf-loaders +++ /dev/null @@ -1,86 +0,0 @@ -#! /bin/sh -# Updates the gdk-pixbuf.loaders in /etc/gtk-2.0/$host - -umask 022 - -# Get the machine type from uname: -host=$(uname -m)-slackware-linux - -# Fix $host for arm arch: -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/gdk-pixbuf.loaders - -case "$host" in - s390x*|x86_64*) - if [ -x /usr/bin/gdk-pixbuf-query-loaders-64 ]; then - if [ "$1" = "--verbose" ]; then - echo "Updating gdk-pixbuf.loaders for ${host}:" - echo " /usr/bin/gdk-pixbuf-query-loaders-64 \\" - echo " > $FILE" - fi - /usr/bin/gdk-pixbuf-query-loaders-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/gdk-pixbuf.loaders -a \ - -x /usr/bin/gdk-pixbuf-query-loaders-32 ]; then - FILE=/etc/gtk-2.0/$mlhost/gdk-pixbuf.loaders - if [ "$1" = "--verbose" ]; then - echo "Updating gdk-pixbuf.loaders for ${mlhost}:" - echo " /usr/bin/gdk-pixbuf-query-loaders-32 \\" - echo " > $FILE" - fi - /usr/bin/gdk-pixbuf-query-loaders-32 > $FILE - fi - fi - else - if [ "$1" = "--verbose" ]; then - echo "Updating gdk-pixbuf.loaders for ${host}:" - echo " /usr/bin/gdk-pixbuf-query-loaders \\" - echo " > $FILE" - fi - /usr/bin/gdk-pixbuf-query-loaders > $FILE - fi - ;; - *) - if [ -x /usr/bin/gdk-pixbuf-query-loaders-32 ]; then - if [ "$1" = "--verbose" ]; then - echo "Updating gdk-pixbuf.loaders for ${host}:" - echo " /usr/bin/gdk-pixbuf-query-loaders-32 \\" - echo " > $FILE" - fi - /usr/bin/gdk-pixbuf-query-loaders-32 > $FILE - else - if [ "$1" = "--verbose" ]; then - echo "Updating gdk-pixbuf.loaders for ${host}:" - echo " /usr/bin/gdk-pixbuf-query-loaders \\" - echo " > $FILE" - fi - /usr/bin/gdk-pixbuf-query-loaders > $FILE - fi - ;; -esac - diff --git a/source/l/gtk+2/update-gtk-immodules b/source/l/gtk+2/update-gtk-immodules index d913f69f4..a56b3fdcb 100644 --- a/source/l/gtk+2/update-gtk-immodules +++ b/source/l/gtk+2/update-gtk-immodules @@ -1,86 +1,12 @@ #! /bin/sh -# Updates the immodules in /etc/gtk-2.0/$host - -umask 022 - -# Get the machine type from uname: -host=$(uname -m)-slackware-linux - -# Fix $host for arm arch: -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 +# This is a wrapper script that calls update-gtk-immodules-2.0 (GTK+2) +# and/or update-gtk-immodules-3.0 (GTK+3) to do the actual updating. -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" - 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 - fi - 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" - fi - /usr/bin/gtk-query-immodules-2.0-32 > $FILE - 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 - ;; -esac +if [ -x /usr/bin/update-gtk-immodules-2.0 ]; then + /usr/bin/update-gtk-immodules-2.0 $* +fi +if [ -x /usr/bin/update-gtk-immodules-3.0 ]; then + /usr/bin/update-gtk-immodules-3.0 $* +fi diff --git a/source/l/gtk+2/update-gtk-immodules-2.0 b/source/l/gtk+2/update-gtk-immodules-2.0 new file mode 100644 index 000000000..d913f69f4 --- /dev/null +++ b/source/l/gtk+2/update-gtk-immodules-2.0 @@ -0,0 +1,86 @@ +#! /bin/sh +# Updates the immodules in /etc/gtk-2.0/$host + +umask 022 + +# Get the machine type from uname: +host=$(uname -m)-slackware-linux + +# Fix $host for arm arch: +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" + 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 + fi + 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" + fi + /usr/bin/gtk-query-immodules-2.0-32 > $FILE + 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 + ;; +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 new file mode 100644 index 000000000..7f86d38d8 --- /dev/null +++ b/source/l/gtk+2/use_host_triplet_for_gtk_immodules.diff @@ -0,0 +1,23 @@ +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; |