Update GpgOL to 2.4.1
authorAndre Heinecke <aheinecke@gnupg.org>
Sat, 15 Jun 2019 04:23:48 +0000 (06:23 +0200)
committerAndre Heinecke <aheinecke@gnupg.org>
Sat, 15 Jun 2019 04:23:48 +0000 (06:23 +0200)
--

packages/packages.current
patches/gpgol-2.4.0/0001-Revert-Only-use-IPM.Note.SMIME.MultipartSigned-for-S.patch [deleted file]
patches/libkleo/0001-Fix-key-mapping-based-on-summary-column.patch [new file with mode: 0644]

index f082c83..a3d5538 100644 (file)
@@ -235,11 +235,11 @@ chk  1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c
 #
 server http://files.gpg4win.org/src
 
-# last-changed: 2019-06-03
+# last-changed: 2019-06-15
 # by: ah
 # verified: Sig 5B80 C575 4298 F0CB  55D8 ED6A BCEF 7E29 4B09 2E28
-file gpgol/gpgol-2.4.0.tar.bz2
-chk  10c393839813119e1f8ae3e222ead2882e23d680ca3c8382f1e3f94bfeac46de
+file gpgol/gpgol-2.4.1.tar.bz2
+chk  1e854a766e716c846c7db72c138436a152d0557e299ede96bcaf09d28daeda07
 
 # for beta
 server http://files.intevation.de/projects/gpg4all
diff --git a/patches/gpgol-2.4.0/0001-Revert-Only-use-IPM.Note.SMIME.MultipartSigned-for-S.patch b/patches/gpgol-2.4.0/0001-Revert-Only-use-IPM.Note.SMIME.MultipartSigned-for-S.patch
deleted file mode 100755 (executable)
index 0ae3e57..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From e714c4c749eb4800c1b49386d543b7e224b8686b Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@gnupg.org>
-Date: Tue, 4 Jun 2019 10:38:32 +0200
-Subject: [PATCH] Revert "Only use IPM.Note.SMIME.MultipartSigned for SMIME"
-
-This reverts commit 7323a82d1f8d548b85eb1c4cf7cd1e0c0224c246.
----
- src/mimemaker.cpp | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/src/mimemaker.cpp b/src/mimemaker.cpp
-index 91a8c30..06d1375 100644
---- a/src/mimemaker.cpp
-+++ b/src/mimemaker.cpp
-@@ -1235,12 +1235,9 @@ finalize_message (LPMESSAGE message, mapi_attach_item_t *att_table,
-          not immediately showing the GpgOL icon but gives other
-          clients that do not have GpgOL installed a better chance
-          to handle the mail. */
--      if (encrypt && /* exchange_major_version >= 15*/ 0)
-+      if (encrypt && exchange_major_version >= 15)
-         {
--          (void) exchange_major_version;
--          /* This only appears to work with later exchange versions and
--          caused other Problems with incompatibilities. MultipartSigned
--          seemd to work better, even if it now has the wrong icon. */
-+          /* This only appears to work with later exchange versions */
-           prop.Value.lpszA = xstrdup ("IPM.Note.SMIME");
-         }
-       else
---
-2.20.1
diff --git a/patches/libkleo/0001-Fix-key-mapping-based-on-summary-column.patch b/patches/libkleo/0001-Fix-key-mapping-based-on-summary-column.patch
new file mode 100644 (file)
index 0000000..3e8ede4
--- /dev/null
@@ -0,0 +1,42 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From 2b0c2bd30d39d0ec568da788a8e77bc34e227c0c Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke@gnupg.org>
+Date: Tue, 11 Jun 2019 09:31:10 +0200
+Subject: [PATCH] Fix key mapping based on summary column
+
+If we move the summary column below num columns data queries
+for this column fail. This breaks for example the
+certificatelineedit in Kleopatra.
+
+The summary column is still hidden because we do not set
+header data.
+
+GnuPG-Bug-ID: T4569
+
+This fixes: 4847fcc27afc8101752de82b0dd1f5fee027695d
+
+Merge is not neccessary as 4847fcc27 was not included
+in any branch so far.
+---
+ src/models/keylistmodelinterface.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/models/keylistmodelinterface.h b/src/models/keylistmodelinterface.h
+index 3167538..4820ece 100644
+--- a/src/models/keylistmodelinterface.h
++++ b/src/models/keylistmodelinterface.h
+@@ -73,8 +73,8 @@ public:
+ #endif
+
+         Validity,
+-        NumColumns,
+         Summary, // Short summary line
++        NumColumns,
+         Icon = PrettyName // which column shall the icon be displayed in?
+     };
+
+--
+2.20.1