rpms/mingw32-gtk2/devel gtk.immodules, NONE, 1.1 gdk-pixbuf.loaders, 1.2, 1.3 mingw32-gtk2.spec, 1.16, 1.17
epienbro
epienbro at fedoraproject.org
Sun Sep 20 10:32:41 UTC 2009
- Previous message: rpms/fotowall/F-10 .cvsignore, 1.7, 1.8 fotowall.spec, 1.7, 1.8 sources, 1.7, 1.8
- Next message: rpms/mediawiki-wikicalendar/devel .cvsignore, 1.2, 1.3 mediawiki-wikicalendar.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: epienbro
Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28167
Modified Files:
gdk-pixbuf.loaders mingw32-gtk2.spec
Added Files:
gtk.immodules
Log Message:
* Sun Sep 20 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.11-3
- Use relative paths instead of absolute paths in the gdk-pixbuf.loaders file
- Added the gtk.immodules file (BZ #522957)
--- NEW FILE gtk.immodules ---
# GTK+ Input Method Modules file
# Automatically generated file, do not edit
# Created by Z:\usr\i686-pc-mingw32\sys-root\mingw\bin\gtk-query-immodules-2.0.exe from gtk+-2.17.11
#
# ModulesPath = Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\gtk-2.0\2.10.0\i686-pc-mingw32\immodules;Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\gtk-2.0\2.10.0\immodules;Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\gtk-2.0\i686-pc-mingw32\immodules;Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\gtk-2.0\immodules
#
"../lib/gtk-2.0/2.10.0/immodules/im-am-et.dll"
"am_et" "Amharic (EZ+)" "gtk20" "../share/locale" "am"
"../lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll"
"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "../share/locale" ""
"../lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll"
"inuktitut" "Inuktitut (Transliterated)" "gtk20" "../share/locale" "iu"
"../lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll"
"cedilla" "Cedilla" "gtk20" "../share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa"
"../lib/gtk-2.0/2.10.0/immodules/im-ime.dll"
"ime" "Windows IME" "gtk+" "" "ja:ko:zh"
"../lib/gtk-2.0/2.10.0/immodules/im-multipress.dll"
"multipress" "Multipress" "gtk20" "" ""
"../lib/gtk-2.0/2.10.0/immodules/im-viqr.dll"
"viqr" "Vietnamese (VIQR)" "gtk20" "../share/locale" "vi"
"../lib/gtk-2.0/2.10.0/immodules/im-thai.dll"
"thai" "Thai-Lao" "gtk20" "../share/locale" "lo:th"
"../lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll"
"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "../share/locale" "ti"
"../lib/gtk-2.0/2.10.0/immodules/im-ipa.dll"
"ipa" "IPA" "gtk20" "../share/locale" ""
"../lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll"
"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "../share/locale" "ti"
Index: gdk-pixbuf.loaders
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/gdk-pixbuf.loaders,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdk-pixbuf.loaders 10 Jun 2009 19:57:01 -0000 1.2
+++ gdk-pixbuf.loaders 20 Sep 2009 10:32:41 -0000 1.3
@@ -4,19 +4,19 @@
#
# LoaderDir = Z:\usr\i686-pc-mingw32\sys-root\mingw/lib/gtk-2.0/2.10.0/loaders
#
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
"ani" 4 "gtk20" "The ANI image format" "LGPL"
"application/x-navi-animation" ""
"ani" ""
"RIFF ACON" " xxxx " 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
"bmp" 5 "gtk20" "The BMP image format" "LGPL"
"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
"bmp" ""
"BM" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
"tiff" 1 "gtk20" "The TIFF image format" "LGPL"
"image/tiff" ""
"tiff" "tif" ""
@@ -24,20 +24,20 @@
"II* " " z" 100
"II* \020 CR\002 " " z zzz z" 0
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
"gif" 4 "gtk20" "The GIF image format" "LGPL"
"image/gif" ""
"gif" ""
"GIF8" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
"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
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
"tga" 4 "gtk20" "The Targa image format" "LGPL"
"image/x-tga" ""
"tga" "targa" ""
@@ -48,13 +48,13 @@
" \n" "xz " 100
" \013" "xz " 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
"jpeg" 5 "gtk20" "The JPEG image format" "LGPL"
"image/jpeg" ""
"jpeg" "jpe" "jpg" ""
"\377\330" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
"wbmp" 4 "gtk20" "The WBMP image format" "LGPL"
"image/vnd.wap.wbmp" ""
"wbmp" ""
@@ -63,26 +63,26 @@
" @" "z " 1
" " "z " 1
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
"xpm" 4 "gtk20" "The XPM image format" "LGPL"
"image/x-xpixmap" ""
"xpm" ""
"/* XPM */" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
"icns" 4 "gtk20" "The ICNS image format" "GPL"
"image/x-icns" ""
"icns" ""
"icns" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
"jpeg2000" 4 "gtk20" "The JPEG 2000 image format" "LGPL"
"image/jp2" "image/jpeg2000" "image/jpx" ""
"jp2" "jpc" "jpx" "j2k" "jpf" ""
" jP" "!!!! " 100
"\377O\377Q" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
"pcx" 4 "gtk20" "The PCX image format" "LGPL"
"image/x-pcx" ""
"pcx" ""
@@ -92,13 +92,13 @@
"\n\004\001" "" 100
"\n\005\001" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
"png" 5 "gtk20" "The PNG image format" "LGPL"
"image/png" ""
"png" ""
"\211PNG\r\n\032\n" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family" "LGPL"
"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
"pnm" "pbm" "pgm" "ppm" ""
@@ -109,13 +109,13 @@
"P5" "" 100
"P6" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
"image/x-cmu-raster" "image/x-sun-raster" ""
"ras" ""
"Y\246j\225" "" 100
-"Z:/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
"xbm" 4 "gtk20" "The XBM image format" "LGPL"
"image/x-xbitmap" ""
"xbm" ""
Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mingw32-gtk2.spec 18 Sep 2009 21:25:06 -0000 1.16
+++ mingw32-gtk2.spec 20 Sep 2009 10:32:41 -0000 1.17
@@ -7,7 +7,7 @@
Name: mingw32-gtk2
Version: 2.17.11
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: MinGW Windows Gtk2 library
License: LGPLv2+
@@ -21,6 +21,9 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
# wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe > gdk-pixbuf.loaders
Source1: gdk-pixbuf.loaders
+# wine %{_mingw32_bindir}/gtk-query-immodules-2.0.exe > gtk.immodules
+Source2: gtk.immodules
+
# Patch to fix the translations detection (got broken in GTK 2.17.11)
Patch0: gtk2-fix-install.patch
@@ -132,9 +135,10 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/
rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-win32-2.0.def
rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gailutil.def
-# Install gdk-pixbuf.loaders.
+# Install gdk-pixbuf.loaders and gtk.immodules
mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
%find_lang %{name} --all-name
@@ -338,6 +342,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Sep 20 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.11-3
+- Use relative paths instead of absolute paths in the gdk-pixbuf.loaders file
+- Added the gtk.immodules file (BZ #522957)
+
* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.11-2
- Rebuild because of broken mingw32-gcc/mingw32-binutils
- Previous message: rpms/fotowall/F-10 .cvsignore, 1.7, 1.8 fotowall.spec, 1.7, 1.8 sources, 1.7, 1.8
- Next message: rpms/mediawiki-wikicalendar/devel .cvsignore, 1.2, 1.3 mediawiki-wikicalendar.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list