Update Kleopatra and GpgOL to latest master
authorAndre Heinecke <aheinecke@intevation.de>
Fri, 3 Mar 2017 15:07:08 +0000 (16:07 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Fri, 3 Mar 2017 15:08:33 +0000 (16:08 +0100)
* packages/packages.current(Kleopatra, GpgOL): Update
* patches/kleopatra/relax-gpgme-checks.patch: Enable features our
GpgME already supports.
* patches/kleopatra: Rebase to current master

Makefile.am
packages/packages.current
patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
patches/kleopatra/lower-kf5-required.patch
patches/kleopatra/relax-gpgme-checks.patch [new file with mode: 0755]

index 3bac8b7..a04d295 100644 (file)
@@ -50,6 +50,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
         patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
         patches/kleopatra/lower-kf5-required.patch \
+        patches/kleopatra/relax-gpgme-checks.patch \
         patches/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for-Windows.patch \
         patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch \
         patches/libkleo/lower-kf5-required.patch \
index fab223d..6f3eb67 100644 (file)
@@ -520,8 +520,9 @@ chk 94734a63406ad62643acd5908837482e7f60d6ea8ee523b3587cbdc97e062319
 # ditto for gpgol.
 # by: ah
 # verified: tarball created by ah
-file gpgol/gpgol-2.0.0-beta256.tar.bz2
-chk 029a2e07b7f7165e0f4f2eb785f2cd0a2fd8c91771230eadcf1d20acc8a7f324
+file gpgol/gpgol-2.0.0-beta259.tar.bz2
+chk f89a57cc57124e2bd4e506c4b26c8ca2ee4f7c3a8b987b0816762ea57251a8bf
+
 
 # Libkleo
 # last changed: see package date.
@@ -544,5 +545,5 @@ chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592
 # last changed: see package date.
 # by: ah
 # verified: Tarball created by ah.
-file kleopatra/kleopatra-201701171118.tar.gz
-chk 6de660fcfb3cebb9825a3e763f0ea7eb219f3e997675a45771e3a3d9fb15e5a0
+file kleopatra/kleopatra-201703031520.tar.gz
+chk cb4bf790d5cf1cba61a2c7220a8452125eae380d28643f2c2d3ad882dbcf393d
index 45724c7..533d4ef 100755 (executable)
@@ -31,10 +31,10 @@ that has a packaged kconfig_compiler5.
  create mode 100644 src/tooltippreferences.h
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6799187..8c8193c 100644
+index 0c1b207..29ac1e0 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -259,12 +259,21 @@ ki18n_wrap_ui(_kleopatra_SRCS
+@@ -263,12 +263,21 @@ ki18n_wrap_ui(_kleopatra_SRCS
    newcertificatewizard/advancedsettingsdialog.ui
  )
 
@@ -63,11 +63,11 @@ index 6799187..8c8193c 100644
  file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kleopatra.png")
  ecm_add_app_icon(_kleopatra_SRCS ICONS ${ICONS_SRCS})
 diff --git a/src/conf/CMakeLists.txt b/src/conf/CMakeLists.txt
-index bd46c88..d7351e2 100644
+index 5e2092c..888d87d 100644
 --- a/src/conf/CMakeLists.txt
 +++ b/src/conf/CMakeLists.txt
-@@ -14,10 +14,6 @@ if(BUILD_libkleopatraclient)
-     cryptooperationsconfigwidget.ui
+@@ -13,10 +13,6 @@ if(BUILD_libkleopatraclient)
+     smimevalidationconfigurationwidget.ui
    )
 
 -  kconfig_add_kcfg_files(_kcm_kleopatra_libkleopatraclient_extra_SRCS
@@ -77,7 +77,7 @@ index bd46c88..d7351e2 100644
    set(_kcm_kleopatra_libkleopatraclient_extra_LIBS kleopatraclientgui)
 
    set(_kcm_kleopatra_libkleopatraclient_extra_install_FILES
-@@ -48,12 +44,18 @@ ki18n_wrap_ui(kcm_kleopatra_PART_SRCS
+@@ -47,12 +43,18 @@ ki18n_wrap_ui(kcm_kleopatra_PART_SRCS
    smimevalidationconfigurationwidget.ui
  )
 
index ec773b2..16a91ea 100755 (executable)
@@ -3,16 +3,17 @@ patch -p1 -l -f $* < $0
 exit $?
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7223ab9..754088c 100644
+index 622164c..2e06952 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -6,8 +6,8 @@ option(FORCE_DISABLE_KCMUTILS "Force building Kleopatra without KCMUtils. Doing
  option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)
 
  # Standalone build. Find / include everything neccessary.
--set(KF5_VERSION "5.30.0")
+-set(KF5_VERSION "5.31.0")
 -set(KMIME_VERSION "5.4.40")
-+set(KF5_VERSION "5.25.0")
-+set(KMIME_VERSION "5.2")
++set(KF5_VERSION "5.20.0")
++set(KMIME_VERSION "5.2.40")
  set(LIBKLEO_VERSION "5.4.40")
- set(QT_REQUIRED_VERSION "5.5.0")
+ set(QT_REQUIRED_VERSION "5.6.0")
+ set(GPGME_REQUIRED_VERSION "1.8.0")
diff --git a/patches/kleopatra/relax-gpgme-checks.patch b/patches/kleopatra/relax-gpgme-checks.patch
new file mode 100755 (executable)
index 0000000..605cd93
--- /dev/null
@@ -0,0 +1,30 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+diff --git a/src/commands/keytocardcommand.cpp b/src/commands/keytocardcommand.cpp
+index 7fedf50..464c2a0 100644
+--- a/src/commands/keytocardcommand.cpp
++++ b/src/commands/keytocardcommand.cpp
+@@ -48,7 +48,7 @@
+ #include <cassert>
+
+ #include <gpgme++/gpgmepp_version.h>
+-#if GPGMEPP_VERSION > 0x10801
++#if GPGMEPP_VERSION > 0x10800
+ # define GPGME_SUBKEY_HAS_KEYGRIP
+ #endif
+
+diff --git a/src/view/pgpcardwidget.cpp b/src/view/pgpcardwidget.cpp
+index 4d04f20..3a69744 100644
+--- a/src/view/pgpcardwidget.cpp
++++ b/src/view/pgpcardwidget.cpp
+@@ -63,7 +63,7 @@
+ #include <QGpgME/DataProvider>
+
+
+-#if GPGMEPP_VERSION > 0x10801 // 1.8.1
++#if GPGMEPP_VERSION > 0x10800 // 1.8.1
+ // TODO remove ifdef once > 1.8.1 is required
+ #include <gpgme++/gpggencardkeyinteractor.h>
+ # define GPGME_CAN_GENCARDKEY