Add patch for GpgOL to fix language in conf dlg
[gpg4win.git] / Makefile.am
index 18e628e..44b282b 100644 (file)
@@ -27,50 +27,46 @@ 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/boost/boost-1-fixes.patch \
+        patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
+        patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.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/w32pth-2.0.5/workaround-broken-libtool.patch \
-        patches/qttools/disable-most-tools.patch \
-        patches/ki18n/no-tests.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/0001-Make-KGlobalAccel-dependency-optional.patch \
-        patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
-        patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
-        patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
+        patches/glib-2.41.5/02-formatsec.patch \
+        patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch \
+        patches/gpgol-2.3.1/0001-Pass-lang-correctly-to-config-dialog.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/0001-Implement-KDBusService-alternative-for-Windows.patch \
-        patches/kleopatra/0002-Add-alternative-configuredialog-wihout-KCMUtils.patch \
-        patches/kleopatra/0003-Add-option-to-disable-KWatchGnuPG.patch \
-        patches/kleopatra/0004-Make-DBus-integration-of-the-smime-conf-optional.patch \
-        patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
+        patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
+        patches/kleopatra/fix-qt5.6-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/libgpg-error-1.29/0001-doc-Fix-yat2m-build-for-cross-compilation.patch \
+        patches/qtbase/config-standardpaths.patch \
+        patches/qtbase/qtbase-mingw-fixes.patch \
+        patches/qtbase/relative-paths.patch \
+        patches/qttools/disable-most-tools.patch \
+        patches/qtwinextras/support-xp.patch \
+        patches/w32pth-2.0.5/workaround-broken-libtool.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; \