diff --git a/Makefile.am b/Makefile.am index 1b5e4660..34204142 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,96 +1,95 @@ # Makefile.am - Installer for GnuPG 4 Windows Makefile. # Copyright (C) 2005, 2008, 2012 g10 Code GmbH # # This file is part of GPG4Win. # # GPG4Win is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # GPG4Win is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, see . ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32 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/boost/boost-1-fixes.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/glib-2.41.5/02-formatsec.patch \ patches/kconfigwidgets/0001-Make-QDbus-optional.patch \ patches/kiconthemes/0001-Make-DBus-optional.patch \ patches/kxmlgui/0001-make-qdbus-optional.patch \ patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \ patches/qtbase/0001-Fix-build-without-std-thread.patch \ patches/qtbase/0002-Gpg4win-theme-names-and-relpaths.patch \ patches/qtbase/0001-Gpg4win-qstandardpaths-patch.patch \ patches/qttools/disable-most-tools.patch \ patches/w32pth-2.0.5/workaround-broken-libtool.patch \ patches/breeze-icons/0001-Make-binary-icons-cross-compilable.patch \ - patches/gpg4win-tools/0001-Show-about-data-information-from-VERSION.patch \ - patches/gpgme/0001-qt-Fix-export-of-qDebug-GpgME-Error-overload.patch + patches/gpg4win-tools/0001-Show-about-data-information-from-VERSION.patch copy-news: cp NEWS doc/website/NEWS.last 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 \ 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; \ done;\ fi dist-hook: gen-ChangeLog gen_start_date = 2012-03-26T00:00:00 .PHONY: gen-ChangeLog gen-ChangeLog: set -e; \ if test -d $(top_srcdir)/.git; then \ (cd $(top_srcdir) && \ $(GITLOG_TO_CHANGELOG) --append-dot --tear-off \ --amend=build-aux/git-log-fix \ --since=$(gen_start_date) ) > $(distdir)/cl-t; \ cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\ rm -f $(distdir)/ChangeLog; \ mv $(distdir)/cl-t $(distdir)/ChangeLog; \ fi download: packages/packages.current (cd packages; ./download.sh) msi: $(MAKE) $(AM_MAKEFLAGS) -C src msi msi-signed: $(MAKE) $(AM_MAKEFLAGS) -C src msi-signed msi-upload: $(MAKE) $(AM_MAKEFLAGS) -C src msi-upload diff --git a/patches/gpgme/0001-qt-Fix-export-of-qDebug-GpgME-Error-overload.patch b/patches/gpgme/0001-qt-Fix-export-of-qDebug-GpgME-Error-overload.patch deleted file mode 100755 index a690d468..00000000 --- a/patches/gpgme/0001-qt-Fix-export-of-qDebug-GpgME-Error-overload.patch +++ /dev/null @@ -1,28 +0,0 @@ -#! /bin/sh -patch -p1 -l -f $* < $0 -exit $? - -From df5a89e6929479dc1bf301974fe7d607d024bc1f Mon Sep 17 00:00:00 2001 -From: Andre Heinecke -Date: Thu, 12 Nov 2020 16:07:14 +0100 -Subject: [PATCH] qt: Fix export of qDebug GpgME::Error overload - -* lang/qt/src/debug.cpp: Include debug.h to get the export decl. ---- - lang/qt/src/debug.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lang/qt/src/debug.cpp b/lang/qt/src/debug.cpp -index e4974ad9..b563ac0c 100644 ---- a/lang/qt/src/debug.cpp -+++ b/lang/qt/src/debug.cpp -@@ -36,6 +36,7 @@ - #endif - - #include "error.h" -+#include "debug.h" - - #include - --- -2.20.1