0001-qt-tests-Fix-build-in-source-directory.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From d23528cadf4284f508bc4ba05e1b5c14b46bd354 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
  3. Date: Mon, 21 Aug 2023 21:08:01 +0200
  4. Subject: qt,tests: Fix build in source directory
  5. * lang/qt/tests/Makefile.am (AM_CPPFLAGS): Include Qt binding sources
  6. before C++ binding sources and C sources.
  7. --
  8. This fixes the problem that the debug.h in the C sources was found
  9. before the one in the Qt bindings.
  10. GnuPG-bug-id: 6673
  11. ---
  12. lang/qt/tests/Makefile.am | 4 ++--
  13. 1 file changed, 2 insertions(+), 2 deletions(-)
  14. diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
  15. index 32ad6466..aedd3264 100644
  16. --- a/lang/qt/tests/Makefile.am
  17. +++ b/lang/qt/tests/Makefile.am
  18. @@ -51,10 +51,10 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
  19. ../../../src/libgpgme.la @GPGME_QT5_LIBS@ @GPG_ERROR_LIBS@ \
  20. @GPGME_QT5TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++
  21. -AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
  22. +AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \
  23. + -I$(top_builddir)/src \
  24. @GPG_ERROR_CFLAGS@ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ \
  25. @LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ -DBUILDING_QGPGME \
  26. - -I$(top_srcdir)/lang/qt/src \
  27. -DTOP_SRCDIR="$(top_srcdir)"
  28. endif
  29. if WANT_QT6
  30. --
  31. 2.42.0