[Gpg4win-commits] [git] Gpg4win - branch, kleo-kf5, updated. gpg4win-2.3.0-48-g04f92de
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Jan 22 15:12:03 CET 2016
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, kleo-kf5 has been updated
via 04f92de785aa75fd94bafed557d09d13e9fbfa46 (commit)
via 616fba265a1632ed77af9509497f1c74dd5748a5 (commit)
via ce9b085ec242abdc25d7caa37883f202c25c8ead (commit)
from 4afd89e0e311372b7cee17b9834ded4b757f9d70 (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 04f92de785aa75fd94bafed557d09d13e9fbfa46
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jan 22 15:10:22 2016 +0100
Add libkleo and update gpgmepp
* configure.ac: Add package.
* src/inst-libkleo.nsi,
src/uninst-libkleo.nsi: New:
* src/Makefile.am, src/inst-sections.nsi,
packages/packages.current, src/config.nsi.in: Update accordingly.
* patches/gpgmepp/0001-Remove-uneccessary-dependency-to-KDEWIN.patch:
Removed. Applied upstream.
* Makefile.am (EXTRA_DIST): Update accordingly.
diff --git a/Makefile.am b/Makefile.am
index 1716213..5f270fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/qttools/disable-most-tools.patch \
patches/ki18n/no-tests.patch \
- patches/gpgmepp/0001-Remove-uneccessary-dependency-to-KDEWIN.patch \
patches/gpgmepp/0002-disable-variants.patch
copy-news:
diff --git a/configure.ac b/configure.ac
index 1c7df38..a6b7543 100644
--- a/configure.ac
+++ b/configure.ac
@@ -345,7 +345,7 @@ GPG4WIN_SPKG([qtbase], [dbus libpng])
GPG4WIN_SPKG([qttools], [qtbase])
GPG4WIN_SPKG([qtwinextras], [qtbase])
GPG4WIN_SPKG([boost], [expat zlib bzip2])
-GPG4WIN_BPKG_BINSRC([kleopatra], [kcoreaddons kwidgetsaddons kwindowsystem kcompletion kconfig gpgme qtbase oxygen-icons])
+GPG4WIN_BPKG_BINSRC([kleopatra], [libkleo qtbase oxygen-icons])
GPG4WIN_KDEPKG([extra-cmake-modules])
GPG4WIN_KDEPKG([kconfig], [qtbase qttools extra-cmake-modules])
GPG4WIN_KDEPKG([ki18n], [qtbase gettext qttools extra-cmake-modules])
@@ -354,6 +354,7 @@ GPG4WIN_KDEPKG([kwidgetsaddons], [kconfig qttools qtbase])
GPG4WIN_KDEPKG([kcompletion], [kwidgetsaddons])
GPG4WIN_KDEPKG([kwindowsystem], [qtbase qtwinextras])
GPG4WIN_KDEPKG([kcoreaddons], [qtbase])
+GPG4WIN_KDEPKG([libkleo], [gpgmepp kcoreaddons kwidgetsaddons kwindowsystem kcompletion kconfig gpgme])
GPG4WIN_FINALIZE
diff --git a/packages/packages.current b/packages/packages.current
index 44dd725..732f875 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -421,14 +421,31 @@ chk 7c41dbcc217d0e93cb276c84b23a55ad803e80a3
# KDE Applications
-server http://download.kde.org/stable/applications/
+# server http://download.kde.org/stable/applications/
+server http://files.intevation.de/projects/gpg4all
# Gpgmepp
# last changed: 2016-01-21
# by: ah
# verified: https://www.kde.org/info/applications-15.12.1.php
-file 15.12.1/src/gpgmepp-15.12.1.tar.xz
-chk 56d5f05bd513efc6caf770e43b6109e42842198f
+# file 15.12.1/src/gpgmepp-15.12.1.tar.xz
+# chk 56d5f05bd513efc6caf770e43b6109e42842198f
+#
+# Gpgmepp-devel
+# last changed: 2016-01-22
+# by: ah
+# verified: Tarball created by ah.
+
+file gpgmepp/gpgmepp-201601221458.tar.xz
+chk 04cfa9a41f06915d95d0d83a199f05bfcc9a527d
+
+# Libkleo
+# last changed: 2016-01-22
+# by: ah
+# verified: Tarball created by ah.
+
+file libkleo/libkleo-201601221448.tar.xz
+chk 668b115e7e025b5408f53ced73056f5c4f660993
#
# Qt links DBus and Kleopatra / KDE libs needs it
diff --git a/patches/gpgmepp/0001-Remove-uneccessary-dependency-to-KDEWIN.patch b/patches/gpgmepp/0001-Remove-uneccessary-dependency-to-KDEWIN.patch
deleted file mode 100755
index a0a4749..0000000
--- a/patches/gpgmepp/0001-Remove-uneccessary-dependency-to-KDEWIN.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-From 88ffbec2863509cb687c0d40e8dded2ba9cf1b5c Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Thu, 21 Jan 2016 17:34:57 +0100
-Subject: [PATCH] Remove uneccessary dependency to KDEWIN
-
-There was already a question in FindGpgme.cmake if KDEWIN
-is actually used. Turns out it's not. At least with mingw-3
-on debian jessie you can compile gpgmepp withoug KDEWIN.
----
- CMakeLists.txt | 5 -----
- cmake/FindGpgme.cmake | 6 ------
- 2 files changed, 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8986f78..35f6221 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,11 +37,6 @@ set_package_properties(Gpgme PROPERTIES
- )
-
- find_package(Boost REQUIRED)
--if(WIN32)
-- find_package(KDEWin REQUIRED)
-- INCLUDE_DIRECTORIES(${KDEWIN_INCLUDES})
-- LINK_LIBRARIES(${KDEWIN_LIBRARIES})
--endif()
-
- ########### CMake Config Files ###########
- set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Gpgmepp")
-diff --git a/cmake/FindGpgme.cmake b/cmake/FindGpgme.cmake
-index 9db4e50..c5f8470 100644
---- a/cmake/FindGpgme.cmake
-+++ b/cmake/FindGpgme.cmake
-@@ -87,12 +87,6 @@ if ( WIN32 )
-
- else()
-
-- # is this needed, of just unreflected cut'n'paste?
-- # this isn't a KDE library, after all!
-- if( NOT KDEWIN_FOUND )
-- find_package( KDEWIN REQUIRED )
-- endif()
--
- set( GPGME_FOUND false )
- set( GPGME_VANILLA_FOUND false )
- set( GPGME_GLIB_FOUND false )
---
-2.1.4
diff --git a/src/Makefile.am b/src/Makefile.am
index 0df021e..72cbf42 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,6 +68,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-kwidgetsaddons.nsi uninst-kwidgetsaddons.nsi \
inst-kcompletion.nsi uninst-kcompletion.nsi \
inst-kwindowsystem.nsi uninst-kwindowsystem.nsi \
+ inst-libkleo.nsi uninst-libkleo.nsi \
inst-kcoreaddons.nsi uninst-kcoreaddons.nsi \
inst-qttools.nsi uninst-qttools.nsi \
inst-boost.nsi uninst-boost.nsi \
@@ -103,7 +104,7 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
# Source packages following the KDE pattern
gpg4win_kdepkgs = kconfig kwidgetsaddons gpgmepp ki18n extra-cmake-modules \
- kcompletion kwindowsystem kcoreaddons
+ kcompletion kwindowsystem kcoreaddons libkleo
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 70b9f79..3229f48 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -238,8 +238,12 @@
!define gpg4win_pkg_qtwinextras_version @gpg4win_pkg_qtwinextras_version@
@HAVE_PKG_KCOREADDONS@
-!define gpg4win_pkg_kcoreaddons @gpg4win_pkg_kwindowsystem@
-!define gpg4win_pkg_kcoreaddons_version @gpg4win_pkg_kwindowsystem_version@
+!define gpg4win_pkg_kcoreaddons @gpg4win_pkg_kcoreaddons@
+!define gpg4win_pkg_kcoreaddons_version @gpg4win_pkg_kcoreaddons_version@
+
+ at HAVE_PKG_LIBKLEO@
+!define gpg4win_pkg_libkleo @gpg4win_pkg_libkleo@
+!define gpg4win_pkg_libkleo_version @gpg4win_pkg_libkleo_version@
# Internal packages.
@HAVE_PKG_COMPENDIUM@
diff --git a/src/inst-libkleo.nsi b/src/inst-libkleo.nsi
new file mode 100644
index 0000000..b2ae001
--- /dev/null
+++ b/src/inst-libkleo.nsi
@@ -0,0 +1,51 @@
+# Copyright (C) 2015 Intevation 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}/libkleo-${gpg4win_pkg_libkleo_version}
+
+!ifdef DEBUG
+Section "libkleo" SEC_libkleo
+!else
+Section "-libkleo" SEC_libkleo
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_libkleo}"
+!else
+ SetOutPath "$INSTDIR\bin"
+ File ${prefix}/bin/libKF5Libkleo.dll
+ SetOutPath "$INSTDIR\etc\xdg"
+ File ${prefix}/etc/xdg/libkleopatrarc
+ SetOutPath "$INSTDIR\share\libkleopatra\pics"
+ File ${prefix}/share/libkleopatra/pics/chiasmus_chi.png
+ File ${prefix}/share/libkleopatra/pics/hi16-app-gpg.png
+ File ${prefix}/share/libkleopatra/pics/hi16-app-gpgsm.png
+ File ${prefix}/share/libkleopatra/pics/hi22-app-gpg.png
+ File ${prefix}/share/libkleopatra/pics/hi22-app-gpgsm.png
+ File ${prefix}/share/libkleopatra/pics/hi32-app-gpg.png
+ File ${prefix}/share/libkleopatra/pics/hi32-app-gpgsm.png
+ File ${prefix}/share/libkleopatra/pics/key_bad.png
+ File ${prefix}/share/libkleopatra/pics/key_ok.png
+ File ${prefix}/share/libkleopatra/pics/key.png
+ File ${prefix}/share/libkleopatra/pics/key_unknown.png
+ File ${prefix}/share/libkleopatra/pics/smartcard.xpm
+
+!endif
+SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 31dd432..d8d4930 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -134,6 +134,9 @@
!ifdef HAVE_PKG_KCOREADDONS
!include "inst-kcoreaddons.nsi"
!endif
+!ifdef HAVE_PKG_LIBKLEO
+!include "inst-libkleo.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "inst-extra-cmake-modules.nsi"
!endif
@@ -326,6 +329,9 @@
!ifdef HAVE_PKG_KCOREADDONS
!include "uninst-kcoreaddons.nsi"
!endif
+!ifdef HAVE_PKG_LIBKLEO
+!include "uninst-libkleo.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "uninst-extra-cmake-modules.nsi"
!endif
@@ -586,6 +592,9 @@ Function CalcDepends
!ifdef HAVE_PKG_KCOREADDONS
!insertmacro UnselectSection ${SEC_kcoreaddons}
!endif
+!ifdef HAVE_PKG_LIBKLEO
+ !insertmacro UnselectSection ${SEC_libkleo}
+!endif
# Always install gnupg2. This is also ensured by putting
# these packages in the RO section and enabling them by default, but
@@ -683,6 +692,7 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_kcompletion}
!insertmacro SelectSection ${SEC_kwindowsystem}
!insertmacro SelectSection ${SEC_kcoreaddons}
+ !insertmacro SelectSection ${SEC_libkleo}
!insertmacro SelectSection ${SEC_qttools}
!insertmacro SelectSection ${SEC_qtwinextras}
!insertmacro SelectSection ${SEC_boost}
diff --git a/src/uninst-libkleo.nsi b/src/uninst-libkleo.nsi
new file mode 100644
index 0000000..a6eabdb
--- /dev/null
+++ b/src/uninst-libkleo.nsi
@@ -0,0 +1,53 @@
+# Copyright (C) 2015 Intevation 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}/libkleo-${gpg4win_pkg_libkleo_version}
+
+; Uninstaller section.
+Section "-un.libkleo"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_libkleo}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\etc\xdg\libkleopatrarc"
+ RmDir "$INSTDIR\etc\xdg"
+ RmDir "$INSTDIR\etc"
+
+ Delete "$INSTDIR\bin\libKF5Libkleo.dll"
+ RmDir "$INSTDIR\bin"
+
+ Delete "$INSTDIR\share\libkleopatra\pics\chiasmus_chi.png"
+ Delete "$INSTDIR\share\libkleopatra\pics\hi16-app-gpg.png"
+ Delete "$INSTDIR\share\libkleopatra\pics\hi16-app-gpgsm.png"
+ Delete "$INSTDIR\share\libkleopatra\pics\hi22-app-gpg.png"
+ Delete "$INSTDIR\share\libkleopatra\pics\hi22-app-gpgsm.png"
+ Delete "$INSTDIR\share\libkleopatra\pics\hi32-app-gpg.png"
+ Delete "$INSTDIR\share\libkleopatra\pics\hi32-app-gpgsm.png"
+ Delete "$INSTDIR\share\libkleopatra\pics\key_bad.png"
+ Delete "$INSTDIR\share\libkleopatra\pics\key_ok.png"
+ Delete "$INSTDIR\share\libkleopatra\pics\key.png"
+ Delete "$INSTDIR\share\libkleopatra\pics\key_unknown.png"
+ Delete "$INSTDIR\share\libkleopatra\pics\smartcard.xpm"
+ RmDir "$INSTDIR\share\libkleopatra\pics"
+ RmDir "$INSTDIR\share\libkleopatra"
+ RmDir "$INSTDIR\share"
+
+!endif
+SectionEnd
commit 616fba265a1632ed77af9509497f1c74dd5748a5
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jan 22 11:38:56 2016 +0100
Add KCoreAddons
* configure.ac: Add packages.
* src/inst-kcoreaddons.nsi,
src/uninst-kcoreaddons.nsi: New:
* src/Makefile.am, src/inst-sections.nsi,
packages/packages.current, src/config.nsi.in: Update accordingly.
diff --git a/configure.ac b/configure.ac
index cf493ba..1c7df38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -345,7 +345,7 @@ GPG4WIN_SPKG([qtbase], [dbus libpng])
GPG4WIN_SPKG([qttools], [qtbase])
GPG4WIN_SPKG([qtwinextras], [qtbase])
GPG4WIN_SPKG([boost], [expat zlib bzip2])
-GPG4WIN_BPKG_BINSRC([kleopatra], [kwidgetsaddons kwindowsystem kcompletion kconfig gpgme qtbase oxygen-icons])
+GPG4WIN_BPKG_BINSRC([kleopatra], [kcoreaddons kwidgetsaddons kwindowsystem kcompletion kconfig gpgme qtbase oxygen-icons])
GPG4WIN_KDEPKG([extra-cmake-modules])
GPG4WIN_KDEPKG([kconfig], [qtbase qttools extra-cmake-modules])
GPG4WIN_KDEPKG([ki18n], [qtbase gettext qttools extra-cmake-modules])
@@ -353,6 +353,7 @@ GPG4WIN_KDEPKG([gpgmepp], [boost qtbase gpgme extra-cmake-modules])
GPG4WIN_KDEPKG([kwidgetsaddons], [kconfig qttools qtbase])
GPG4WIN_KDEPKG([kcompletion], [kwidgetsaddons])
GPG4WIN_KDEPKG([kwindowsystem], [qtbase qtwinextras])
+GPG4WIN_KDEPKG([kcoreaddons], [qtbase])
GPG4WIN_FINALIZE
diff --git a/packages/packages.current b/packages/packages.current
index 9b92311..44dd725 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -412,6 +412,13 @@ chk 6e4e095711c073056d1bd101d24e7ba1c4c214cc
file 5.18/kwindowsystem-5.18.0.tar.xz
chk 6aa1d1e590dc500a7511a95a8d0d6bac93eb19d2
+# KCoreAddons
+# last changed: 2016-01-22
+# by: ah
+# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
+file 5.18/kcoreaddons-5.18.0.tar.xz
+chk 7c41dbcc217d0e93cb276c84b23a55ad803e80a3
+
# KDE Applications
server http://download.kde.org/stable/applications/
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c302e3..0df021e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,6 +68,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-kwidgetsaddons.nsi uninst-kwidgetsaddons.nsi \
inst-kcompletion.nsi uninst-kcompletion.nsi \
inst-kwindowsystem.nsi uninst-kwindowsystem.nsi \
+ inst-kcoreaddons.nsi uninst-kcoreaddons.nsi \
inst-qttools.nsi uninst-qttools.nsi \
inst-boost.nsi uninst-boost.nsi \
inst-extra-cmake-modules.nsi uninst-extra-cmake-modules.nsi \
@@ -102,7 +103,7 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
# Source packages following the KDE pattern
gpg4win_kdepkgs = kconfig kwidgetsaddons gpgmepp ki18n extra-cmake-modules \
- kcompletion kwindowsystem
+ kcompletion kwindowsystem kcoreaddons
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
diff --git a/src/config.nsi.in b/src/config.nsi.in
index a14eb32..70b9f79 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -237,6 +237,10 @@
!define gpg4win_pkg_qtwinextras @gpg4win_pkg_qtwinextras@
!define gpg4win_pkg_qtwinextras_version @gpg4win_pkg_qtwinextras_version@
+ at HAVE_PKG_KCOREADDONS@
+!define gpg4win_pkg_kcoreaddons @gpg4win_pkg_kwindowsystem@
+!define gpg4win_pkg_kcoreaddons_version @gpg4win_pkg_kwindowsystem_version@
+
# Internal packages.
@HAVE_PKG_COMPENDIUM@
diff --git a/src/inst-kcoreaddons.nsi b/src/inst-kcoreaddons.nsi
new file mode 100644
index 0000000..e2b4ccb
--- /dev/null
+++ b/src/inst-kcoreaddons.nsi
@@ -0,0 +1,35 @@
+# Copyright (C) 2015 Intevation 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}/kcoreaddons-${gpg4win_pkg_kcoreaddons_version}
+
+!ifdef DEBUG
+Section "kcoreaddons" SEC_kcoreaddons
+!else
+Section "-kcoreaddons" SEC_kcoreaddons
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_kcoreaddons}"
+!else
+ SetOutPath "$INSTDIR\bin"
+ File ${prefix}/bin/libKF5CoreAddons.dll
+!endif
+SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 0f8279f..31dd432 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -131,6 +131,9 @@
!ifdef HAVE_PKG_KWINDOWSYSTEM
!include "inst-kwindowsystem.nsi"
!endif
+!ifdef HAVE_PKG_KCOREADDONS
+!include "inst-kcoreaddons.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "inst-extra-cmake-modules.nsi"
!endif
@@ -320,6 +323,9 @@
!ifdef HAVE_PKG_KWINDOWSYSTEM
!include "uninst-kwindowsystem.nsi"
!endif
+!ifdef HAVE_PKG_KCOREADDONS
+!include "uninst-kcoreaddons.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "uninst-extra-cmake-modules.nsi"
!endif
@@ -577,6 +583,9 @@ Function CalcDepends
!ifdef HAVE_PKG_KWINDOWSYSTEM
!insertmacro UnselectSection ${SEC_kwindowsystem}
!endif
+!ifdef HAVE_PKG_KCOREADDONS
+ !insertmacro UnselectSection ${SEC_kcoreaddons}
+!endif
# Always install gnupg2. This is also ensured by putting
# these packages in the RO section and enabling them by default, but
@@ -673,6 +682,7 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_kwidgetsaddons}
!insertmacro SelectSection ${SEC_kcompletion}
!insertmacro SelectSection ${SEC_kwindowsystem}
+ !insertmacro SelectSection ${SEC_kcoreaddons}
!insertmacro SelectSection ${SEC_qttools}
!insertmacro SelectSection ${SEC_qtwinextras}
!insertmacro SelectSection ${SEC_boost}
diff --git a/src/uninst-kcoreaddons.nsi b/src/uninst-kcoreaddons.nsi
new file mode 100644
index 0000000..a99631b
--- /dev/null
+++ b/src/uninst-kcoreaddons.nsi
@@ -0,0 +1,33 @@
+# Copyright (C) 2015 Intevation 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}/kcoreaddons-${gpg4win_pkg_kcoreaddons_version}
+
+; Uninstaller section.
+Section "-un.kcoreaddons"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_kcoreaddons}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\bin\libKF5CoreAddons.dll"
+ RmDir "$INSTDIR\bin"
+
+!endif
+SectionEnd
commit ce9b085ec242abdc25d7caa37883f202c25c8ead
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jan 22 11:23:43 2016 +0100
Add KWindowsystem and QtWinExtras
* configure.ac: Add packages.
* src/inst-kwindowsystem.nsi,
src/inst-qtwinextras.nsi,
src/uninst-kwindowsystem.nsi,
src/uninst-qtwinextras.nsi: New.
* src/Makefile.am, src/inst-sections.nsi,
packages/packages.current, src/config.nsi.in,
src/gpg4win.mk.in: Update accordingly.
diff --git a/configure.ac b/configure.ac
index fd868cb..cf493ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -343,14 +343,16 @@ GPG4WIN_BPKG_GNUWIN32([dbus])
GPG4WIN_BPKG_BINSRC([oxygen-icons])
GPG4WIN_SPKG([qtbase], [dbus libpng])
GPG4WIN_SPKG([qttools], [qtbase])
+GPG4WIN_SPKG([qtwinextras], [qtbase])
GPG4WIN_SPKG([boost], [expat zlib bzip2])
-GPG4WIN_BPKG_BINSRC([kleopatra], [kwidgetsaddons kcompletion kconfig gpgme qtbase oxygen-icons])
+GPG4WIN_BPKG_BINSRC([kleopatra], [kwidgetsaddons kwindowsystem kcompletion kconfig gpgme qtbase oxygen-icons])
GPG4WIN_KDEPKG([extra-cmake-modules])
GPG4WIN_KDEPKG([kconfig], [qtbase qttools extra-cmake-modules])
GPG4WIN_KDEPKG([ki18n], [qtbase gettext qttools extra-cmake-modules])
GPG4WIN_KDEPKG([gpgmepp], [boost qtbase gpgme extra-cmake-modules])
GPG4WIN_KDEPKG([kwidgetsaddons], [kconfig qttools qtbase])
GPG4WIN_KDEPKG([kcompletion], [kwidgetsaddons])
+GPG4WIN_KDEPKG([kwindowsystem], [qtbase qtwinextras])
GPG4WIN_FINALIZE
diff --git a/packages/packages.current b/packages/packages.current
index 043ac4c..9b92311 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -358,6 +358,14 @@ name qttools-5.5.1.tar.xz
file 5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
chk f7815165d0b427346028901a42be5f0f47d05962
+# Qt Winextras
+# last changed: 2016-01-22
+# by: ah
+# verified: HTTPS https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwinextras-opensource-src-5.5.1.tar.xz.sha1
+name qtwinextras-5.5.1.tar.xz
+file 5.5/5.5.1/submodules/qtwinextras-opensource-src-5.5.1.tar.xz
+chk 116678ea988123adb76a7406941b0f70519a9f6c
+
# KDE Frameworks
server http://download.kde.org/stable/frameworks/
@@ -397,6 +405,12 @@ chk b6120dd7ca1ffe52d4fecaf396ac64ad3dfe5e94
file 5.18/kcompletion-5.18.0.tar.xz
chk 6e4e095711c073056d1bd101d24e7ba1c4c214cc
+# KWindowSystem
+# last changed: 2016-01-22
+# by: ah
+# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
+file 5.18/kwindowsystem-5.18.0.tar.xz
+chk 6aa1d1e590dc500a7511a95a8d0d6bac93eb19d2
# KDE Applications
diff --git a/src/Makefile.am b/src/Makefile.am
index cc56c5f..8c302e3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,6 +67,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-gpgmepp.nsi uninst-gpgmepp.nsi \
inst-kwidgetsaddons.nsi uninst-kwidgetsaddons.nsi \
inst-kcompletion.nsi uninst-kcompletion.nsi \
+ inst-kwindowsystem.nsi uninst-kwindowsystem.nsi \
inst-qttools.nsi uninst-qttools.nsi \
inst-boost.nsi uninst-boost.nsi \
inst-extra-cmake-modules.nsi uninst-extra-cmake-modules.nsi \
@@ -97,11 +98,11 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
gpa opencdk \
pinentry libassuan \
w32pth paperkey regex libiconv gettext \
- qtbase qttools boost
+ qtbase qttools boost qtwinextras
# Source packages following the KDE pattern
gpg4win_kdepkgs = kconfig kwidgetsaddons gpgmepp ki18n extra-cmake-modules \
- kcompletion
+ kcompletion kwindowsystem
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
@@ -303,6 +304,15 @@ define gpg4win_pkg_qttools_post_install
cp -r bin lib include $$$${pkgidir};)
endef
+define gpg4win_pkg_qtwinextras_post_install
+ (cd $$$${pkgbdir}; \
+ make uninstall; \
+ mkdir $$$${pkgidir}; \
+ cp -r lib include $$$${pkgidir}; \
+ mkdir $$$${pkgidir}/bin; \
+ mv $$$${pkgidir}/lib/*.dll $$$${pkgidir}/bin;)
+endef
+
# Supported make-only source packages.
gpg4win_mpkgs = bzip2 zlib
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 3be13fb..a14eb32 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -229,6 +229,14 @@
!define gpg4win_pkg_kcompletion @gpg4win_pkg_kcompletion@
!define gpg4win_pkg_kcompletion_version @gpg4win_pkg_kcompletion_version@
+ at HAVE_PKG_KWINDOWSYSTEM@
+!define gpg4win_pkg_kwindowsystem @gpg4win_pkg_kwindowsystem@
+!define gpg4win_pkg_kwindowsystem_version @gpg4win_pkg_kwindowsystem_version@
+
+ at HAVE_PKG_QTWINEXTRAS@
+!define gpg4win_pkg_qtwinextras @gpg4win_pkg_qtwinextras@
+!define gpg4win_pkg_qtwinextras_version @gpg4win_pkg_qtwinextras_version@
+
# Internal packages.
@HAVE_PKG_COMPENDIUM@
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 45f891c..28a563c 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -114,6 +114,8 @@ define DEFLATE_macro
$(TAR) -xJ --transform='s,^qtbase-opensource-src,qtbase,' -f "$(1)" ;; \
*/qttools*.*.tar.xz) \
$(TAR) -xJ --transform='s,^qttools-opensource-src,qttools,' -f "$(1)" ;; \
+ */qtwinextras*.*.tar.xz) \
+ $(TAR) -xJ --transform='s,^qtwinextras-opensource-src,qtwinextras,' -f "$(1)" ;; \
*/boost*.*.tar.bz2) \
$(TAR) -xj --transform='s,^boost_1_60_0,boost-1.60.0,' -f "$(1)" ;; \
*.tar.gz | *.tgz) \
@@ -627,6 +629,7 @@ stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
endef
$(eval $(call OVERRIDE_QTTOOLS_CONF_TEMPLATE,qttools))
+$(eval $(call OVERRIDE_QTTOOLS_CONF_TEMPLATE,qtwinextras))
define OVERRIDE_BOOST_CONF_TEMPLATE
# Override of the configure rule. For targets that not use
diff --git a/src/inst-kwindowsystem.nsi b/src/inst-kwindowsystem.nsi
new file mode 100644
index 0000000..1e19c12
--- /dev/null
+++ b/src/inst-kwindowsystem.nsi
@@ -0,0 +1,35 @@
+# Copyright (C) 2015 Intevation 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}/kwindowsystem-${gpg4win_pkg_kwindowsystem_version}
+
+!ifdef DEBUG
+Section "kwindowsystem" SEC_kwindowsystem
+!else
+Section "-kwindowsystem" SEC_kwindowsystem
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_kwindowsystem}"
+!else
+ SetOutPath "$INSTDIR\bin"
+ File ${prefix}/bin/libKF5WindowSystem.dll
+!endif
+SectionEnd
diff --git a/src/inst-qtwinextras.nsi b/src/inst-qtwinextras.nsi
new file mode 100644
index 0000000..40ee20f
--- /dev/null
+++ b/src/inst-qtwinextras.nsi
@@ -0,0 +1,35 @@
+# Copyright (C) 2015 Intevation 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}/qtwinextras-${gpg4win_pkg_qtwinextras_version}
+
+!ifdef DEBUG
+Section "qtwinextras" SEC_qtwinextras
+!else
+Section "-qtwinextras" SEC_qtwinextras
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_qtwinextras}"
+!else
+ SetOutPath "$INSTDIR\bin"
+ File ${prefix}/bin/Qt5WinExtras.dll
+!endif
+SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 6629752..0f8279f 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -107,6 +107,9 @@
!ifdef HAVE_PKG_QTTOOLS
!include "inst-qttools.nsi"
!endif
+!ifdef HAVE_PKG_QTWINEXTRAS
+!include "inst-qtwinextras.nsi"
+!endif
!ifdef HAVE_PKG_BOOST
!include "inst-boost.nsi"
!endif
@@ -125,6 +128,9 @@
!ifdef HAVE_PKG_KCOMPLETION
!include "inst-kcompletion.nsi"
!endif
+!ifdef HAVE_PKG_KWINDOWSYSTEM
+!include "inst-kwindowsystem.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "inst-extra-cmake-modules.nsi"
!endif
@@ -290,6 +296,9 @@
!ifdef HAVE_PKG_QTTOOLS
!include "uninst-qttools.nsi"
!endif
+!ifdef HAVE_PKG_QTWINEXTRAS
+!include "uninst-qtwinextras.nsi"
+!endif
!ifdef HAVE_PKG_BOOST
!include "uninst-boost.nsi"
!endif
@@ -308,6 +317,9 @@
!ifdef HAVE_PKG_KCOMPLETION
!include "uninst-kcompletion.nsi"
!endif
+!ifdef HAVE_PKG_KWINDOWSYSTEM
+!include "uninst-kwindowsystem.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "uninst-extra-cmake-modules.nsi"
!endif
@@ -538,6 +550,12 @@ Function CalcDepends
!ifdef HAVE_PKG_QTBASE
!insertmacro UnselectSection ${SEC_qtbase}
!endif
+!ifdef HAVE_PKG_QTTOOLS
+ !insertmacro UnselectSection ${SEC_qttools}
+!endif
+!ifdef HAVE_PKG_QTWINEXTRAS
+ !insertmacro UnselectSection ${SEC_qtwinextras}
+!endif
!ifdef HAVE_PKG_OXYGEN_ICONS
!insertmacro UnselectSection ${SEC_oxygen_icons}
!endif
@@ -556,6 +574,9 @@ Function CalcDepends
!ifdef HAVE_PKG_KCOMPLETION
!insertmacro UnselectSection ${SEC_kcompletion}
!endif
+!ifdef HAVE_PKG_KWINDOWSYSTEM
+ !insertmacro UnselectSection ${SEC_kwindowsystem}
+!endif
# Always install gnupg2. This is also ensured by putting
# these packages in the RO section and enabling them by default, but
@@ -651,7 +672,9 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_gpgmepp}
!insertmacro SelectSection ${SEC_kwidgetsaddons}
!insertmacro SelectSection ${SEC_kcompletion}
+ !insertmacro SelectSection ${SEC_kwindowsystem}
!insertmacro SelectSection ${SEC_qttools}
+ !insertmacro SelectSection ${SEC_qtwinextras}
!insertmacro SelectSection ${SEC_boost}
!insertmacro SelectSection ${SEC_extra-cmake-modules}
skip_kleopatra_libs:
diff --git a/src/uninst-kwindowsystem.nsi b/src/uninst-kwindowsystem.nsi
new file mode 100644
index 0000000..84da053
--- /dev/null
+++ b/src/uninst-kwindowsystem.nsi
@@ -0,0 +1,33 @@
+# Copyright (C) 2015 Intevation 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}/kwindowsystem-${gpg4win_pkg_kwindowsystem_version}
+
+; Uninstaller section.
+Section "-un.kwindowsystem"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_kwindowsystem}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\bin\libKF5WindowSystem.dll"
+ RmDir "$INSTDIR\bin"
+
+!endif
+SectionEnd
diff --git a/src/uninst-qtwinextras.nsi b/src/uninst-qtwinextras.nsi
new file mode 100644
index 0000000..5fa0111
--- /dev/null
+++ b/src/uninst-qtwinextras.nsi
@@ -0,0 +1,32 @@
+# Copyright (C) 2015 Intevation 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}/qtwinextras-${gpg4win_pkg_qtwinextras_version}
+
+; Uninstaller section.
+Section "-un.qtwinextras"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_qtwinextras}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\bin\Qt5WinExtras.dll"
+ RmDir "$INSTDIR\bin"
+!endif
+SectionEnd
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 -
configure.ac | 6 ++-
packages/packages.current | 44 ++++++++++++++++--
...1-Remove-uneccessary-dependency-to-KDEWIN.patch | 52 ---------------------
src/Makefile.am | 16 ++++++-
src/config.nsi.in | 16 +++++++
src/gpg4win.mk.in | 3 ++
src/{inst-kcompletion.nsi => inst-kcoreaddons.nsi} | 10 ++--
src/{inst-gpgmepp.nsi => inst-kwindowsystem.nsi} | 10 ++--
src/inst-libkleo.nsi | 51 +++++++++++++++++++++
src/{inst-kcompletion.nsi => inst-qtwinextras.nsi} | 10 ++--
src/inst-sections.nsi | 43 ++++++++++++++++++
...inst-kcompletion.nsi => uninst-kcoreaddons.nsi} | 8 ++--
src/{uninst-boost.nsi => uninst-kwindowsystem.nsi} | 8 ++--
src/uninst-libkleo.nsi | 53 ++++++++++++++++++++++
...inst-kcompletion.nsi => uninst-qtwinextras.nsi} | 9 ++--
16 files changed, 253 insertions(+), 87 deletions(-)
delete mode 100755 patches/gpgmepp/0001-Remove-uneccessary-dependency-to-KDEWIN.patch
copy src/{inst-kcompletion.nsi => inst-kcoreaddons.nsi} (80%)
copy src/{inst-gpgmepp.nsi => inst-kwindowsystem.nsi} (79%)
create mode 100644 src/inst-libkleo.nsi
copy src/{inst-kcompletion.nsi => inst-qtwinextras.nsi} (80%)
copy src/{uninst-kcompletion.nsi => uninst-kcoreaddons.nsi} (84%)
copy src/{uninst-boost.nsi => uninst-kwindowsystem.nsi} (82%)
create mode 100644 src/uninst-libkleo.nsi
copy src/{uninst-kcompletion.nsi => uninst-qtwinextras.nsi} (84%)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list