From 094b69d68b633807bdfe34551bb152144407da3a Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Mon, 30 Sep 2013 21:18:44 +1000 Subject: gtk-32: 2.24.19 -> 2.24.21 --- gtk-32/.footprint | 18 ++++++------------ gtk-32/.md5sum | 5 +---- gtk-32/Pkgfile | 19 ++++++------------- gtk-32/gtk-register-32.sh | 8 -------- gtk-32/gtk.immodules-32 | 39 --------------------------------------- gtk-32/gtk.immodules-32.patch | 12 ------------ gtk-32/post-install | 4 ++++ 7 files changed, 17 insertions(+), 88 deletions(-) delete mode 100644 gtk-32/gtk-register-32.sh delete mode 100644 gtk-32/gtk.immodules-32 delete mode 100644 gtk-32/gtk.immodules-32.patch create mode 100755 gtk-32/post-install (limited to 'gtk-32') diff --git a/gtk-32/.footprint b/gtk-32/.footprint index a07c5f3e..f7d21fd3 100644 --- a/gtk-32/.footprint +++ b/gtk-32/.footprint @@ -1,12 +1,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/gtk-builder-convert-32 -rwxr-xr-x root/root usr/bin/gtk-query-immodules-2.0-32 --rwxr-xr-x root/root usr/bin/gtk-register-32 --rwxr-xr-x root/root usr/bin/gtk-update-icon-cache-32 -drwxr-xr-x root/root usr/etc/ -drwxr-xr-x root/root usr/etc/gtk-2.0/ --rw-r--r-- root/root usr/etc/gtk-2.0/gtk.immodules-32 drwxr-xr-x root/root usr/lib32/ drwxr-xr-x root/root usr/lib32/gtk-2.0/ drwxr-xr-x root/root usr/lib32/gtk-2.0/2.10.0/ @@ -53,13 +47,13 @@ lrwxrwxrwx root/root usr/lib32/libgailutil.so -> libgailutil.so.18.0.1 lrwxrwxrwx root/root usr/lib32/libgailutil.so.18 -> libgailutil.so.18.0.1 -rwxr-xr-x root/root usr/lib32/libgailutil.so.18.0.1 -rw-r--r-- root/root usr/lib32/libgdk-x11-2.0.la -lrwxrwxrwx root/root usr/lib32/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.19 -lrwxrwxrwx root/root usr/lib32/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.19 --rwxr-xr-x root/root usr/lib32/libgdk-x11-2.0.so.0.2400.19 +lrwxrwxrwx root/root usr/lib32/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.21 +lrwxrwxrwx root/root usr/lib32/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.21 +-rwxr-xr-x root/root usr/lib32/libgdk-x11-2.0.so.0.2400.21 -rw-r--r-- root/root usr/lib32/libgtk-x11-2.0.la -lrwxrwxrwx root/root usr/lib32/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.19 -lrwxrwxrwx root/root usr/lib32/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.19 --rwxr-xr-x root/root usr/lib32/libgtk-x11-2.0.so.0.2400.19 +lrwxrwxrwx root/root usr/lib32/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.21 +lrwxrwxrwx root/root usr/lib32/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.21 +-rwxr-xr-x root/root usr/lib32/libgtk-x11-2.0.so.0.2400.21 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/gail.pc -rw-r--r-- root/root usr/lib32/pkgconfig/gdk-2.0.pc diff --git a/gtk-32/.md5sum b/gtk-32/.md5sum index fe116494..46b75da1 100644 --- a/gtk-32/.md5sum +++ b/gtk-32/.md5sum @@ -1,4 +1 @@ -490236abeb0d9351b2a34e9aca70e1de gtk+-2.24.19.tar.xz -df16be5e725670790d9be46103ffe511 gtk-register-32.sh -fddd1230689619f27f05e99b5d8b9ab5 gtk.immodules-32 -27527cc6d9bbd00f59874922f87ab433 gtk.immodules-32.patch +d7ba702e76236237f2667f3def591fe7 gtk+-2.24.21.tar.xz diff --git a/gtk-32/Pkgfile b/gtk-32/Pkgfile index 9f90fdf7..a525bc33 100644 --- a/gtk-32/Pkgfile +++ b/gtk-32/Pkgfile @@ -1,33 +1,26 @@ # Description: A multi-platform toolkit for creating graphical user interfaces # URL: http://www.gtk.org/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: atk-32 hicolor-icon-theme gdk-pixbuf-32 pango-32 xorg-libsm-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxcomposite-32 gtk +# Depends on: atk-32 gdk-pixbuf-32 pango-32 xorg-libsm-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxcomposite-32 gtk name=gtk-32 -version=2.24.19 +version=2.24.21 release=1 -source=(http://download.gnome.org/sources/gtk+/${version%.*}/gtk+-$version.tar.xz \ - gtk.immodules-32 gtk-register-32.sh gtk.immodules-32.patch) +source=(http://download.gnome.org/sources/gtk+/${version%.*}/gtk+-$version.tar.xz) build() { cd gtk+-$version - patch -p1 -i $SRC/gtk.immodules-32.patch ./configure \ --prefix=/usr \ --mandir=/usr/man \ --libdir=/usr/lib32 \ - --program-suffix=-32 \ --disable-cups make make DESTDIR=$PKG install - install -d $PKG/usr/etc/gtk-2.0 - install -m 0644 $SRC/gtk.immodules-32 $PKG/usr/etc/gtk-2.0/ - rm $PKG/usr/bin/gtk-demo-32 - - install -m 0755 $SRC/gtk-register-32.sh $PKG/usr/bin/gtk-register-32 - rm -rf $PKG/usr/{include,man,share} - rm $PKG/usr/etc/gtk-2.0/im-multipress.conf + mv $PKG/usr/bin/gtk-query-immodules-2.0 $PKG/usr/bin/gtk-query-immodules-2.0-32 + rm $PKG/usr/bin/{gtk-builder-convert,gtk-demo,gtk-update-icon-cache} + rm -r $PKG/usr/etc $PKG/usr/{include,share} } diff --git a/gtk-32/gtk-register-32.sh b/gtk-32/gtk-register-32.sh deleted file mode 100644 index 76d3e899..00000000 --- a/gtk-32/gtk-register-32.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# /usr/bin/gtk-register: register input modules -# - -/usr/bin/gtk-query-immodules-2.0-32 > /usr/etc/gtk-2.0/gtk.immodules-32 - -# End of file diff --git a/gtk-32/gtk.immodules-32 b/gtk-32/gtk.immodules-32 deleted file mode 100644 index 59ece139..00000000 --- a/gtk-32/gtk.immodules-32 +++ /dev/null @@ -1,39 +0,0 @@ -# GTK+ Input Method Modules file -# Automatically generated file, do not edit -# Created by gtk-query-immodules-2.0-32 from gtk+-2.24.19 -# -# ModulesPath = /root/.gtk-2.0/2.10.0/x86_64-unknown-linux-gnu/immodules:/root/.gtk-2.0/2.10.0/immodules:/root/.gtk-2.0/x86_64-unknown-linux-gnu/immodules:/root/.gtk-2.0/immodules:/usr/lib32/gtk-2.0/2.10.0/x86_64-unknown-linux-gnu/immodules:/usr/lib32/gtk-2.0/2.10.0/immodules:/usr/lib32/gtk-2.0/x86_64-unknown-linux-gnu/immodules:/usr/lib32/gtk-2.0/immodules -# -"/usr/lib32/gtk-2.0/2.10.0/immodules/im-am-et.so" -"am_et" "Amharic (EZ+)" "gtk20" "/usr/share/locale" "am" - -"/usr/lib32/gtk-2.0/2.10.0/immodules/im-ipa.so" -"ipa" "IPA" "gtk20" "/usr/share/locale" "" - -"/usr/lib32/gtk-2.0/2.10.0/immodules/im-xim.so" -"xim" "X Input Method" "gtk20" "/usr/share/locale" "ko:ja:th:zh" - -"/usr/lib32/gtk-2.0/2.10.0/immodules/im-viqr.so" -"viqr" "Vietnamese (VIQR)" "gtk20" "/usr/share/locale" "vi" - -"/usr/lib32/gtk-2.0/2.10.0/immodules/im-inuktitut.so" -"inuktitut" "Inuktitut (Transliterated)" "gtk20" "/usr/share/locale" "iu" - -"/usr/lib32/gtk-2.0/2.10.0/immodules/im-thai.so" -"thai" "Thai-Lao" "gtk20" "/usr/share/locale" "lo:th" - -"/usr/lib32/gtk-2.0/2.10.0/immodules/im-cedilla.so" -"cedilla" "Cedilla" "gtk20" "/usr/share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa" - -"/usr/lib32/gtk-2.0/2.10.0/immodules/im-multipress.so" -"multipress" "Multipress" "gtk20" "" "" - -"/usr/lib32/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so" -"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "/usr/share/locale" "" - -"/usr/lib32/gtk-2.0/2.10.0/immodules/im-ti-er.so" -"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "/usr/share/locale" "ti" - -"/usr/lib32/gtk-2.0/2.10.0/immodules/im-ti-et.so" -"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "/usr/share/locale" "ti" - diff --git a/gtk-32/gtk.immodules-32.patch b/gtk-32/gtk.immodules-32.patch deleted file mode 100644 index 7594c1ce..00000000 --- a/gtk-32/gtk.immodules-32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN gtk+-2.24.8.orig/gtk/gtkrc.c gtk+-2.24.8/gtk/gtkrc.c ---- gtk+-2.24.8.orig/gtk/gtkrc.c 2011-11-10 11:38:03.000000000 -0600 -+++ gtk+-2.24.8/gtk/gtkrc.c 2011-12-16 10:04:07.947129223 -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", "gtk.immodules-32", NULL); - } - - return result; diff --git a/gtk-32/post-install b/gtk-32/post-install new file mode 100755 index 00000000..16dc5215 --- /dev/null +++ b/gtk-32/post-install @@ -0,0 +1,4 @@ +#!/bin/sh + +GTK_PATH=/usr/lib32/gtk-2.0 /usr/bin/gtk-query-immodules-2.0-32 --update-cache + -- cgit v1.2.3