[Gpg4win-commits] r536 - in trunk: . include packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Sep 24 18:08:39 CEST 2007
Author: marcus
Date: 2007-09-24 18:08:38 +0200 (Mon, 24 Sep 2007)
New Revision: 536
Added:
trunk/src/inst-kdesupport.nsi
trunk/src/uninst-kdesupport.nsi
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-sections.nsi
Log:
2007-09-24 Marcus Brinkmann <marcus at g10code.de>
* src/Makefile.am (EXTRA_DIST): Add inst-kdesupport.nsi and
src/uninst-kdesupport.nsi.
(gpg4win_bpkgs): Add kdesupport.
(gpg4win_pkg_kdesupport_post_install): New macro.
* src/inst-kdesupport.nsi, src/uninst-kdesupport.nsi: New files.
* src/inst-sections.nsi: Add kdesupport (also as a dependency for
Qt).
* packages/packages.current: Add kdesupport.
* include/config.nsi.in: Add macros for kdesupport.
* configure.ac: Check for kdesupport. Make qt dependent on it.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-24 13:46:07 UTC (rev 535)
+++ trunk/ChangeLog 2007-09-24 16:08:38 UTC (rev 536)
@@ -1,5 +1,16 @@
2007-09-24 Marcus Brinkmann <marcus at g10code.de>
+ * src/Makefile.am (EXTRA_DIST): Add inst-kdesupport.nsi and
+ src/uninst-kdesupport.nsi.
+ (gpg4win_bpkgs): Add kdesupport.
+ (gpg4win_pkg_kdesupport_post_install): New macro.
+ * src/inst-kdesupport.nsi, src/uninst-kdesupport.nsi: New files.
+ * src/inst-sections.nsi: Add kdesupport (also as a dependency for
+ Qt).
+ * packages/packages.current: Add kdesupport.
+ * include/config.nsi.in: Add macros for kdesupport.
+ * configure.ac: Check for kdesupport. Make qt dependent on it.
+
* configure.ac: Check for mingwm10.dll.
* src/gpg4win.mk.in: Fix clean-PKG for binary packages.
* src/inst-qt.nsi: Install QtDBus4.dll. Do not install debug and
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-09-24 13:46:07 UTC (rev 535)
+++ trunk/configure.ac 2007-09-24 16:08:38 UTC (rev 536)
@@ -214,7 +214,8 @@
#GPG4WIN_IPKG([man_advanced_en])
# Qt related stuff.
-GPG4WIN_BPKG_GNUWIN32([qt])
+GPG4WIN_BPKG_GNUWIN32([kdesupport])
+GPG4WIN_BPKG_GNUWIN32([qt], [kdesupport])
GPG4WIN_FINALIZE
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2007-09-24 13:46:07 UTC (rev 535)
+++ trunk/include/config.nsi.in 2007-09-24 16:08:38 UTC (rev 536)
@@ -210,6 +210,12 @@
!define gpg4win_pkg_qt_dev @gpg4win_pkg_qt_dev@
!define gpg4win_pkg_qt_src @gpg4win_pkg_qt_src@
+ at HAVE_PKG_KDESUPPORT@
+!define gpg4win_pkg_kdesupport @gpg4win_pkg_kdesupport@
+!define gpg4win_pkg_kdesupport_version @gpg4win_pkg_kdesupport_version@
+!define gpg4win_pkg_kdesupport_dev @gpg4win_pkg_kdesupport_dev@
+!define gpg4win_pkg_kdesupport_src @gpg4win_pkg_kdesupport_src@
+
# Internal packages.
@HAVE_PKG_MAN_NOVICE_DE@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2007-09-24 13:46:07 UTC (rev 535)
+++ trunk/packages/packages.current 2007-09-24 16:08:38 UTC (rev 536)
@@ -294,3 +294,21 @@
name qt-4.3.1-2-src.zip
file qt-win-opensource-src-4.3.1.zip
chk 7dcdaafe5ab451b1bc9af0e5db080e7b5d484732
+
+#
+# Qt contains DBus and thus depends on kdesupport, which is a random
+# collection of libraries.
+#
+
+server ftp://ftp.kdab.net/pub/gpg4win
+
+file kdesupport-4.0.0-2-bin.zip
+chk 03514b4007a0b7edbed2dd5157d60be11009745c
+
+# FIXME: This does not actually contain the development files, but
+# further binary files we need.
+file kdesupport-4.0.0-2-lib.zip
+chk 78a5d914fa232e85dddd26ef102d6b309111037f
+
+file kdesupport-4.0.0-2-src.zip
+chk 40318619764a5c0ae9aa3796a6f33155d0a90c0d
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-09-24 13:46:07 UTC (rev 535)
+++ trunk/src/Makefile.am 2007-09-24 16:08:38 UTC (rev 536)
@@ -60,6 +60,7 @@
inst-winpt.nsi uninst-winpt.nsi \
inst-zlib.nsi uninst-zlib.nsi \
inst-qt.nsi uninst-qt.nsi \
+ inst-kdesupport.nsi uninst-kdesupport.nsi \
inst-bzip2.nsi uninst-bzip2.nsi
@@ -147,7 +148,7 @@
gpg4win_pkg_pinentry_configure = \
--disable-pinentry-gtk \
--disable-pinentry-gtk2 \
- --disable-pinentry-qt
+ --disable-pinentry-qt
# The LDFLAGS is needed for -lintl for glib. The QT4 variables work
# around the lack of cross compilation support in qt-dev.
@@ -216,7 +217,7 @@
# Supported binary packages.
gpg4win_bpkgs = libiconv gettext pkgconfig zlib libpng jpeg pango cairo \
- atk gtk+ gpgee crypt regex qt
+ atk gtk+ gpgee crypt regex qt kdesupport
# libiconv needs some special magic to generate a usable import
# library.
@@ -301,6 +302,20 @@
endef
+define gpg4win_pkg_libiconv_post_install
+(cp $(srcdir)/libiconv.def $$$${pkgidir}/lib; \
+cd $$$${pkgidir}/lib; \
+$(DLLTOOL) --output-lib libiconv.dll.a --def libiconv.def)
+endef
+
+
+# kdesupport ships gettext, which we already have. Remove a stow
+# conflict.
+define gpg4win_pkg_kdesupport_post_install
+(rm -fR "$$$${pkgidir_dev}/share/locale")
+endef
+
+
# Supported internal packages. Internal packages do not require any
# special support. Thus, this variable is actually unused, and no
# rules are added in gpg4win.mk.
Added: trunk/src/inst-kdesupport.nsi
===================================================================
--- trunk/src/inst-kdesupport.nsi 2007-09-24 13:46:07 UTC (rev 535)
+++ trunk/src/inst-kdesupport.nsi 2007-09-24 16:08:38 UTC (rev 536)
@@ -0,0 +1,65 @@
+# inst-kdesupport.nsi - Snioppet for kdesupport. -*- coding: latin-1; -*-
+# Copyright (C) 2005, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/kdesupport-${gpg4win_pkg_kdesupport_version}
+
+!ifdef DEBUG
+Section "kdesupport" SEC_kdesupport
+!else
+Section "-kdesupport" SEC_kdesupport
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_kdesupport_src}"
+!else
+ File ${prefix}/bin/dbus-daemon.exe
+ File ${prefix}/bin/dbus-launch.exe
+ File ${prefix}/bin/dbus-monitor.exe
+ File ${prefix}/bin/dbus-send.exe
+ File ${prefix}/bin/pcregrep.exe
+ File ${prefix}/bin/update-mime-database.exe
+ File ${prefix}/bin/xmlcatalog.exe
+ File ${prefix}/bin/xmllint.exe
+ File ${prefix}/bin/xsltproc.exe
+
+ # FIXME: From the lib package. This is wrong.
+!undef prefix
+!define prefix ${ipdir}/kdesupport-dev-${gpg4win_pkg_kdesupport_version}
+
+ File ${prefix}/bin/giflib4.dll
+ File ${prefix}/bin/libdbus-1.dll
+ File ${prefix}/bin/libeay32.dll
+ File ${prefix}/bin/libexpat.dll
+ File ${prefix}/bin/libexpatw.dll
+ File ${prefix}/bin/libexslt.dll
+ File ${prefix}/bin/libkdewin32.dll
+ File ${prefix}/bin/libxml2.dll
+ File ${prefix}/bin/libxslt.dll
+ File ${prefix}/bin/mingw-pcrecpp.dll
+ File ${prefix}/bin/pcre.dll
+ File ${prefix}/bin/pcrecpp.dll
+ File ${prefix}/bin/pcreposix.dll
+ File ${prefix}/bin/ssleay32.dll
+
+!endif
+SectionEnd
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2007-09-24 13:46:07 UTC (rev 535)
+++ trunk/src/inst-sections.nsi 2007-09-24 16:08:38 UTC (rev 536)
@@ -122,6 +122,9 @@
!ifdef HAVE_PKG_QT
!include "inst-qt.nsi"
!endif
+!ifdef HAVE_PKG_KDESUPPORT
+!include "inst-kdesupport.nsi"
+!endif
!ifdef HAVE_PKG_MAN_NOVICE_EN
!include "inst-man_novice_en.nsi"
!endif
@@ -152,6 +155,9 @@
!ifdef HAVE_PKG_QT
!include "uninst-qt.nsi"
!endif
+!ifdef HAVE_PKG_KDESUPPORT
+!include "uninst-kdesupport.nsi"
+!endif
#!ifdef HAVE_PKG_EUDORAGPG
#!include "uninst-eudoragpg.nsi"
#!endif
@@ -478,6 +484,9 @@
!ifdef HAVE_PKG_QT
!insertmacro UnselectSection ${SEC_qt}
!endif
+!ifdef HAVE_PKG_KDESUPPORT
+ !insertmacro UnselectSection ${SEC_kdesupport}
+!endif
# Then enable all dependencies in reverse build list order!
@@ -674,8 +683,17 @@
!endif
# Package "libiconv" has no dependencies.
- # Package "qt" has no dependencies.
+!ifdef HAVE_PKG_QT
+ !insertmacro SectionFlagIsSet ${SEC_qt} \
+ ${SF_SELECTED} have_qt skip_qt
+ have_qt:
+ !insertmacro SelectSection ${SEC_kdesupport}
+ skip_qt:
+!endif
+
+ # Package "kdesupport" has no dependencies.
+
FunctionEnd
Added: trunk/src/uninst-kdesupport.nsi
===================================================================
--- trunk/src/uninst-kdesupport.nsi 2007-09-24 13:46:07 UTC (rev 535)
+++ trunk/src/uninst-kdesupport.nsi 2007-09-24 16:08:38 UTC (rev 536)
@@ -0,0 +1,60 @@
+# uninst-kdesupport.nsi - Snippet for kdesupport. -*- coding: latin-1; -*-
+# Copyright (C) 2005, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/kdesupport-${gpg4win_pkg_kdesupport_version}
+
+
+; Uninstaller section.
+Section "-un.kdesupport"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_kdesupport_src}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\dbus-daemon.exe"
+ Delete "$INSTDIR\dbus-launch.exe"
+ Delete "$INSTDIR\dbus-monitor.exe"
+ Delete "$INSTDIR\dbus-send.exe"
+ Delete "$INSTDIR\pcregrep.exe"
+ Delete "$INSTDIR\update-mime-database.exe"
+ Delete "$INSTDIR\xmlcatalog.exe"
+ Delete "$INSTDIR\xmllint.exe"
+ Delete "$INSTDIR\xsltproc.exe"
+
+ Delete "$INSTDIR\giflib4.dll"
+ Delete "$INSTDIR\libdbus-1.dll"
+ Delete "$INSTDIR\libeay32.dll"
+ Delete "$INSTDIR\libexpat.dll"
+ Delete "$INSTDIR\libexpatw.dll"
+ Delete "$INSTDIR\libexslt.dll"
+ Delete "$INSTDIR\libkdewin32.dll"
+ Delete "$INSTDIR\libxml2.dll"
+ Delete "$INSTDIR\libxslt.dll"
+ Delete "$INSTDIR\mingw-pcrecpp.dll"
+ Delete "$INSTDIR\pcre.dll"
+ Delete "$INSTDIR\pcrecpp.dll"
+ Delete "$INSTDIR\pcreposix.dll"
+ Delete "$INSTDIR\ssleay32.dll"
+
+ RMDir "$INSTDIR"
+!endif
+SectionEnd
More information about the Gpg4win-commits
mailing list