diff options
Diffstat (limited to 'security/gpgme/files/patch-lang_qt_tests_Makefile.in')
| -rw-r--r-- | security/gpgme/files/patch-lang_qt_tests_Makefile.in | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/security/gpgme/files/patch-lang_qt_tests_Makefile.in b/security/gpgme/files/patch-lang_qt_tests_Makefile.in new file mode 100644 index 000000000000..ffc5f0ef5c55 --- /dev/null +++ b/security/gpgme/files/patch-lang_qt_tests_Makefile.in @@ -0,0 +1,32 @@ +Fix build of Qt tests. + +This fixes the problem that the debug.h in the C sources was found +before the one in the Qt bindings. + +Based on upstream commits: +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=d23528cadf4284f508bc4ba05e1b5c14b46bd354 +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=aee18a2ab2498bc6092bef518c532796bbe5b502 + +--- lang/qt/tests/Makefile.in.orig 2023-08-21 07:46:32 UTC ++++ lang/qt/tests/Makefile.in +@@ -796,16 +796,16 @@ AM_LDFLAGS = -no-install + @WANT_QT6_TRUE@ ../../../src/libgpgme.la @GPGME_QT6_LIBS@ @GPG_ERROR_LIBS@ \ + @WANT_QT6_TRUE@ @GPGME_QT6TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++ + +-@WANT_QT5_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ ++@WANT_QT5_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \ ++@WANT_QT5_TRUE@ -I$(top_builddir)/src \ + @WANT_QT5_TRUE@ @GPG_ERROR_CFLAGS@ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ \ + @WANT_QT5_TRUE@ @LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ -DBUILDING_QGPGME \ +-@WANT_QT5_TRUE@ -I$(top_srcdir)/lang/qt/src \ + @WANT_QT5_TRUE@ -DTOP_SRCDIR="$(top_srcdir)" + +-@WANT_QT6_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ ++@WANT_QT6_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \ ++@WANT_QT6_TRUE@ -I$(top_builddir)/src \ + @WANT_QT6_TRUE@ @GPG_ERROR_CFLAGS@ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ \ + @WANT_QT6_TRUE@ @LIBASSUAN_CFLAGS@ @GPGME_QT6TEST_CFLAGS@ -DBUILDING_QGPGME \ +-@WANT_QT6_TRUE@ -I$(top_srcdir)/lang/qt/src \ + @WANT_QT6_TRUE@ -DTOP_SRCDIR="$(top_srcdir)" + + support_src = t-support.h t-support.cpp |