Update KDE Frameworks to 5.24.0 and add KArchive
[gpg4win.git] / Makefile.am
index d8c49f7..d80070f 100644 (file)
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
-DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc
+DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32
 
-SUBDIRS = po packages include doc src
+SUBDIRS = po packages doc src
+
+# find patches -type f | sort | sed 's/$/ \\/' | sed 's/^/             /'
 
 EXTRA_DIST = autogen.sh README.GIT ONEWS \
+        doc/license-page doc/GPLv3 \
         build-aux/git-log-footer build-aux/git-log-fix \
-        patches/pthreads-w32-2-8-0-release/01-make.patch \
-        patches/glib-2.12.12/01-giowin32.patch \
-        patches/glib-2.12.12/02-gspawn-w32.patch \
-        patches/glib-2.12.12/03-gspawn-w32-fixup.patch \
-        patches/glib-2.20.0/01-socket.patch \
-        patches/glib-2.24.0/01-socket.patch \
-       patches/gpgme/01-gpg2.patch \
-       patches/gpgme-1.1.7/01-registry.patch \
-       patches/gpgme-1.1.7/02-extern-umlaute.patch \
-       patches/gpgme-1.1.7/03-error-parsing.patch \
-        patches/gpgme-1.2.0/01-w32-io-threads.patch \
-       patches/gpgme-1.2.0/02-inv-signer.patch \
-       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-0.9.5/01-default-no-suffix.patch \
-       patches/gnupg2/01-version.patch.in \
-       patches/gnupg2/02-allow-mark-trusted.patch \
-       patches/gnupg2-2.0.9/01-close-all-handle.patch \
-       patches/gnupg2-2.0.9/02-de.po-fix.patch \
-       patches/gnupg2-2.0.9/03-i18n+etc.patch \
-       patches/gnupg2-2.0.9/04-ks-w32init.patch \
-       patches/gnupg2-2.0.9/05-w32-http.patch \
-       patches/gnupg2-2.0.12/01-scd-pw2.patch \
-       patches/gnupg2-2.0.12/02-pth-estream.patch \
-       patches/gnupg2-2.0.12/03-opgp-writekey.patch \
-       patches/gnupg2-2.0.12/04-hash-prefs.patch \
-       patches/gnupg2-2.0.12/05-dns-sd.patch \
-        patches/gnupg2-2.0.12/06-opgp-sign3072.patch \
-        patches/gnupg2-2.0.12/07-gpg-no-detached.patch \
-        patches/gnupg2-2.0.12/08-sm-learn-card.patch \
-       patches/gnupg2-2.0.12/09-sm-keylist.patch \
-       patches/gnupg2-2.0.12/10-inv-sgnr.patch \
-       patches/gnupg2-2.0.12/11-photoid-sk.patch \
-       patches/gnupg2-2.0.14/01-encode-s2k.patch \
-       patches/gnupg2-2.0.14/02-scd-no-service.patch \
-       patches/gnupg2-2.0.16/01-estream.patch \
-       patches/gnupg2-2.0.16/02-gpgtar.patch \
-        patches/gnupg2-2.0.16/03-kbx-realloc.patch \
-       patches/gnupg2-2.0.16/04-gpgtar-2.patch \
-       patches/gnupg2-2.0.16/05-err-codes.patch \
-       patches/gnupg2-2.0.16/06-reread-agent.patch \
-        patches/gnupg2-2.0.17/01-scd-reader-removal.patch \
-       patches/dirmngr-1.0.3/01-ldaphttp.patch \
-       patches/dirmngr-1.1.0/01-mmap.patch \
-       patches/gpgol-0.9.91/01-gpgme.patch \
-        patches/gpa-0.9.0/01-title-prop.patch \
-       patches/libetpan-0.57/01-gnutls_compat.patch \
-        patches/scute-1.2.0/01-bugfixes.patch \
-        patches/scute-1.3.0/01-wsastartup.patch \
-        patches/claws-mail-3.8.0cvs30/01-glib-h-only.patch
+        patches/glib-2.41.5/01-socket.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
+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-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; \