[Gpg4win-commits] r535 - in trunk: . packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Sep 24 15:46:08 CEST 2007
Author: marcus
Date: 2007-09-24 15:46:07 +0200 (Mon, 24 Sep 2007)
New Revision: 535
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/packages/packages.current
trunk/src/gpg4win.mk.in
trunk/src/inst-qt.nsi
trunk/src/uninst-qt.nsi
Log:
2007-09-24 Marcus Brinkmann <marcus at g10code.de>
* 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
source files.
* src/uninst-qt.nsi: Likewise for uninstall.
* packages/packages.current: Update Qt.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-17 17:16:37 UTC (rev 534)
+++ trunk/ChangeLog 2007-09-24 13:46:07 UTC (rev 535)
@@ -1,3 +1,12 @@
+2007-09-24 Marcus Brinkmann <marcus at g10code.de>
+
+ * 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
+ source files.
+ * src/uninst-qt.nsi: Likewise for uninstall.
+ * packages/packages.current: Update Qt.
+
2007-09-17 Werner Koch <wk at g10code.com>
* configure.ac: Set version to 1.9.0-svn. Make gpgme depend on qt
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-09-17 17:16:37 UTC (rev 534)
+++ trunk/configure.ac 2007-09-24 13:46:07 UTC (rev 535)
@@ -218,6 +218,33 @@
GPG4WIN_FINALIZE
+# Qt is compiled with -mthreads, and thus requires the mingwm10.dll.
+mingwm_dll=no
+AC_ARG_WITH([mingwm-dll],
+ AC_HELP_STRING([--with-mingwm-dll=FILE], [use the mingwm DLL]),
+ [mingwm_dll=$withval])
+if test "$mingwm_dll" = "no"; then
+ file="/usr/share/doc/mingw32-runtime/mingwm10.dll.gz"
+ if test -r "$file"; then
+ mingwm_dll="$file"
+ fi
+fi
+if test "$mingwm_dll" = "no"; then
+ missing_tools="mingwm10.dll $missing_tools"
+fi
+# To make things simple, we just install a copy of the file in the
+# source directory. No need to make this ugly hack any uglier by
+# messing around with the build system.
+case "$mingwm_dll" in
+ *.gz)
+ $ZCAT $mingwm_dll > src/mingwm10.dll
+ ;;
+ *)
+ cp $mingwm_dll src/mingwm10.dll
+ ;;
+esac
+
+
# Throw an error if required tools are missing
if test -n "$missing_tools"; then
for i in $missing_tools; do
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2007-09-17 17:16:37 UTC (rev 534)
+++ trunk/packages/packages.current 2007-09-24 13:46:07 UTC (rev 535)
@@ -280,17 +280,17 @@
#
# Qt
#
-server http://www.kdab.net/~frank/qt-win
+server ftp://ftp.kdab.net/pub/gpg4win
-name qt-4.3.1-bin.zip
-file Qt-Win-Opensource-4.3.1.zip
-chk 36da6ba5a271bb66dd4e92a6b237ec8051edbf92
+name qt-4.3.1-2-bin.zip
+file qt-gpg4win-4.3.1-2-bin.zip
+chk 7d811a95bee1fcef20cb62104a53754726bc8267
-name qt-4.3.1-lib.zip
-file Qt-Win-Opensource-4.3.1-dev.zip
-chk c73998ac45b17ec4b7a52de6ef8f7f0e95d9818a
+name qt-4.3.1-2-lib.zip
+file qt-gpg4win-4.3.1-2-dev.zip
+chk ea1f1e73db6425530a9c1826465d2c42e2ba1f30
server ftp://ftp.trolltech.com/pub/qt/source
-name qt-4.3.1-src.zip
+name qt-4.3.1-2-src.zip
file qt-win-opensource-src-4.3.1.zip
chk 7dcdaafe5ab451b1bc9af0e5db080e7b5d484732
Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in 2007-09-17 17:16:37 UTC (rev 534)
+++ trunk/src/gpg4win.mk.in 2007-09-24 13:46:07 UTC (rev 535)
@@ -267,7 +267,8 @@
($(call SETVARS,$(1)); \
cd $(ipdir) && \
($(STOW) -D "$$$${pkg_version}"; \
- rm -fR "$$$${pkg_version}"))
+ $(STOW) -D "$$$${pkg_version_dev}"; \
+ rm -fR "$$$${pkg_version}" "$$$${pkg_version_dev}"))
rm -f stamps/stamp-final-$(1) stamps/stamp-$(1)-*
endef
Modified: trunk/src/inst-qt.nsi
===================================================================
--- trunk/src/inst-qt.nsi 2007-09-17 17:16:37 UTC (rev 534)
+++ trunk/src/inst-qt.nsi 2007-09-24 13:46:07 UTC (rev 535)
@@ -34,10 +34,13 @@
!else
# Qt needs some help to find itself.
File qt.conf
+ # Qt uses -mthreads, so install the support library.
+ File mingwm10.dll
File ${prefix}/bin/Qt3Support4.dll
File ${prefix}/bin/QtAssistantClient4.dll
File ${prefix}/bin/QtCore4.dll
+ File ${prefix}/bin/QtDBus4.dll
File ${prefix}/bin/QtDesigner4.dll
File ${prefix}/bin/QtDesignerComponents4.dll
File ${prefix}/bin/QtGui4.dll
@@ -49,118 +52,62 @@
File ${prefix}/bin/QtTest4.dll
File ${prefix}/bin/QtXml4.dll
- SetOutPath "$INSTDIR\phrasebooks"
-
-# File ${prefix}/phrasebooks/danish.qph
-# File ${prefix}/phrasebooks/dutch.qph
-# File ${prefix}/phrasebooks/finnish.qph
-# File ${prefix}/phrasebooks/french.qph
- File ${prefix}/phrasebooks/german.qph
-# File ${prefix}/phrasebooks/italian.qph
-# File ${prefix}/phrasebooks/japanese.qph
-# File ${prefix}/phrasebooks/norwegian.qph
-# File ${prefix}/phrasebooks/polish.qph
-# File ${prefix}/phrasebooks/russian.qph
-# File ${prefix}/phrasebooks/spanish.qph
-# File ${prefix}/phrasebooks/swedish.qph
-
SetOutPath "$INSTDIR\plugins\accessible"
File ${prefix}/plugins/accessible/qtaccessiblecompatwidgets4.dll
- File ${prefix}/plugins/accessible/qtaccessiblecompatwidgetsd4.dll
File ${prefix}/plugins/accessible/qtaccessiblewidgets4.dll
- File ${prefix}/plugins/accessible/qtaccessiblewidgetsd4.dll
SetOutPath "$INSTDIR\plugins\codecs"
File ${prefix}/plugins/codecs/qcncodecs4.dll
- File ${prefix}/plugins/codecs/qcncodecsd4.dll
File ${prefix}/plugins/codecs/qjpcodecs4.dll
- File ${prefix}/plugins/codecs/qjpcodecsd4.dll
File ${prefix}/plugins/codecs/qkrcodecs4.dll
- File ${prefix}/plugins/codecs/qkrcodecsd4.dll
File ${prefix}/plugins/codecs/qtwcodecs4.dll
- File ${prefix}/plugins/codecs/qtwcodecsd4.dll
SetOutPath "$INSTDIR\plugins\designer"
File ${prefix}/plugins/designer/arthurplugin.dll
File ${prefix}/plugins/designer/containerextension.dll
- File ${prefix}/plugins/designer/containerextensiond.dll
File ${prefix}/plugins/designer/customwidgetplugin.dll
File ${prefix}/plugins/designer/qt3supportwidgets.dll
File ${prefix}/plugins/designer/taskmenuextension.dll
- File ${prefix}/plugins/designer/taskmenuextensiond.dll
File ${prefix}/plugins/designer/worldtimeclockplugin.dll
SetOutPath "$INSTDIR\plugins\iconengines"
File ${prefix}/plugins/iconengines/qsvg4.dll
- File ${prefix}/plugins/iconengines/qsvgd4.dll
SetOutPath "$INSTDIR\plugins\imageformats"
File ${prefix}/plugins/imageformats/qgif4.dll
- File ${prefix}/plugins/imageformats/qgifd4.dll
File ${prefix}/plugins/imageformats/qjpeg4.dll
- File ${prefix}/plugins/imageformats/qjpegd4.dll
File ${prefix}/plugins/imageformats/qmng4.dll
- File ${prefix}/plugins/imageformats/qmngd4.dll
File ${prefix}/plugins/imageformats/qsvg4.dll
- File ${prefix}/plugins/imageformats/qsvgd4.dll
File ${prefix}/plugins/imageformats/qtiff4.dll
- File ${prefix}/plugins/imageformats/qtiffd4.dll
SetOutPath "$INSTDIR\plugins\sqldrivers"
File ${prefix}/plugins/sqldrivers/qsqlite4.dll
- File ${prefix}/plugins/sqldrivers/qsqlited4.dll
SetOutPath "$INSTDIR\translations"
File ${prefix}/translations/assistant_de.qm
- File ${prefix}/translations/assistant_de.ts
# File ${prefix}/translations/assistant_ja.qm
-# File ${prefix}/translations/assistant_ja.ts
-# File ${prefix}/translations/assistant_pl.ts
- File ${prefix}/translations/assistant_untranslated.ts
File ${prefix}/translations/designer_de.qm
- File ${prefix}/translations/designer_de.ts
# File ${prefix}/translations/designer_ja.qm
-# File ${prefix}/translations/designer_ja.ts
-# File ${prefix}/translations/designer_pl.ts
- File ${prefix}/translations/designer_untranslated.ts
# File ${prefix}/translations/linguist_ja.qm
-# File ${prefix}/translations/linguist_ja.ts
-# File ${prefix}/translations/linguist_pl.ts
# File ${prefix}/translations/qt_ar.qm
-# File ${prefix}/translations/qt_ar.ts
File ${prefix}/translations/qt_de.qm
- File ${prefix}/translations/qt_de.ts
# File ${prefix}/translations/qt_es.qm
-# File ${prefix}/translations/qt_es.ts
# File ${prefix}/translations/qt_fr.qm
-# File ${prefix}/translations/qt_fr.ts
# File ${prefix}/translations/qt_iw.qm
-# File ${prefix}/translations/qt_iw.ts
# File ${prefix}/translations/qt_ja_jp.qm
-# File ${prefix}/translations/qt_ja_jp.ts
-# File ${prefix}/translations/qt_pl.ts
# File ${prefix}/translations/qt_pt.qm
-# File ${prefix}/translations/qt_pt.ts
# File ${prefix}/translations/qt_ru.qm
-# File ${prefix}/translations/qt_ru.ts
# File ${prefix}/translations/qt_sk.qm
-# File ${prefix}/translations/qt_sk.ts
# File ${prefix}/translations/qt_sv.qm
-# File ${prefix}/translations/qt_sv.ts
# File ${prefix}/translations/qt_uk.qm
-# File ${prefix}/translations/qt_uk.ts
- File ${prefix}/translations/qt_untranslated.ts
# File ${prefix}/translations/qt_zh_CN.qm
-# File ${prefix}/translations/qt_zh_CN.ts
-# File ${prefix}/translations/qtconfig_pl.ts
-# File ${prefix}/translations/qvfb_pl.ts
!endif
SectionEnd
Modified: trunk/src/uninst-qt.nsi
===================================================================
--- trunk/src/uninst-qt.nsi 2007-09-17 17:16:37 UTC (rev 534)
+++ trunk/src/uninst-qt.nsi 2007-09-24 13:46:07 UTC (rev 535)
@@ -1,5 +1,5 @@
# uninst-qt.nsi - Installer snippet for qt. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2007 g10 Code GmbH
#
# This file is part of GPG4Win.
#
@@ -33,6 +33,7 @@
Delete "$INSTDIR\Qt3Support4.dll"
Delete "$INSTDIR\QtAssistantClient4.dll"
Delete "$INSTDIR\QtCore4.dll"
+ Delete "$INSTDIR\QtDBus4.dll"
Delete "$INSTDIR\QtDesigner4.dll"
Delete "$INSTDIR\QtDesignerComponents4.dll"
Delete "$INSTDIR\QtGui4.dll"
@@ -44,117 +45,61 @@
Delete "$INSTDIR\QtTest4.dll"
Delete "$INSTDIR\QtXml4.dll"
-# Delete "$INSTDIR\phrasebooks\danish.qph"
-# Delete "$INSTDIR\phrasebooks\dutch.qph"
-# Delete "$INSTDIR\phrasebooks\finnish.qph"
-# Delete "$INSTDIR\phrasebooks\french.qph"
- Delete "$INSTDIR\phrasebooks\german.qph"
-# Delete "$INSTDIR\phrasebooks\italian.qph"
-# Delete "$INSTDIR\phrasebooks\japanese.qph"
-# Delete "$INSTDIR\phrasebooks\norwegian.qph"
-# Delete "$INSTDIR\phrasebooks\polish.qph"
-# Delete "$INSTDIR\phrasebooks\russian.qph"
-# Delete "$INSTDIR\phrasebooks\spanish.qph"
-# Delete "$INSTDIR\phrasebooks\swedish.qph"
-
- RMDir "$INSTDIR\phrasebooks"
-
Delete "$INSTDIR\plugins\accessible\qtaccessiblecompatwidgets4.dll"
- Delete "$INSTDIR\plugins\accessible\qtaccessiblecompatwidgetsd4.dll"
Delete "$INSTDIR\plugins\accessible\qtaccessiblewidgets4.dll"
- Delete "$INSTDIR\plugins\accessible\qtaccessiblewidgetsd4.dll"
RMDir "$INSTDIR\plugins\accessible"
Delete "$INSTDIR\plugins\codecs\qcncodecs4.dll"
- Delete "$INSTDIR\plugins\codecs\qcncodecsd4.dll"
Delete "$INSTDIR\plugins\codecs\qjpcodecs4.dll"
- Delete "$INSTDIR\plugins\codecs\qjpcodecsd4.dll"
Delete "$INSTDIR\plugins\codecs\qkrcodecs4.dll"
- Delete "$INSTDIR\plugins\codecs\qkrcodecsd4.dll"
Delete "$INSTDIR\plugins\codecs\qtwcodecs4.dll"
- Delete "$INSTDIR\plugins\codecs\qtwcodecsd4.dll"
RMDir "$INSTDIR\plugins\codecs"
Delete "$INSTDIR\plugins\designer\arthurplugin.dll"
Delete "$INSTDIR\plugins\designer\containerextension.dll"
- Delete "$INSTDIR\plugins\designer\containerextensiond.dll"
Delete "$INSTDIR\plugins\designer\customwidgetplugin.dll"
Delete "$INSTDIR\plugins\designer\qt3supportwidgets.dll"
Delete "$INSTDIR\plugins\designer\taskmenuextension.dll"
- Delete "$INSTDIR\plugins\designer\taskmenuextensiond.dll"
Delete "$INSTDIR\plugins\designer\worldtimeclockplugin.dll"
RMDir "$INSTDIR\plugins\designer"
Delete "$INSTDIR\plugins\iconengines\qsvg4.dll"
- Delete "$INSTDIR\plugins\iconengines\qsvgd4.dll"
RMDir "$INSTDIR\plugins\iconengines"
Delete "$INSTDIR\plugins\imageformats\qgif4.dll"
- Delete "$INSTDIR\plugins\imageformats\qgifd4.dll"
Delete "$INSTDIR\plugins\imageformats\qjpeg4.dll"
- Delete "$INSTDIR\plugins\imageformats\qjpegd4.dll"
Delete "$INSTDIR\plugins\imageformats\qmng4.dll"
- Delete "$INSTDIR\plugins\imageformats\qmngd4.dll"
Delete "$INSTDIR\plugins\imageformats\qsvg4.dll"
- Delete "$INSTDIR\plugins\imageformats\qsvgd4.dll"
Delete "$INSTDIR\plugins\imageformats\qtiff4.dll"
- Delete "$INSTDIR\plugins\imageformats\qtiffd4.dll"
RMDir "$INSTDIR\plugins\imageformats"
Delete "$INSTDIR\plugins\sqldrivers\qsqlite4.dll"
- Delete "$INSTDIR\plugins\sqldrivers\qsqlited4.dll"
RMDir "$INSTDIR\plugins\sqldrivers"
RMDir "$INSTDIR\plugins"
Delete "$INSTDIR\translations\assistant_de.qm"
- Delete "$INSTDIR\translations\assistant_de.ts"
# Delete "$INSTDIR\translations\assistant_ja.qm"
-# Delete "$INSTDIR\translations\assistant_ja.ts"
-# Delete "$INSTDIR\translations\assistant_pl.ts"
- Delete "$INSTDIR\translations\assistant_untranslated.ts"
Delete "$INSTDIR\translations\designer_de.qm"
- Delete "$INSTDIR\translations\designer_de.ts"
# Delete "$INSTDIR\translations\designer_ja.qm"
-# Delete "$INSTDIR\translations\designer_ja.ts"
-# Delete "$INSTDIR\translations\designer_pl.ts"
- Delete "$INSTDIR\translations\designer_untranslated.ts"
# Delete "$INSTDIR\translations\linguist_ja.qm"
-# Delete "$INSTDIR\translations\linguist_ja.ts"
-# Delete "$INSTDIR\translations\linguist_pl.ts"
# Delete "$INSTDIR\translations\qt_ar.qm"
-# Delete "$INSTDIR\translations\qt_ar.ts"
Delete "$INSTDIR\translations\qt_de.qm"
- Delete "$INSTDIR\translations\qt_de.ts"
# Delete "$INSTDIR\translations\qt_es.qm"
-# Delete "$INSTDIR\translations\qt_es.ts"
# Delete "$INSTDIR\translations\qt_fr.qm"
-# Delete "$INSTDIR\translations\qt_fr.ts"
# Delete "$INSTDIR\translations\qt_iw.qm"
-# Delete "$INSTDIR\translations\qt_iw.ts"
# Delete "$INSTDIR\translations\qt_ja_jp.qm"
-# Delete "$INSTDIR\translations\qt_ja_jp.ts"
-# Delete "$INSTDIR\translations\qt_pl.ts"
# Delete "$INSTDIR\translations\qt_pt.qm"
-# Delete "$INSTDIR\translations\qt_pt.ts"
# Delete "$INSTDIR\translations\qt_ru.qm"
-# Delete "$INSTDIR\translations\qt_ru.ts"
# Delete "$INSTDIR\translations\qt_sk.qm"
-# Delete "$INSTDIR\translations\qt_sk.ts"
# Delete "$INSTDIR\translations\qt_sv.qm"
-# Delete "$INSTDIR\translations\qt_sv.ts"
# Delete "$INSTDIR\translations\qt_uk.qm"
-# Delete "$INSTDIR\translations\qt_uk.ts"
- Delete "$INSTDIR\translations\qt_untranslated.ts"
# Delete "$INSTDIR\translations\qt_zh_CN.qm"
-# Delete "$INSTDIR\translations\qt_zh_CN.ts"
-# Delete "$INSTDIR\translations\qtconfig_pl.ts"
-# Delete "$INSTDIR\translations\qvfb_pl.ts"
RMDir "$INSTDIR\translations"
More information about the Gpg4win-commits
mailing list