Removed gpgex/01-no-checksums.patch.
authorEmanuel Schuetze <emanuel.schuetze@intevation.de>
Thu, 8 Jul 2010 15:23:08 +0000 (15:23 +0000)
committerEmanuel Schuetze <emanuel.schuetze@intevation.de>
Thu, 8 Jul 2010 15:23:08 +0000 (15:23 +0000)
ChangeLog
Makefile.am
patches/gpgex/01-no-checksums.patch [deleted file]

index 2a7731e..f64a201 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-08  Emanuel Schuetze <emanuel@intevation.de>
+
+       * Makefile.am (EXTRA_DIST): Remove patches/gpgex/01-no-checksums.patch.
+       * patches/gpgex/01-no-checksums.patch: Remove file.
+
 2010-05-21  Emanuel Schuetze <emanuel@intevation.de>
 
        * configure.ac: Change compendium-de date.
index 7b4ae7b..d24cdde 100644 (file)
@@ -38,7 +38,6 @@ EXTRA_DIST = autogen.sh README.SVN ONEWS \
        patches/gpgme-1.2.0/03-w32-socket.patch \
         patches/gpgme-1.2.0/04-check-agent.patch \
         patches/gpgme-1.2.0/05-is-socket.patch \
-       patches/gpgex/01-no-checksums.patch \
        patches/gpgex-0.9.5/01-default-no-suffix.patch \
        patches/gnupg2/01-version.patch.in \
        patches/gnupg2-2.0.9/01-close-all-handle.patch \
diff --git a/patches/gpgex/01-no-checksums.patch b/patches/gpgex/01-no-checksums.patch
deleted file mode 100755 (executable)
index ceab064..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Disable checksum commands.
-
-
-diff -rup src/gpgex.cc src/gpgex.cc
---- src/gpgex.cc       2008-09-09 11:02:17.000000000 +0200
-+++ src/gpgex.cc       2009-02-25 14:24:44.000000000 +0100
-@@ -356,12 +356,14 @@ gpgex_t::QueryContextMenu (HMENU hMenu, 
-   if (res)
-     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
-                     idCmdFirst + ID_CMD_IMPORT, ID_CMD_STR_IMPORT);
-+#if 0
-   if (res)
-     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
-                     idCmdFirst + ID_CMD_CREATE_CHECKSUMS, ID_CMD_STR_CREATE_CHECKSUMS);
-   if (res)
-     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
-                     idCmdFirst + ID_CMD_VERIFY_CHECKSUMS, ID_CMD_STR_VERIFY_CHECKSUMS);
-+#endif
-   if (res)
-     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
-   if (res)
-