Add libkleo and update gpgmepp
authorAndre Heinecke <aheinecke@intevation.de>
Fri, 22 Jan 2016 14:10:22 +0000 (15:10 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Fri, 22 Jan 2016 14:10:22 +0000 (15:10 +0100)
* 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.

Makefile.am
configure.ac
packages/packages.current
patches/gpgmepp/0001-Remove-uneccessary-dependency-to-KDEWIN.patch [deleted file]
src/Makefile.am
src/config.nsi.in
src/inst-libkleo.nsi [new file with mode: 0644]
src/inst-sections.nsi
src/uninst-libkleo.nsi [new file with mode: 0644]

index 1716213..5f270fe 100644 (file)
@@ -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:
index 1c7df38..a6b7543 100644 (file)
@@ -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
 
index 44dd725..732f875 100644 (file)
@@ -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 (executable)
index a0a4749..0000000
+++ /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@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
index 0df021e..72cbf42 100644 (file)
@@ -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 \
index 70b9f79..3229f48 100644 (file)
 !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@
+
+@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 (file)
index 0000000..b2ae001
--- /dev/null
@@ -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
index 31dd432..d8d4930 100644 (file)
 !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
 !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 (file)
index 0000000..a6eabdb
--- /dev/null
@@ -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