[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-139-g8ca318e
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Apr 26 19:55:01 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, master has been updated
via 8ca318e41092e8553729ec21346c358dbf3975cc (commit)
via 33cffedcdbc50f554f6068c3d9c194289da8c274 (commit)
via a52bc732fd977de9fc56fd9a1a9048bd259dd74a (commit)
via d630ddac7bc657dacf7aaa0e1c0d654b8ff77318 (commit)
via 79a04b8cd715af3258768d020056a2915f96fce5 (commit)
via 44d37fcae59d28de87a8712f7b3183bd28fbfd02 (commit)
via 15dcadc8ade5b18d3588b7ecbca31078b0c8127d (commit)
via aac81ab9c37790506b55cfb246b98047898f8b0c (commit)
via 8cc6b082fe9ecb1503966667894df280c597c8b2 (commit)
via ab618fbd9a9e62160d4101689426b532536514f3 (commit)
via c081bd4fbee213d031d88d9de1162b5076eaa2c7 (commit)
via 898cfba86523ad709bd10eaecd0cb7a560d4a3d3 (commit)
from 42c2f86cb450782bda1dd626e86b57e095cad20f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8ca318e41092e8553729ec21346c358dbf3975cc
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 17:37:10 2013 +0000
Remove translations for qt tools.
Those have nothing to do with kleopatra and are not used.
* inst-qt.nsi, uninst-qt.nsi: Remove translations
diff --git a/src/inst-qt.nsi b/src/inst-qt.nsi
index 54028e3..93e1397 100644
--- a/src/inst-qt.nsi
+++ b/src/inst-qt.nsi
@@ -51,53 +51,6 @@ Section "-qt" SEC_qt
File ${prefix}/plugins/imageformats/qsvg4.dll
File ${prefix}/plugins/imageformats/qtiff4.dll
-
- # Are those actually used anywhere?
- SetOutPath "$INSTDIR\translations"
-
- File ${prefix}/translations/assistant_adp_de.qm
-# File ${prefix}/translations/assistant_adp_ja.qm
-# File ${prefix}/translations/assistant_adp_pl.qm
-# File ${prefix}/translations/assistant_adp_zh_CN.qm
-# File ${prefix}/translations/assistant_adp_zh_TW.qm
- File ${prefix}/translations/assistant_de.qm
-# File ${prefix}/translations/assistant_pl.qm
-# File ${prefix}/translations/assistant_zh_CN.qm
-# File ${prefix}/translations/assistant_zh_TW.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/designer_zh_TW.qm
- File ${prefix}/translations/linguist_de.qm
-# File ${prefix}/translations/linguist_ja.qm
-# File ${prefix}/translations/linguist_pl.qm
-# File ${prefix}/translations/linguist_zh_CN.qm
-# File ${prefix}/translations/linguist_zh_TW.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_help_de.qm
-# File ${prefix}/translations/qt_help_pl.qm
-# File ${prefix}/translations/qt_help_zh_CN.qm
-# File ${prefix}/translations/qt_help_zh_TW.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/qt_zh_TW.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
-# File ${prefix}/translations/qvfb_zh_TW.qm
-
# For what is this needed? Scripting?
SetOutPath "$INSTDIR"
File ${prefix}/bin/qdbus.exe
diff --git a/src/uninst-qt.nsi b/src/uninst-qt.nsi
index becdebe..e874f58 100644
--- a/src/uninst-qt.nsi
+++ b/src/uninst-qt.nsi
@@ -52,45 +52,6 @@ Section "-un.qt"
RMDir "$INSTDIR\plugins"
- Delete "$INSTDIR\translations\assistant_adp_de.qm"
-# Delete "$INSTDIR\translations\assistant_adp_ja.qm"
-# Delete "$INSTDIR\translations\assistant_adp_pl.qm"
-# Delete "$INSTDIR\translations\assistant_adp_zh_CN.qm"
-# Delete "$INSTDIR\translations\assistant_adp_zh_TW.qm"
- Delete "$INSTDIR\translations\assistant_de.qm"
-# Delete "$INSTDIR\translations\assistant_pl.qm"
-# Delete "$INSTDIR\translations\assistant_zh_CN.qm"
-# Delete "$INSTDIR\translations\assistant_zh_TW.qm"
- Delete "$INSTDIR\translations\designer_de.qm"
-# Delete "$INSTDIR\translations\designer_ja.qm"
-# Delete "$INSTDIR\translations\designer_pl.qm"
-# Delete "$INSTDIR\translations\designer_zh_CN.qm"
-# Delete "$INSTDIR\translations\designer_zh_TW.qm"
- Delete "$INSTDIR\translations\linguist_de.qm"
-# Delete "$INSTDIR\translations\linguist_ja.qm"
-# Delete "$INSTDIR\translations\linguist_pl.qm"
-# Delete "$INSTDIR\translations\linguist_zh_CN.qm"
-# Delete "$INSTDIR\translations\linguist_zh_TW.qm"
-# Delete "$INSTDIR\translations\qt_ar.qm"
- Delete "$INSTDIR\translations\qt_de.qm"
-# Delete "$INSTDIR\translations\qt_es.qm"
-# Delete "$INSTDIR\translations\qt_fr.qm"
-# Delete "$INSTDIR\translations\qt_iw.qm"
- Delete "$INSTDIR\translations\qt_help_de.qm"
-# Delete "$INSTDIR\translations\qt_help_pl.qm"
-# Delete "$INSTDIR\translations\qt_help_zh_CN.qm"
-# Delete "$INSTDIR\translations\qt_help_zh_TW.qm"
-# Delete "$INSTDIR\translations\qt_ja_jp.qm"
-# Delete "$INSTDIR\translations\qt_pt.qm"
-# Delete "$INSTDIR\translations\qt_ru.qm"
-# Delete "$INSTDIR\translations\qt_sk.qm"
-# Delete "$INSTDIR\translations\qt_sv.qm"
-# Delete "$INSTDIR\translations\qt_uk.qm"
-# Delete "$INSTDIR\translations\qt_zh_CN.qm"
-# Delete "$INSTDIR\translations\qt_zh_TW.qm"
-
- RMDir "$INSTDIR\translations"
-
RMDir "$INSTDIR"
!endif
SectionEnd
commit 33cffedcdbc50f554f6068c3d9c194289da8c274
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 17:32:20 2013 +0000
Update kleopatra binary package
The old package accidentally contained some uneccessary
libraries.
* packages/packages.current: Update kleopatra binary package
diff --git a/packages/packages.current b/packages/packages.current
index 84b391f..6aa703f 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -472,8 +472,8 @@ chk fe11199a0e917d4c9ed01d453e10f270eadb136b
#
server http://files.kolab.org/local/gpg4win
-file kleopatra-20130426-bin.tar.bz2
-chk e1b8f91c0c1e4b6328dab45bde688a42f8007653
+file kleopatra-20130426-1-bin.tar.bz2
+chk 4afe6f491269781490610e9cb30978a5907c593f
file kleopatra-20130426-src.tar.bz2
chk 647450abb26bdd0449bc4be5d10184571cb94b8e
commit a52bc732fd977de9fc56fd9a1a9048bd259dd74a
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 17:28:38 2013 +0000
Uopdate nsis configuration for kdesupport kdelibs
* include/config.nsi.in: Rename kdesupport to dbus. Remove kdelibs
diff --git a/include/config.nsi.in b/include/config.nsi.in
index 8978b4a..74302ec 100644
--- a/include/config.nsi.in
+++ b/include/config.nsi.in
@@ -266,11 +266,11 @@
!define gpg4win_pkg_gettext_version @gpg4win_pkg_gettext_version@
!define gpg4win_pkg_gettext_src @gpg4win_pkg_gettext_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@
+ at HAVE_PKG_DBUS@
+!define gpg4win_pkg_dbus @gpg4win_pkg_dbus@
+!define gpg4win_pkg_dbus_version @gpg4win_pkg_dbus_version@
+!define gpg4win_pkg_dbus_dev @gpg4win_pkg_dbus_dev@
+!define gpg4win_pkg_dbus_src @gpg4win_pkg_dbus_src@
@HAVE_PKG_QT@
!define gpg4win_pkg_qt @gpg4win_pkg_qt@
@@ -283,12 +283,6 @@
!define gpg4win_pkg_oxygen_icons_version @gpg4win_pkg_oxygen_icons_version@
!define gpg4win_pkg_oxygen_icons_src @gpg4win_pkg_oxygen_icons_src@
- at HAVE_PKG_KDELIBS@
-!define gpg4win_pkg_kdelibs @gpg4win_pkg_kdelibs@
-!define gpg4win_pkg_kdelibs_version @gpg4win_pkg_kdelibs_version@
-!define gpg4win_pkg_kdelibs_dev @gpg4win_pkg_kdelibs_dev@
-!define gpg4win_pkg_kdelibs_src @gpg4win_pkg_kdelibs_src@
-
@HAVE_PKG_KLEOPATRA@
!define gpg4win_pkg_kleopatra @gpg4win_pkg_kleopatra@
!define gpg4win_pkg_kleopatra_version @gpg4win_pkg_kleopatra_version@
commit d630ddac7bc657dacf7aaa0e1c0d654b8ff77318
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 16:30:44 2013 +0000
Fix filename of pinentry-0.8.3
Pinentry is now distributed as a bziped archive.
* src/packages.current: Change pinentry from tar.gz to tar.bz2
diff --git a/packages/packages.current b/packages/packages.current
index 60af78d..84b391f 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -381,7 +381,7 @@ file dirmngr/dirmngr-1.1.1.tar.bz2
chk e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690
# checked: 2013-04-26 wk
-file pinentry/pinentry-0.8.3.tar.gz
+file pinentry/pinentry-0.8.3.tar.bz2
chk fc0efe5d375568f90ddbb23ee68e173411a49d4a
# checked: 2012-03-28 wk
commit 79a04b8cd715af3258768d020056a2915f96fce5
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 16:22:46 2013 +0000
Update kleopatra and qt
Kleopatra is now from KDE 4.10.2
* src/packages.current: Update Kleopatra, Qt and remove kdelibs
diff --git a/packages/packages.current b/packages/packages.current
index cf08c57..60af78d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -428,14 +428,14 @@ chk ef483090edcdd85ae672aa3bab21526b1e335ae3
#
server http://files.kolab.org/local/gpg4win/libs/
-file qt-x86-mingw4-4.8.4-20130418-bin.tar.bz2
-chk 2ad50b6890268efdc980bffc79426012380065f3
+file qt-x86-mingw4-4.8.4-20130426-bin.tar.bz2
+chk 48f84d4f483e5ff4eeceff2402f56225878ed558
-file qt-x86-mingw4-4.8.4-20130418-lib.tar.bz2
-chk 386a044ee4b87fea312c7bb7a75e34a60a7dc67b
+file qt-x86-mingw4-4.8.4-20130426-lib.tar.bz2
+chk df86e6513cc5639d79881dd812197153f830be67
-file qt-x86-mingw4-4.8.4-src.tar.bz2
-chk caaa01e15ce534de5020b019d23c052eb042bfb3
+file qt-x86-mingw4-4.8.4-20130426-src.tar.bz2
+chk 66c56babca65fb38c6919cf63405dc51acf00ac6
#
# Qt links DBus and Kleopatra / KDE libs needs it
@@ -467,22 +467,13 @@ chk fe11199a0e917d4c9ed01d453e10f270eadb136b
#
-# kdelibs + kleopatra
+# kleopatra (and her KDE dependencies)
#
#
server http://files.kolab.org/local/gpg4win
-file kdelibs-20110203-bin.zip
-chk b23c554b0c144a04513cc72a53af9983ceccf500
+file kleopatra-20130426-bin.tar.bz2
+chk e1b8f91c0c1e4b6328dab45bde688a42f8007653
-file kdelibs-20110203-lib.zip
-chk f877c4c69060718b7e4e22fa7475e788e33316df
-
-file kdelibs-20110203-src.zip
-chk 5c0515c4619af0e2e21cfd9c7a019d2dfa9db118
-
-file kleopatra-20121209-bin.zip
-chk 95c4dfecf05c345b7725935ddf6f64d37881244c
-
-file kleopatra-20121209-src.zip
-chk 5883ec2d2f487510bd29d961456680702e33787f
+file kleopatra-20130426-src.tar.bz2
+chk 647450abb26bdd0449bc4be5d10184571cb94b8e
commit 44d37fcae59d28de87a8712f7b3183bd28fbfd02
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 15:53:22 2013 +0000
Combine kdelibs and kleopatra package
* Makefile.am: Remove kdelibs package.
* gpg4win.nsi: Update section management for kdelibs and dbus.
* inst-kleopatra, uninst-kleopatra: Add parts from kdelibs.
* uninst-kdelibs, inst-kdelibs: Removed.
--
A combined package is easier to handle from the KDE side of things
as the previous distinction was unclear. Kdelibs for example
contained also the localization and some parts of kde-runtime.
The Kleopatra package now should contain everything in Gpg4Win that
is maintained by KDE.
diff --git a/src/Makefile.am b/src/Makefile.am
index 6457fff..fb6ba81 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,7 +81,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
inst-qt.nsi uninst-qt.nsi \
inst-dbus.nsi uninst-dbus.nsi \
inst-oxygen-icons.nsi uninst-oxygen-icons.nsi \
- inst-kdelibs.nsi uninst-kdelibs.nsi \
inst-kleopatra.nsi uninst-kleopatra.nsi \
inst-bzip2.nsi uninst-bzip2.nsi \
inst-final.nsi
@@ -369,7 +368,7 @@ gpg4win_pkg_zlib_make_args_inst = -fwin32/Makefile.gcc install \
# Supported binary packages.
gpg4win_bpkgs = libiconv gettext pkgconfig pango expat freetype fontconfig \
- cairo atk qt dbus oxygen-icons kdelibs kleopatra bsfilter
+ cairo atk qt dbus oxygen-icons kleopatra bsfilter
# libiconv needs some special magic to generate a usable import
# library.
diff --git a/src/gpg4win.nsi b/src/gpg4win.nsi
index 0e834b6..d4be5be 100644
--- a/src/gpg4win.nsi
+++ b/src/gpg4win.nsi
@@ -33,9 +33,6 @@
!ifdef HAVE_PKG_KLEOPATRA
!undef HAVE_PKG_KLEOPATRA
!endif
-!ifdef HAVE_PKG_KDELIBS
-!undef HAVE_PKG_KDELIBS
-!endif
!ifdef HAVE_PKG_OXYGEN_ICONS
!undef HAVE_PKG_OXYGEN_ICONS
!endif
@@ -137,8 +134,8 @@
!ifdef HAVE_PKG_GTK_
!undef HAVE_PKG_GTK_
!endif
-!ifdef HAVE_PKG_KDESUPPORT
-!undef HAVE_PKG_KDESUPPORT
+!ifdef HAVE_PKG_DBUS
+!undef HAVE_PKG_DBUS
!endif
!ifdef HAVE_PKG_QT
!undef HAVE_PKG_QT
@@ -146,9 +143,6 @@
!ifdef HAVE_PKG_OXYGEN_ICONS
!undef HAVE_PKG_OXYGEN_ICONS
!endif
-!ifdef HAVE_PKG_KDELIBS
-!undef HAVE_PKG_KDELIBS
-!endif
!ifdef HAVE_PKG_KLEOPATRA
!undef HAVE_PKG_KLEOPATRA
!endif
diff --git a/src/inst-kdelibs.nsi b/src/inst-kdelibs.nsi
deleted file mode 100644
index 25b6dcc..0000000
--- a/src/inst-kdelibs.nsi
+++ /dev/null
@@ -1,224 +0,0 @@
-# inst-kdelibs.nsi - Installer snippet for kdelibs. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 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}/kdelibs-${gpg4win_pkg_kdelibs_version}
-
-!ifdef DEBUG
-Section "kdelibs" SEC_kdelibs
-!else
-Section "-kdelibs" SEC_kdelibs
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_kdelibs_src}"
-!else
-
- # Relocate this when dbus-daemon is relocated.
- SetOutPath "$INSTDIR\bin"
- File ${prefix}/bin/kcmdwrapper.exe
- File ${prefix}/bin/kbuildsycoca4.exe
-
- SetOutPath "$INSTDIR"
-
- File ${prefix}/bin/kdebugdialog.exe
- File ${prefix}/bin/libgpgme++-glib.dll
- File ${prefix}/bin/libgpgme++.dll
- File ${prefix}/bin/libkdecore.dll
- File ${prefix}/bin/libkdeui.dll
- File ${prefix}/bin/libkmime.dll
- File ${prefix}/bin/libqgpgme.dll
- File ${prefix}/lib/libkcmutils.dll
- File ${prefix}/lib/kde4/kded_globalaccel.dll
-
- SetOutPath "$INSTDIR\share\apps\kcharselect"
-
- File ${prefix}/share/apps/kcharselect/kcharselect-data
-
- SetOutPath "$INSTDIR\share\apps\kdeui\about"
-
- File ${prefix}/share/apps/kdeui/about/bar-bottom-left.png
- File ${prefix}/share/apps/kdeui/about/bar-bottom-middle.png
- File ${prefix}/share/apps/kdeui/about/bar-bottom-right.png
- File ${prefix}/share/apps/kdeui/about/bar-middle-left.png
- File ${prefix}/share/apps/kdeui/about/bar-middle-right.png
- File ${prefix}/share/apps/kdeui/about/bar-top-left.png
- File ${prefix}/share/apps/kdeui/about/bar-top-middle.png
- File ${prefix}/share/apps/kdeui/about/bar-top-right.png
- File ${prefix}/share/apps/kdeui/about/bottom-left.png
- File ${prefix}/share/apps/kdeui/about/bottom-middle.png
- File ${prefix}/share/apps/kdeui/about/bottom-right.png
- File ${prefix}/share/apps/kdeui/about/box-bottom-left.png
- File ${prefix}/share/apps/kdeui/about/box-bottom-middle.png
- File ${prefix}/share/apps/kdeui/about/box-bottom-right.png
- File ${prefix}/share/apps/kdeui/about/box-middle-left.png
- File ${prefix}/share/apps/kdeui/about/box-middle-right.png
- File ${prefix}/share/apps/kdeui/about/box-top-left.png
- File ${prefix}/share/apps/kdeui/about/box-top-middle.png
- File ${prefix}/share/apps/kdeui/about/box-top-right.png
- File ${prefix}/share/apps/kdeui/about/kde_infopage.css
- File ${prefix}/share/apps/kdeui/about/kde_infopage_rtl.css
- File ${prefix}/share/apps/kdeui/about/top-middle.png
- File ${prefix}/share/apps/kdeui/about/top-right.png
-
- SetOutPath "$INSTDIR\share\apps\kdeui\pics"
-
- File ${prefix}/share/apps/kdeui/pics/aboutkde.png
- File ${prefix}/share/apps/kdeui/pics/kdeprint_nup1.png
- File ${prefix}/share/apps/kdeui/pics/kdeprint_nup2.png
- File ${prefix}/share/apps/kdeui/pics/kdeprint_nup4.png
- File ${prefix}/share/apps/kdeui/pics/kdeprint_nupother.png
- File ${prefix}/share/apps/kdeui/pics/ktip-bulb.png
-
- SetOutPath "$INSTDIR\share\config\colors"
-
- File ${prefix}/share/config/colors/40.colors
- File ${prefix}/share/config/colors/Oxygen.colors
- File ${prefix}/share/config/colors/Rainbow.colors
- File ${prefix}/share/config/colors/Royal.colors
- File ${prefix}/share/config/colors/Web.colors
-
- SetOutPath "$INSTDIR\share\config"
-
- File ${prefix}/share/config/kdebug.areas
- File ${prefix}/share/config/kdebugrc
-
- SetOutPath "$INSTDIR\share\config\ui"
-
- File ${prefix}/share/config/ui/ui_standards.rc
-
- SetOutPath "$INSTDIR\share\kde4\services\kded"
-
- File ${prefix}/share/kde4/services/kded/kdedglobalaccel.desktop
-
- SetOutPath "$INSTDIR\share\kde4\servicetypes"
-
- File ${prefix}/share/kde4/servicetypes/kconfigbackend.desktop
- File ${prefix}/share/kde4/servicetypes/kplugininfo.desktop
- File ${prefix}/share/kde4/servicetypes/sonnetspeller.desktop
-
- SetOutPath "$INSTDIR\share\locale"
-
- File ${prefix}/share/locale/all_languages
-
- SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
-
- File ${prefix}/share/locale/de/LC_MESSAGES/akonaditray.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/akregator.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdepim.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdepimlibs.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kabc.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kabc2mutt.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kabc_dir.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kabc_file.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kabc_ldapkio.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kabc_net.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kabc_slox.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kabcakonadi.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kabcclient.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kabcformat_binary.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kaddressbook.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kalarm.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kcmkabconfig.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kcmkontactnt.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kdepimresources.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kdepimwizards.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kdgantt1.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kfile_vcf.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kio_groupwise.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kio_imap4.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kio_ldap.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kio_mbox.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kio_nntp.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kio_pop3.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kio_sieve.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kio_smtp.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kitchensync.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kjots.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kleopatra.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kmail.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_calendar_plugin.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_vcard_plugin.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_xdiff_plugin.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kmailcvt.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kmobiletools.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kmobiletools_at_engine.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/knode.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/knotes.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kode.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/konsolekalendar.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kontact.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kontactinterfaces.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/korganizer.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/korn.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kpilot.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kres_birthday.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kres_blog.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kres_featureplan.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kres_groupware.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kres_groupwise.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kres_kolab.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kres_remote.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kres_scalix.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kres_tvanytime.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kres_xmlrpc.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/ktimetracker.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/ktnef.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kwatchgnupg.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kxforms.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libakonadi.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkblog.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkcal.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkdepim.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkholidays.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkldap.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkleopatra.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkmime.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkpgp.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkpimidentities.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkpimutils.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkresources.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libksieve.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libktnef.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libkxmlrpcclient.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/libmailtransport.mo
-
- File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdelibs.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/desktop_l10n.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/katepart4.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kcertpart.mo
- #File ${prefix}/share/locale/de/LC_MESSAGES/kcm_phonon.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kcmcrypto.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs4.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs_colors4.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kdeqt.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kfileaudiopreview4.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kio4.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/kio_help4.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditor_plugins.mo
- #File ${prefix}/share/locale/de/LC_MESSAGES/libphonon.mo
- #File ${prefix}/share/locale/de/LC_MESSAGES/phonon_kde.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/timezones4.mo
-
-!endif
-SectionEnd
diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
index 6b0923f..08c0e97 100644
--- a/src/inst-kleopatra.nsi
+++ b/src/inst-kleopatra.nsi
@@ -26,6 +26,8 @@
${MementoSection} "Kleopatra" SEC_kleopatra
SetOutPath "$INSTDIR"
!ifdef SOURCES
+ # Kleopatra Source Package also contains kdepimlibs, kdelibs and
+ # kde-runtime, as well as win-iconv and attica
File "${gpg4win_pkg_kleopatra_src}"
!else
@@ -37,12 +39,31 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
File ${prefix}/bin/kgpgconf.exe
File ${prefix}/bin/kwatchgnupg.exe
+ File ${prefix}/bin/kcmdwrapper.exe
+ File ${prefix}/bin/kbuildsycoca4.exe
+ File ${prefix}/bin/libattica.dll
+ File ${prefix}/bin/libdbus-1.dll
+ File ${prefix}/bin/libdbusmenu-qt.dll
+ File ${prefix}/bin/libgcc_s_sjlj-1.dll
+ File ${prefix}/bin/libgpg-error-0.dll
+ File ${prefix}/bin/libgpgme-11.dll
+ File ${prefix}/bin/libgpgme++.dll
+ File ${prefix}/bin/wconv.dll
+ File ${prefix}/bin/libintl.dll
+ File ${prefix}/bin/libjasper.dll
+ File ${prefix}/bin/libkcmutils.dll
+ File ${prefix}/bin/libkdecore.dll
+ File ${prefix}/bin/libkdeui.dll
+ File ${prefix}/bin/libkdewin.dll
File ${prefix}/bin/libkleo.dll
File ${prefix}/bin/libkleopatraclientcore.dll
File ${prefix}/bin/libkleopatraclientgui.dll
+ File ${prefix}/bin/libkmime.dll
+ File ${prefix}/bin/libqgpgme.dll
SetOutPath "$INSTDIR\lib\kde4"
+ # This should be made build static
File ${prefix}/lib/kde4/kcm_kleopatra.dll
SetOutPath "$INSTDIR\share\applications\kde4"
@@ -91,6 +112,7 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
File ${prefix}/share/config/libkleopatrarc
+ # TODO
SetOutPath "$INSTDIR\share\doc\HTML\common"
File ${prefix}/share/doc/HTML/common/common/1.png
@@ -238,6 +260,179 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
File ${prefix}/share/kde4/services/kleopatra_signencryptfiles.desktop
File ${prefix}/share/kde4/services/kleopatra_signencryptfolders.desktop
+ # Parts formerly in the kdelibs section:
+ SetOutPath "$INSTDIR\share\apps\kcharselect"
+
+ File ${prefix}/share/apps/kcharselect/kcharselect-data
+
+ SetOutPath "$INSTDIR\share\apps\kdeui\about"
+
+ File ${prefix}/share/apps/kdeui/about/bar-bottom-left.png
+ File ${prefix}/share/apps/kdeui/about/bar-bottom-middle.png
+ File ${prefix}/share/apps/kdeui/about/bar-bottom-right.png
+ File ${prefix}/share/apps/kdeui/about/bar-middle-left.png
+ File ${prefix}/share/apps/kdeui/about/bar-middle-right.png
+ File ${prefix}/share/apps/kdeui/about/bar-top-left.png
+ File ${prefix}/share/apps/kdeui/about/bar-top-middle.png
+ File ${prefix}/share/apps/kdeui/about/bar-top-right.png
+ File ${prefix}/share/apps/kdeui/about/bottom-left.png
+ File ${prefix}/share/apps/kdeui/about/bottom-middle.png
+ File ${prefix}/share/apps/kdeui/about/bottom-right.png
+ File ${prefix}/share/apps/kdeui/about/box-bottom-left.png
+ File ${prefix}/share/apps/kdeui/about/box-bottom-middle.png
+ File ${prefix}/share/apps/kdeui/about/box-bottom-right.png
+ File ${prefix}/share/apps/kdeui/about/box-middle-left.png
+ File ${prefix}/share/apps/kdeui/about/box-middle-right.png
+ File ${prefix}/share/apps/kdeui/about/box-top-left.png
+ File ${prefix}/share/apps/kdeui/about/box-top-middle.png
+ File ${prefix}/share/apps/kdeui/about/box-top-right.png
+ File ${prefix}/share/apps/kdeui/about/kde_infopage.css
+ File ${prefix}/share/apps/kdeui/about/kde_infopage_rtl.css
+ File ${prefix}/share/apps/kdeui/about/top-middle.png
+ File ${prefix}/share/apps/kdeui/about/top-right.png
+
+ SetOutPath "$INSTDIR\share\apps\kdeui\pics"
+
+ File ${prefix}/share/apps/kdeui/pics/aboutkde.png
+ File ${prefix}/share/apps/kdeui/pics/kdeprint_nup1.png
+ File ${prefix}/share/apps/kdeui/pics/kdeprint_nup2.png
+ File ${prefix}/share/apps/kdeui/pics/kdeprint_nup4.png
+ File ${prefix}/share/apps/kdeui/pics/kdeprint_nupother.png
+ File ${prefix}/share/apps/kdeui/pics/ktip-bulb.png
+
+ SetOutPath "$INSTDIR\share\config\colors"
+
+ File ${prefix}/share/config/colors/40.colors
+ File ${prefix}/share/config/colors/Oxygen.colors
+ File ${prefix}/share/config/colors/Rainbow.colors
+ File ${prefix}/share/config/colors/Royal.colors
+ File ${prefix}/share/config/colors/Web.colors
+
+ SetOutPath "$INSTDIR\share\config"
+
+ File ${prefix}/share/config/kdebug.areas
+ File ${prefix}/share/config/kdebugrc
+
+ SetOutPath "$INSTDIR\share\config\ui"
+
+ File ${prefix}/share/config/ui/ui_standards.rc
+
+ SetOutPath "$INSTDIR\share\kde4\services\kded"
+
+ File ${prefix}/share/kde4/services/kded/kdedglobalaccel.desktop
+
+ SetOutPath "$INSTDIR\share\kde4\servicetypes"
+
+ File ${prefix}/share/kde4/servicetypes/kconfigbackend.desktop
+ File ${prefix}/share/kde4/servicetypes/kplugininfo.desktop
+ File ${prefix}/share/kde4/servicetypes/sonnetspeller.desktop
+
+ SetOutPath "$INSTDIR\share\locale"
+
+ File ${prefix}/share/locale/all_languages
+
+ SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
+
+ File ${prefix}/share/locale/de/LC_MESSAGES/akonaditray.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/akregator.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdepim.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdepimlibs.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc2mutt.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc_dir.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc_file.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc_ldapkio.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc_net.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabc_slox.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabcakonadi.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabcclient.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kabcformat_binary.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kaddressbook.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kalarm.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kcmkabconfig.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kcmkontactnt.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kdepimresources.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kdepimwizards.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kdgantt1.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kfile_vcf.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_groupwise.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_imap4.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_ldap.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_mbox.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_nntp.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_pop3.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_sieve.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_smtp.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kitchensync.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kjots.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kleopatra.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kmail.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_calendar_plugin.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_vcard_plugin.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kmail_text_xdiff_plugin.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kmailcvt.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kmobiletools.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kmobiletools_at_engine.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/knode.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/knotes.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kode.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/konsolekalendar.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kontact.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kontactinterfaces.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/korganizer.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/korn.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kpilot.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kres_birthday.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kres_blog.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kres_featureplan.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kres_groupware.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kres_groupwise.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kres_kolab.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kres_remote.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kres_scalix.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kres_tvanytime.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kres_xmlrpc.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/ktimetracker.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/ktnef.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kwatchgnupg.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kxforms.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libakonadi.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkblog.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkcal.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkdepim.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkholidays.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkldap.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkleopatra.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkmime.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkpgp.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkpimidentities.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkpimutils.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkresources.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libksieve.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libktnef.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libkxmlrpcclient.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/libmailtransport.mo
+
+ File ${prefix}/share/locale/de/LC_MESSAGES/desktop_kdelibs.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/desktop_l10n.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/katepart4.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kcertpart.mo
+ #File ${prefix}/share/locale/de/LC_MESSAGES/kcm_phonon.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kcmcrypto.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs4.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs_colors4.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kdeqt.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kfileaudiopreview4.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio4.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/kio_help4.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditor_plugins.mo
+ #File ${prefix}/share/locale/de/LC_MESSAGES/libphonon.mo
+ #File ${prefix}/share/locale/de/LC_MESSAGES/phonon_kde.mo
+ File ${prefix}/share/locale/de/LC_MESSAGES/timezones4.mo
+
+
+
!endif
${MementoSectionEnd}
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 3e087eb..fff4d40 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -35,8 +35,8 @@
!ifdef HAVE_PKG_CRYPT
!include "inst-crypt.nsi"
!endif
-!ifdef HAVE_PKG_KDESUPPORT
-!include "inst-kdesupport.nsi"
+!ifdef HAVE_PKG_DBUS
+!include "inst-dbus.nsi"
!endif
!ifdef HAVE_PKG_LIBGSASL
!include "inst-libgsasl.nsi"
@@ -86,9 +86,6 @@
!ifdef HAVE_PKG_LIBASSUAN
!include "inst-libassuan.nsi"
!endif
-!ifdef HAVE_PKG_KDELIBS
-!include "inst-kdelibs.nsi"
-!endif
!ifdef HAVE_PKG_LIBGPG_ERROR
!include "inst-libgpg-error.nsi"
!endif
@@ -332,9 +329,6 @@
!ifdef HAVE_PKG_LIBGPG_ERROR
!include "uninst-libgpg-error.nsi"
!endif
-!ifdef HAVE_PKG_KDELIBS
-!include "uninst-kdelibs.nsi"
-!endif
!ifdef HAVE_PKG_LIBASSUAN
!include "uninst-libassuan.nsi"
!endif
@@ -395,8 +389,8 @@
!ifdef HAVE_PKG_LIBGSASL
!include "uninst-libgsasl.nsi"
!endif
-!ifdef HAVE_PKG_KDESUPPORT
-!include "uninst-kdesupport.nsi"
+!ifdef HAVE_PKG_DBUS
+!include "uninst-dbus.nsi"
!endif
!ifdef HAVE_PKG_CRYPT
!include "uninst-crypt.nsi"
@@ -700,8 +694,8 @@ Function CalcDepends
!ifdef HAVE_PKG_BSFILTER_PLUGIN
!insertmacro UnselectSection ${SEC_bsfilter_plugin}
!endif
-!ifdef HAVE_PKG_KDESUPPORT
- !insertmacro UnselectSection ${SEC_kdesupport}
+!ifdef HAVE_PKG_DBUS
+ !insertmacro UnselectSection ${SEC_dbus}
!endif
!ifdef HAVE_PKG_QT
!insertmacro UnselectSection ${SEC_qt}
@@ -709,9 +703,6 @@ Function CalcDepends
!ifdef HAVE_PKG_OXYGEN_ICONS
!insertmacro UnselectSection ${SEC_oxygen_icons}
!endif
-!ifdef HAVE_PKG_KDELIBS
- !insertmacro UnselectSection ${SEC_kdelibs}
-!endif
# Always install gnupg2. This is also ensured by putting
# these packages in the RO section and enabling them by default, but
@@ -778,7 +769,7 @@ Function CalcDepends
have_kleopatra:
!insertmacro SelectSection ${SEC_gpgme}
# This drags in all the other KDE and Qt stuff.
- !insertmacro SelectSection ${SEC_kdelibs}
+ !insertmacro SelectSection ${SEC_kleopatra}
skip_kleopatra:
!endif
@@ -848,24 +839,24 @@ Function CalcDepends
# Now the implicitely installed packages.
-!ifdef HAVE_PKG_KDELIBS
- !insertmacro SectionFlagIsSet ${SEC_kdelibs} \
- ${SF_SELECTED} have_kdelibs skip_kdelibs
- have_kdelibs:
+!ifdef HAVE_PKG_KLEOPATRA
+ !insertmacro SectionFlagIsSet ${SEC_kleopatra} \
+ ${SF_SELECTED} have_kleopatra skip_kdelibs
+ have_kleopatra:
!insertmacro SelectSection ${SEC_qt}
!insertmacro SelectSection ${SEC_oxygen_icons}
- skip_kdelibs:
+ skip_kleopatra:
!endif
!ifdef HAVE_PKG_QT
!insertmacro SectionFlagIsSet ${SEC_qt} \
${SF_SELECTED} have_qt skip_qt
have_qt:
- !insertmacro SelectSection ${SEC_kdesupport}
+ !insertmacro SelectSection ${SEC_dbus}
skip_qt:
!endif
- # Package "kdesupport" has no dependencies.
+ # Package "dbus" has no dependencies.
# Package "oxygen-icons" has no dependencies.
!ifdef HAVE_PKG_RSSYL
diff --git a/src/uninst-kdelibs.nsi b/src/uninst-kdelibs.nsi
deleted file mode 100644
index 3dc028b..0000000
--- a/src/uninst-kdelibs.nsi
+++ /dev/null
@@ -1,215 +0,0 @@
-# uninst-kdelibs.nsi - Installer snippet for kdelibs. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 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}/kdelibs-${gpg4win_pkg_kdelibs_version}
-
-
-; Uninstaller section.
-Section "-un.kdelibs"
-!ifdef SOURCES
- Push "${gpg4win_pkg_kdelibs_src}"
- Call un.SourceDelete
-!else
-
- # FIXME: See inst-kleopatra.nsi
- Delete "$INSTDIR\bin\kcmdwrapper.exe"
- Delete "$INSTDIR\bin\kbuildsycoca4.exe"
- RMDir "$INSTDIR\bin"
-
- Delete "$INSTDIR\kdebugdialog.exe"
- Delete "$INSTDIR\kded_globalaccel.dll"
- Delete "$INSTDIR\libkdeui.dll"
- Delete "$INSTDIR\libkdecore.dll"
- Delete "$INSTDIR\libkcmutils.dll"
- Delete "$INSTDIR\libqgpgme.dll"
- Delete "$INSTDIR\libkmime.dll"
- Delete "$INSTDIR\libgpgme++.dll"
- Delete "$INSTDIR\libgpgme++-qt.dll"
- Delete "$INSTDIR\libgpgme++-glib.dll"
- # Old (but correct) location, better delete it too.
- Delete "$INSTDIR\kbuildsycoca4.exe"
-
- Delete "$INSTDIR\share\locale\all_languages"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdeqt.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\timezones4.mo"
- #Delete "$INSTDIR\share\locale\de\LC_MESSAGES\phonon_kde.mo"
- #Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libphonon.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libmailtransport.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkxmlrpcclient.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libktnef.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libksieve.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkresources.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimutils.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimidentities.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpgp.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkmime.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkleopatra.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkldap.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkholidays.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkdepim.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkcal.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkblog.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libakonadi.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kxforms.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kwatchgnupg.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktnef.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktimetracker.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditorkabcbridge_plugin.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditor_plugins.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_xmlrpc.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_tvanytime.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_scalix.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_remote.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_kolab.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupwise.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupware.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_featureplan.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_blog.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_birthday.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kpilot.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korn.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korganizer.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontactinterfaces.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontact.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\konsolekalendar.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kode.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knotes.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knode.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools_at_engine.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmailcvt.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_xdiff_plugin.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_vcard_plugin.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_calendar_plugin.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kleopatra.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kjots.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kitchensync.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_smtp.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_sieve.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_pop3.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_nntp.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_mbox.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_ldap.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_imap4.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_help4.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_groupwise.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio4.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kfileaudiopreview4.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kfile_vcf.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdgantt1.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimwizards.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimresources.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs_colors4.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs4.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkontactnt.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkabconfig.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmcrypto.mo"
- #Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcm_phonon.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcertpart.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\katepart4.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kalarm.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kaddressbook.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcformat_binary.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcclient.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcakonadi.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_slox.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_net.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_ldapkio.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_file.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_dir.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc2mutt.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_l10n.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepimlibs.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepim.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdelibs.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akregator.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akonaditray.mo"
-
- Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
- Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
- Delete "$INSTDIR\share\kde4\servicetypes\kconfigbackend.desktop"
- Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
- Delete "$INSTDIR\share\config\ui\ui_standards.rc"
- Delete "$INSTDIR\share\config\kdebugrc"
- Delete "$INSTDIR\share\config\kdebug.areas"
- Delete "$INSTDIR\share\config\colors\Web.colors"
- Delete "$INSTDIR\share\config\colors\Royal.colors"
- Delete "$INSTDIR\share\config\colors\Rainbow.colors"
- Delete "$INSTDIR\share\config\colors\Oxygen.colors"
- Delete "$INSTDIR\share\config\colors\40.colors"
- Delete "$INSTDIR\share\apps\kdeui\pics\ktip-bulb.png"
- Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nupother.png"
- Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup4.png"
- Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup2.png"
- Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup1.png"
- Delete "$INSTDIR\share\apps\kdeui\pics\aboutkde.png"
- Delete "$INSTDIR\share\apps\kdeui\about\top-middle.png"
- Delete "$INSTDIR\share\apps\kdeui\about\top-right.png"
- Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage_rtl.css"
- Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage.css"
- Delete "$INSTDIR\share\apps\kdeui\about\box-top-right.png"
- Delete "$INSTDIR\share\apps\kdeui\about\box-top-middle.png"
- Delete "$INSTDIR\share\apps\kdeui\about\box-top-left.png"
- Delete "$INSTDIR\share\apps\kdeui\about\box-middle-right.png"
- Delete "$INSTDIR\share\apps\kdeui\about\box-middle-left.png"
- Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-right.png"
- Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-middle.png"
- Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-left.png"
- Delete "$INSTDIR\share\apps\kdeui\about\bottom-right.png"
- Delete "$INSTDIR\share\apps\kdeui\about\bottom-middle.png"
- Delete "$INSTDIR\share\apps\kdeui\about\bottom-left.png"
- Delete "$INSTDIR\share\apps\kdeui\about\bar-top-right.png"
- Delete "$INSTDIR\share\apps\kdeui\about\bar-top-middle.png"
- Delete "$INSTDIR\share\apps\kdeui\about\bar-top-left.png"
- Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-right.png"
- Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-left.png"
- Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-right.png"
- Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-middle.png"
- Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-left.png"
- Delete "$INSTDIR\share\apps\kcharselect\kcharselect-data"
-
- RMDir "$INSTDIR\share\locale"
- RMDir "$INSTDIR\share\kde4\servicetypes"
- RMDir "$INSTDIR\share\kde4\services\kded"
- RMDir "$INSTDIR\share\kde4\services"
- RMDir "$INSTDIR\share\kde4"
- RMDir "$INSTDIR\share\config\ui"
- RMDir "$INSTDIR\share\config\colors"
- RMDir "$INSTDIR\share\config"
- RMDir "$INSTDIR\share\apps\kdeui\pics"
- RMDir "$INSTDIR\share\apps\kdeui\about"
- RMDir "$INSTDIR\share\apps\kdeui"
- RMDir "$INSTDIR\share\apps\kcharselect"
- RMDir "$INSTDIR\share\apps"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR\lib\kde4"
- RMDir "$INSTDIR\lib"
- RMDir "$INSTDIR\etc\xdg\menus"
- RMDir "$INSTDIR\etc\xdg"
- RMDir "$INSTDIR\etc"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index 2805a41..e594051 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -1,18 +1,18 @@
# uninst-kleopatra.nsi - Installer snippet for kleopatra. -*- coding: latin-1; -*-
# Copyright (C) 2005, 2007, 2008 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
@@ -181,11 +181,217 @@ Section "-un.kleopatra"
Delete "$INSTDIR\share\applications\kde4\kleopatra_import.desktop"
Delete "$INSTDIR\share\applications\kde4\kleopatra.desktop"
Delete "$INSTDIR\lib\kde4\kcm_kleopatra.dll"
+ Delete "$INSTDIR\lib\kde4\kded_globalaccel.dll"
Delete "$INSTDIR\libkleopatraclientgui.dll"
Delete "$INSTDIR\libkleopatraclientcore.dll"
Delete "$INSTDIR\libkleo.dll"
Delete "$INSTDIR\kwatchgnupg.exe"
Delete "$INSTDIR\kgpgconf.exe"
+ Delete "$INSTDIR\kgpgconf.exe"
+ Delete "$INSTDIR\kwatchgnupg.exe"
+ Delete "$INSTDIR\kcmdwrapper.exe"
+ Delete "$INSTDIR\kbuildsycoca4.exe"
+ Delete "$INSTDIR\libattica.dll"
+ Delete "$INSTDIR\libdbus-1.dll"
+ Delete "$INSTDIR\libdbusmenu-qt.dll"
+ Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
+ Delete "$INSTDIR\libgpg-error-0.dll"
+ Delete "$INSTDIR\libgpgme-11.dll"
+ Delete "$INSTDIR\libgpgme++.dll"
+ Delete "$INSTDIR\wconv.dll"
+ Delete "$INSTDIR\libintl.dll"
+ Delete "$INSTDIR\libjasper.dll"
+ Delete "$INSTDIR\libkcmutils.dll"
+ Delete "$INSTDIR\libkdecore.dll"
+ Delete "$INSTDIR\libkdeui.dll"
+ Delete "$INSTDIR\libkdewin.dll"
+ Delete "$INSTDIR\libkleo.dll"
+ Delete "$INSTDIR\libkleopatraclientcore.dll"
+ Delete "$INSTDIR\libkleopatraclientgui.dll"
+ Delete "$INSTDIR\libkmime.dll"
+ Delete "$INSTDIR\libqgpgme.dll"
+
+ # Parts formerly in the kdelibs section
+ Delete "$INSTDIR\bin\kcmdwrapper.exe"
+ Delete "$INSTDIR\bin\kbuildsycoca4.exe"
+ RMDir "$INSTDIR\bin"
+
+ Delete "$INSTDIR\kdebugdialog.exe"
+ Delete "$INSTDIR\kded_globalaccel.dll"
+ Delete "$INSTDIR\libkdeui.dll"
+ Delete "$INSTDIR\libkdecore.dll"
+ Delete "$INSTDIR\libkcmutils.dll"
+ Delete "$INSTDIR\libqgpgme.dll"
+ Delete "$INSTDIR\libkmime.dll"
+ Delete "$INSTDIR\libgpgme++.dll"
+ Delete "$INSTDIR\libgpgme++-qt.dll"
+ Delete "$INSTDIR\libgpgme++-glib.dll"
+ # Old (but correct) location, better delete it too.
+ Delete "$INSTDIR\kbuildsycoca4.exe"
+
+ Delete "$INSTDIR\share\locale\all_languages"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdeqt.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\timezones4.mo"
+ #Delete "$INSTDIR\share\locale\de\LC_MESSAGES\phonon_kde.mo"
+ #Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libphonon.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libmailtransport.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkxmlrpcclient.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libktnef.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libksieve.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkresources.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimutils.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimidentities.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpgp.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkmime.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkleopatra.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkldap.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkholidays.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkdepim.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkcal.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkblog.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libakonadi.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kxforms.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kwatchgnupg.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktnef.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktimetracker.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditorkabcbridge_plugin.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditor_plugins.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_xmlrpc.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_tvanytime.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_scalix.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_remote.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_kolab.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupwise.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupware.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_featureplan.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_blog.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_birthday.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kpilot.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korn.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korganizer.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontactinterfaces.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontact.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\konsolekalendar.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kode.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knotes.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knode.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools_at_engine.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmailcvt.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_xdiff_plugin.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_vcard_plugin.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_calendar_plugin.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kleopatra.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kjots.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kitchensync.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_smtp.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_sieve.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_pop3.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_nntp.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_mbox.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_ldap.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_imap4.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_help4.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_groupwise.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio4.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kfileaudiopreview4.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kfile_vcf.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdgantt1.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimwizards.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimresources.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs_colors4.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs4.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkontactnt.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkabconfig.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmcrypto.mo"
+ #Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcm_phonon.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcertpart.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\katepart4.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kalarm.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kaddressbook.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcformat_binary.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcclient.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcakonadi.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_slox.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_net.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_ldapkio.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_file.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_dir.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc2mutt.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_l10n.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepimlibs.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepim.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdelibs.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akregator.mo"
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akonaditray.mo"
+
+ Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
+ Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
+ Delete "$INSTDIR\share\kde4\servicetypes\kconfigbackend.desktop"
+ Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
+ Delete "$INSTDIR\share\config\ui\ui_standards.rc"
+ Delete "$INSTDIR\share\config\kdebugrc"
+ Delete "$INSTDIR\share\config\kdebug.areas"
+ Delete "$INSTDIR\share\config\colors\Web.colors"
+ Delete "$INSTDIR\share\config\colors\Royal.colors"
+ Delete "$INSTDIR\share\config\colors\Rainbow.colors"
+ Delete "$INSTDIR\share\config\colors\Oxygen.colors"
+ Delete "$INSTDIR\share\config\colors\40.colors"
+ Delete "$INSTDIR\share\apps\kdeui\pics\ktip-bulb.png"
+ Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nupother.png"
+ Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup4.png"
+ Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup2.png"
+ Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup1.png"
+ Delete "$INSTDIR\share\apps\kdeui\pics\aboutkde.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\top-middle.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\top-right.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage_rtl.css"
+ Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage.css"
+ Delete "$INSTDIR\share\apps\kdeui\about\box-top-right.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\box-top-middle.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\box-top-left.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\box-middle-right.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\box-middle-left.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-right.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-middle.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-left.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bottom-right.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bottom-middle.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bottom-left.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bar-top-right.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bar-top-middle.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bar-top-left.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-right.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-left.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-right.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-middle.png"
+ Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-left.png"
+ Delete "$INSTDIR\share\apps\kcharselect\kcharselect-data"
+
+ RMDir "$INSTDIR\share\locale"
+ RMDir "$INSTDIR\share\kde4\servicetypes"
+ RMDir "$INSTDIR\share\kde4\services\kded"
+ RMDir "$INSTDIR\share\kde4\services"
+ RMDir "$INSTDIR\share\kde4"
+ RMDir "$INSTDIR\share\config\ui"
+ RMDir "$INSTDIR\share\config\colors"
+ RMDir "$INSTDIR\share\config"
+ RMDir "$INSTDIR\share\apps\kdeui\pics"
+ RMDir "$INSTDIR\share\apps\kdeui\about"
+ RMDir "$INSTDIR\share\apps\kdeui"
+ RMDir "$INSTDIR\share\apps\kcharselect"
+ RMDir "$INSTDIR\share\apps"
+ RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR\lib\kde4"
+ RMDir "$INSTDIR\lib"
+ RMDir "$INSTDIR\etc\xdg\menus"
+ RMDir "$INSTDIR\etc\xdg"
+ RMDir "$INSTDIR\etc"
+ RMDir "$INSTDIR"
+
+
RMDir "$INSTDIR\share\kde4\services"
RMDir "$INSTDIR\share\kde4"
RMDir "$INSTDIR\share\icons\oxygen\scalable\apps"
commit 15dcadc8ade5b18d3588b7ecbca31078b0c8127d
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 15:48:50 2013 +0000
Only package parts of Qt that are actually used.
* src/inst-qt.nsi, src/uninst-qt.nsi: Remove uneccessary Qt parts
diff --git a/src/inst-qt.nsi b/src/inst-qt.nsi
index 4fbee66..54028e3 100644
--- a/src/inst-qt.nsi
+++ b/src/inst-qt.nsi
@@ -1,18 +1,18 @@
# inst-qt.nsi - Installer snippet for qt. -*- coding: latin-1; -*-
# Copyright (C) 2005, 2007, 2008 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
@@ -34,42 +34,14 @@ Section "-qt" SEC_qt
!else
# Qt needs some help to find itself.
File ${SRCDIR}/qt.conf
- # Qt uses -mthreads, so install the support library.
- File ${BUILD_DIR}/mingwm10.dll
- File ${prefix}/bin/Qt3Support4.dll
File ${prefix}/bin/QtCore4.dll
File ${prefix}/bin/QtDBus4.dll
File ${prefix}/bin/QtGui4.dll
- File ${prefix}/bin/QtHelp4.dll
File ${prefix}/bin/QtNetwork4.dll
- File ${prefix}/bin/QtOpenGL4.dll
- File ${prefix}/bin/QtScript4.dll
- File ${prefix}/bin/QtSql4.dll
File ${prefix}/bin/QtSvg4.dll
File ${prefix}/bin/QtXml4.dll
- SetOutPath "$INSTDIR\plugins\accessible"
-
- File ${prefix}/plugins/accessible/qtaccessiblecompatwidgets4.dll
- File ${prefix}/plugins/accessible/qtaccessiblewidgets4.dll
-
- SetOutPath "$INSTDIR\plugins\codecs"
-
- File ${prefix}/plugins/codecs/qcncodecs4.dll
- File ${prefix}/plugins/codecs/qjpcodecs4.dll
- File ${prefix}/plugins/codecs/qkrcodecs4.dll
- File ${prefix}/plugins/codecs/qtwcodecs4.dll
-
- SetOutPath "$INSTDIR\plugins\designer"
-
- File ${prefix}/plugins/designer/qt3supportwidgets.dll
- File ${prefix}/plugins/designer/qwebview.dll
-
- SetOutPath "$INSTDIR\plugins\iconengines"
-
- File ${prefix}/plugins/iconengines/qsvgicon4.dll
-
SetOutPath "$INSTDIR\plugins\imageformats"
File ${prefix}/plugins/imageformats/qgif4.dll
@@ -79,14 +51,8 @@ Section "-qt" SEC_qt
File ${prefix}/plugins/imageformats/qsvg4.dll
File ${prefix}/plugins/imageformats/qtiff4.dll
- SetOutPath "$INSTDIR\plugins\script"
-
- File ${prefix}/plugins/script/qtscriptdbus4.dll
-
- SetOutPath "$INSTDIR\plugins\sqldrivers"
-
- File ${prefix}/plugins/sqldrivers/qsqlite4.dll
+ # Are those actually used anywhere?
SetOutPath "$INSTDIR\translations"
File ${prefix}/translations/assistant_adp_de.qm
@@ -132,10 +98,7 @@ Section "-qt" SEC_qt
# File ${prefix}/translations/qvfb_zh_CN.qm
# File ${prefix}/translations/qvfb_zh_TW.qm
- # FIXME: From the lib package. This is wrong.
-!undef prefix
-!define prefix ${ipdir}/qt-dev-${gpg4win_pkg_qt_version}
-
+ # For what is this needed? Scripting?
SetOutPath "$INSTDIR"
File ${prefix}/bin/qdbus.exe
diff --git a/src/uninst-qt.nsi b/src/uninst-qt.nsi
index 284ccda..becdebe 100644
--- a/src/uninst-qt.nsi
+++ b/src/uninst-qt.nsi
@@ -30,52 +30,16 @@ Section "-un.qt"
Push "${gpg4win_pkg_qt_src}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\mingwm10.dll"
Delete "$INSTDIR\qt.conf"
Delete "$INSTDIR\qdbus.exe"
- Delete "$INSTDIR\Qt3Support4.dll"
Delete "$INSTDIR\QtCore4.dll"
Delete "$INSTDIR\QtDBus4.dll"
Delete "$INSTDIR\QtGui4.dll"
- Delete "$INSTDIR\QtHelp4.dll"
Delete "$INSTDIR\QtNetwork4.dll"
- Delete "$INSTDIR\QtOpenGL4.dll"
- 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\plugins\accessible\qtaccessiblecompatwidgets4.dll"
- Delete "$INSTDIR\plugins\accessible\qtaccessiblewidgets4.dll"
-
- RMDir "$INSTDIR\plugins\accessible"
-
- Delete "$INSTDIR\plugins\codecs\qcncodecs4.dll"
- Delete "$INSTDIR\plugins\codecs\qjpcodecs4.dll"
- Delete "$INSTDIR\plugins\codecs\qkrcodecs4.dll"
- Delete "$INSTDIR\plugins\codecs\qtwcodecs4.dll"
-
- RMDir "$INSTDIR\plugins\codecs"
-
- Delete "$INSTDIR\plugins\designer\qwebview.dll"
- 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\taskmenuextension.dll"
- Delete "$INSTDIR\plugins\designer\worldtimeclockplugin.dll"
-
- RMDir "$INSTDIR\plugins\designer"
-
- Delete "$INSTDIR\plugins\iconengines\qsvg4.dll"
- Delete "$INSTDIR\plugins\iconengines\qsvgicon4.dll"
-
- RMDir "$INSTDIR\plugins\iconengines"
Delete "$INSTDIR\plugins\imageformats\qgif4.dll"
Delete "$INSTDIR\plugins\imageformats\qico4.dll"
@@ -86,12 +50,6 @@ Section "-un.qt"
RMDir "$INSTDIR\plugins\imageformats"
- Delete "$INSTDIR\plugins\script\qtscriptdbus4.dll"
- RMDir "$INSTDIR\plugins\script"
-
- Delete "$INSTDIR\plugins\sqldrivers\qsqlite4.dll"
- RMDir "$INSTDIR\plugins\sqldrivers"
-
RMDir "$INSTDIR\plugins"
Delete "$INSTDIR\translations\assistant_adp_de.qm"
commit aac81ab9c37790506b55cfb246b98047898f8b0c
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 15:46:16 2013 +0000
Remove mingwm10 this is no longer neccessary
Qt no longer depends on mingwm10.dll so it is uneccessary to
package it.
* configure.ac: Remove mingwm10.dll handling
diff --git a/configure.ac b/configure.ac
index 0096e66..4bb630f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,33 +337,6 @@ GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg2 kdelibs])
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
commit 8cc6b082fe9ecb1503966667894df280c597c8b2
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 15:45:03 2013 +0000
Make Qt depend on dbus instead of kdesupport
* configure.ac: Remove dependency to kdesupport and add dbus
diff --git a/configure.ac b/configure.ac
index d82357d..0096e66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,9 +328,9 @@ GPG4WIN_SPKG([bsfilter_plugin], [claws-mail])
GPG4WIN_IPKG([compendium])
# Qt related stuff.
-GPG4WIN_BPKG_GNUWIN32([kdesupport])
+GPG4WIN_BPKG_GNUWIN32([dbus])
GPG4WIN_BPKG_BINSRC([oxygen-icons])
-GPG4WIN_BPKG_GNUWIN32([qt], [kdesupport])
+GPG4WIN_BPKG_GNUWIN32([qt], [dbus])
GPG4WIN_BPKG_GNUWIN32([kdelibs], [qt oxygen-icons])
GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg2 kdelibs])
#GPG4WIN_BPKG_GNUWIN32([kleopatra], [gpgme gnupg2 kdelibs])
commit ab618fbd9a9e62160d4101689426b532536514f3
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 26 10:04:17 2013 +0000
Update buildsystem for qt and dbus
Kdesupport is replaced by a dbus only package. Qt is updated
so the Pkgconfig files have to be updated accordingly.
* src/QtCore.pc, src/QtGui.pc: Update to qt 4.8.4
* src/inst-kdesupport.nsi, src/uninst-kdesupport.nsi: Renamed to
dbus.
* src/Makefile.am: Remove workarounds for the kdesupport package
that are no longer neccessary.
diff --git a/src/Makefile.am b/src/Makefile.am
index f4b1439..6457fff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,7 +79,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
inst-zlib.nsi uninst-zlib.nsi \
inst-bsfilter.nsi uninst-bsfilter.nsi \
inst-qt.nsi uninst-qt.nsi \
- inst-kdesupport.nsi uninst-kdesupport.nsi \
+ inst-dbus.nsi uninst-dbus.nsi \
inst-oxygen-icons.nsi uninst-oxygen-icons.nsi \
inst-kdelibs.nsi uninst-kdelibs.nsi \
inst-kleopatra.nsi uninst-kleopatra.nsi \
@@ -369,7 +369,7 @@ gpg4win_pkg_zlib_make_args_inst = -fwin32/Makefile.gcc install \
# Supported binary packages.
gpg4win_bpkgs = libiconv gettext pkgconfig pango expat freetype fontconfig \
- cairo atk qt kdesupport oxygen-icons kdelibs kleopatra bsfilter
+ cairo atk qt dbus oxygen-icons kdelibs kleopatra bsfilter
# libiconv needs some special magic to generate a usable import
# library.
@@ -502,21 +502,6 @@ define gpg4win_pkg_qt_post_install
cp $(srcdir)/QtCore.pc $(srcdir)/QtGui.pc $$$${pkgidir_dev}/lib/pkgconfig/)
endef
-
-# kdesupport ships gettext, which we already have. Remove a stow
-# conflict about that. Also remove a stow conflict with kdelibs-lib.
-define gpg4win_pkg_kdesupport_post_install
-(rm -fR "$$$${pkgidir_dev}/share/locale"; \
- rm -fR "$$$${pkgidir_dev}/share/apps/cmake/modules")
-endef
-
-# libxml2 ships some binaries, which we already have from kdesupport. Remove a stow
-# conflict about that.
-define gpg4win_pkg_libxml2_post_install
-(rm -f "$$$${pkgidir}/bin/xmllint.exe"; \
- rm -f "$$$${pkgidir}/bin/xmlcatalog.exe")
-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.
diff --git a/src/QtCore.pc b/src/QtCore.pc
index 8b243f7..eb39fa3 100644
--- a/src/QtCore.pc
+++ b/src/QtCore.pc
@@ -5,7 +5,7 @@ includedir=${prefix}/include/QtCore
Name: Qtcore
Description: Qtcore Library
-Version: 4.5.0
+Version: 4.8.4
Libs: -L${libdir} -lQtCore4
-Cflags: -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I${includedir}
+Cflags: -DQT_SHARED -DQT_THREAD_SUPPORT -I${includedir}
diff --git a/src/QtGui.pc b/src/QtGui.pc
index a9f8ba5..148ff0d 100644
--- a/src/QtGui.pc
+++ b/src/QtGui.pc
@@ -5,8 +5,8 @@ includedir=${prefix}/include/QtGui
Name: Qtgui
Description: Qtgui Library
-Version: 4.5.0
+Version: 4.8.4
Libs: -L${libdir} -lQtGui4
-Cflags: -DQT_GUI_LIB -I${includedir}
+Cflags: -DQT_SHARED -DQT_THREAD_SUPPORT -I${includedir}
Requires: QtCore
diff --git a/src/inst-kdesupport.nsi b/src/inst-dbus.nsi
similarity index 88%
rename from src/inst-kdesupport.nsi
rename to src/inst-dbus.nsi
index 5f49c17..81ed606 100644
--- a/src/inst-kdesupport.nsi
+++ b/src/inst-dbus.nsi
@@ -1,18 +1,18 @@
-# inst-kdesupport.nsi - Snippet for kdesupport. -*- coding: latin-1; -*-
+# inst-dbus.nsi - Snippet for dbus. -*- 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
@@ -21,16 +21,16 @@
!ifdef prefix
!undef prefix
!endif
-!define prefix ${ipdir}/kdesupport-${gpg4win_pkg_kdesupport_version}
+!define prefix ${ipdir}/dbus-${gpg4win_pkg_dbus_version}
!ifdef DEBUG
-Section "kdesupport" SEC_kdesupport
+Section "dbus" SEC_dbus
!else
-Section "-kdesupport" SEC_kdesupport
+Section "-dbus" SEC_dbus
!endif
SetOutPath "$INSTDIR"
!ifdef SOURCES
- File "${gpg4win_pkg_kdesupport_src}"
+ File "${gpg4win_pkg_dbus_src}"
!else
# FIXME: Figure out how to relocate dbus-daemon (and kleopatra).
SetOutPath "$INSTDIR\bin"
@@ -55,7 +55,7 @@ Section "-kdesupport" SEC_kdesupport
# FIXME: From the lib package. This is wrong.
!undef prefix
-!define prefix ${ipdir}/kdesupport-dev-${gpg4win_pkg_kdesupport_version}
+!define prefix ${ipdir}/dbus-dev-${gpg4win_pkg_dbus_version}
SetOutPath "$INSTDIR"
File ${prefix}/bin/giflib4.dll
diff --git a/src/uninst-kdesupport.nsi b/src/uninst-dbus.nsi
similarity index 88%
rename from src/uninst-kdesupport.nsi
rename to src/uninst-dbus.nsi
index 3ccbd1a..1887ed0 100644
--- a/src/uninst-kdesupport.nsi
+++ b/src/uninst-dbus.nsi
@@ -1,18 +1,18 @@
-# uninst-kdesupport.nsi - Snippet for kdesupport. -*- coding: latin-1; -*-
+# uninst-dbus.nsi - Snippet for dbus. -*- 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
@@ -21,16 +21,16 @@
!ifdef prefix
!undef prefix
!endif
-!define prefix ${ipdir}/kdesupport-${gpg4win_pkg_kdesupport_version}
+!define prefix ${ipdir}/dbus-${gpg4win_pkg_dbus_version}
; Uninstaller section.
-Section "-un.kdesupport"
+Section "-un.dbus"
!ifdef SOURCES
- Push "${gpg4win_pkg_kdesupport_src}"
+ Push "${gpg4win_pkg_dbus_src}"
Call un.SourceDelete
!else
- # FIXME: See inst-kdesupport.nsi.
+ # FIXME: See inst-dbus.nsi.
Delete /REBOOTOK "$INSTDIR\bin\dbus-daemon.exe"
RMDir "$INSTDIR\bin"
commit c081bd4fbee213d031d88d9de1162b5076eaa2c7
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 18 13:25:10 2013 +0000
Update qt to 4.8.4
This update brings 4 years of qt development and new styles
like Aero style to improve the look and feel of kleopatra
on modern Windows Systems. This update should resolve a
lot of bugs in kleopatra that were already fixed upstream.
(cherry picked from commit 2f0dc549e8c2b154cb9c7d3eeb71d676fa3b333b)
diff --git a/packages/packages.current b/packages/packages.current
index 6fd4765..cf08c57 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -423,20 +423,19 @@ chk ef483090edcdd85ae672aa3bab21526b1e335ae3
#
# Qt
+# Build recipe is available in kde git emerge
+# branch gpg4win qt-minimal
#
-server ftp://ftp.kdab.net/gpg4win
+server http://files.kolab.org/local/gpg4win/libs/
-name qt-4.4.0-4-bin.zip
-file qt-gpg4win-4.4.0-4-bin.zip
-chk 363e017b4018d34a0340ef69b907c609c345f388
+file qt-x86-mingw4-4.8.4-20130418-bin.tar.bz2
+chk 2ad50b6890268efdc980bffc79426012380065f3
-name qt-4.4.0-4-lib.zip
-file qt-gpg4win-4.4.0-4-lib.zip
-chk 731e7bc44b4a71d75b012c43e080f7c67aa2acf7
+file qt-x86-mingw4-4.8.4-20130418-lib.tar.bz2
+chk 386a044ee4b87fea312c7bb7a75e34a60a7dc67b
-name qt-4.4.0-4-src.zip
-file qt-gpg4win-4.4.0-4-src.zip
-chk 3c86381ba5c416c6728ff5b839379cca9208f0c3
+file qt-x86-mingw4-4.8.4-src.tar.bz2
+chk caaa01e15ce534de5020b019d23c052eb042bfb3
#
# Qt links DBus and Kleopatra / KDE libs needs it
commit 898cfba86523ad709bd10eaecd0cb7a560d4a3d3
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 18 13:18:43 2013 +0000
Update dbus from dbus to freedesktop dbus 1.4.24
This should greatly improve stability and performance
of dbus for windows. Other windows specific improvements
include better multiuser support and a seperation of multiple
dbus instances based on their installation location.
This will also allow it to have two different versions of kleopatra
running.
It is also a depedency for newer qt and kde versions.
(cherry picked from commit 9e4fe24b99aa4f39df8d1d61c65be2f9f05e77b7)
diff --git a/packages/packages.current b/packages/packages.current
index cfd4041..6fd4765 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -439,27 +439,20 @@ file qt-gpg4win-4.4.0-4-src.zip
chk 3c86381ba5c416c6728ff5b839379cca9208f0c3
#
-# Qt contains DBus and thus depends on kdesupport, which is a random
-# collection of libraries.
+# Qt links DBus and Kleopatra / KDE libs needs it
#
-server ftp://ftp.kdab.net/gpg4win
+server http://files.kolab.org/local/gpg4win/libs/
-name kdesupport-20090701-bin.zip
-file kdesupport-20090701-dbus4win-bin.zip
-chk 02bc4fab05ccf037daad184c06a13c00d3f0d542
+file dbus-x86-mingw4-1.4.24-20130417-bin.tar.bz2
+chk f556de269dda7bdd2a45639681533ee3da2732d4
-name kdesupport-20090701-dev.zip
-file kdesupport-20090701-dbus4win-dev.zip
-chk ddc85461dd0e358b6e5289a93c02ac5310491bb8
+file dbus-x86-mingw4-1.4.24-20130417-lib.tar.bz2
+chk fc557d7eb161881e1d6c091f215dd8e0615682cb
-name kdesupport-20090701-lib.zip
-file kdesupport-20090701-dbus4win-lib.zip
-chk 25124ee9a77ea5a4812026fca0b2b395e00a1f74
+file dbus-x86-mingw4-1.4.24-20130417-src.tar.bz2
+chk f03ffd02333f786a5e540c4430d3109952b5553e
-name kdesupport-20090701-src.zip
-file kdesupport-20090701-dbus4win-src.zip
-chk 2fa67502e00872d5e3ece1682d71383ca8cbf1e0
# oxygen-icons
#
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 31 +---
include/config.nsi.in | 16 +--
packages/packages.current | 63 +++-----
src/Makefile.am | 20 +--
src/QtCore.pc | 4 +-
src/QtGui.pc | 4 +-
src/gpg4win.nsi | 10 +-
src/{inst-kdesupport.nsi => inst-dbus.nsi} | 20 +-
src/inst-kdelibs.nsi | 224 ------------------------
src/inst-kleopatra.nsi | 195 +++++++++++++++++++++
src/inst-qt.nsi | 94 +----------
src/inst-sections.nsi | 37 ++---
src/{uninst-kdesupport.nsi => uninst-dbus.nsi} | 18 +-
src/uninst-kdelibs.nsi | 215 -----------------------
src/uninst-kleopatra.nsi | 214 ++++++++++++++++++++++-
src/uninst-qt.nsi | 81 ---------
16 files changed, 481 insertions(+), 765 deletions(-)
rename src/{inst-kdesupport.nsi => inst-dbus.nsi} (88%)
delete mode 100644 src/inst-kdelibs.nsi
rename src/{uninst-kdesupport.nsi => uninst-dbus.nsi} (88%)
delete mode 100644 src/uninst-kdelibs.nsi
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list