[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-178-gedc88cb

[by Andre Heinecke]

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  edc88cbf8aa03ed150119a6cbfb964464c03e9be (commit)
      from  1a0a3264cedfb82aab59a473001ed39f15bd4490 (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 edc88cbf8aa03ed150119a6cbfb964464c03e9be
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Aug 10 18:33:46 2016 +0200

    Update development packages
    
    * packages/packages.current: Update libkleo, gpgme, gpgmepp and
    kleopatra.
    * patches/kleopatra/
    0005-Hack-generated-conf-files-for-Crosscompiling.patch: Update.

diff --git a/packages/packages.current b/packages/packages.current
index 92c6b67..676912b 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -518,8 +518,8 @@ chk 67b017001928ad072f57435b72d473a961f64bfb17c792e42984dc31f72ae7d1
 # ditto for gpgme.
 # by: ah
 # verified: tarball created by ah
-file gpgme/gpgme-1.7.0-beta225.tar.bz2
-chk c70f1699fc9af870d9225f57878385b49f9d571b2a8cfd17c73613b7ea983c56
+file gpgme/gpgme-1.7.0-beta274.tar.bz2
+chk cd0a9bd05541270288fd9e3c990cf221a3ec890176c7cc7a59a1e4d8e5d402d4
 
 # Gpgmepp
 # last changed: 2016-01-21
@@ -529,20 +529,20 @@ chk c70f1699fc9af870d9225f57878385b49f9d571b2a8cfd17c73613b7ea983c56
 # chk 56d5f05bd513efc6caf770e43b6109e42842198f
 #
 # Gpgmepp-devel
-# last changed: 2016-07-22
+# last changed: see package date
 # by: ah
 # verified: Tarball created by ah.
 
-file gpgmepp/gpgmepp-201607221449.tar.xz
-chk d214a6c15558f335693f15246c69202bd3c3da9aab6341e9bc72263719034bb3
+file gpgmepp/gpgmepp-201608101758.tar.xz
+chk 42c6c6a3d64a179280e1fe7359624a4a68b44703e6de5c92aeea50abe2063116
 
 
 # Libkleo
 # last changed: see package date.
 # by: ah
 # verified: Tarball created by ah.
-file libkleo/libkleo-201607221445.tar.xz
-chk 2d6087dc5e404434178895a0585f5833b492ab4d3e4d78cba7a19dfc2dbcc5fc
+file libkleo/libkleo-201608101800.tar.xz
+chk b99424789e2fe69dc60df980315efa46d56b747879283acfa2d03ffe21fcc4a8
 
 # KDE-L10n
 # last changed: 2016-02-19
@@ -558,5 +558,5 @@ chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592
 # last changed: see package date.
 # by: ah
 # verified: Tarball created by ah.
-file kleopatra/kleopatra-201607221447.tar.gz
-chk 9f70895dc99717c6b107da143fd95e89d80f28ea1edb7d8447054daf48c4c4bf
+file kleopatra/kleopatra-201608101800.tar.gz
+chk f341c557b08f6bbd426d45eb857105d20f8da4e4d6d227c7ef9400e97dc1e2c7
diff --git a/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch b/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
index 6fd271f..45724c7 100755
--- a/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
+++ b/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
@@ -229,7 +229,7 @@ new file mode 100644
 index 0000000..d2d20fc
 --- /dev/null
 +++ b/src/fileoperationspreferences.cpp
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,30 @@
 +// This file is generated by kconfig_compiler_kf5 from fileoperationspreferences.kcfg.
 +// All changes you do to this file will be lost.
 +
@@ -248,6 +248,12 @@ index 0000000..d2d20fc
 +  KConfigSkeleton::ItemBool  *itemAutoDecryptVerify;
 +  itemAutoDecryptVerify = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "auto-decrypt-verify" ), mAutoDecryptVerify, true );
 +  addItem( itemAutoDecryptVerify, QStringLiteral( "AutoDecryptVerify" ) );
++  KConfigSkeleton::ItemString  *itemArchiveCommand;
++  itemArchiveCommand = new KConfigSkeleton::ItemString( currentGroup(), QStringLiteral( "default-archive-cmd" ), mArchiveCommand, QStringLiteral( "tar" ) );
++  addItem( itemArchiveCommand, QStringLiteral( "ArchiveCommand" ) );
++  KConfigSkeleton::ItemBool  *itemAddASCIIArmor;
++  itemAddASCIIArmor = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "ascii-armor" ), mAddASCIIArmor, false );
++  addItem( itemAddASCIIArmor, QStringLiteral( "AddASCIIArmor" ) );
 +}
 +
 +FileOperationsPreferences::~FileOperationsPreferences()
@@ -259,7 +265,7 @@ new file mode 100644
 index 0000000..9866a70
 --- /dev/null
 +++ b/src/fileoperationspreferences.h
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,102 @@
 +// This file is generated by kconfig_compiler_kf5 from fileoperationspreferences.kcfg.
 +// All changes you do to this file will be lost.
 +#ifndef KLEO_FILEOPERATIONSPREFERENCES_H
@@ -313,11 +319,47 @@ index 0000000..9866a70
 +      return mAutoDecryptVerify;
 +    }
 +
++    /**
++      Set Use this command to create file archives.
++    */
++    void setArchiveCommand( const QString & v )
++    {
++      if (!isImmutable( QStringLiteral( "ArchiveCommand" ) ))
++        mArchiveCommand = v;
++    }
++
++    /**
++      Get Use this command to create file archives.
++    */
++    QString archiveCommand() const
++    {
++      return mArchiveCommand;
++    }
++
++    /**
++      Set Create signed and or encrypted files as text files.
++    */
++    void setAddASCIIArmor( bool v )
++    {
++      if (!isImmutable( QStringLiteral( "AddASCIIArmor" ) ))
++        mAddASCIIArmor = v;
++    }
++
++    /**
++      Get Create signed and or encrypted files as text files.
++    */
++    bool addASCIIArmor() const
++    {
++      return mAddASCIIArmor;
++    }
++
 +  protected:
 +
 +    // FileOperations
 +    bool mUsePGPFileExt;
 +    bool mAutoDecryptVerify;
++    QString mArchiveCommand;
++    bool mAddASCIIArmor;
 +
 +  private:
 +};

-----------------------------------------------------------------------

Summary of changes:
 packages/packages.current                          | 18 ++++-----
 ...k-generated-conf-files-for-Crosscompiling.patch | 46 +++++++++++++++++++++-
 2 files changed, 53 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org