gtk: updated to 2.18.3.

5 files changed, 102 insertions, 92 deletions

diff --git a/gtk/.footprint b/gtk/.footprint
index 87b6a96f8..e977a7357 100644
--- a/gtk/.footprint
+++ b/gtk/.footprint
@@ -363,21 +363,21 @@ lrwxrwxrwx	root/root	usr/lib/libgailutil.so -> libgailutil.so.18.0.1
 lrwxrwxrwx	root/root	usr/lib/libgailutil.so.18 -> libgailutil.so.18.0.1
 -rwxr-xr-x	root/root	usr/lib/libgailutil.so.18.0.1
 -rw-r--r--	root/root	usr/lib/libgdk-x11-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.1800.0
-lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1800.0
--rwxr-xr-x	root/root	usr/lib/libgdk-x11-2.0.so.0.1800.0
+lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.1800.3
+lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1800.3
+-rwxr-xr-x	root/root	usr/lib/libgdk-x11-2.0.so.0.1800.3
 -rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.1800.0
-lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1800.0
--rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf-2.0.so.0.1800.0
+lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.1800.3
+lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1800.3
+-rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf-2.0.so.0.1800.3
 -rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.1800.0
-lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1800.0
--rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1800.0
+lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.1800.3
+lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1800.3
+-rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1800.3
 -rw-r--r--	root/root	usr/lib/libgtk-x11-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.1800.0
-lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1800.0
--rwxr-xr-x	root/root	usr/lib/libgtk-x11-2.0.so.0.1800.0
+lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.1800.3
+lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1800.3
+-rwxr-xr-x	root/root	usr/lib/libgtk-x11-2.0.so.0.1800.3
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gail.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gdk-2.0.pc
diff --git a/gtk/.md5sum b/gtk/.md5sum
index 014968d33..346af3297 100644
--- a/gtk/.md5sum
+++ b/gtk/.md5sum
@@ -1,4 +1,7 @@
-4ad6ada4741239fa9609008b311d4c4b  gdk-pixbuf.loaders
+7cacdf15d110e0c04b407ed34f67735c  gdk-pixbuf.loaders
+1c4af2cb338edfafa1099e86adec6a86  gtk+-2.18.0-2.18.1.diff.gz
 bb7ef5463a74a80454ced2c1d47a0192  gtk+-2.18.0.tar.bz2
+292634901553d4338aac4e08567340b7  gtk+-2.18.1-2.18.2.diff.gz
+70d36d6faf63ccded7e6d4ecf04032a0  gtk+-2.18.2-2.18.3.diff.gz
 3c88561a89724dfe9d807077ba0603c8  gtk-register.sh
-cd8a0cff2180b85f3855667fcdfc8acb  gtk.immodules
+b48d9bb973b5506e196db70ad6cef402  gtk.immodules
diff --git a/gtk/Pkgfile b/gtk/Pkgfile
index d45a6d306..8b5d4aea7 100644
--- a/gtk/Pkgfile
+++ b/gtk/Pkgfile
@@ -4,14 +4,21 @@
 # Depends on: atk, hicolor-icon-theme, libtiff, pango, xorg-libsm, xorg-libxcursor, xorg-libxinerama, xorg-libxrandr
 
 name=gtk
