commit afc78fd87b347ded701d95d62c245e31c58b91f3
Author: Matt Housh <jaeger(a)crux.nu>
Date: Thu Sep 27 13:14:07 2007 -0500
gtk: updated to version 2.12.0 (again), added gtk-register script
diff --git a/gtk/.footprint b/gtk/.footprint
index ac25243..6e2dc82 100644
--- a/gtk/.footprint
+++ b/gtk/.footprint
@@ -2,12 +2,15 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/gdk-pixbuf-csource
-rwxr-xr-x root/root usr/bin/gdk-pixbuf-query-loaders
+-rwxr-xr-x root/root usr/bin/gtk-builder-convert
-rwxr-xr-x root/root usr/bin/gtk-query-immodules-2.0
+-rwxr-xr-x root/root usr/bin/gtk-register
-rwxr-xr-x root/root usr/bin/gtk-update-icon-cache
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/gdk-pixbuf.loaders
-rw-r--r-- root/root usr/etc/gtk-2.0/gtk.immodules
+-rw-r--r-- root/root usr/etc/gtk-2.0/im-multipress.conf
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/gtk-2.0/
drwxr-xr-x root/root usr/include/gtk-2.0/gdk-pixbuf-xlib/
@@ -76,6 +79,8 @@ drwxr-xr-x root/root usr/include/gtk-2.0/gtk/
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkbin.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkbindings.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkbox.h
+-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkbuildable.h
+-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkbuilder.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkbutton.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkcalendar.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkcelleditable.h
@@ -185,6 +190,7 @@ drwxr-xr-x root/root usr/include/gtk-2.0/gtk/
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkradiotoolbutton.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkrange.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkrc.h
+-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkrecentaction.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkrecentchooser.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkrecentchooserdialog.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkrecentchoosermenu.h
@@ -193,6 +199,7 @@ drwxr-xr-x root/root usr/include/gtk-2.0/gtk/
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkrecentmanager.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkruler.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkscale.h
+-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkscalebutton.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkscrollbar.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkscrolledwindow.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkselection.h
@@ -228,6 +235,7 @@ drwxr-xr-x root/root usr/include/gtk-2.0/gtk/
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtktoolbar.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtktoolbutton.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtktoolitem.h
+-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtktooltip.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtktooltips.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtktree.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtktreednd.h
@@ -247,6 +255,7 @@ drwxr-xr-x root/root usr/include/gtk-2.0/gtk/
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkvbox.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkversion.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkviewport.h
+-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkvolumebutton.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkvpaned.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkvruler.h
-rw-r--r-- root/root usr/include/gtk-2.0/gtk/gtkvscale.h
@@ -277,6 +286,8 @@ drwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/im-ipa.la
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/im-ipa.so
+-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/im-multipress.la
+-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/im-multipress.so
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/im-thai.la
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/im-thai.so
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/im-ti-er.la
@@ -317,8 +328,6 @@ drwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/loaders/
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.la
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.so
drwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/printbackends/
--rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la
--rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.la
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.so
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.la
@@ -326,21 +335,21 @@ drwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/printbackends/
drwxr-xr-x root/root usr/lib/gtk-2.0/include/
-rw-r--r-- root/root usr/lib/gtk-2.0/include/gdkconfig.h
-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.1000.14
-lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1000.14
--rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.1000.14
+lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.1200.0
+lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1200.0
+-rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.1200.0
-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.1000.14
-lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1000.14
--rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.1000.14
+lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.1200.0
+lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1200.0
+-rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.1200.0
-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.1000.14
-lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1000.14
--rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1000.14
+lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.1200.0
+lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1200.0
+-rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1200.0
-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.1000.14
-lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1000.14
--rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.1000.14
+lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.1200.0
+lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1200.0
+-rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.1200.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-2.0.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-pixbuf-2.0.pc
@@ -353,6 +362,7 @@ drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/gdk-pixbuf-csource.1.gz
-rw-r--r-- root/root usr/man/man1/gdk-pixbuf-query-loaders.1.gz
+-rw-r--r-- root/root usr/man/man1/gtk-builder-convert.1.gz
-rw-r--r-- root/root usr/man/man1/gtk-query-immodules-2.0.1.gz
-rw-r--r-- root/root usr/man/man1/gtk-update-icon-cache.1.gz
drwxr-xr-x root/root usr/share/
diff --git a/gtk/.md5sum b/gtk/.md5sum
index bf8b9e6..1ca5910 100644
--- a/gtk/.md5sum
+++ b/gtk/.md5sum
@@ -1,4 +1,5 @@
-4f9fbbc1d43a4e8509ae9abdcd247227 gdk-pixbuf.loaders
-018d7dd0fa7de01cfdb77c7c55e7ba26 gtk+-2.10.14.tar.bz2
-9cad584301bd5f9f47a2428da7035249 gtk.immodules
-eb1659d096092f85f45fc82878673208 http-authstring.patch
+eb8046ca31ce7a56b1e36816e9537545 gdk-pixbuf.loaders
+e9c280afec29b11772af5a7c807abf41 gtk+-2.12.0.tar.bz2
+3c88561a89724dfe9d807077ba0603c8 gtk-register.sh
+b203b162788dd918a922be347ca1bf5d gtk.immodules
+bdf79fd8a435bad46d51b407d0e961b4 gtkiconcache.patch
diff --git a/gtk/Pkgfile b/gtk/Pkgfile
index cacf73c..c57488d 100644
--- a/gtk/Pkgfile
+++ b/gtk/Pkgfile
@@ -4,15 +4,16 @@
# Depends on: atk, hicolor-icon-theme, libtiff, pango, xorg-libsm, xorg-libxcursor, xorg-libxinerama, xorg-libxrandr
name=gtk
-version=2.10.14
-release=2
-source=(ftp://ftp.gtk.org/pub/gtk/v2.10/${name}+-$version.tar.bz2 \
- gdk-pixbuf.loaders gtk.immodules http-authstring.patch)
+version=2.12.0
+release=1
+source=(ftp://ftp.gtk.org/pub/gtk/2.12/${name}+-$version.tar.bz2 \
+ gdk-pixbuf.loaders gtk.immodules gtkiconcache.patch \
+ gtk-register.sh)
build () {
cd gtk+-$version
- patch -p1 -i $SRC/http-authstring.patch
+ patch -p1 -i $SRC/gtkiconcache.patch
./configure --prefix=/usr \
--mandir=/usr/man
@@ -22,4 +23,6 @@ build () {
install -m 644 $SRC/{gtk.immodules,gdk-pixbuf.loaders} \
$PKG/usr/etc/gtk-2.0/
rm -r $PKG/usr/share/{locale,gtk-doc,gtk-2.0} $PKG/usr/bin/gtk-demo
+
+ install -m 0755 $SRC/gtk-register.sh $PKG/usr/bin/gtk-register
}
diff --git a/gtk/gdk-pixbuf.loaders b/gtk/gdk-pixbuf.loaders
index 05c0638..1af89dd 100644
--- a/gtk/gdk-pixbuf.loaders
+++ b/gtk/gdk-pixbuf.loaders
@@ -1,14 +1,14 @@
# GdkPixbuf Image Loader Modules file
# Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders from gtk+-2.10.14
+# Created by gdk-pixbuf-query-loaders from gtk+-2.12.0
#
# LoaderDir = /usr/lib/gtk-2.0/2.10.0/loaders
#
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so"
-"png" 5 "gtk20" "The PNG image format"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.so"
+"wbmp" 4 "gtk20" "The WBMP image format"
+"image/vnd.wap.wbmp" ""
+"wbmp" ""
+" " "z" 1
"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
"jpeg" 5 "gtk20" "The JPEG image format"
@@ -16,6 +16,18 @@
"jpeg" "jpe" "jpg" ""
"\377\330" "" 100
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.so"
+"ani" 4 "gtk20" "The ANI image format"
+"application/x-navi-animation" ""
+"ani" ""
+"RIFF ACON" " xxxx " 100
+
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
+"bmp" 5 "gtk20" "The BMP image format"
+"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
+"bmp" ""
+"BM" "" 100
+
"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.so"
"gif" 4 "gtk20" "The GIF image format"
"image/gif" ""
@@ -29,30 +41,21 @@
" \001 " "zz znz" 100
" \002 " "zz znz" 100
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.so"
-"ani" 4 "gtk20" "The ANI image format"
-"application/x-navi-animation" ""
-"ani" ""
-"RIFF ACON" " xxxx " 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.so"
-"ras" 4 "gtk20" "The Sun raster image format"
-"image/x-cmu-raster" "image/x-sun-raster" ""
-"ras" ""
-"Y\246j\225" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
-"xpm" 4 "gtk20" "The XPM image format"
-"image/x-xpixmap" ""
-"xpm" ""
-"/* XPM */" "" 100
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.so"
+"pcx" 4 "gtk20" "The PCX image format"
+"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-tiff.so"
-"tiff" 1 "gtk20" "The TIFF image format"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" " z " 100
-"II* " " z" 100
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so"
+"png" 5 "gtk20" "The PNG image format"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.so"
"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family"
@@ -65,24 +68,11 @@
"P5" "" 100
"P6" "" 100
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
-"bmp" 5 "gtk20" "The BMP image format"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.so"
-"wbmp" 4 "gtk20" "The WBMP image format"
-"image/vnd.wap.wbmp" ""
-"wbmp" ""
-" " "z" 1
-
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.so"
-"xbm" 4 "gtk20" "The XBM image format"
-"image/x-xbitmap" ""
-"xbm" ""
-"#define " "" 100
-"/*" "" 50
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.so"
+"ras" 4 "gtk20" "The Sun raster image format"
+"image/x-cmu-raster" "image/x-sun-raster" ""
+"ras" ""
+"Y\246j\225" "" 100
"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.so"
"tga" 4 "gtk20" "The Targa image format"
@@ -95,13 +85,23 @@
" \n" "xz " 100
" \013" "xz " 100
-"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.so"
-"pcx" 4 "gtk20" "The PCX image format"
-"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-xbm.so"
+"xbm" 4 "gtk20" "The XBM image format"
+"image/x-xbitmap" ""
+"xbm" ""
+"#define " "" 100
+"/*" "" 50
+
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
+"tiff" 1 "gtk20" "The TIFF image format"
+"image/tiff" ""
+"tiff" "tif" ""
+"MM *" " z " 100
+"II* " " z" 100
+
+"/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
+"xpm" 4 "gtk20" "The XPM image format"
+"image/x-xpixmap" ""
+"xpm" ""
+"/* XPM */" "" 100
diff --git a/gtk/gtk-register.sh b/gtk/gtk-register.sh
new file mode 100644
index 0000000..aaf5fd4
--- /dev/null
+++ b/gtk/gtk-register.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# /usr/bin/gtk-register: register input modules and gdk-pixbuf loaders
+#
+
+/usr/bin/gtk-query-immodules-2.0 > /usr/etc/gtk-2.0/gtk.immodules
+/usr/bin/gdk-pixbuf-query-loaders > /usr/etc/gtk-2.0/gdk-pixbuf.loaders
+
+# End of file
diff --git a/gtk/gtk.immodules b/gtk/gtk.immodules
index 34d9cad..4061cbc 100644
--- a/gtk/gtk.immodules
+++ b/gtk/gtk.immodules
@@ -1,29 +1,32 @@
# GTK+ Input Method Modules file
# Automatically generated file, do not edit
-# Created by gtk-query-immodules-2.0 from gtk+-2.10.14
+# Created by gtk-query-immodules-2.0 from gtk+-2.12.0
#
# ModulesPath = /root/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/root/.gtk-2.0/2.10.0/immodules:/root/.gtk-2.0/i686-pc-linux-gnu/immodules:/root/.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-xim.so"
-"xim" "X Input Method" "gtk20" "/usr/share/locale" "ko:ja:th:zh"
+"/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-am-et.so"
"am_et" "Amharic (EZ+)" "gtk20" "/usr/share/locale" "am"
+"/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-multipress.so"
+"multipress" "Multipress" "gtk20" "" ""
+
+"/usr/lib/gtk-2.0/2.10.0/immodules/im-thai.so"
+"thai" "Thai-Lao" "gtk+" "/usr/share/locale" "lo:th"
+
"/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-cyrillic-translit.so"
-"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "/usr/share/locale" ""
-
"/usr/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so"
"inuktitut" "Inuktitut (Transliterated)" "gtk20" "/usr/share/locale" "iu"
-"/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" "gtk+" "/usr/share/locale" "lo:th"
+"/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-ti-er.so"
"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "/usr/share/locale" "ti"
@@ -31,6 +34,6 @@
"/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-viqr.so"
-"viqr" "Vietnamese (VIQR)" "gtk20" "/usr/share/locale" "vi"
+"/usr/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so"
+"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "/usr/share/locale" ""
diff --git a/gtk/http-authstring.patch b/gtk/http-authstring.patch
deleted file mode 100644
index 0e259b3..0000000
--- a/gtk/http-authstring.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- gtk+2.0-2.10.13.orig/modules/printbackends/cups/gtkcupsutils.c
-+++ gtk+2.0-2.10.13/modules/printbackends/cups/gtkcupsutils.c
-@@ -33,6 +33,9 @@
- #if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR > 1) || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 1 && CUPS_VERSION_PATCH >= 20)
- #define HAVE_HTTP_AUTHSTRING 1
- #endif
-+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR > 2)
-+#define HAVE_GET_HTTP_AUTHSTRING
-+#endif
-
- typedef void (*GtkCupsRequestStateFunc) (GtkCupsRequest *request);
-
-@@ -627,7 +630,9 @@
- httpClearFields(request->http);
- httpSetField(request->http, HTTP_FIELD_CONTENT_LENGTH, length);
- httpSetField(request->http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
--#ifdef HAVE_HTTP_AUTHSTRING
-+#if defined (HAVE_GET_HTTP_AUTHSTRING)
-+ httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
-+#elif defined (HAVE_HTTP_AUTHSTRING)
- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
- #endif
-
-@@ -966,7 +971,9 @@
- }
-
- httpClearFields(request->http);
--#ifdef HAVE_HTTP_AUTHSTRING
-+#if defined (HAVE_GET_HTTP_AUTHSTRING)
-+ httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
-+#elif defined (HAVE_HTTP_AUTHSTRING)
- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
- #endif
-
