[Gpg4win-commits] r396 - in trunk: . doc doc/manual include packages patches src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed May 16 20:14:28 CEST 2007
Author: werner
Date: 2007-05-16 20:14:26 +0200 (Wed, 16 May 2007)
New Revision: 396
Added:
trunk/patches/glib-2.12.12/
trunk/src/inst-cairo.nsi
trunk/src/uninst-cairo.nsi
Removed:
trunk/patches/glib-2.8.4/
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/README
trunk/TODO
trunk/autogen.sh
trunk/configure.ac
trunk/doc/ChangeLog
trunk/doc/manual/Makefile.am
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-gtk+.nsi
trunk/src/inst-pango.nsi
trunk/src/inst-sections.nsi
trunk/src/uninst-gnupg.nsi
trunk/src/uninst-gtk+.nsi
trunk/src/uninst-pango.nsi
Log:
Preparing for a GTK update
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/ChangeLog 2007-05-16 18:14:26 UTC (rev 396)
@@ -1,3 +1,18 @@
+2007-05-16 Werner Koch <wk at g10code.com>
+
+ * src/inst-gtk+.nsi: Install new themes and the engines. Update
+ to gtk 2.10.
+ * src/uninst-gtk+.nsi: Likewise.
+
+ * src/inst-pango.nsi: Adjust for Pango 1.16.
+
+ * configure.ac: New package Cairo as reguired by the current Gtk+.
+ * src/uninst-cairo.nsi, src/inst-cairo.nsi: New.
+ * src/inst-sections.nsi: Install Cairo.
+ * include/config.nsi.in: Ditto.
+
+ * src/uninst-gnupg.nsi: Delete gnupg.nls directory.
+
2007-03-09 Werner Koch <wk at g10code.com>
Released 1.0.9.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/Makefile.am 2007-05-16 18:14:26 UTC (rev 396)
@@ -19,15 +19,11 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2
-DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc
+DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc --disable-pkg-man_advanced_en
SUBDIRS = packages include doc src
EXTRA_DIST = autogen.sh README.SVN \
- patches/gnupg-1.4.4/01-reopen-std.patch \
- patches/gnupg-1.4.5/01-uncompress.patch \
- patches/gpgme-1.1.0/01-gpgme-def.patch \
- patches/gpgme-1.1.0/02-libtool-dll.patch \
patches/pthreads-w32-2-7-0-release/01-make.patch \
patches/glib-2.9.2-wk1/01-giowin32.patch \
patches/glib-2.9.2-wk1/02-gspawn-w32.patch \
Modified: trunk/README
===================================================================
--- trunk/README 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/README 2007-05-16 18:14:26 UTC (rev 396)
@@ -87,7 +87,7 @@
Copyright
=========
-The entire GPG4Win package is
+The entire Gpg4win package is
Copyright (C) 2005, 2006 g10 Code GmbH
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/TODO 2007-05-16 18:14:26 UTC (rev 396)
@@ -1,6 +1,15 @@
-*- outline -*-
* next release
+ We need tocheck whether setting Threadpriority in 01-giowin32.pacth
+ is still required. It is not in upstream.
+
+ 02-gspawn-w32.patch is required.
+ 03-gspawn-w32-fixup.patch is required.
+
+ (04-* is not required).
+
+
* Build system
** Some versions of strip don't work.
Werner's GNU strip 2.15.91 20040904 is fine but
@@ -44,3 +53,4 @@
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE.
+
Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/autogen.sh 2007-05-16 18:14:26 UTC (rev 396)
@@ -82,7 +82,6 @@
fi
./configure --host=${host} --build=${build} \
- --disable-pkg-man_novice_en \
--disable-pkg-man_advanced_en "$@"
rc=$?
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/configure.ac 2007-05-16 18:14:26 UTC (rev 396)
@@ -156,12 +156,14 @@
GPG4WIN_BPKG_GNUWIN32([jpeg])
GPG4WIN_BPKG_GTK([pkgconfig])
-# We build our own version of glib, because we need to patch giowin32.c.
+# We build our own version of glib, because we need to apply a few patches.
# GPG4WIN_BPKG_GTK_DEV([glib], [pkgconfig])
GPG4WIN_SPKG([glib], [libiconv gettext pkgconfig])
-GPG4WIN_BPKG_GTK_DEV([gtk+], [atk pango glib libiconv gettext pkgconfig])
+GPG4WIN_BPKG_GTK_DEV([gtk+], [atk pango glib libiconv gettext pkgconfig cairo])
GPG4WIN_BPKG_GTK_DEV([atk], [glib pkgconfig])
GPG4WIN_BPKG_GTK_DEV([pango], [glib pkgconfig])
+GPG4WIN_BPKG_GTK_DEV([cairo], [glib pkgconfig])
+
GPG4WIN_BPKG_BINSRC([GPGee], [gnupg])
GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
@@ -173,7 +175,7 @@
GPG4WIN_SPKG([winpt], [gpgme gnupg])
GPG4WIN_SPKG([sylpheed-claws], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
gpgme pthreads-w32 crypt regex])
-# The Eudora license (the one for thye EMS API) is still not acceptable.
+# The Eudora license (the one for the EMS API) is still not acceptable.
#GPG4WIN_SPKG([eudoragpg])
GPG4WIN_IPKG([man_novice_de])
GPG4WIN_IPKG([man_advanced_de])
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/doc/ChangeLog 2007-05-16 18:14:26 UTC (rev 396)
@@ -1,3 +1,7 @@
+2007-05-16 Werner Koch <wk at g10code.com>
+
+ * manual/Makefile.am: Commented advanced manual.
+
2007-05-02 Bernhard Reiter <bernhard.reiter at intevation.de>
* website/download-de.htm4, website/download.htm4: Credited
Modified: trunk/doc/manual/Makefile.am
===================================================================
--- trunk/doc/manual/Makefile.am 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/doc/manual/Makefile.am 2007-05-16 18:14:26 UTC (rev 396)
@@ -72,21 +72,24 @@
#eps_files_pdf := $(eps_files:.eps.gz=.pdf)
png_files_eps := $(png_files:.png=.eps)
-EXTRA_DIST = fdl.tex einsteiger.tex durchblicker.tex novices.tex advanced.tex \
+EXTRA_DIST = fdl.tex einsteiger.tex durchblicker.tex novices.tex \
$(eps_files) $(png_files) $(web_png_files) \
was-ist-gpg4win.tex what-is-gpg4win.tex \
macros.tex macros-en.tex version.tex.in \
gpg4win-logo.eps gpg4win-logo.png
+# advanced.tex
CLEANFILES = $(eps_files_bb) $(png_files_eps) \
*.dvi *.pdf *.pdf *.toc *.log *.aux *.out
DISTCLEANFILES = version.tex $(eps_files_png)
-pkgdata_DATA = einsteiger.pdf durchblicker.pdf novices.pdf advanced.pdf
+pkgdata_DATA = einsteiger.pdf durchblicker.pdf novices.pdf
+# advanced.pdf
BUILT_SOURCES = $(eps_files_bb) $(png_files_eps) $(eps_files_png)
-all-local: einsteiger.pdf durchblicker.pdf novices.pdf advanced.pdf
+all-local: einsteiger.pdf durchblicker.pdf novices.pdf
+# advanced.pdf
einsteiger.pdf : $(eps_files_bb) $(png_files_eps) $(eps_files_png)
einsteiger.dvi : version.tex macros.tex $(eps_files_bb)
@@ -97,9 +100,9 @@
novices.pdf : $(eps_files_bb) $(png_files_eps) $(eps_files_png)
novices.dvi : version.tex macros-en.tex $(eps_files_bb) $(eps_files_png)
novices.html : version.tex macros-en.tex $(eps_files_png)
-advanced.pdf : $(eps_files_bb) $(png_files_eps) $(eps_files_png)
-advanced.dvi : version.tex macros-en.tex $(eps_files_bb)
-advanced.html : version.tex macros-en.tex $(eps_files_png)
+#advanced.pdf : $(eps_files_bb) $(png_files_eps) $(eps_files_png)
+#advanced.dvi : version.tex macros-en.tex $(eps_files_bb)
+#advanced.html : version.tex macros-en.tex $(eps_files_png)
webversion: einsteiger.html durchblicker.html novices.html
# advanced.html
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/include/config.nsi.in 2007-05-16 18:14:26 UTC (rev 396)
@@ -1,21 +1,22 @@
# config.nsi - Configuration settings for gpg4win.nsi. -*- nsi -*-
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2007 g10 Code GmbH
#
-# This file is part of GPG4Win.
+# This file is part of Gpg4win.
#
-# GPG4Win is free software; you can redistribute it and/or modify
+# 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,
+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
!define _PACKAGE @PACKAGE@
@@ -135,6 +136,12 @@
!define gpg4win_pkg_atk_dev @gpg4win_pkg_atk_dev@
!define gpg4win_pkg_atk_src @gpg4win_pkg_atk_src@
+ at HAVE_PKG_CAIRO@
+!define gpg4win_pkg_cairo @gpg4win_pkg_cairo@
+!define gpg4win_pkg_cairo_version @gpg4win_pkg_cairo_version@
+!define gpg4win_pkg_cairo_dev @gpg4win_pkg_cairo_dev@
+!define gpg4win_pkg_cairo_src @gpg4win_pkg_cairo_src@
+
@HAVE_PKG_PANGO@
!define gpg4win_pkg_pango @gpg4win_pkg_pango@
!define gpg4win_pkg_pango_version @gpg4win_pkg_pango_version@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/packages/packages.current 2007-05-16 18:14:26 UTC (rev 396)
@@ -19,8 +19,9 @@
# Note: You may use "make upload" to copy this file to is canonical place.
#
-
+#
# GNU
+#
server ftp://ftp.cs.tu-berlin.de/pub/gnu
file gettext/gettext-runtime-0.13.1.bin.woe32.zip
@@ -35,7 +36,7 @@
# Gnuwin32 packages orginally hosted at sf.net but mirrored at g10code
-# for easier download. The regex-0.12 package has evne disappeared
+# for easier download. The regex-0.12 package has even disappeared
# from Sourceforge.
server ftp://ftp.g10code.com/mirrors/gnuwin32
@@ -70,68 +71,95 @@
file regex-0.12-src.zip
chk b9faae10efae552f23c213891a3ed8187cb7d017
-
-# For the same reason we also keep a copy of the Sylpheed hosted Claws project.
+#
+# Claws
+#
+# (Kept on our own mirror due to Soruceforge peculiarities.)
server ftp://ftp.g10code.com/mirrors/claws
file sylpheed-claws-2.4.0.tar.bz2
chk f61acdf3e9851da3d1e2591321bf43426465955f
-# RedHat
-
+#
+# Pthreads for Windows.
+#
server ftp://sources.redhat.com/pub
file pthreads-win32/pthreads-w32-2-7-0-release.tar.gz
chk e9f66acde58136ab67e2167412773f727cd13a9d
-# GTK+ stuff
-# http://www.gimp.org/~tml/gimp/win32/downloads.html
+#
+# GLIB
+#
+server ftp://ftp.gtk.org/pub/glib/2.12
-#server ftp://ftp.gtk.org/pub/gtk/v2.9
+file glib-2.12.12.tar.bz2
+chk 527bced2e6d38169c08c8712d5e3b6ebb0dc46b5
+
+
#
-#file glib-2.9.1.tar.bz2
-#chk ab84a8afc60c726c105cba3f542f1425e058b1c4
-server ftp://ftp.g10code.com/g10code/scratch
+# ATK
+#
+server ftp://ftp.gnome.org/pub/gnome/sources/atk/1.12
-file glib-2.9.2-wk1.tar.bz2
-chk 2ba7b74ec3337126d8a56aae1b7a77705a6166d5
+file atk-1.12.2.tar.bz2
+chk 8c59f23a90e6b4ddcff0712dcbf1bfdaa9fc35cb
+server ftp://ftp.gtk.org/pub/gtk/v2.10/win32/dependencies
-server ftp://ftp.gtk.org/pub/gtk/v2.6
+file atk-1.12.2.zip
+chk c4dd9617e96f03a6856cc99dec407bc9e8f28a98
+file atk-dev-1.12.2.zip
+chk 168ebd566ab4913cb8b03b11d7bc7a038bf27273
-# We need to build our onw glib - see above.
-#file win32/glib-2.6.6.zip
-#chk f1cf6ff8831217aac38ecd83c07d02416e571c5d
-#file win32/glib-dev-2.6.6.zip
-#chk 9445676e9394cd92b1e60e0550ed74d8917414d6
-#file glib-2.6.6.tar.bz2
-#chk 6bb8860bd29a83964ee66ad53ae3e4950aa2677f
-file win32/atk-1.9.0.zip
-chk d6f99c56b890051c3b9bc77abe8c5a705d3bc5d4
-file win32/atk-dev-1.9.0.zip
-chk 7934420db4233374304aa55f47aeb4be66603974
-file atk-1.9.0.tar.bz2
-chk 3e34534e5bcf3494c5a89c4804c7892a915f3f58
+#
+# PANGO
+#
+server ftp://ftp.gtk.org/pub/pango/1.16
-file win32/pango-1.8.2.zip
-chk 5e1a16803a3d6a1c13c3c6b8213f35d32fa081f5
-file win32/pango-dev-1.8.2.zip
-chk a4b1b9015279679011a9d2646a5b161dc3698474
-file pango-1.8.2.tar.bz2
-chk 1ff94ba7618ea8bffbd9872ffb4856c414a0e8d8
+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 win32/gtk+-2.6.9.zip
-chk c150c1300a4e57c03c7900ce8a46e18bc882f231
-file win32/gtk+-dev-2.6.9.zip
-chk a0a59ce11244c8aa63d01ff526a777185ceb2fd9
-file gtk+-2.6.6.tar.bz2
-chk 6d5da1d14c2351de11e7d31499b38ebfe7678f8d
+#
+# CAIRO
+#
+server http://cairographics.org/releases
+file cairo-1.4.2.tar.gz
+chk 9e7a323fc7d81d5011044d7eb22db3bf26ff7314
+server ftp://ftp.gtk.org/pub/gtk/v2.10
+
+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
+
+file gtk+-2.10.12.tar.bz2
+chk 2912aeac11628c60b653e6a4bc5919106c02e045
+file win32/gtk+-2.10.12.zip
+chk d9e496b42ac8eb69eec7ead6a2530a32f9929372
+file win32/gtk+-dev-2.10.12.zip
+chk c0a8e450252451ed8c09af93753c981e7dfc690e
+
+
+#
# GIMP stuff for W32
+#
server http://www.gimp.org/~tml/gimp/win32
file pkgconfig-0.15.zip
@@ -139,9 +167,9 @@
file pkgconfig-0.15.0.tar.gz
chk 1019c8027c0cf94bca680886f4e2ae4e629a2a97
-
+#
# WinPT
-
+#
server http://wald.intevation.org/frs/download.php
#file 265/winpt-1.0.0.tar.bz2
@@ -152,7 +180,10 @@
file 312/winpt-1.2.0.tar.bz2
chk 050f93a0d74385ce90e8934e49c11f171d495c5a
+
+#
# GPGee
+#
# Note that the -bin package has been repackaged from the
# -noinstaller package using these commands:
# mkdir gpgee-tmp
@@ -161,7 +192,6 @@
# unzip GPGee.zip
# rm GPGee/uninst.exe
# zip ../GPGee-1.2.3-bin.zip GPGee/*
-
server ftp://ftp.gnupg.org/gcrypt/gpgee
file GPGee-1.3.1-noinstaller.zip
@@ -170,18 +200,18 @@
chk b04fa9ea81fc77844c7aa2e3eda042d819d8e9f1
+#
# GPGol
+#
server ftp://ftp.g10code.com/g10code/gpgol
-#file gpgol-0.9.90.tar.bz2
-#chk 54d6d42d613804ce646d72a9e40b1c1cabfcacb7
-
file gpgol-0.9.91.tar.bz2
chk 391eee90ea072ea181bed332b9411f2a43395e7e
-# GnuPG stuff.
-
+#
+# GnuPG et al.
+#
server ftp://ftp.gnupg.org/gcrypt
file gnupg/gnupg-1.4.7.tar.bz2
@@ -193,9 +223,9 @@
file gpgme/gpgme-1.1.4.tar.bz2
chk d3c71afb8b88b1050067633cd8bcc4ca0bae696d
-
-# Intevation.org stuff.
-
+#
+# GPA
+#
server http://wald.intevation.org/frs/download.php
file 324/gpa-0.7.5.tar.bz2
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/src/Makefile.am 2007-05-16 18:14:26 UTC (rev 396)
@@ -103,8 +103,8 @@
# Supported binary packages.
-gpg4win_bpkgs := libiconv gettext pkgconfig zlib libpng jpeg pango atk gtk+ \
- gpgee crypt regex
+gpg4win_bpkgs := libiconv gettext pkgconfig zlib libpng jpeg pango cairo \
+ atk gtk+ gpgee crypt regex
# libiconv needs some special magic to generate a usable import
# library.
@@ -166,6 +166,11 @@
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`)
+endef
+
define gpg4win_pkg_pango_post_install
(cd $$$${pkgidir_dev}; \
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
Added: trunk/src/inst-cairo.nsi
===================================================================
--- trunk/src/inst-cairo.nsi 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/src/inst-cairo.nsi 2007-05-16 18:14:26 UTC (rev 396)
@@ -0,0 +1,39 @@
+# inst-cairo.nsi - Installer snippet for Cairo. -*- 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}/cairo-${gpg4win_pkg_cairo_version}
+
+!ifdef DEBUG
+Section "cairo" SEC_cairo
+!else
+Section "-cairo" SEC_cairo
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_cairo_src}"
+!else
+
+ File ${prefix}/bin/libcairo-2.dll
+
+!endif
+SectionEnd
Modified: trunk/src/inst-gtk+.nsi
===================================================================
--- trunk/src/inst-gtk+.nsi 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/src/inst-gtk+.nsi 2007-05-16 18:14:26 UTC (rev 396)
@@ -40,42 +40,50 @@
File ${prefix}/etc/gtk-2.0/gdk-pixbuf.loaders
File ${prefix}/etc/gtk-2.0/gtk.immodules
- SetOutPath "$INSTDIR\lib\gtk-2.0\2.4.0\loaders"
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ani.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-bmp.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-gif.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ico.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-jpeg.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-pcx.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-png.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-pnm.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ras.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-tga.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-tiff.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-wbmp.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xbm.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.dll
+ 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-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.4.0\immodules"
- File ${prefix}/lib/gtk-2.0/2.4.0/immodules/im-am-et.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/immodules/im-cedilla.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/immodules/im-cyrillic-translit.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/immodules/im-ime.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/immodules/im-inuktitut.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/immodules/im-ipa.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/immodules/im-thai-broken.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/immodules/im-ti-er.dll
- File ${prefix}/lib/gtk-2.0/2.4.0/immodules/im-ti-et.dll
- File ${prefix}/lib/gtk-2.0/2.4.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\share\themes\Default\gtk-2.0"
- File ${prefix}/share/themes/Default/gtk-2.0/gtkrc
+ 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\share\themes\Default\gtk-2.0-key"
File ${prefix}/share/themes/Default/gtk-2.0-key/gtkrc
SetOutPath "$INSTDIR\share\themes\Emacs\gtk-2.0-key"
File ${prefix}/share/themes/Emacs/gtk-2.0-key/gtkrc
+ SetOutPath "$INSTDIR\share\themes\Raleigh\gtk-2.0"
+ File ${prefix}/share/themes/Raleigh/gtk-2.0/gtkrc
+
+ 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
Modified: trunk/src/inst-pango.nsi
===================================================================
--- trunk/src/inst-pango.nsi 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/src/inst-pango.nsi 2007-05-16 18:14:26 UTC (rev 396)
@@ -35,21 +35,11 @@
File ${prefix}/bin/libpango-1.0-0.dll
File ${prefix}/bin/libpangoft2-1.0-0.dll
File ${prefix}/bin/libpangowin32-1.0-0.dll
+ File ${prefix}/bin/libpangocairo-1.0-0.dll
SetOutPath "$INSTDIR\etc\pango"
File ${prefix}/etc/pango/pango.aliases
File ${prefix}/etc/pango/pango.modules
- SetOutPath "$INSTDIR\lib\pango\1.4.0\modules"
- File ${prefix}/lib/pango/1.4.0/modules/pango-arabic-fc.dll
- File ${prefix}/lib/pango/1.4.0/modules/pango-basic-fc.dll
- File ${prefix}/lib/pango/1.4.0/modules/pango-basic-win32.dll
- File ${prefix}/lib/pango/1.4.0/modules/pango-hangul-fc.dll
- File ${prefix}/lib/pango/1.4.0/modules/pango-hebrew-fc.dll
- File ${prefix}/lib/pango/1.4.0/modules/pango-indic-fc.dll
- File ${prefix}/lib/pango/1.4.0/modules/pango-khmer-fc.dll
- File ${prefix}/lib/pango/1.4.0/modules/pango-syriac-fc.dll
- File ${prefix}/lib/pango/1.4.0/modules/pango-thai-fc.dll
- File ${prefix}/lib/pango/1.4.0/modules/pango-tibetan-fc.dll
!endif
SectionEnd
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/src/inst-sections.nsi 2007-05-16 18:14:26 UTC (rev 396)
@@ -15,8 +15,10 @@
#
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
# Sections
!include "inst-gpg4win.nsi"
@@ -66,6 +68,9 @@
!ifdef HAVE_PKG_PANGO
!include "inst-pango.nsi"
!endif
+!ifdef HAVE_PKG_CAIRO
+!include "inst-cairo.nsi"
+!endif
!ifdef HAVE_PKG_ATK
!include "inst-atk.nsi"
!endif
@@ -135,6 +140,9 @@
!ifdef HAVE_PKG_ATK
!include "uninst-atk.nsi"
!endif
+!ifdef HAVE_PKG_CAIRO
+!include "uninst-cairo.nsi"
+!endif
!ifdef HAVE_PKG_PANGO
!include "uninst-pango.nsi"
!endif
@@ -229,6 +237,9 @@
!ifdef HAVE_PKG_ATK
!insertmacro UnselectSection ${SEC_atk}
!endif
+!ifdef HAVE_PKG_CAIRO
+ !insertmacro UnselectSection ${SEC_cairo}
+!endif
!ifdef HAVE_PKG_PANGO
!insertmacro UnselectSection ${SEC_pango}
!endif
@@ -305,6 +316,7 @@
${SF_SELECTED} have_gtk_ skip_gtk_
have_gtk_:
!insertmacro SelectSection ${SEC_atk}
+ !insertmacro SelectSection ${SEC_cairo}
!insertmacro SelectSection ${SEC_pango}
!insertmacro SelectSection ${SEC_glib}
!insertmacro SelectSection ${SEC_libiconv}
@@ -322,6 +334,15 @@
skip_atk:
!endif
+!ifdef HAVE_PKG_CAIRO
+ !insertmacro SectionFlagIsSet ${SEC_cairo} \
+ ${SF_SELECTED} have_cairo skip_cairo
+ have_cairo:
+ !insertmacro SelectSection ${SEC_glib}
+ !insertmacro SelectSection ${SEC_pkgconfig}
+ skip_cairo:
+!endif
+
!ifdef HAVE_PKG_PANGO
!insertmacro SectionFlagIsSet ${SEC_pango} \
${SF_SELECTED} have_pango skip_pango
Added: trunk/src/uninst-cairo.nsi
===================================================================
--- trunk/src/uninst-cairo.nsi 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/src/uninst-cairo.nsi 2007-05-16 18:14:26 UTC (rev 396)
@@ -0,0 +1,35 @@
+# uninst-cairo.nsi - Installer snippet for cairo. -*- 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}/cairo-${gpg4win_pkg_cairo_version}
+
+
+; Uninstaller section.
+Section "-un.cairo"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_cairo_src}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\libcairo-2.dll"
+!endif
+SectionEnd
Modified: trunk/src/uninst-gnupg.nsi
===================================================================
--- trunk/src/uninst-gnupg.nsi 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/src/uninst-gnupg.nsi 2007-05-16 18:14:26 UTC (rev 396)
@@ -51,6 +51,9 @@
RMDir "$INSTDIR\share"
RMDir "$INSTDIR"
+ Delete "$INSTDIR\gnupg.nls\de.mo"
+ RMDir "$INSTDIR\gnupg.nls"
+
DeleteRegValue HKLM "Software\GNU\GnuPG" "Install Directory"
!endif
SectionEnd
Modified: trunk/src/uninst-gtk+.nsi
===================================================================
--- trunk/src/uninst-gtk+.nsi 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/src/uninst-gtk+.nsi 2007-05-16 18:14:26 UTC (rev 396)
@@ -31,49 +31,39 @@
Call un.SourceDelete
!else
- Delete "$INSTDIR\lib\locale\de\LC_MESSAGES\gtk20.mo"
- RMDir "$INSTDIR\lib\locale\de\LC_MESSAGES"
- RMDir "$INSTDIR\lib\locale\de"
- RMDir "$INSTDIR\lib\locale"
-
Delete "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
Delete "$INSTDIR\libgdk-win32-2.0-0.dll"
Delete "$INSTDIR\libgtk-win32-2.0-0.dll"
Delete "$INSTDIR\etc\gtk-2.0\gdk-pixbuf.loaders"
Delete "$INSTDIR\etc\gtk-2.0\gtk.immodules"
+ Delete "$INSTDIR\etc\gtk-2.0\gtkrc"
RMDir "$INSTDIR\etc\gtk-2.0"
RMDir "$INSTDIR\etc"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-ani.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-bmp.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-gif.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-ico.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-jpeg.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-pcx.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-png.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-pnm.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-ras.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-tga.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-tiff.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-wbmp.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-xbm.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-xpm.dll"
- RMDir "$INSTDIR\lib\gtk-2.0\2.4.0\loaders"
+ Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\*.dll"
+ RMDir "$INSTDIR\lib\gtk-2.0\2.10.0\loaders"
+ Delete "$INSTDIR\lib\gtk-2.0\2.10.0\loaders\*.dll"
+ RMDir "$INSTDIR\lib\gtk-2.0\2.10.0\loaders"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-am-et.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-cedilla.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-cyrillic-translit.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ime.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-inuktitut.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ipa.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-thai-broken.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ti-er.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ti-et.dll"
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-viqr.dll"
+ Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\*.dll"
RMDir "$INSTDIR\lib\gtk-2.0\2.4.0\immodules"
+ Delete "$INSTDIR\lib\gtk-2.0\2.10.0\immodules\*.dll"
+ RMDir "$INSTDIR\lib\gtk-2.0\2.10.0\immodules"
+
+ Delete "$INSTDIR\lib\gtk-2.0\2.10.0\engines\*.dll"
+ RMDir "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
+
RMDir "$INSTDIR\lib\gtk-2.0\2.4.0"
+ RMDir "$INSTDIR\lib\gtk-2.0\2.10.0"
+
RMDir "$INSTDIR\lib\gtk-2.0"
+
+ Delete "$INSTDIR\lib\locale\de\LC_MESSAGES\gtk20.mo"
+ RMDir "$INSTDIR\lib\locale\de\LC_MESSAGES"
+ RMDir "$INSTDIR\lib\locale\de"
+ RMDir "$INSTDIR\lib\locale"
+
RMDir "$INSTDIR\lib"
Delete "$INSTDIR\share\themes\Default\gtk-2.0\gtkrc"
@@ -85,8 +75,19 @@
Delete "$INSTDIR\share\themes\Emacs\gtk-2.0-key\gtkrc"
RMDir "$INSTDIR\share\themes\Emacs\gtk-2.0-key"
RMDir "$INSTDIR\share\themes\Emacs"
+
+ Delete "$INSTDIR\share\themes\Raleigh\gtk-2.0\gtkrc"
+ RMDir "$INSTDIR\share\themes\Raleigh\gtk-2.0"
+ RMDir "$INSTDIR\share\themes\Raleigh"
+
+ Delete "$INSTDIR\share\themes\MS-Windows\gtk-2.0\gtkrc"
+ RMDir "$INSTDIR\share\themes\MS-Windows\gtk-2.0"
+ RMDir "$INSTDIR\share\themes\MW-Windows"
+
RMDir "$INSTDIR\share\themes"
+
RMDir "$INSTDIR\share"
+
RMDir "$INSTDIR"
!endif
SectionEnd
Modified: trunk/src/uninst-pango.nsi
===================================================================
--- trunk/src/uninst-pango.nsi 2007-05-16 14:15:33 UTC (rev 395)
+++ trunk/src/uninst-pango.nsi 2007-05-16 18:14:26 UTC (rev 396)
@@ -33,12 +33,14 @@
Delete "$INSTDIR\libpango-1.0-0.dll"
Delete "$INSTDIR\libpangoft2-1.0-0.dll"
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"
+# Remove stuff from old Pango versions.
Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-arabic-fc.dll"
Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-basic-fc.dll"
Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-basic-win32.dll"
@@ -52,6 +54,7 @@
RMDir "$INSTDIR\lib\pango\1.4.0\modules"
RMDir "$INSTDIR\lib\pango\1.4.0"
RMDir "$INSTDIR\lib\pango"
+
RMDir "$INSTDIR\lib"
RMDir "$INSTDIR"
!endif
More information about the Gpg4win-commits
mailing list