-version=2.18.0
+version=2.18.3
 release=1
 source=(http://download.gnome.org/sources/gtk+/2.18/${name}+-2.18.0.tar.bz2 \
+        http://download.gnome.org/sources/gtk+/2.18/${name}+-2.18.0-2.18.1.diff.gz \
+        http://download.gnome.org/sources/gtk+/2.18/${name}+-2.18.1-2.18.2.diff.gz \
+        http://download.gnome.org/sources/gtk+/2.18/${name}+-2.18.2-2.18.3.diff.gz \
 	gdk-pixbuf.loaders gtk.immodules \
 	gtk-register.sh)
 
 build () {
-	cd gtk+-$version
+	cd gtk+-2.18.0
+
+	zcat $SRC/${name}+-2.18.0-2.18.1.diff.gz | patch -p1
+	zcat $SRC/${name}+-2.18.1-2.18.2.diff.gz | patch -p1
+	zcat $SRC/${name}+-2.18.2-2.18.3.diff.gz | patch -p1
 
 	./configure --prefix=/usr \
 		--mandir=/usr/man --without-libjasper
diff --git a/gtk/gdk-pixbuf.loaders b/gtk/gdk-pixbuf.loaders
index 33b534e53..7e1866c5c 100644
--- a/gtk/gdk-pixbuf.loaders
+++ b/gtk/gdk-pixbuf.loaders
@@ -1,6 +1,6 @@
 # GdkPixbuf Image Loader Modules file
 # Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders from gtk+-2.18.0
+# Created by gdk-pixbuf-query-loaders from gtk+-2.18.3
 #
 # LoaderDir = /usr/lib/gtk-2.0/2.10.0/loaders
 #
@@ -10,24 +10,23 @@
 "png" ""
 "\211PNG\r\n\032\n" "" 100
 
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.so"
-"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
-"image/x-cmu-raster" "image/x-sun-raster" ""
-"ras" ""
-"Y\246j\225" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.so"
-"ico" 5 "gtk20" "The ICO image format" "LGPL"
-"image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
-"ico" "cur" ""
-"  \001   " "zz znz" 100
-"  \002   " "zz znz" 100
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.so"
+"pcx" 4 "gtk20" "The PCX image format" "LGPL"
+"image/x-pcx" ""
+"pcx" ""
+"\n \001" "" 100
+"\n\002\001" "" 100
+"\n\003\001" "" 100
+"\n\004\001" "" 100
+"\n\005\001" "" 100
 
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.so"
-"icns" 4 "gtk20" "The ICNS image format" "GPL"
-"image/x-icns" ""
-"icns" ""
-"icns" "" 100
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
+"tiff" 1 "gtk20" "The TIFF image format" "LGPL"
+"image/tiff" ""
+"tiff" "tif" ""
+"MM *" "  z " 100
+"II* " "   z" 100
+"II* \020   CR\002 " "   z zzz   z" 0
 
 "/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.so"
 "xbm" 4 "gtk20" "The XBM image format" "LGPL"
@@ -45,26 +44,35 @@
 " @" "z " 1
 "  " "z " 1
 
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.so"
-"tga" 4 "gtk20" "The Targa image format" "LGPL"
-"image/x-tga" ""
-"tga" "targa" ""
-" \001\001" "x  " 100
-" \001\t" "x  " 100
-"  \002" "xz " 99
-"  \003" "xz " 100
-"  \n" "xz " 100
-"  \013" "xz " 100
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
+"bmp" 5 "gtk20" "The BMP image format" "LGPL"
+"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
+"bmp" ""
+"BM" "" 100
 
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.so"
-"pcx" 4 "gtk20" "The PCX image format" "LGPL"
-"image/x-pcx" ""
-"pcx" ""
-"\n \001" "" 100
-"\n\002\001" "" 100
-"\n\003\001" "" 100
-"\n\004\001" "" 100
-"\n\005\001" "" 100
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.so"
+"gif" 4 "gtk20" "The GIF image format" "LGPL"
+"image/gif" ""
+"gif" ""
+"GIF8" "" 100
+
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.so"
+"icns" 4 "gtk20" "The ICNS image format" "GPL"
+"image/x-icns" ""
+"icns" ""
+"icns" "" 100
+
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.so"
+"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
+"image/x-cmu-raster" "image/x-sun-raster" ""
+"ras" ""
+"Y\246j\225" "" 100
+
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
+"jpeg" 5 "gtk20" "The JPEG image format" "LGPL"
+"image/jpeg" ""
+"jpeg" "jpe" "jpg" ""
+"\377\330" "" 100
 
 "/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.so"
 "pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family" "LGPL"
@@ -77,41 +85,33 @@
 "P5" "" 100
 "P6" "" 100
 
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.so"
+"tga" 4 "gtk20" "The Targa image format" "LGPL"
+"image/x-tga" ""
+"tga" "targa" ""
+" \001\001" "x  " 100
+" \001\t" "x  " 100
+"  \002" "xz " 99
+"  \003" "xz " 100
+"  \n" "xz " 100
+"  \013" "xz " 100
+
 "/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.so"
 "ani" 4 "gtk20" "The ANI image format" "LGPL"
 "application/x-navi-animation" ""
 "ani" ""
 "RIFF    ACON" "    xxxx    " 100
 
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
-"tiff" 1 "gtk20" "The TIFF image format" "LGPL"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" "  z " 100
-"II* " "   z" 100
-"II* \020   CR\002 " "   z zzz   z" 0
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
-"bmp" 5 "gtk20" "The BMP image format" "LGPL"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
-"jpeg" 5 "gtk20" "The JPEG image format" "LGPL"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
-
 "/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
 "xpm" 4 "gtk20" "The XPM image format" "LGPL"
 "image/x-xpixmap" ""
 "xpm" ""
 "/* XPM */" "" 100
 
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.so"
-"gif" 4 "gtk20" "The GIF image format" "LGPL"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.so"
+"ico" 5 "gtk20" "The ICO image format" "LGPL"
+"image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
+"ico" "cur" ""
+"  \001   " "zz znz" 100
+"  \002   " "zz znz" 100
 
diff --git a/gtk/gtk.immodules b/gtk/gtk.immodules
index 62daa59b7..8628ec3b0 100644
--- a/gtk/gtk.immodules
+++ b/gtk/gtk.immodules
@@ -1,26 +1,29 @@
 # GTK+ Input Method Modules file
 # Automatically generated file, do not edit
-# Created by gtk-query-immodules-2.0 from gtk+-2.18.0
+# Created by gtk-query-immodules-2.0 from gtk+-2.18.3
 #
 # ModulesPath = /home/tilman/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/home/tilman/.gtk-2.0/2.10.0/immodules:/home/tilman/.gtk-2.0/i686-pc-linux-gnu/immodules:/home/tilman/.gtk-2.0/immodules:/usr/lib/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/usr/lib/gtk-2.0/2.10.0/immodules:/usr/lib/gtk-2.0/i686-pc-linux-gnu/immodules:/usr/lib/gtk-2.0/immodules
 #
+"/usr/lib/gtk-2.0/2.10.0/immodules/im-ipa.so" 
+"ipa" "IPA" "gtk20" "/usr/share/locale" "" 
+
 "/usr/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so" 
 "cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "/usr/share/locale" "" 
 
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-xim.so" 
-"xim" "X Input Method" "gtk20" "/usr/share/locale" "ko:ja:th:zh" 
+"/usr/lib/gtk-2.0/2.10.0/immodules/im-ti-er.so" 
+"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "/usr/share/locale" "ti" 
 
 "/usr/lib/gtk-2.0/2.10.0/immodules/im-multipress.so" 
 "multipress" "Multipress" "gtk20" "" "" 
 
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-ti-et.so" 
-"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "/usr/share/locale" "ti" 
+"/usr/lib/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/lib/gtk-2.0/2.10.0/immodules/im-viqr.so" 
 "viqr" "Vietnamese (VIQR)" "gtk20" "/usr/share/locale" "vi" 
 
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-ipa.so" 
-"ipa" "IPA" "gtk20" "/usr/share/locale" "" 
+"/usr/lib/gtk-2.0/2.10.0/immodules/im-thai.so" 
+"thai" "Thai-Lao" "gtk20" "/usr/share/locale" "lo:th" 
 
 "/usr/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so" 
 "inuktitut" "Inuktitut (Transliterated)" "gtk20" "/usr/share/locale" "iu" 
@@ -28,12 +31,9 @@
 "/usr/lib/gtk-2.0/2.10.0/immodules/im-am-et.so" 
 "am_et" "Amharic (EZ+)" "gtk20" "/usr/share/locale" "am" 
 
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-ti-er.so" 
-"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "/usr/share/locale" "ti" 
-
-"/usr/lib/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/lib/gtk-2.0/2.10.0/immodules/im-xim.so" 
+"xim" "X Input Method" "gtk20" "/usr/share/locale" "ko:ja:th:zh" 
 
-"/usr/lib/gtk-2.0/2.10.0/immodules/im-thai.so" 
-"thai" "Thai-Lao" "gtk20" "/usr/share/locale" "lo:th" 
+"/usr/lib/gtk-2.0/2.10.0/immodules/im-ti-et.so" 
+"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "/usr/share/locale" "ti"