[Gpg4win-commits] r642 - in trunk: . packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Dec 11 17:24:01 CET 2007
Author: marcus
Date: 2007-12-11 17:24:01 +0100 (Tue, 11 Dec 2007)
New Revision: 642
Modified:
trunk/ChangeLog
trunk/packages/packages.current
trunk/src/inst-qt.nsi
trunk/src/uninst-qt.nsi
Log:
2007-12-11 Marcus Brinkmann <marcus at g10code.de>
* packages/packages.current: Update to qt 4.3.3.
* src/inst-qt.nsi, src/uninst-qt.nsi: Update to qt 4.3.3.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-12-11 15:24:50 UTC (rev 641)
+++ trunk/ChangeLog 2007-12-11 16:24:01 UTC (rev 642)
@@ -1,5 +1,8 @@
2007-12-11 Marcus Brinkmann <marcus at g10code.de>
+ * packages/packages.current: Update to qt 4.3.3.
+ * src/inst-qt.nsi, src/uninst-qt.nsi: Update to qt 4.3.3.
+
* src/inst-sections.nsi: Delete old start menu, desktop and
quicklaunch links.
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2007-12-11 15:24:50 UTC (rev 641)
+++ trunk/packages/packages.current 2007-12-11 16:24:01 UTC (rev 642)
@@ -297,18 +297,17 @@
#
server ftp://ftp.kdab.net/pub/gpg4win
-name qt-4.3.1-2-bin.zip
-file qt-gpg4win-4.3.1-2-bin.zip
-chk 7d811a95bee1fcef20cb62104a53754726bc8267
+name qt-4.3.3-1-bin.zip
+file qt-gpg4win-4.3.3-1-bin.zip
+chk ce4af57778a63b0a1369ae230a5cdf71735b2db5
-name qt-4.3.1-2-lib.zip
-file qt-gpg4win-4.3.1-2-dev.zip
-chk ea1f1e73db6425530a9c1826465d2c42e2ba1f30
+name qt-4.3.3-1-lib.zip
+file qt-gpg4win-4.3.3-1-lib.zip
+chk 6f33ba41210d18d59b93cd331d0bdc6b107e132b
-server ftp://ftp.trolltech.com/pub/qt/source
-name qt-4.3.1-2-src.zip
-file qt-win-opensource-src-4.3.1.zip
-chk 7dcdaafe5ab451b1bc9af0e5db080e7b5d484732
+name qt-4.3.3-1-src.zip
+file qt-gpg4win-4.3.3-1-src.zip
+chk 3f918cc7d0a4e039db53df97cdce7aeac408d90c
#
# Qt contains DBus and thus depends on kdesupport, which is a random
Modified: trunk/src/inst-qt.nsi
===================================================================
--- trunk/src/inst-qt.nsi 2007-12-11 15:24:50 UTC (rev 641)
+++ trunk/src/inst-qt.nsi 2007-12-11 16:24:01 UTC (rev 642)
@@ -49,7 +49,6 @@
File ${prefix}/bin/QtScript4.dll
File ${prefix}/bin/QtSql4.dll
File ${prefix}/bin/QtSvg4.dll
- File ${prefix}/bin/QtTest4.dll
File ${prefix}/bin/QtXml4.dll
SetOutPath "$INSTDIR\plugins\accessible"
@@ -66,12 +65,7 @@
SetOutPath "$INSTDIR\plugins\designer"
- File ${prefix}/plugins/designer/arthurplugin.dll
- File ${prefix}/plugins/designer/containerextension.dll
- File ${prefix}/plugins/designer/customwidgetplugin.dll
File ${prefix}/plugins/designer/qt3supportwidgets.dll
- File ${prefix}/plugins/designer/taskmenuextension.dll
- File ${prefix}/plugins/designer/worldtimeclockplugin.dll
SetOutPath "$INSTDIR\plugins\iconengines"
@@ -85,6 +79,34 @@
File ${prefix}/plugins/imageformats/qsvg4.dll
File ${prefix}/plugins/imageformats/qtiff4.dll
+ SetOutPath "$INSTDIR\plugins\plugins\accessible"
+
+ File ${prefix}/plugins/plugins/accessible/qtaccessiblecompatwidgetsd4.dll
+ File ${prefix}/plugins/plugins/accessible/qtaccessiblewidgetsd4.dll
+
+ SetOutPath "$INSTDIR\plugins\plugins\codecs"
+
+ File ${prefix}/plugins/plugins/codecs/qcncodecsd4.dll
+ File ${prefix}/plugins/plugins/codecs/qjpcodecsd4.dll
+ File ${prefix}/plugins/plugins/codecs/qkrcodecsd4.dll
+ File ${prefix}/plugins/plugins/codecs/qtwcodecsd4.dll
+
+ SetOutPath "$INSTDIR\plugins\plugins\iconengines"
+
+ File ${prefix}/plugins/plugins/iconengines/qsvgd4.dll
+
+ SetOutPath "$INSTDIR\plugins\plugins\imageformats"
+
+ File ${prefix}/plugins/plugins/imageformats/qgifd4.dll
+ File ${prefix}/plugins/plugins/imageformats/qjpegd4.dll
+ File ${prefix}/plugins/plugins/imageformats/qmngd4.dll
+ File ${prefix}/plugins/plugins/imageformats/qsvgd4.dll
+ File ${prefix}/plugins/plugins/imageformats/qtiffd4.dll
+
+ SetOutPath "$INSTDIR\plugins\plugins\sqldrivers"
+
+ File ${prefix}/plugins/plugins/sqldrivers/qsqlited4.dll
+
SetOutPath "$INSTDIR\plugins\sqldrivers"
File ${prefix}/plugins/sqldrivers/qsqlite4.dll
@@ -93,21 +115,32 @@
File ${prefix}/translations/assistant_de.qm
# File ${prefix}/translations/assistant_ja.qm
+# File ${prefix}/translations/assistant_pl.qm
+# File ${prefix}/translations/assistant_zh_CN.qm
File ${prefix}/translations/designer_de.qm
# File ${prefix}/translations/designer_ja.qm
+# File ${prefix}/translations/designer_pl.qm
+# File ${prefix}/translations/designer_zh_CN.qm
# File ${prefix}/translations/linguist_ja.qm
+# File ${prefix}/translations/linguist_pl.qm
+# File ${prefix}/translations/linguist_zh_CN.qm
# File ${prefix}/translations/qt_ar.qm
File ${prefix}/translations/qt_de.qm
# File ${prefix}/translations/qt_es.qm
# File ${prefix}/translations/qt_fr.qm
# File ${prefix}/translations/qt_iw.qm
# File ${prefix}/translations/qt_ja_jp.qm
+# File ${prefix}/translations/qt_pl.qm
# File ${prefix}/translations/qt_pt.qm
# File ${prefix}/translations/qt_ru.qm
# File ${prefix}/translations/qt_sk.qm
# File ${prefix}/translations/qt_sv.qm
# File ${prefix}/translations/qt_uk.qm
# File ${prefix}/translations/qt_zh_CN.qm
+# File ${prefix}/translations/qtconfig_pl.qm
+# File ${prefix}/translations/qtconfig_zh_CN.qm
+# File ${prefix}/translations/qvfb_pl.qm
+# File ${prefix}/translations/qvfb_zh_CN.qm
!endif
SectionEnd
Modified: trunk/src/uninst-qt.nsi
===================================================================
--- trunk/src/uninst-qt.nsi 2007-12-11 15:24:50 UTC (rev 641)
+++ trunk/src/uninst-qt.nsi 2007-12-11 16:24:01 UTC (rev 642)
@@ -45,8 +45,9 @@
Delete "$INSTDIR\QtScript4.dll"
Delete "$INSTDIR\QtSql4.dll"
Delete "$INSTDIR\QtSvg4.dll"
+ Delete "$INSTDIR\QtXml4.dll"
+ # Not in Qt anymore since 4.3.3.
Delete "$INSTDIR\QtTest4.dll"
- Delete "$INSTDIR\QtXml4.dll"
Delete "$INSTDIR\plugins\accessible\qtaccessiblecompatwidgets4.dll"
Delete "$INSTDIR\plugins\accessible\qtaccessiblewidgets4.dll"
@@ -60,10 +61,11 @@
RMDir "$INSTDIR\plugins\codecs"
+ Delete "$INSTDIR\plugins\designer\qt3supportwidgets.dll"
+ # Not in Qt anymore since 4.3.3.
Delete "$INSTDIR\plugins\designer\arthurplugin.dll"
Delete "$INSTDIR\plugins\designer\containerextension.dll"
Delete "$INSTDIR\plugins\designer\customwidgetplugin.dll"
- Delete "$INSTDIR\plugins\designer\qt3supportwidgets.dll"
Delete "$INSTDIR\plugins\designer\taskmenuextension.dll"
Delete "$INSTDIR\plugins\designer\worldtimeclockplugin.dll"
@@ -81,6 +83,30 @@
RMDir "$INSTDIR\plugins\imageformats"
+ Delete "$INSTDIR\plugins\plugins\accessible\qtaccessiblecompatwidgetsd4.dll"
+ Delete "$INSTDIR\plugins\plugins\accessible\qtaccessiblewidgetsd4.dll"
+
+ RMDir "$INSTDIR\plugins\plugins\accessible"
+
+ Delete "$INSTDIR\plugins\plugins\codecs\qcncodecsd4.dll"
+ Delete "$INSTDIR\plugins\plugins\codecs\qjpcodecsd4.dll"
+ Delete "$INSTDIR\plugins\plugins\codecs\qkrcodecsd4.dll"
+ Delete "$INSTDIR\plugins\plugins\codecs\qtwcodecsd4.dll"
+
+ RMDir "$INSTDIR\plugins\plugins\codecs"
+
+ Delete "$INSTDIR\plugins\plugins\iconengines\qsvgd4.dll"
+
+ RMDir "$INSTDIR\plugins\plugins\iconengines"
+
+ Delete "$INSTDIR\plugins\plugins\imageformats\qgifd4.dll"
+ Delete "$INSTDIR\plugins\plugins\imageformats\qjpegd4.dll"
+ Delete "$INSTDIR\plugins\plugins\imageformats\qmngd4.dll"
+ Delete "$INSTDIR\plugins\plugins\imageformats\qsvgd4.dll"
+ Delete "$INSTDIR\plugins\plugins\imageformats\qtiffd4.dll"
+
+ RMDir "$INSTDIR\plugins\plugins\imageformats"
+
Delete "$INSTDIR\plugins\sqldrivers\qsqlite4.dll"
RMDir "$INSTDIR\plugins\sqldrivers"
More information about the Gpg4win-commits
mailing list