[Gpg4win-commits] r1151 - in trunk: . packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Apr 3 16:54:54 CEST 2009
Author: marcus
Date: 2009-04-03 16:54:51 +0200 (Fri, 03 Apr 2009)
New Revision: 1151
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-atk.nsi
trunk/src/inst-glib.nsi
trunk/src/inst-gtk+.nsi
trunk/src/inst-libpng.nsi
trunk/src/inst-pango.nsi
trunk/src/uninst-atk.nsi
trunk/src/uninst-glib.nsi
trunk/src/uninst-gtk+.nsi
trunk/src/uninst-libpng.nsi
trunk/src/uninst-pango.nsi
Log:
2009-04-03 Marcus Brinkmann <marcus at g10code.de>
* packages/packages.current: Update pinentry, libpng, glib, atk,
pango, cairo, gtk+, pkgconfig.
* configure.ac: libpng is now from GTK.
* src/inst-atk.nsi, src/uninst-atk.nsi, src/inst-pango.nsi,
src/inst-libpng.nsi, src/uninst-glib.nsi, src/uninst-libpng.nsi,
src/inst-gtk+.nsi, src/uninst-gtk+.nsi, src/inst-glib.nsi,
src/uninst-pango.nsi: Update for new version of the packages.
* src/Makefile.am (gpg4win_pkg_libpng_post_install): Fix path for
new package version.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/ChangeLog 2009-04-03 14:54:51 UTC (rev 1151)
@@ -1,5 +1,15 @@
2009-04-03 Marcus Brinkmann <marcus at g10code.de>
+ * packages/packages.current: Update pinentry, libpng, glib, atk,
+ pango, cairo, gtk+, pkgconfig.
+ * configure.ac: libpng is now from GTK.
+ * src/inst-atk.nsi, src/uninst-atk.nsi, src/inst-pango.nsi,
+ src/inst-libpng.nsi, src/uninst-glib.nsi, src/uninst-libpng.nsi,
+ src/inst-gtk+.nsi, src/uninst-gtk+.nsi, src/inst-glib.nsi,
+ src/uninst-pango.nsi: Update for new version of the packages.
+ * src/Makefile.am (gpg4win_pkg_libpng_post_install): Fix path for
+ new package version.
+
* src/Makefile.am (gpg4win_pkg_qt_post_install): New macro.
* src/QtCore.pc, src/QtGui.pc: New files.
* src/gpg4win.mk.in: Clear PKG_CONFIG_LIBDIR.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/configure.ac 2009-04-03 14:54:51 UTC (rev 1151)
@@ -187,7 +187,6 @@
GPG4WIN_BPKG_GNUWIN32([zlib])
GPG4WIN_BPKG_GNUWIN32_LIB([crypt])
GPG4WIN_BPKG_GNUWIN32([regex])
-GPG4WIN_BPKG_GNUWIN32([libpng], [pkgconfig])
GPG4WIN_BPKG_GNUWIN32([jpeg])
GPG4WIN_BPKG_GNUWIN32([bsfilter])
@@ -199,6 +198,7 @@
GPG4WIN_BPKG_GTK_DEV([pango], [glib pkgconfig])
GPG4WIN_BPKG_GTK_DEV([cairo], [glib pkgconfig])
GPG4WIN_BPKG_GTK_DEV([gtk+], [libiconv gettext pkgconfig atk pango glib cairo])
+GPG4WIN_BPKG_GTK_DEV([libpng], [pkgconfig])
GPG4WIN_SPKG([bzip2])
GPG4WIN_SPKG([adns])
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/packages/packages.current 2009-04-03 14:54:51 UTC (rev 1151)
@@ -39,12 +39,12 @@
file zlib-1.2.3-src.zip
chk 0e18fcd7f1a585f825c210a1bb2456b4aa8fcc0d
-file libpng-1.2.8-bin.zip
-chk 32876271847afed0ed721fb1b5913a2ce5f25168
-file libpng-1.2.8-lib.zip
-chk 834e1567813506525c0f1003a048df0353b1bb36
-file libpng-1.2.8-src.zip
-chk f00a86596d804fb62e912cf575983124692858fa
+# file libpng-1.2.8-bin.zip
+# chk 32876271847afed0ed721fb1b5913a2ce5f25168
+# file libpng-1.2.8-lib.zip
+# chk 834e1567813506525c0f1003a048df0353b1bb36
+# file libpng-1.2.8-src.zip
+# chk f00a86596d804fb62e912cf575983124692858fa
file jpeg-6b-4-bin.zip
chk d6309212c783cffe8ea9d2c7c8913b69709796fe
@@ -170,79 +170,108 @@
#
# GLIB
#
-server ftp://ftp.gtk.org/pub/glib/2.12
+server http://ftp.gnome.org/pub/gnome/sources/glib/2.20
-file glib-2.12.12.tar.bz2
-chk 527bced2e6d38169c08c8712d5e3b6ebb0dc46b5
+file glib-2.20.0.tar.bz2
+chk 4d653ef39fd1ebe7b64217fd824dfb1bbbde7007
-
#
# ATK
#
-server ftp://ftp.gnome.org/pub/gnome/sources/atk/1.12
+server http://ftp.gnome.org/pub/gnome/sources/atk/1.24
-file atk-1.12.2.tar.bz2
-chk 8c59f23a90e6b4ddcff0712dcbf1bfdaa9fc35cb
+file atk-1.24.0.tar.bz2
+chk 85ff5bd8f1879d2a43dfcf4842fc5ea9125dec11
-server ftp://ftp.gtk.org/pub/gtk/v2.10/win32/dependencies
+server http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.24
-file atk-1.12.2.zip
-chk c4dd9617e96f03a6856cc99dec407bc9e8f28a98
-file atk-dev-1.12.2.zip
-chk 168ebd566ab4913cb8b03b11d7bc7a038bf27273
+name atk-1.24.0.zip
+file atk_1.24.0-1_win32.zip
+chk 206a90bd5c03d4349c83c760916eca2b5eeeb08a
+name atk-dev-1.24.0.zip
+file atk-dev_1.24.0-1_win32.zip
+chk cee1664fde5109ad3715a57e6b7c642f3a749b6e
-
#
# PANGO
#
-server ftp://ftp.gtk.org/pub/pango/1.16
+server http://ftp.gnome.org/pub/gnome/sources/pango/1.24
-file pango-1.16.4.tar.bz2
-chk 6a21126632ed99950818c64d8598b6e92fa7da58
-file win32/pango-1.16.4.zip
-chk c0dbdaf50465c28ba0686f7d125a6cddc70e40fb
-file win32/pango-dev-1.16.4.zip
-chk 3ffdfe8f49421e5c0f8608c113ee6920316b9562
+file pango-1.24.0.tar.bz2
+chk 32e99f3f1b4ca550225837bf35d581d4d92d08a9
+server http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.24
+
+name pango-1.24.0.zip
+file pango_1.24.0-1_win32.zip
+chk ddb16003b42644b6e12cba81961e1928c453a732
+name pango-dev-1.24.0.zip
+file pango-dev_1.24.0-1_win32.zip
+chk baabaae320c2278695da571928c29602b941a1d1
+
#
# CAIRO
#
server http://cairographics.org/releases
-file cairo-1.4.2.tar.gz
-chk 9e7a323fc7d81d5011044d7eb22db3bf26ff7314
+file cairo-1.8.6.tar.gz
+chk d1e5479d4eeb7b1a3589672e3ef8f4899e7c5eba
-server ftp://ftp.gtk.org/pub/gtk/v2.10
+server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
+
+name cairo-1.8.6.zip
+file cairo_1.8.6-1_win32.zip
+chk d41dc913befc827e3776ad356ba424350a6a2e49
+name cairo-dev-1.8.6.zip
+file cairo-dev_1.8.6-1_win32.zip
+chk 74f6da5762bbd1ff79ea34b4dc5309ce8a9f25c5
-file win32/cairo-1.4.2.zip
-chk 33d5308b94c967bfbf2d94a9ec7eda170411d628
-file win32/cairo-dev-1.4.2.zip
-chk 689f8959f69cff6b086846d3f25c361cd6800cb6
-
-
-
#
# GTK+
#
-server ftp://ftp.gtk.org/pub/gtk/v2.10
+server http://ftp.gnome.org/pub/gnome/sources/gtk+/2.16
-file gtk+-2.10.13.tar.bz2
-chk 8d00b928a8788ff86d97197c20c18d41f9a1b1cd
-file win32/gtk+-2.10.13.zip
-chk 1cb9e220adcd784ef92d147d2c5d72545eb9c226
-file win32/gtk+-dev-2.10.13.zip
-chk e3a8e235fef16c01291e683214fb82e19be61844
+file gtk+-2.16.0.tar.bz2
+chk b737ad4b224a3cff966ef43b2682c696d756764c
+server http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.16
+name gtk+-2.16.0.zip
+file gtk+_2.16.0-2_win32.zip
+chk f4834c74e8da1ed4ab3ad0e5ed0cb43e235a9dd2
+name gtk+-dev-2.16.0.zip
+file gtk+-dev_2.16.0-2_win32.zip
+chk 5d1a1ae730786d2698eaa309ee0da7127a88e30e
+
+
#
# GIMP stuff for W32
#
-server http://www.gimp.org/~tml/gimp/win32
+server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
-file pkgconfig-0.15.zip
-chk fc4b38b372e1559cbfafc169f528efcb31c9dd94
-file pkgconfig-0.15.0.tar.gz
-chk 1019c8027c0cf94bca680886f4e2ae4e629a2a97
+name pkgconfig-0.23.tar.gz
+file pkg-config-0.23.tar.gz
+chk b59dddd6b5320bd74c0f74b3339618a327096b2a
+name pkgconfig-0.23.zip
+file pkg-config-0.23-2.zip
+chk 2d300159d8c5ebd4f7c139aa9e320e194106d003
+
+# PNG
+
+server http://dfn.dl.sourceforge.net/sourceforge/libpng
+
+file libpng-1.2.34.tar.gz
+chk 8b1e1e544660e918af75d8af2c078f85c022db68
+
+server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
+
+name libpng-1.2.34.zip
+file libpng_1.2.34-1_win32.zip
+chk 5de32013ebad64ec7c592103d8e7b6806851197d
+name libpng-dev-1.2.34.zip
+file libpng-dev_1.2.34-1_win32.zip
+chk 509a4cea2fd45fccd0660980a3257cb29398fbeb
+
#
# WinPT
#
@@ -330,8 +359,8 @@
file libassuan/libassuan-1.0.5.tar.bz2
chk f6c36e9d99736883a8ce5b80b0a51d854cbbbc70
-file pinentry/pinentry-0.7.5.tar.gz
-chk 6699a1ff94c649e8905199d480c6412cc43bad3d
+#file pinentry-0.7.6-svn197.tar.gz
+#chk 982297616aa78550dd838dc6f4339f52bb4e50d9
#file gpgme/gpgme-1.1.7.tar.bz2
#chk c735bb90431667e3d020aa3adcf0efa858c992af
@@ -349,6 +378,9 @@
file gpgme-1.1.9-svn1357.tar.bz2
chk 02752ef4450aef89f2c114088ba6c2f3b2d13076
+file pinentry-0.7.6-svn199.tar.gz
+chk a259477abe529a6b51d77df071c5ed44b1d6d70e
+
#
# GnuPG utilities
#
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/src/Makefile.am 2009-04-03 14:54:51 UTC (rev 1151)
@@ -382,7 +382,7 @@
# In libpng, the pkg-config files are surprisingly found in the
# runtime package.
define gpg4win_pkg_libpng_post_install
- (cd $$$${pkgidir}; \
+ (cd $$$${pkgidir_dev}; \
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
endef
Modified: trunk/src/inst-atk.nsi
===================================================================
--- trunk/src/inst-atk.nsi 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/src/inst-atk.nsi 2009-04-03 14:54:51 UTC (rev 1151)
@@ -34,20 +34,20 @@
!else
File ${prefix}/bin/libatk-1.0-0.dll
- SetOutPath "$INSTDIR\lib\locale\de\LC_MESSAGES"
- File ${prefix}/lib/locale/de/LC_MESSAGES/atk10.mo
+ SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
+ File ${prefix}/share/locale/de/LC_MESSAGES/atk10.mo
- SetOutPath "$INSTDIR\lib\locale\ar\LC_MESSAGES"
- File ${prefix}/lib/locale/ar/LC_MESSAGES/atk10.mo
+ SetOutPath "$INSTDIR\share\locale\ar\LC_MESSAGES"
+ File ${prefix}/share/locale/ar/LC_MESSAGES/atk10.mo
- SetOutPath "$INSTDIR\lib\locale\es\LC_MESSAGES"
- File ${prefix}/lib/locale/es/LC_MESSAGES/atk10.mo
+ SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
+ File ${prefix}/share/locale/es/LC_MESSAGES/atk10.mo
- SetOutPath "$INSTDIR\lib\locale\fr\LC_MESSAGES"
- File ${prefix}/lib/locale/fr/LC_MESSAGES/atk10.mo
+ SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
+ File ${prefix}/share/locale/fr/LC_MESSAGES/atk10.mo
- SetOutPath "$INSTDIR\lib\locale\ru\LC_MESSAGES"
- File ${prefix}/lib/locale/ru/LC_MESSAGES/atk10.mo
+ SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
+ File ${prefix}/share/locale/ru/LC_MESSAGES/atk10.mo
!endif
SectionEnd
Modified: trunk/src/inst-glib.nsi
===================================================================
--- trunk/src/inst-glib.nsi 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/src/inst-glib.nsi 2009-04-03 14:54:51 UTC (rev 1151)
@@ -37,6 +37,7 @@
File ${prefix}/bin/libgmodule-2.0-0.dll
File ${prefix}/bin/libgobject-2.0-0.dll
File ${prefix}/bin/libgthread-2.0-0.dll
+ File ${prefix}/bin/libgio-2.0-0.dll
SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
File ${prefix}/share/locale/de/LC_MESSAGES/glib20.mo
Modified: trunk/src/inst-gtk+.nsi
===================================================================
--- trunk/src/inst-gtk+.nsi 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/src/inst-gtk+.nsi 2009-04-03 14:54:51 UTC (rev 1151)
@@ -36,14 +36,20 @@
File ${prefix}/bin/libgdk-win32-2.0-0.dll
File ${prefix}/bin/libgtk-win32-2.0-0.dll
+ File ${prefix}/bin/libgailutil-18.dll
+ File ${prefix}/bin/gdk-pixbuf-query-loaders.exe
+ File ${prefix}/bin/gtk-query-immodules-2.0.exe
+
SetOutPath "$INSTDIR\etc\gtk-2.0"
File ${prefix}/etc/gtk-2.0/gdk-pixbuf.loaders
File ${prefix}/etc/gtk-2.0/gtk.immodules
+ File ${prefix}/etc/gtk-2.0/im-multipress.conf
SetOutPath "$INSTDIR\lib\gtk-2.0\2.10.0\loaders"
File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll
File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll
File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll
+ File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll
File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll
File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll
File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll
@@ -56,17 +62,17 @@
File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll
File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll
- SetOutPath "$INSTDIR\lib\gtk-2.0\2.10.0\immodules"
- File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ime.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-thai.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll
+# SetOutPath "$INSTDIR\lib\gtk-2.0\2.10.0\immodules"
+# File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll
+# File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll
+# File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll
+# File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ime.dll
+# File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll
+# File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll
+# File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-thai.dll
+# File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll
+# File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll
+# File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll
SetOutPath "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
File ${prefix}/lib/gtk-2.0/2.10.0/engines/libpixmap.dll
@@ -84,25 +90,25 @@
SetOutPath "$INSTDIR\share\themes\MS-Windows\gtk-2.0"
File ${prefix}/share/themes/MS-Windows/gtk-2.0/gtkrc
- SetOutPath "$INSTDIR\lib\locale\de\LC_MESSAGES"
- File ${prefix}/lib/locale/de/LC_MESSAGES/gtk20.mo
- File ${prefix}/lib/locale/de/LC_MESSAGES/gtk20-properties.mo
+ SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
+ File ${prefix}/share/locale/de/LC_MESSAGES/gtk20.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/gtk20-properties.mo
- SetOutPath "$INSTDIR\lib\locale\ar\LC_MESSAGES"
- File ${prefix}/lib/locale/ar/LC_MESSAGES/gtk20.mo
- File ${prefix}/lib/locale/ar/LC_MESSAGES/gtk20-properties.mo
+ SetOutPath "$INSTDIR\share\locale\ar\LC_MESSAGES"
+ File ${prefix}/share/locale/ar/LC_MESSAGES/gtk20.mo
+ File ${prefix}/share/locale/ar/LC_MESSAGES/gtk20-properties.mo
- SetOutPath "$INSTDIR\lib\locale\es\LC_MESSAGES"
- File ${prefix}/lib/locale/es/LC_MESSAGES/gtk20.mo
- File ${prefix}/lib/locale/es/LC_MESSAGES/gtk20-properties.mo
+ SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
+ File ${prefix}/share/locale/es/LC_MESSAGES/gtk20.mo
+ File ${prefix}/share/locale/es/LC_MESSAGES/gtk20-properties.mo
- SetOutPath "$INSTDIR\lib\locale\fr\LC_MESSAGES"
- File ${prefix}/lib/locale/fr/LC_MESSAGES/gtk20.mo
- File ${prefix}/lib/locale/fr/LC_MESSAGES/gtk20-properties.mo
+ SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
+ File ${prefix}/share/locale/fr/LC_MESSAGES/gtk20.mo
+ File ${prefix}/share/locale/fr/LC_MESSAGES/gtk20-properties.mo
- SetOutPath "$INSTDIR\lib\locale\ru\LC_MESSAGES"
- File ${prefix}/lib/locale/ru/LC_MESSAGES/gtk20.mo
- File ${prefix}/lib/locale/ru/LC_MESSAGES/gtk20-properties.mo
+ SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
+ File ${prefix}/share/locale/ru/LC_MESSAGES/gtk20.mo
+ File ${prefix}/share/locale/ru/LC_MESSAGES/gtk20-properties.mo
!endif
SectionEnd
Modified: trunk/src/inst-libpng.nsi
===================================================================
--- trunk/src/inst-libpng.nsi 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/src/inst-libpng.nsi 2009-04-03 14:54:51 UTC (rev 1151)
@@ -32,7 +32,7 @@
!ifdef SOURCES
File "${gpg4win_pkg_libpng_src}"
!else
- File ${prefix}/bin/libpng13.dll
+ File ${prefix}/bin/libpng12-0.dll
!ifdef DEBUG
# We install a couple of binaries that may be useful for testing.
File ${prefix}/bin/png2pnm.exe
Modified: trunk/src/inst-pango.nsi
===================================================================
--- trunk/src/inst-pango.nsi 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/src/inst-pango.nsi 2009-04-03 14:54:51 UTC (rev 1151)
@@ -38,7 +38,7 @@
File ${prefix}/bin/libpangocairo-1.0-0.dll
SetOutPath "$INSTDIR\etc\pango"
- File ${prefix}/etc/pango/pango.aliases
+# File ${prefix}/etc/pango/pango.aliases
File ${prefix}/etc/pango/pango.modules
!endif
Modified: trunk/src/uninst-atk.nsi
===================================================================
--- trunk/src/uninst-atk.nsi 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/src/uninst-atk.nsi 2009-04-03 14:54:51 UTC (rev 1151)
@@ -30,6 +30,7 @@
Push "${gpg4win_pkg_atk_src}"
Call un.SourceDelete
!else
+ # Old stuff.
Delete "$INSTDIR\lib\locale\de\LC_MESSAGES\atk10.mo"
RMDir "$INSTDIR\lib\locale\de\LC_MESSAGES"
RMDir "$INSTDIR\lib\locale\de"
@@ -48,6 +49,25 @@
RMDir "$INSTDIR\lib\locale"
RMDir "$INSTDIR\lib"
+ # Current stuff.
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\atk10.mo"
+ RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\de"
+ Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\atk10.mo"
+ RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\ar"
+ Delete "$INSTDIR\share\locale\es\LC_MESSAGES\atk10.mo"
+ RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\es"
+ Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\atk10.mo"
+ RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\fr"
+ Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\atk10.mo"
+ RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\ru"
+ RMDir "$INSTDIR\share\locale"
+ RMDir "$INSTDIR\share"
+
Delete "$INSTDIR\libatk-1.0-0.dll"
!endif
Modified: trunk/src/uninst-glib.nsi
===================================================================
--- trunk/src/uninst-glib.nsi 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/src/uninst-glib.nsi 2009-04-03 14:54:51 UTC (rev 1151)
@@ -54,6 +54,7 @@
Delete "$INSTDIR\libgmodule-2.0-0.dll"
Delete "$INSTDIR\libgobject-2.0-0.dll"
Delete "$INSTDIR\libgthread-2.0-0.dll"
+ Delete "$INSTDIR\libgio-2.0-0.dll"
RMDir "$INSTDIR"
!endif
SectionEnd
Modified: trunk/src/uninst-gtk+.nsi
===================================================================
--- trunk/src/uninst-gtk+.nsi 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/src/uninst-gtk+.nsi 2009-04-03 14:54:51 UTC (rev 1151)
@@ -35,8 +35,13 @@
Delete "$INSTDIR\libgdk-win32-2.0-0.dll"
Delete "$INSTDIR\libgtk-win32-2.0-0.dll"
+ Delete "$INSTDIR\libgailutil-18.dll"
+ Delete "$INSTDIR\gdk-pixbuf-query-loaders.exe"
+ Delete "$INSTDIR\gtk-query-immodules-2.0.exe"
+
Delete "$INSTDIR\etc\gtk-2.0\gdk-pixbuf.loaders"
Delete "$INSTDIR\etc\gtk-2.0\gtk.immodules"
+ Delete "$INSTDIR\etc\gtk-2.0\im-multipress.conf"
Delete "$INSTDIR\etc\gtk-2.0\gtkrc"
RMDir "$INSTDIR\etc\gtk-2.0"
RMDir "$INSTDIR\etc"
@@ -83,6 +88,28 @@
RMDir "$INSTDIR\lib"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gtk20.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gtk20-properties.mo"
+ RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\de"
+ Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\gtk20.mo"
+ Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\gtk20-properties.mo"
+ RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\ar"
+ Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gtk20.mo"
+ Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gtk20-properties.mo"
+ RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\es"
+ Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtk20.mo"
+ Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtk20-properties.mo"
+ RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\fr"
+ Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gtk20.mo"
+ Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gtk20-properties.mo"
+ RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\ru"
+ RMDir "$INSTDIR\share\locale"
+
Delete "$INSTDIR\share\themes\Default\gtk-2.0\gtkrc"
RMDir "$INSTDIR\share\themes\Default\gtk-2.0"
Delete "$INSTDIR\share\themes\Default\gtk-2.0-key\gtkrc"
Modified: trunk/src/uninst-libpng.nsi
===================================================================
--- trunk/src/uninst-libpng.nsi 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/src/uninst-libpng.nsi 2009-04-03 14:54:51 UTC (rev 1151)
@@ -30,7 +30,11 @@
Push "${gpg4win_pkg_libpng_src}"
Call un.SourceDelete
!else
+ Delete "$INSTDIR\libpng12-0.dll"
+
+ # Old versions:
Delete "$INSTDIR\libpng13.dll"
+
!ifdef DEBUG
Delete "$INSTDIR\png2pnm.exe"
Delete "$INSTDIR\pngtest.exe"
Modified: trunk/src/uninst-pango.nsi
===================================================================
--- trunk/src/uninst-pango.nsi 2009-04-03 14:02:44 UTC (rev 1150)
+++ trunk/src/uninst-pango.nsi 2009-04-03 14:54:51 UTC (rev 1151)
@@ -35,7 +35,7 @@
Delete "$INSTDIR\libpangowin32-1.0-0.dll"
Delete "$INSTDIR\libpangocairo-1.0-0.dll"
- Delete "$INSTDIR\etc\pango\pango.aliases"
+
Delete "$INSTDIR\etc\pango\pango.modules"
RMDir "$INSTDIR\etc\pango"
RMDir "$INSTDIR\etc"
@@ -54,8 +54,11 @@
RMDir "$INSTDIR\lib\pango\1.4.0\modules"
RMDir "$INSTDIR\lib\pango\1.4.0"
RMDir "$INSTDIR\lib\pango"
+ RMDir "$INSTDIR\lib"
- RMDir "$INSTDIR\lib"
+ Delete "$INSTDIR\etc\pango\pango.aliases"
+ RMDir "$INSTDIR\etc\pango"
+ RMDir "$INSTDIR\etc"
RMDir "$INSTDIR"
!endif
SectionEnd
More information about the Gpg4win-commits
mailing list