[Gpg4win-commits] [git] Gpg4win - branch, kleo-kf5, updated. gpg4win-2.3.0-90-g1100a02
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Feb 23 14:38:05 CET 2016
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, kleo-kf5 has been updated
via 1100a025c802c08fb5b791a128937eec355cad48 (commit)
via 09e2fbdd25d8f378ab7c9d966757c4f66a92b268 (commit)
via db77a67f9871fc062a6b2c384c17d9cbb5c4f8f5 (commit)
via c3ae4abd54d0bd940db5e73b28bbccac3ee2530b (commit)
via 603620e0bd0bb045f945a2c4c238690f5f3fba93 (commit)
from 52e46a36ededb843f64aa3d98d4811092712fa25 (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 1100a025c802c08fb5b791a128937eec355cad48
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 23 14:36:11 2016 +0100
Remove override template hacks
* src/Makefile.am: Use qtpkg template. Update qt package defines.
* src/gpg4win.mk.in: Add boost template and qt package template.
--
The override of targets was a hack and led to warnings and it
also did not simplify things much. Now we have a bit more template
duplication but things are simpler.
Especially boost build was extremly fragile with the configure
target creating the make stamps.
diff --git a/src/Makefile.am b/src/Makefile.am
index d222a04..903f2c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,8 +107,9 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
libgpg-error gpgme gpgol gpgex libpng \
gpa opencdk \
pinentry libassuan \
- w32pth paperkey regex libiconv gettext \
- qtbase qttools boost qtwinextras qtsvg
+ w32pth paperkey regex libiconv gettext
+
+gpg4win_qtpkgs = qtbase qttools qtwinextras qtsvg
# Source packages following the KDE pattern
gpg4win_kdepkgs = kconfig kwidgetsaddons gpgmepp ki18n extra-cmake-modules \
@@ -269,7 +270,7 @@ gpg4win_pkg_paperkey_configure = --silent
gpg4win_pkg_ki18n_configure = -DBUILD_WITH_QTSCRIPT=OFF
-gpg4win_pkg_qtbase_configure = -opensource \
+gpg4win_pkg_qtbase_configure = ../$$$${pkg_version}/configure -opensource \
-confirm-license \
-xplatform win32-g++ \
-device-option CROSS_COMPILE=$(host)- \
@@ -301,41 +302,50 @@ gpg4win_pkg_qtbase_configure = -opensource \
-no-openssl \
-no-dbus
+# qtbase
# invoke qmake with removed debug options as a workaround for
# https://bugreports.qt-project.org/browse/QTBUG-30898
gpg4win_pkg_qtbase_make_args = \
- QMAKE='$$$${pkgsdir}/bin/qmake CONFIG-="debug debug_and_release"'
+ QMAKE='$$$${pkgbdir}/bin/qmake'
# Qmake still writes debug names in pkgconfig files.
define gpg4win_pkg_qtbase_post_install
- (cd $$$${pkgidir}; \
- sed -i 's/-lQt5\(\w*\)d/-lQt5\1/g' `find . -name \*.pc`)
+ (cd $$$${pkgbdir}; \
+ make install); \
+ (cd $$$${pkgidir}; \
+ sed -i 's/-lQt5\(\w*\)d/-lQt5\1/g' `find . -name \*.pc`)
endef
-# Qmake does not support setting the installation path.
-# really https://bugreports.qt.io/browse/QTBUG-12341
+
+gpg4win_pkg_qttools_configure = \
+ "$(idir)/bin/qmake" ../$$$${pkg_version}
+
define gpg4win_pkg_qttools_post_install
- (cd $$$${pkgbdir}; \
- make uninstall; \
- mkdir $$$${pkgidir}; \
- cp -r bin lib include $$$${pkgidir};)
+ (cd $$$${pkgbdir}; \
+ mkdir -p $$$${pkgidir}; \
+ cp -r bin lib include $$$${pkgidir})
endef
+# Qmake does not support setting the installation path.
+# really https://bugreports.qt.io/browse/QTBUG-12341
+gpg4win_pkg_qtwinextras_configure = \
+ "$(idir)/bin/qmake" ../$$$${pkg_version}
+
define gpg4win_pkg_qtwinextras_post_install
(cd $$$${pkgbdir}; \
- make uninstall; \
- mkdir $$$${pkgidir}; \
+ mkdir -p $$$${pkgidir}/bin; \
cp -r lib include $$$${pkgidir}; \
- mkdir $$$${pkgidir}/bin; \
mv $$$${pkgidir}/lib/*.dll $$$${pkgidir}/bin;)
endef
+gpg4win_pkg_qtsvg_configure = \
+ "$(idir)/bin/qmake" ../$$$${pkg_version}
+
define gpg4win_pkg_qtsvg_post_install
(cd $$$${pkgbdir}; \
- make uninstall; \
- mkdir $$$${pkgidir}; \
+ mkdir -p $$$${pkgidir}; \
cp -r lib include plugins $$$${pkgidir}; \
- mkdir $$$${pkgidir}/bin; \
+ mkdir -p $$$${pkgidir}/bin; \
mv $$$${pkgidir}/lib/*.dll $$$${pkgidir}/bin;)
endef
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 9df9381..16447c6 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -444,6 +444,71 @@ $(if $(filter-out no, $(call GETVAR,gpg4win_pkg_$(1))),
$(call BPKG_template_,$1))
endef
+# Template for qt packages.
+
+define QTPKG_template_
+
+pkg_files += $(call GETVAR,gpg4win_pkg_$(1))
+
+stamps/stamp-$(1)-00-unpack: stamps/stamp-directories $(call GETDEPS,$(1))
+ (cd $(bdir); \
+ $(call SETVARS,$(1)); \
+ $(call DEFLATE_macro,$$$${pkg}))
+ touch stamps/stamp-$(1)-00-unpack
+
+stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
+ (shopt -s nullglob; \
+ $(call SETVARS,$(1)); \
+ for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do \
+ (cd "$$$${pkgsdir}"; "$$$${pfile}") \
+ done)
+ touch stamps/stamp-$(1)-01-patch
+
+stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
+ ($(call SETVARS,$(1)); \
+ mkdir "$$$${pkgbdir}"; \
+ cd "$$$${pkgbdir}"; \
+ $$$${pkgcfg}) && \
+ touch stamps/stamp-$(1)-02-configure
+
+stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-02-configure
+ ($(call SETVARS,$(1)); \
+ cd "$$$${pkgbdir}"; \
+ test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
+ $(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs})
+ touch stamps/stamp-$(1)-03-make
+
+# Note that post_install must come last because it may be empty and
+# "; ;" is a syntax error.
+stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
+ ($(call SETVARS,$(1)); \
+ $(call gpg4win_pkg_$(call FROB_macro,$(1))_post_install))
+ touch stamps/stamp-$(1)-04-install
+
+stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install
+ ($(call SETVARS,$(1)); \
+ cd $(ipdir); \
+ $(STOW) "$$$${pkg_version}")
+ touch stamps/stamp-$(1)-05-stow
+
+stamps/stamp-final-$(1): stamps/stamp-$(1)-05-stow
+ touch stamps/stamp-final-$(1)
+
+.PHONY : clean-$(1)
+clean-$(1):
+ ($(call SETVARS,$(1)); \
+ (cd $(ipdir) && \
+ ($(STOW) -D "$$$${pkg_version}"; \
+ rm -fR "$$$${pkg_version}")); \
+ rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}")
+ rm -f stamps/stamp-final-$(1) stamps/stamp-$(1)-*
+
+endef
+
+define QTPKG_template
+$(if $(filter-out no, $(call GETVAR,gpg4win_pkg_$(1))),
+ $(call QTPKG_template_,$1))
+endef
# Template for internal packages.
@@ -482,6 +547,80 @@ HOWTO-$(1).$(2).txt : $(top_srcdir)/doc/HOWTO-$(1).$(2).txt
| awk '{printf "%s\r\n", $$$$0}' > HOWTO-$(1).$(2).txt
endef
+# Special Template for boost.
+define BOOST_template_
+pkg_files += $(call GETVAR,gpg4win_pkg_$(1))
+
+stamps/stamp-$(1)-00-unpack: stamps/stamp-directories $(call GETDEPS,$(1))
+ (cd $(bdir); \
+ $(call SETVARS,$(1)); \
+ $(call DEFLATE_macro,$$$${pkg}))
+ touch stamps/stamp-$(1)-00-unpack
+
+stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
+ (shopt -s nullglob; \
+ $(call SETVARS,$(1)); \
+ for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do \
+ (cd "$$$${pkgsdir}"; "$$$${pfile}") \
+ done)
+ touch stamps/stamp-$(1)-01-patch
+
+stamps/stamp-$(1)-02-build: stamps/stamp-$(1)-01-patch
+ ($(call SETVARS,$(1)); \
+ cd $$$${pkgsdir}/tools/build/; \
+ ./bootstrap.sh; \
+ cd $$$${pkgsdir}; \
+ echo "using gcc : mxe : $(host)-g++ : <rc>$(host)-windres <archiver>$(host)-ar <ranlib>$(host)-ranlib ;" > "user-config.jam"; \
+ ./tools/build/b2 \
+ -a \
+ -q \
+ '$(GPG4WIN_PARALLEL)' \
+ --ignore-site-config \
+ --user-config=user-config.jam \
+ abi=ms \
+ address-model=32 \
+ architecture=x86 \
+ binary-format=pe \
+ link=shared \
+ target-os=windows \
+ threadapi=win32 \
+ threading=multi \
+ variant=release \
+ toolset=gcc-mxe \
+ --layout=tagged \
+ --disable-icu \
+ --without-mpi \
+ --without-python \
+ --prefix=$$$${pkgidir} \
+ --exec-prefix=$$$${pkgidir}/bin \
+ --libdir=$$$${pkgidir}/lib \
+ --includedir=$$$${pkgidir}/include \
+ -sEXPAT_INCLUDE='$(idir)/include' \
+ -sEXPAT_LIBPATH='$(idir)/lib' \
+ -sBZIP2_INCLUDE='$(idir)/include' \
+ -sBZIP2_LIBPATH='$(idir)/lib' \
+ install) && \
+ touch stamps/stamp-$(1)-02-build
+
+stamps/stamp-$(1)-03-stow: stamps/stamp-$(1)-02-build
+ ($(call SETVARS,$(1)); \
+ cd $(ipdir); \
+ $(STOW) "$$$${pkg_version}")
+ touch stamps/stamp-$(1)-03-stow
+
+stamps/stamp-final-$(1): stamps/stamp-$(1)-03-stow
+ touch stamps/stamp-final-$(1)
+
+.PHONY : clean-$(1)
+clean-$(1):
+ ($(call SETVARS,$(1)); \
+ (cd $(ipdir) && \
+ ($(STOW) -D "$$$${pkg_version}"; \
+ rm -fR "$$$${pkg_version}")); \
+ rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}")
+ rm -f stamps/stamp-final-$(1) stamps/stamp-$(1)-*
+endef
+
# Template for source packages of KDE software
define KDEPKG_template_
@@ -579,9 +718,15 @@ $(foreach rll, $(gpg4win_readme_ll), $(eval $(call README_template,$(rll))))
# Insert the template for KDE packages.
$(foreach kdepkg, $(gpg4win_kdepkgs), $(eval $(call KDEPKG_template,$(kdepkg))))
+# Insert the template for qt packages.
+$(foreach qtpkg, $(gpg4win_qtpkgs), $(eval $(call QTPKG_template,$(qtpkg))))
+
+
$(foreach rll, $(gpg4win_howto_smime_ll), \
$(eval $(call HOWTO_template,SMIME,$(rll))))
+$(eval $(call BOOST_template_,boost))
+
stamps/stamp-final: stamps/stamp-directories
stamps/stamp-final: $(addprefix stamps/stamp-final-,$(gpg4win_build_list)) \
$(addprefix stamps/stamp-final-ex-,$(gpg4win_build_ex_list))
@@ -602,83 +747,6 @@ clean-gpg4win:
.PHONY : all-gpg4win clean-stamps clean-gpg4win
-# TODO find a better way to do this. Like a define thats checked for
-# in the spkg template
-define OVERRIDE_CONF_TEMPLATE
-# Override of the configure rule. For targets that not use
-# autotools configure to have more freedom with the options.
-stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
- ($(call SETVARS,$(1)); \
- mkdir "$$$${pkgbdir}"; \
- cd "$$$${pkgbdir}"; \
- "../$$$${pkg_version}/configure" \
- $$$${pkgcfg}) && \
- touch stamps/stamp-$(1)-02-configure
-endef
-
-$(eval $(call OVERRIDE_CONF_TEMPLATE,qtbase))
-
-define OVERRIDE_QTTOOLS_CONF_TEMPLATE
-# Override of the configure rule. For targets that not use
-# autotools configure to have more freedom with the options.
-stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
- ($(call SETVARS,$(1)); \
- mkdir "$$$${pkgbdir}"; \
- cd "$$$${pkgbdir}"; \
- "$(idir)/bin/qmake" ../$$$${pkg_version} CONFIG-="debug debug_and_release" \
- $$$${pkgcfg}) && \
- touch stamps/stamp-$(1)-02-configure
-endef
-
-$(eval $(call OVERRIDE_QTTOOLS_CONF_TEMPLATE,qttools))
-$(eval $(call OVERRIDE_QTTOOLS_CONF_TEMPLATE,qtwinextras))
-$(eval $(call OVERRIDE_QTTOOLS_CONF_TEMPLATE,qtsvg))
-
-define OVERRIDE_BOOST_CONF_TEMPLATE
-# Override of the configure rule. For targets that not use
-# autotools configure to have more freedom with the options.
-stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
- ($(call SETVARS,$(1)); \
- cd $$$${pkgsdir}/tools/build/; \
- ./bootstrap.sh; \
- cd $$$${pkgsdir}; \
- echo "using gcc : mxe : $(host)-g++ : <rc>$(host)-windres <archiver>$(host)-ar <ranlib>$(host)-ranlib ;" > "user-config.jam"; \
- ./tools/build/b2 \
- -a \
- -q \
- '$(GPG4WIN_PARALLEL)' \
- --ignore-site-config \
- --user-config=user-config.jam \
- abi=ms \
- address-model=32 \
- architecture=x86 \
- binary-format=pe \
- link=shared \
- target-os=windows \
- threadapi=win32 \
- threading=multi \
- variant=release \
- toolset=gcc-mxe \
- --layout=tagged \
- --disable-icu \
- --without-mpi \
- --without-python \
- --prefix=$$$${pkgidir} \
- --exec-prefix=$$$${pkgidir}/bin \
- --libdir=$$$${pkgidir}/lib \
- --includedir=$$$${pkgidir}/include \
- -sEXPAT_INCLUDE='$(idir)/include' \
- -sEXPAT_LIBPATH='$(idir)/lib' \
- -sBZIP2_INCLUDE='$(idir)/include' \
- -sBZIP2_LIBPATH='$(idir)/lib' \
- install) && \
- touch stamps/stamp-$(1)-02-configure && \
- touch stamps/stamp-$(1)-03-make && \
- touch stamps/stamp-$(1)-04-install
-endef
-
-$(eval $(call OVERRIDE_BOOST_CONF_TEMPLATE,boost))
-
# @emacs_local_vars_begin@
# @emacs_local_vars_read_only@
# @emacs_local_vars_end@
commit 09e2fbdd25d8f378ab7c9d966757c4f66a92b268
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 23 14:34:52 2016 +0100
Do not call make three times
* src/gpg4win.mk.in (SPKG_template, SPKG_EX_template): Do not
call make three times. Reindent SPKG configure.
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 41e7cd5..9df9381 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -200,9 +200,8 @@ stamps/stamp-$(1)-ex-03-make: stamps/stamp-$(1)-ex-02-configure
($(call SETVARS_EX,$(1)); \
cd "$$$${pkgbdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
- $(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} || \
- $(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} || \
- $(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs})
+ $(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} \
+ )
touch stamps/stamp-$(1)-ex-03-make
# Note that post_install must come last because it may be empty and
@@ -263,32 +262,30 @@ stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
touch stamps/stamp-$(1)-01-patch
stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
- ($(call SETVARS,$(1)); \
- mkdir "$$$${pkgbdir}"; \
- cd "$$$${pkgbdir}"; \
- eval "../$$$${pkg_version}/configure" \
- --prefix="$$$${pkgidir}" \
- --host=$(host) \
- --build=$(build) \
- $$$${pkgcfg} CFLAGS=\"-mms-bitfields $$$${pkgextracflags}\";\
- shopt -s nullglob; \
- for pfile in "$$$${pkgpbdir}"/*.postcfg \
- "$$$${pkgpdir}"/*.postcfg ; do \
- (cd "$$$${pkgsdir}"; "$$$${pfile}") \
- done; \
- for pfile in "$$$${pkgpbdir}"/*.postcfg-build \
- "$$$${pkgpdir}"/*.postcfg-build ; do \
- (cd "$$$${pkgbdir}"; "$$$${pfile}") \
- done)
+ ($(call SETVARS,$(1)); \
+ mkdir "$$$${pkgbdir}"; \
+ cd "$$$${pkgbdir}"; \
+ eval "../$$$${pkg_version}/configure" \
+ --prefix="$$$${pkgidir}" \
+ --host=$(host) \
+ --build=$(build) \
+ $$$${pkgcfg} CFLAGS=\"-mms-bitfields $$$${pkgextracflags}\";\
+ shopt -s nullglob; \
+ for pfile in "$$$${pkgpbdir}"/*.postcfg \
+ "$$$${pkgpdir}"/*.postcfg ; do \
+ (cd "$$$${pkgsdir}"; "$$$${pfile}") \
+ done; \
+ for pfile in "$$$${pkgpbdir}"/*.postcfg-build \
+ "$$$${pkgpdir}"/*.postcfg-build ; do \
+ (cd "$$$${pkgbdir}"; "$$$${pfile}") \
+ done;) && \
touch stamps/stamp-$(1)-02-configure
stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-02-configure
($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
- $(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} || \
- $(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} || \
- $(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs})
+ $(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs})
touch stamps/stamp-$(1)-03-make
# Note that post_install must come last because it may be empty and
commit db77a67f9871fc062a6b2c384c17d9cbb5c4f8f5
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 23 14:32:13 2016 +0100
Build with -e
* src/Makefile.am: Fix errors.
* src/gpg4win.mk.in: Inject -e through variable setters.
--
Undetected build errors can lead to horrible horrible follow up
errors especially if something like mkdir / change dir fails
and commands get executed in wrong directories.
diff --git a/src/Makefile.am b/src/Makefile.am
index 2a16757..d222a04 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -185,7 +185,7 @@ endef
# Build the reference manual.
define gpg4win_pkg_gpgol_post_install
-( cd $$$${pkgndir}/doc; make pdf )
+( cd $$$${pkgbdir}/doc; make pdf )
endef
# We would like to use --with-libiconv-prefix and
@@ -454,11 +454,6 @@ define gpg4win_pkg_pango_post_install
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
endef
-define gpg4win_pkg_gtk__post_install
- (cd $$$${pkgidir_dev}; \
- perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
-endef
-
define gpg4win_pkg_libpng_post_install
(cd $$$${pkgidir}; \
perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 3b9eb82..41e7cd5 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -60,6 +60,7 @@ endef
# Set a couple of common variables.
define SETVARS
+ set -e; \
pkg="$(call GETVAR,gpg4win_pkg_$(1))"; \
pkg_version="$(1)-$(call GETVAR,gpg4win_pkg_$(1)_version)"; \
pkgsdir="$(bdir)/$$$${pkg_version}"; \
@@ -86,6 +87,7 @@ endef
# Set variables for building in an additional architecture
define SETVARS_EX
+ set -e; \
pkg="$(call GETVAR,gpg4win_pkg_$(1))"; \
pkg_version="$(1)-$(call GETVAR,gpg4win_pkg_$(1)_version)"; \
pkgsdir="$(bdir)/$$$${pkg_version}"; \
commit c3ae4abd54d0bd940db5e73b28bbccac3ee2530b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 23 14:29:27 2016 +0100
Fix circular dependency typo for kiconthemes
* configure.ac: Fix kiconthemes dependency
diff --git a/configure.ac b/configure.ac
index 3f9b615..cb0b6c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -361,7 +361,7 @@ GPG4WIN_KDEPKG([kguiaddons], [qtbase qttools])
GPG4WIN_KDEPKG([kmime], [kcodecs])
GPG4WIN_KDEPKG([kconfigwidgets], [kwidgetsaddons kguiaddons ki18n kcodecs kconfig])
GPG4WIN_KDEPKG([kitemviews], [qtbase qttools])
-GPG4WIN_KDEPKG([kiconthemes], [qtsvg kconfigwidgets kiconthemes])
+GPG4WIN_KDEPKG([kiconthemes], [qtsvg kconfigwidgets])
GPG4WIN_KDEPKG([kxmlgui], [kiconthemes kconfigwidgets kitemviews])
GPG4WIN_KDEPKG([libkleo], [gpgmepp kmime kwidgetsaddons kwindowsystem kcompletion kconfig gpgme])
commit 603620e0bd0bb045f945a2c4c238690f5f3fba93
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 23 14:28:16 2016 +0100
Hack patches to avoid picking up build sys libs
* patches/kconfigwidgets/0001-Make-QDbus-optional.patch,
kiconthemes/0001-Make-DBus-optional.patch: Don't make dbus optional
for Windows.
--
This can lead to the dependency beeing picked up from the build
system and not for the target system.
diff --git a/patches/kconfigwidgets/0001-Make-QDbus-optional.patch b/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
index bda7b3e..9206ff3 100755
--- a/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
+++ b/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
@@ -28,12 +28,12 @@ index bed53d1..87f976c 100644
-find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets DBus)
+if (UNIX)
+ find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets DBus)
-+else()
-+ find_package(Qt5DBus "${REQUIRED_QT_VERSION}" CONFIG)
-+ set_package_properties(Qt5DBus PROPERTIES DESCRIPTION "Qt DBus Library"
-+ PURPOSE "KPasteAction klipper integration."
-+ URL "https://doc.qt.io/qt-5/qdbus.html"
-+ TYPE OPTIONAL)
++#else()
++# find_package(Qt5DBus "${REQUIRED_QT_VERSION}" CONFIG)
++# set_package_properties(Qt5DBus PROPERTIES DESCRIPTION "Qt DBus Library"
++# PURPOSE "KPasteAction klipper integration."
++# URL "https://doc.qt.io/qt-5/qdbus.html"
++# TYPE OPTIONAL)
+endif()
+set (HAVE_QDBUS ${Qt5DBus_FOUND})
include(KDEInstallDirs)
diff --git a/patches/kiconthemes/0001-Make-DBus-optional.patch b/patches/kiconthemes/0001-Make-DBus-optional.patch
index b5b6d47..2f46c68 100755
--- a/patches/kiconthemes/0001-Make-DBus-optional.patch
+++ b/patches/kiconthemes/0001-Make-DBus-optional.patch
@@ -26,14 +26,14 @@ index 5664ea1..22642b9 100644
find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
find_package(Qt5Svg ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
-find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
-+if (UNIX)
-+else()
-+ find_package(Qt5DBus "${REQUIRED_QT_VERSION}" CONFIG)
-+ set_package_properties(Qt5DBus PROPERTIES DESCRIPTION "Qt DBus Library"
-+ PURPOSE "KIconLoader icon change notifications."
-+ URL "https://doc.qt.io/qt-5/qdbus.html"
-+ TYPE OPTIONAL)
-+endif()
++#if (UNIX)
++#else()
++# find_package(Qt5DBus "${REQUIRED_QT_VERSION}" CONFIG)
++# set_package_properties(Qt5DBus PROPERTIES DESCRIPTION "Qt DBus Library"
++# PURPOSE "KIconLoader icon change notifications."
++# URL "https://doc.qt.io/qt-5/qdbus.html"
++# TYPE OPTIONAL)
++#endif()
+set (HAVE_QDBUS ${Qt5DBus_FOUND})
find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
.../kconfigwidgets/0001-Make-QDbus-optional.patch | 12 +-
patches/kiconthemes/0001-Make-DBus-optional.patch | 16 +-
src/Makefile.am | 53 ++--
src/gpg4win.mk.in | 267 +++++++++++++--------
5 files changed, 211 insertions(+), 139 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list