[Gpg4win-commits] r1410 - in trunk: . include packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed May 5 01:23:10 CEST 2010
Author: marcus
Date: 2010-05-05 01:22:59 +0200 (Wed, 05 May 2010)
New Revision: 1410
Added:
trunk/src/inst-expat.nsi
trunk/src/inst-fontconfig.nsi
trunk/src/inst-freetype.nsi
trunk/src/uninst-expat.nsi
trunk/src/uninst-fontconfig.nsi
trunk/src/uninst-freetype.nsi
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-gtk+.nsi
trunk/src/inst-libpng.nsi
trunk/src/inst-sections.nsi
trunk/src/inst-zlib.nsi
trunk/src/uninst-bzip2.nsi
trunk/src/uninst-gtk+.nsi
trunk/src/uninst-libpng.nsi
trunk/src/uninst-zlib.nsi
Log:
2010-05-04 Marcus Brinkmann <marcus at g10code.de>
* packages/packages.current: Update to glib 2.24.0, atk 1.30.0,
pango 1.28.0, cairo 1.8.10, gtk+ 2.16.6. Add expat, freetype and
fontconfig. Update to libpng 1.4.1 and convert to source package.
* configure.ac: Add expat, freetype and fontconfig. Make libpng
source package.
* include/config.nsi.in: Likewise. Remove libpng dev and src
variables.
* src/Makefile.am (EXTRA_DIST): Add inst-expat.nsi,
uninst-expat.nsi, inst-freetype.nsi, uninst-freetype.nsi,
inst-fontconfig.nsi, uninst-fontconfig.nsi.
(gpg4win_pkg_freetype_post_install,
gpg4win_pkg_fontconfig_post_install): New.
(gpg4win_bpkgs): Add expat, freetype and fontconfig.
(gpg4win_spkgs): Add libpng.
(gpg4win_pkg_libpng_configure): New.
(gpg4win_pkg_libpng_post_install): Fix location.
(gpg4win_pkg_zlib_post_install): Include comment which is tested
by new libtool versions as safety check.
* src/inst-sections.nsi: Add support for expat, freetype and
fontconfig.
* src/inst-expat.nsi, src/uninst-expat.nsi, src/inst-freetype.nsi,
src/uninst-freetype.nsi, src/inst-fontconfig.nsi,
src/uninst-fontconfig.nsi: New files.
* src/uninst-bzip2.nsi, src/inst-zlib.nsi, src/uninst-zlib.nsi:
Fix source package file name.
* src/inst-libpng.nsi, src/uninst-libpng.nsi: Likewise, also
remove debug install and adjust shared library name.
* src/inst-gtk+.nsi: Remove pixbufloader modules (now included in
main loader) and install libgail.dll.
* src/uninst-gtk+.nsi: Uninstall libgail.dll.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/ChangeLog 2010-05-04 23:22:59 UTC (rev 1410)
@@ -1,5 +1,36 @@
2010-05-04 Marcus Brinkmann <marcus at g10code.de>
+ * packages/packages.current: Update to glib 2.24.0, atk 1.30.0,
+ pango 1.28.0, cairo 1.8.10, gtk+ 2.16.6. Add expat, freetype and
+ fontconfig. Update to libpng 1.4.1 and convert to source package.
+ * configure.ac: Add expat, freetype and fontconfig. Make libpng
+ source package.
+ * include/config.nsi.in: Likewise. Remove libpng dev and src
+ variables.
+ * src/Makefile.am (EXTRA_DIST): Add inst-expat.nsi,
+ uninst-expat.nsi, inst-freetype.nsi, uninst-freetype.nsi,
+ inst-fontconfig.nsi, uninst-fontconfig.nsi.
+ (gpg4win_pkg_freetype_post_install,
+ gpg4win_pkg_fontconfig_post_install): New.
+ (gpg4win_bpkgs): Add expat, freetype and fontconfig.
+ (gpg4win_spkgs): Add libpng.
+ (gpg4win_pkg_libpng_configure): New.
+ (gpg4win_pkg_libpng_post_install): Fix location.
+ (gpg4win_pkg_zlib_post_install): Include comment which is tested
+ by new libtool versions as safety check.
+ * src/inst-sections.nsi: Add support for expat, freetype and
+ fontconfig.
+ * src/inst-expat.nsi, src/uninst-expat.nsi, src/inst-freetype.nsi,
+ src/uninst-freetype.nsi, src/inst-fontconfig.nsi,
+ src/uninst-fontconfig.nsi: New files.
+ * src/uninst-bzip2.nsi, src/inst-zlib.nsi, src/uninst-zlib.nsi:
+ Fix source package file name.
+ * src/inst-libpng.nsi, src/uninst-libpng.nsi: Likewise, also
+ remove debug install and adjust shared library name.
+ * src/inst-gtk+.nsi: Remove pixbufloader modules (now included in
+ main loader) and install libgail.dll.
+ * src/uninst-gtk+.nsi: Uninstall libgail.dll.
+
* packages/packages.current: Update zlib to 1.2.5, now directly as
source package from zlib.net.
* configure.ac: Make zlib a source package.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/Makefile.am 2010-05-04 23:22:59 UTC (rev 1410)
@@ -28,6 +28,7 @@
patches/glib-2.12.12/02-gspawn-w32.patch \
patches/glib-2.12.12/03-gspawn-w32-fixup.patch \
patches/glib-2.20.0/01-socket.patch \
+ patches/glib-2.24.0/01-socket.patch \
patches/gpgme/01-gpg2.patch \
patches/gpgme-1.1.7/01-registry.patch \
patches/gpgme-1.1.7/02-extern-umlaute.patch \
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/configure.ac 2010-05-04 23:22:59 UTC (rev 1410)
@@ -208,8 +208,11 @@
GPG4WIN_BPKG_GTK_DEV([atk], [glib pkgconfig])
GPG4WIN_BPKG_GTK_DEV([pango], [glib pkgconfig])
GPG4WIN_BPKG_GTK_DEV([cairo], [glib pkgconfig])
+GPG4WIN_BPKG_GTK_DEV([expat])
+GPG4WIN_BPKG_GTK_DEV([freetype], [pkgconfig zlib])
+GPG4WIN_BPKG_GTK_DEV([fontconfig], [pkgconfig zlib expat])
GPG4WIN_BPKG_GTK_DEV([gtk+], [libiconv gettext pkgconfig atk pango glib cairo])
-GPG4WIN_BPKG_GTK_DEV([libpng], [pkgconfig])
+GPG4WIN_SPKG([libpng], [pkgconfig])
GPG4WIN_SPKG([bzip2])
GPG4WIN_SPKG([adns])
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/include/config.nsi.in 2010-05-04 23:22:59 UTC (rev 1410)
@@ -177,8 +177,6 @@
@HAVE_PKG_ZLIB@
!define gpg4win_pkg_zlib @gpg4win_pkg_zlib@
!define gpg4win_pkg_zlib_version @gpg4win_pkg_zlib_version@
-!define gpg4win_pkg_zlib_dev @gpg4win_pkg_zlib_dev@
-!define gpg4win_pkg_zlib_src @gpg4win_pkg_zlib_src@
@HAVE_PKG_CRYPT@
!define gpg4win_pkg_crypt @gpg4win_pkg_crypt@
@@ -201,8 +199,6 @@
@HAVE_PKG_LIBPNG@
!define gpg4win_pkg_libpng @gpg4win_pkg_libpng@
!define gpg4win_pkg_libpng_version @gpg4win_pkg_libpng_version@
-!define gpg4win_pkg_libpng_dev @gpg4win_pkg_libpng_dev@
-!define gpg4win_pkg_libpng_src @gpg4win_pkg_libpng_src@
@HAVE_PKG_JPEG@
!define gpg4win_pkg_jpeg @gpg4win_pkg_jpeg@
@@ -227,6 +223,24 @@
!define gpg4win_pkg_atk_dev @gpg4win_pkg_atk_dev@
!define gpg4win_pkg_atk_src @gpg4win_pkg_atk_src@
+ at HAVE_PKG_EXPAT@
+!define gpg4win_pkg_expat @gpg4win_pkg_expat@
+!define gpg4win_pkg_expat_version @gpg4win_pkg_expat_version@
+!define gpg4win_pkg_expat_dev @gpg4win_pkg_expat_dev@
+!define gpg4win_pkg_expat_src @gpg4win_pkg_expat_src@
+
+ at HAVE_PKG_FREETYPE@
+!define gpg4win_pkg_freetype @gpg4win_pkg_freetype@
+!define gpg4win_pkg_freetype_version @gpg4win_pkg_freetype_version@
+!define gpg4win_pkg_freetype_dev @gpg4win_pkg_freetype_dev@
+!define gpg4win_pkg_freetype_src @gpg4win_pkg_freetype_src@
+
+ at HAVE_PKG_FONTCONFIG@
+!define gpg4win_pkg_fontconfig @gpg4win_pkg_fontconfig@
+!define gpg4win_pkg_fontconfig_version @gpg4win_pkg_fontconfig_version@
+!define gpg4win_pkg_fontconfig_dev @gpg4win_pkg_fontconfig_dev@
+!define gpg4win_pkg_fontconfig_src @gpg4win_pkg_fontconfig_src@
+
@HAVE_PKG_CAIRO@
!define gpg4win_pkg_cairo @gpg4win_pkg_cairo@
!define gpg4win_pkg_cairo_version @gpg4win_pkg_cairo_version@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/packages/packages.current 2010-05-04 23:22:59 UTC (rev 1410)
@@ -38,13 +38,6 @@
# for easier download.
server ftp://ftp.g10code.com/mirrors/gnuwin32
-# 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
file jpeg-6b-4-lib.zip
@@ -169,79 +162,117 @@
#
# GLIB
#
-server http://ftp.gnome.org/pub/gnome/sources/glib/2.20
+server http://ftp.gnome.org/pub/gnome/sources/glib/2.24
-file glib-2.20.0.tar.bz2
-chk 4d653ef39fd1ebe7b64217fd824dfb1bbbde7007
+file glib-2.24.0.tar.bz2
+chk 32714e64fff52d18db5f077732910215790e0c5b
#
# ATK
#
-server http://ftp.gnome.org/pub/gnome/sources/atk/1.24
+server http://ftp.gnome.org/pub/gnome/sources/atk/1.30
-file atk-1.24.0.tar.bz2
-chk 85ff5bd8f1879d2a43dfcf4842fc5ea9125dec11
+file atk-1.30.0.tar.bz2
+chk ca9380e956e37275cb0cb72805d20306686fb885
-server http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.24
+server http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.30
-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
+name atk-1.30.0.zip
+file atk_1.30.0-1_win32.zip
+chk 542d772614266b7d18fa72b53ecd5abc82f938e3
+name atk-dev-1.30.0.zip
+file atk-dev_1.30.0-1_win32.zip
+chk 75913d22b51afe28c8a3057f6bf4b5b1aa2bf17d
#
# PANGO
#
-server http://ftp.gnome.org/pub/gnome/sources/pango/1.24
+server http://ftp.gnome.org/pub/gnome/sources/pango/1.28
-file pango-1.24.0.tar.bz2
-chk 32e99f3f1b4ca550225837bf35d581d4d92d08a9
+file pango-1.28.0.tar.bz2
+chk b77fd452a59e4e11ee8b97193344c945250d5d37
-server http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.24
+server http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28
-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
+name pango-1.28.0.zip
+file pango_1.28.0-1_win32.zip
+chk 4f568017e07f42a9038139ea2355b0ae5bd2a70d
+name pango-dev-1.28.0.zip
+file pango-dev_1.28.0-1_win32.zip
+chk aa2b8c03cc15c822b521481e583dbc310a6dae76
#
# CAIRO
#
server http://cairographics.org/releases
-file cairo-1.8.6.tar.gz
-chk d1e5479d4eeb7b1a3589672e3ef8f4899e7c5eba
+file cairo-1.8.10.tar.gz
+chk fd5e8ca82ff0e8542ea4c51612cad387f2a49df3
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
+name cairo-1.8.10.zip
+file cairo_1.8.10-3_win32.zip
+chk 9c5c96ee58a179eed8eef14a6fc9941a1757a3d0
+name cairo-dev-1.8.10.zip
+file cairo-dev_1.8.10-3_win32.zip
+chk b61baec95e9f03c0e4bff9782a76bb7081b6aa31
+
+file freetype-2.3.12.tar.bz2
+chk ebf0438429c0bedd310059326d91646c3c91016b
+name freetype-2.3.12.zip
+file freetype_2.3.12-1_win32.zip
+chk 9ee865e43df2c4bb3840bfbb930cfd19994d9f14
+name freetype-dev-2.3.12.zip
+file freetype-dev_2.3.12-1_win32.zip
+chk 44c0be6409ff9da1fe5818b7a16c0a54c984f59c
+
+server http://www.fontconfig.org/release
+
+file fontconfig-2.8.0.tar.gz
+chk 570fb55eb14f2c92a7b470b941e9d35dbfafa716
+
+server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
+
+name fontconfig-2.8.0.zip
+file fontconfig_2.8.0-2_win32.zip
+chk 37a3117ea6cc50c8a88fba9b6018f35a04fa71ce
+name fontconfig-dev-2.8.0.zip
+file fontconfig-dev_2.8.0-2_win32.zip
+chk 0b772aaeb0a7a0d5de21afd901d6cf00753efa51
+
+
+server ftp://ftp.g10code.com/g10code/scratch
+file expat-2.0.1.tar.gz
+chk 663548c37b996082db1f2f2c32af060d7aa15c2d
+
+server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
+
+name expat-2.0.1.zip
+file expat_2.0.1-1_win32.zip
+chk f47790b9e324cd8613acc9a17fd56bf2c14745fc
+name expat-dev-2.0.1.zip
+file expat-dev_2.0.1-1_win32.zip
+chk 2e9189c6c6d1dac847a47c537c7a5e9dffd91992
+
+
#
# GTK+
#
server http://ftp.gnome.org/pub/gnome/sources/gtk+/2.16
-file gtk+-2.16.0.tar.bz2
-chk b737ad4b224a3cff966ef43b2682c696d756764c
+file gtk+-2.16.6.tar.bz2
+chk f69cb48311d60664bac7cf68351c175c7a214ae6
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
+name gtk+-2.16.6.zip
+file gtk+_2.16.6-2_win32.zip
+chk 012853e6de814ebda0cc4459f9eed8ae680e6d17
+name gtk+-dev-2.16.6.zip
+file gtk+-dev_2.16.6-2_win32.zip
+chk 9f1bf652660076df7f70a855efc7eecbd1e8fced
-
#
# GIMP stuff for W32
#
@@ -257,20 +288,11 @@
# PNG
-server http://kent.dl.sourceforge.net/project/libpng/00-libpng-stable/1.2.40
+server http://download.sourceforge.net/libpng
-file libpng-1.2.40.tar.gz
-chk a3f2df01871da15d66f103a5b4e793601e4d1043
+file libpng-1.4.1.tar.gz
+chk 7a3488f5844068d67074f2507dd8a7ed9c69ff04
-server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
-
-name libpng-1.2.40.zip
-file libpng_1.2.40-1_win32.zip
-chk 918523518a0eba14965035c6a06ec4357816bad2
-name libpng-dev-1.2.40.zip
-file libpng-dev_1.2.40-1_win32.zip
-chk 6834194cfb9824be53be352e3c9a4548512e355d
-
#
# WinPT
#
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/Makefile.am 2010-05-04 23:22:59 UTC (rev 1410)
@@ -21,10 +21,13 @@
installer-options.ini.in libiconv.def libintl.def loreley.mid \
gpg4win-splash.wav gpgwrap.c exdll.h g4wihelp.c g4wihelp.nsi \
inst-sections.nsi installer.nsi installer-finish.nsi \
- QtCore.pc QtGui.pc sha1sum.c \
+ QtCore.pc QtGui.pc sha1sum.c \
qt.conf kleowrap.c potomo Memento.nsh dirmngr.conf \
inst-gpg4win.nsi uninst-gpg4win.nsi \
inst-atk.nsi uninst-atk.nsi \
+ inst-expat.nsi uninst-expat.nsi \
+ inst-freetype.nsi uninst-freetype.nsi \
+ inst-fontconfig.nsi uninst-fontconfig.nsi \
inst-cairo.nsi uninst-cairo.nsi \
inst-libgsasl.nsi uninst-libgsasl.nsi \
inst-libtasn1.nsi uninst-libtasn1.nsi \
@@ -33,13 +36,13 @@
inst-libxml2.nsi uninst-libxml2.nsi \
inst-libetpan.nsi uninst-libetpan.nsi \
inst-claws-mail.nsi uninst-claws-mail.nsi \
- inst-notification_plugin.nsi uninst-notification_plugin.nsi \
- inst-gtkhtml2_viewer.nsi uninst-gtkhtml2_viewer.nsi \
- inst-vcalendar.nsi uninst-vcalendar.nsi \
- inst-rssyl.nsi uninst-rssyl.nsi \
+ inst-notification_plugin.nsi uninst-notification_plugin.nsi \
+ inst-gtkhtml2_viewer.nsi uninst-gtkhtml2_viewer.nsi \
+ inst-vcalendar.nsi uninst-vcalendar.nsi \
+ inst-rssyl.nsi uninst-rssyl.nsi \
inst-tnef_parse.nsi uninst-tnef_parse.nsi \
- inst-attachwarner.nsi uninst-attachwarner.nsi \
- inst-bsfilter_plugin.nsi uninst-bsfilter_plugin.nsi \
+ inst-attachwarner.nsi uninst-attachwarner.nsi \
+ inst-bsfilter_plugin.nsi uninst-bsfilter_plugin.nsi \
inst-crypt.nsi uninst-crypt.nsi \
inst-dirmngr.nsi uninst-dirmngr.nsi \
inst-eudoragpg.nsi uninst-eudoragpg.nsi \
@@ -97,7 +100,7 @@
gpgwrap.exe gpgwrap-2.exe kleowrap.exe $(foosum_exe)
# Supported source packages.
-gpg4win_spkgs = glib libgpg-error gpgme gpgol gpgex \
+gpg4win_spkgs = glib libgpg-error gpgme gpgol gpgex libpng \
gpa winpt libgsasl libtasn1 opencdk gnutls curl libxml2 \
libetpan claws-mail notification_plugin gtkhtml2_viewer \
vcalendar rssyl gnupg2 pinentry libassuan libksba libgcrypt \
@@ -174,6 +177,8 @@
gpg4win_pkg_adns_configure = --silent
+gpg4win_pkg_libpng_configure = CPPFLAGS=\"-I$(idir)/include\" LDFLAGS=\"-L$(idir)/lib\"
+
gpg4win_pkg_dirmngr_configure = \
--with-gpg-error-prefix=$(idir) \
--with-ksba-prefix=$(idir) \
@@ -312,7 +317,7 @@
LIBRARY_PATH=$$$${pkgidir}/lib SHARED_MODE=1 IMPLIB=libz.dll.a
# Supported binary packages.
-gpg4win_bpkgs = libiconv gettext pkgconfig libpng jpeg pango cairo \
+gpg4win_bpkgs = libiconv gettext pkgconfig jpeg pango expat freetype fontconfig cairo \
atk gtk+ gpgee crypt regex qt kdesupport oxygen-icons kdelibs \
kleopatra bsfilter
@@ -338,7 +343,8 @@
# Zlib needs some special magic to generate a libtool file.
define gpg4win_pkg_zlib_post_install
(cd $$$${pkgidir}; \
-echo "dlname='../bin/zlib1.dll'" > lib/libz.la; \
+echo "# Generated by libtool" > lib/libz.la \
+echo "dlname='../bin/zlib1.dll'" >> lib/libz.la; \
echo "library_names='libz.dll.a'" >> lib/libz.la; \
echo "old_library='libz.a'" >> lib/libz.la; \
echo "dependency_libs=''" >> lib/libz.la; \
@@ -378,6 +384,16 @@
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
endef
+define gpg4win_pkg_freetype_post_install
+ (cd $$$${pkgidir_dev}; \
+ perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
+endef
+
+define gpg4win_pkg_fontconfig_post_install
+ (cd $$$${pkgidir_dev}; \
+ perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
+endef
+
define gpg4win_pkg_cairo_post_install
(cd $$$${pkgidir_dev}; \
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
@@ -393,10 +409,8 @@
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
endef
-# In libpng, the pkg-config files are surprisingly found in the
-# runtime package.
define gpg4win_pkg_libpng_post_install
- (cd $$$${pkgidir_dev}; \
+ (cd $$$${pkgidir}; \
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
endef
Added: trunk/src/inst-expat.nsi
===================================================================
--- trunk/src/inst-expat.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/inst-expat.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -0,0 +1,39 @@
+# inst-expat.nsi - Installer snippet for Expat. -*- coding: latin-1; -*-
+# Copyright (C) 2007 g10 Code GmbH
+#
+# This file is part of Gpg4win.
+#
+# Gpg4win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Gpg4win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/expat-${gpg4win_pkg_expat_version}
+
+!ifdef DEBUG
+Section "expat" SEC_expat
+!else
+Section "-expat" SEC_expat
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_expat_src}"
+!else
+
+ File ${prefix}/bin/libexpat-1.dll
+
+!endif
+SectionEnd
Added: trunk/src/inst-fontconfig.nsi
===================================================================
--- trunk/src/inst-fontconfig.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/inst-fontconfig.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -0,0 +1,41 @@
+# inst-fontconfig.nsi - Installer snippet for Fontconfig. -*- coding: latin-1; -*-
+# Copyright (C) 2007 g10 Code GmbH
+#
+# This file is part of Gpg4win.
+#
+# Gpg4win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Gpg4win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/fontconfig-${gpg4win_pkg_fontconfig_version}
+
+!ifdef DEBUG
+Section "fontconfig" SEC_fontconfig
+!else
+Section "-fontconfig" SEC_fontconfig
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_fontconfig_src}"
+!else
+
+ File ${prefix}/bin/libfontconfig-1.dll
+ SetOutPath "$INSTDIR\etc\fonts"
+ File ${prefix}/etc/fonts/fonts.conf
+
+!endif
+SectionEnd
Added: trunk/src/inst-freetype.nsi
===================================================================
--- trunk/src/inst-freetype.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/inst-freetype.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -0,0 +1,39 @@
+# inst-freetype.nsi - Installer snippet for Freetype. -*- coding: latin-1; -*-
+# Copyright (C) 2007 g10 Code GmbH
+#
+# This file is part of Gpg4win.
+#
+# Gpg4win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Gpg4win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/freetype-${gpg4win_pkg_freetype_version}
+
+!ifdef DEBUG
+Section "freetype" SEC_freetype
+!else
+Section "-freetype" SEC_freetype
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_freetype_src}"
+!else
+
+ File ${prefix}/bin/freetype6.dll
+
+!endif
+SectionEnd
Modified: trunk/src/inst-gtk+.nsi
===================================================================
--- trunk/src/inst-gtk+.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/inst-gtk+.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -45,39 +45,13 @@
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
- File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
- File ${prefix}/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll
- 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\engines"
File ${prefix}/lib/gtk-2.0/2.10.0/engines/libpixmap.dll
File ${prefix}/lib/gtk-2.0/2.10.0/engines/libwimp.dll
+ SetOutPath "$INSTDIR\lib\gtk-2.0\modules"
+ File ${prefix}/lib/gtk-2.0/modules/libgail.dll
+
SetOutPath "$INSTDIR\share\themes\Default\gtk-2.0-key"
File ${prefix}/share/themes/Default/gtk-2.0-key/gtkrc
Modified: trunk/src/inst-libpng.nsi
===================================================================
--- trunk/src/inst-libpng.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/inst-libpng.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -30,18 +30,8 @@
!endif
SetOutPath "$INSTDIR"
!ifdef SOURCES
- File "${gpg4win_pkg_libpng_src}"
+ File "${gpg4win_pkg_libpng}"
!else
- 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
- # File ${prefix}/bin/pngtest.exe
- # File ${prefix}/bin/pnm2png.exe
- # File ${prefix}/bin/rpng-win.exe
- # File ${prefix}/bin/rpng2-win.exe
- # File ${prefix}/bin/VisualPng.exe
- # File ${prefix}/bin/wpng.exe
+ File ${prefix}/bin/libpng14-14.dll
!endif
-!endif
SectionEnd
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/inst-sections.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -101,6 +101,15 @@
!ifdef HAVE_PKG_LIBGCRYPT
!include "inst-libgcrypt.nsi"
!endif
+!ifdef HAVE_PKG_EXPAT
+!include "inst-expat.nsi"
+!endif
+!ifdef HAVE_PKG_FREETYPE
+!include "inst-freetype.nsi"
+!endif
+!ifdef HAVE_PKG_FONTCONFIG
+!include "inst-fontconfig.nsi"
+!endif
!ifdef HAVE_PKG_CAIRO
!include "inst-cairo.nsi"
!endif
@@ -302,6 +311,15 @@
!ifdef HAVE_PKG_CAIRO
!include "uninst-cairo.nsi"
!endif
+!ifdef HAVE_PKG_FONTCONFIG
+!include "uninst-fontconfig.nsi"
+!endif
+!ifdef HAVE_PKG_FREETYPE
+!include "uninst-freetype.nsi"
+!endif
+!ifdef HAVE_PKG_EXPAT
+!include "uninst-expat.nsi"
+!endif
!ifdef HAVE_PKG_LIBGCRYPT
!include "uninst-libgcrypt.nsi"
!endif
@@ -608,6 +626,15 @@
!ifdef HAVE_PKG_PANGO
!insertmacro UnselectSection ${SEC_pango}
!endif
+!ifdef HAVE_PKG_EXPAT
+ !insertmacro UnselectSection ${SEC_expat}
+!endif
+!ifdef HAVE_PKG_FREETYPE
+ !insertmacro UnselectSection ${SEC_freetype}
+!endif
+!ifdef HAVE_PKG_FONTCONFIG
+ !insertmacro UnselectSection ${SEC_fontconfig}
+!endif
!ifdef HAVE_PKG_CAIRO
!insertmacro UnselectSection ${SEC_cairo}
!endif
@@ -1003,9 +1030,32 @@
have_cairo:
!insertmacro SelectSection ${SEC_glib}
!insertmacro SelectSection ${SEC_pkgconfig}
+ !insertmacro SelectSection ${SEC_expat}
+ !insertmacro SelectSection ${SEC_freetype}
+ !insertmacro SelectSection ${SEC_fontconfig}
skip_cairo:
!endif
+!ifdef HAVE_PKG_FONTCONFIG
+ !insertmacro SectionFlagIsSet ${SEC_fontconfig} \
+ ${SF_SELECTED} have_fontconfig skip_fontconfig
+ have_fontconfig:
+ !insertmacro SelectSection ${SEC_pkgconfig}
+ !insertmacro SelectSection ${SEC_freetype}
+ skip_fontconfig:
+!endif
+
+!ifdef HAVE_PKG_FREETYPE
+ !insertmacro SectionFlagIsSet ${SEC_freetype} \
+ ${SF_SELECTED} have_freetype skip_freetype
+ have_freetype:
+ !insertmacro SelectSection ${SEC_pkgconfig}
+ !insertmacro SelectSection ${SEC_expat}
+ skip_freetype:
+!endif
+
+# Package "expat" has no dependencies.
+
!ifdef HAVE_PKG_PANGO
!insertmacro SectionFlagIsSet ${SEC_pango} \
${SF_SELECTED} have_pango skip_pango
Modified: trunk/src/inst-zlib.nsi
===================================================================
--- trunk/src/inst-zlib.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/inst-zlib.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -30,7 +30,7 @@
!endif
SetOutPath "$INSTDIR"
!ifdef SOURCES
- File "${gpg4win_pkg_zlib_src}"
+ File "${gpg4win_pkg_zlib}"
!else
File ${prefix}/bin/zlib1.dll
!endif
Modified: trunk/src/uninst-bzip2.nsi
===================================================================
--- trunk/src/uninst-bzip2.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/uninst-bzip2.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -28,7 +28,7 @@
; Uninstaller section.
Section "-un.bzip2"
!ifdef SOURCES
- Push "${gpg4win_pkg_bzip2_src}"
+ Push "${gpg4win_pkg_bzip2}"
Call un.SourceDelete
!else
# Nothing to uninstall
Added: trunk/src/uninst-expat.nsi
===================================================================
--- trunk/src/uninst-expat.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/uninst-expat.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -0,0 +1,36 @@
+# uninst-expat.nsi - Installer snippet for expat. -*- coding: latin-1; -*-
+# Copyright (C) 2007 g10 Code GmbH
+#
+# This file is part of Gpg4win.
+#
+# Gpg4win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Gpg4win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/expat-${gpg4win_pkg_expat_version}
+
+
+; Uninstaller section.
+Section "-un.expat"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_expat_src}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\libexpat-1.dll"
+ RMDir "$INSTDIR"
+!endif
+SectionEnd
Added: trunk/src/uninst-fontconfig.nsi
===================================================================
--- trunk/src/uninst-fontconfig.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/uninst-fontconfig.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -0,0 +1,40 @@
+# uninst-fontconfig.nsi - Installer snippet for fontconfig. -*- coding: latin-1; -*-
+# Copyright (C) 2007 g10 Code GmbH
+#
+# This file is part of Gpg4win.
+#
+# Gpg4win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Gpg4win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/fontconfig-${gpg4win_pkg_fontconfig_version}
+
+
+; Uninstaller section.
+Section "-un.fontconfig"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_fontconfig_src}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\libfontconfig-1.dll"
+ Delete "$INSTDIR\etc\fonts\fonts.conf"
+ RMDir "$INSTDIR\etc\fonts"
+ RMDir "$INSTDIR\etc"
+ RMDir "$INSTDIR"
+
+!endif
+SectionEnd
Added: trunk/src/uninst-freetype.nsi
===================================================================
--- trunk/src/uninst-freetype.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/uninst-freetype.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -0,0 +1,36 @@
+# uninst-freetype.nsi - Installer snippet for freetype. -*- coding: latin-1; -*-
+# Copyright (C) 2007 g10 Code GmbH
+#
+# This file is part of Gpg4win.
+#
+# Gpg4win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Gpg4win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/freetype-${gpg4win_pkg_freetype_version}
+
+
+; Uninstaller section.
+Section "-un.freetype"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_freetype_src}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\freetype6.dll"
+ RMDir "$INSTDIR"
+!endif
+SectionEnd
Modified: trunk/src/uninst-gtk+.nsi
===================================================================
--- trunk/src/uninst-gtk+.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/uninst-gtk+.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -62,6 +62,9 @@
RMDir "$INSTDIR\lib\gtk-2.0\2.4.0"
RMDir "$INSTDIR\lib\gtk-2.0\2.10.0"
+ Delete "$INSTDIR\lib\gtk-2.0\modules\*.dll"
+ RMDir "$INSTDIR\lib\gtk-2.0\modules"
+
RMDir "$INSTDIR\lib\gtk-2.0"
Delete "$INSTDIR\lib\locale\de\LC_MESSAGES\gtk20.mo"
Modified: trunk/src/uninst-libpng.nsi
===================================================================
--- trunk/src/uninst-libpng.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/uninst-libpng.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -27,23 +27,16 @@
; Uninstaller section.
Section "-un.libpng"
!ifdef SOURCES
- Push "${gpg4win_pkg_libpng_src}"
+ Push "${gpg4win_pkg_libpng}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libpng12-0.dll"
+ Delete "$INSTDIR\libpng14-14.dll"
+
# Old versions:
Delete "$INSTDIR\libpng13.dll"
+ Delete "$INSTDIR\libpng12-0.dll"
-!ifdef DEBUG
- Delete "$INSTDIR\png2pnm.exe"
- Delete "$INSTDIR\pngtest.exe"
- Delete "$INSTDIR\pnm2png.exe"
- Delete "$INSTDIR\rpng-win.exe"
- Delete "$INSTDIR\rpng2-win.exe"
- Delete "$INSTDIR\VisualPng.exe"
- Delete "$INSTDIR\wpng.exe"
-!endif
RMDir "$INSTDIR"
!endif
SectionEnd
Modified: trunk/src/uninst-zlib.nsi
===================================================================
--- trunk/src/uninst-zlib.nsi 2010-05-04 16:33:23 UTC (rev 1409)
+++ trunk/src/uninst-zlib.nsi 2010-05-04 23:22:59 UTC (rev 1410)
@@ -27,7 +27,7 @@
; Uninstaller section.
Section "-un.zlib"
!ifdef SOURCES
- Push "${gpg4win_pkg_zlib_src}"
+ Push "${gpg4win_pkg_zlib}"
Call un.SourceDelete
!else
Delete "$INSTDIR\zlib1.dll"
More information about the Gpg4win-commits
mailing list