Update KDE Frameworks to 5.24.0 and add KArchive
[gpg4win.git] / Makefile.am
index 5d28770..d80070f 100644 (file)
@@ -27,57 +27,53 @@ SUBDIRS = po packages doc src
 EXTRA_DIST = autogen.sh README.GIT ONEWS \
         doc/license-page doc/GPLv3 \
         build-aux/git-log-footer build-aux/git-log-fix \
-        patches/claws-mail-3.9.1/01-w64-mingw32.patch \
-        patches/claws-mail-3.9.1/02-ldap-opt.patch \
-        patches/claws-mail-3.9.1/03-all-crypto.patch \
-        patches/claws-mail-3.9.1/20-c416e89d.patch \
-        patches/claws-mail-3.9.1/21-66aa06c7.patch \
-        patches/claws-mail-3.9.1/50-configure.patch \
-        patches/claws-mail-3.9.1/51-version-file.patch \
-        patches/claws-mail-3.9.1/80-src-makefile.postcfg-build \
-        patches/dirmngr-1.1.1/dirmngr-pth.patch \
         patches/glib-2.41.5/01-socket.patch \
-        patches/gpgme-1.5.5/0001-Add-offline-mode-support-for-CMS-keylisting.patch \
-        patches/gnupg2-2.0.28/0001-Enable-wildcard-expansion-with-mingw-w64.patch \
-        patches/gnupg2-2.0.28/0002-Let-wchar_to_native-convert-to-console-codepage.patch \
-        patches/gnupg2-2.0.28/0005-Fix-gpgtar-8-bit-encoding-handling-on-Win32.patch \
-        patches/gnupg2-2.0.28/0006-gpgsm-Add-command-option-offline.patch \
-        patches/gnupg2/01-version.patch \
-        patches/gnupg2/01-version.patch.in \
-        patches/gnutls-2.12.23/01-openssl-wincrypt.patch \
-        patches/gnutls-2.12.23/02-cve-2013-2116.patch \
-        patches/gnutls-2.12.23/03-cve-2014-1959.patch \
-        patches/gnutls-2.12.23/04-cve-2014-0092.patch \
-        patches/gnutls-2.12.23/05-cve-2014-3466.patch \
-        patches/gnutls-2.12.23/06-cve-2015-0282.patch \
-        patches/gnutls-2.12.23/07-cve-2015-0294.patch \
-        patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch \
-        patches/gnutls-2.12.23/gnulib-mingw-w64-fix.patch \
-               patches/gnutls-2.12.23/25_updatedgdocfrommaster.patch \
-        patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build \
-        patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch \
-        patches/pthreads-w32-2-8-0-release/01-make.patch \
-        patches/pthreads-w32-2-8-0-release/02-mingw_w64_timespec_compatibility.patch \
-               patches/w32pth-2.0.5/workaround-broken-libtool.patch \
-               patches/scute-1.4.0/workaround-broken-libtool.patch
+        patches/qtbase-5.5.1/fix-freetype-link.patch \
+        patches/qtbase-5.5.1/fix-oci-detect.patch \
+        patches/qtbase-5.5.1/fix-syssemaphore.patch \
+        patches/qtbase-5.5.1/fix-zlib-link.patch \
+        patches/qtbase-5.5.1/relative-paths.patch \
+        patches/qtbase-5.5.1/config-standardpaths.patch \
+        patches/w32pth-2.0.5/workaround-broken-libtool.patch \
+        patches/qttools/disable-most-tools.patch \
+        patches/ki18n/no-tests.patch \
+        patches/gpgme-1.6.0/0001-w32-Fallback-to-2.1-reg-key-for-gpgconf-search.patch \
+        patches/gpgme-1.6.0/0001-Add-gpgme_pubkey_algo_string.patch \
+        patches/gpgmepp/0002-disable-variants.patch \
+        patches/kmime/0001-Check-for-and-replace-strcasestr.patch \
+        patches/kmime/0002-Fix-Windows-build.patch \
+        patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
+        patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
+        patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
+        patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
+        patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch \
+        patches/kiconthemes/0001-Make-DBus-optional.patch \
+        patches/qtsvg/qtsvg-link-zlib.patch \
+        patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
+        patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
+        patches/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for-Windows.patch \
+        patches/gpgmepp/drop-version-dep.patch \
+        patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch \
+        patches/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch \
+        patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch
 
 copy-news:
        cp NEWS doc/website/NEWS.last
 
 
-copy-release: gpg4win-$(VERSION).tar.bz2 src/gpg4win-$(VERSION).exe \
-             src/gpg4win-light-$(VERSION).exe \
-             src/gpg4win-vanilla-$(VERSION).exe
+copy-release: gpg4win-$(VERSION).tar.bz2 installers/gpg4win-$(VERSION).exe \
+             installers/gpg4win-light-$(VERSION).exe \
+             installers/gpg4win-vanilla-$(VERSION).exe
        @echo Copying $(VERSION) to $(RELEASEHOST) >&2
        @set -e;\
        if ssh "$$(echo $(RELEASEHOST)|cut -d: -f -1)" \
         test -f "$$(echo $(RELEASEHOST)/gpg4win-$(VERSION).exe|cut -d: -f2-)";\
        then echo "This release has already been copied to the server" >&2 ;\
        else scp gpg4win-$(VERSION).tar.bz2 \
-                src/gpg4win-$(VERSION).exe \
-                src/gpg4win-light-$(VERSION).exe \
-                src/gpg4win-vanilla-$(VERSION).exe \
-                src/gpg4win-src-$(VERSION).exe  $(RELEASEHOST)/ ;\
+                installers/gpg4win-$(VERSION).exe \
+                installers/gpg4win-light-$(VERSION).exe \
+                installers/gpg4win-vanilla-$(VERSION).exe \
+                installers/gpg4win-src-$(VERSION).exe  $(RELEASEHOST)/ ;\
             for f in en de ; do \
               scp src/README.$$f.txt \
                     $(RELEASEHOST)/README-$(VERSION).$$f.txt; \