[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-285-gb778a02

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  b778a02cf7d55603ad8c7b5c13719a86e707c5f0 (commit)
      from  b86273ac4763e553525805e87036d371c89494df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b778a02cf7d55603ad8c7b5c13719a86e707c5f0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Aug 23 12:05:54 2017 +0200

    Add hack to generate qt.conf after qtsvg
    
    * configure.ac (qttranslations): Ensure it's built after qtsvg.
    * src/Makefile.am (pkg_qtsvg_post_install): Generate qt.conf here.
    
    --
    For some reason I don't understand qmake does not add -lz to
    the link line of qtsvg if the qt.conf exists when configuring
    qtsvg. So as a workaround we create the file only after qtsvg.

diff --git a/configure.ac b/configure.ac
index 558dd62..5c0d6b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -343,7 +343,7 @@ GPG4WIN_BPKG_BINSRC([kde-l10n])
 # Qt related stuff.
 GPG4WIN_SPKG([qtbase], [libpng])
 GPG4WIN_SPKG([qttools], [qtbase])
-GPG4WIN_SPKG([qttranslations], [qttools])
+GPG4WIN_SPKG([qttranslations], [qtsvg qttools qtwinextras])
 GPG4WIN_SPKG([qtwinextras], [qtbase])
 GPG4WIN_SPKG([qtsvg], [qtbase])
 GPG4WIN_SPKG([boost], [expat zlib bzip2])
diff --git a/src/Makefile.am b/src/Makefile.am
index fc116de..2bc14ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -318,9 +318,7 @@ gpg4win_pkg_qtbase_make_args = \
 # Qmake still writes debug names in pkgconfig files.
 define gpg4win_pkg_qtbase_post_install
 	(cd $$$${pkgbdir}; \
-	 make install; \
-	 echo "[Paths]" > $$$${pkgidir}/bin/qt.conf; \
-	 echo "Prefix = .." >> $$$${pkgidir}/bin/qt.conf)
+	 make install;)
 endef
 
 
@@ -348,12 +346,19 @@ endef
 gpg4win_pkg_qtsvg_configure = \
 	"$(idir)/bin/qmake" ../$$$${pkg_version}
 
+# XXX Adding the qtconf after qtsvg is a weird hack
+# because somhow (yay qmake) zlib is not linked if
+# the qt conf exists before that. The qt conf is
+# needed for qttranslations to find the correct path
+# of the translation tools.
 define gpg4win_pkg_qtsvg_post_install
  (cd $$$${pkgbdir}; \
   mkdir -p $$$${pkgidir}; \
   cp -r lib include plugins $$$${pkgidir}; \
   mkdir -p $$$${pkgidir}/bin; \
-  mv $$$${pkgidir}/lib/*.dll $$$${pkgidir}/bin;)
+  mv $$$${pkgidir}/lib/*.dll $$$${pkgidir}/bin; \
+  echo "[Paths]" > $$$${pkgidir}/bin/qt.conf; \
+  echo "Prefix = .." >> $$$${pkgidir}/bin/qt.conf)
 endef
 
 gpg4win_pkg_qttranslations_configure = \

-----------------------------------------------------------------------

Summary of changes:
 configure.ac    |  2 +-
 src/Makefile.am | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org