From 47a1668dc711843d01c50fefed0e43c6c556fa4f Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 22 Sep 2020 09:12:34 -0700 Subject: [PATCH 1/2] falkon: add KDE build option. --- srcpkgs/falkon/template | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template index 6c9f1f201ad..e4253b8c5db 100644 --- a/srcpkgs/falkon/template +++ b/srcpkgs/falkon/template @@ -4,11 +4,10 @@ version=3.1.0 revision=4 build_style=cmake hostmakedepends="extra-cmake-modules gettext pkg-config - qt5-qmake qt5-host-tools python3 kcoreaddons" + qt5-qmake qt5-host-tools python3" makedepends="qt5-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-declarative-devel qt5-webchannel-devel - qt5-webengine-devel qt5-location-devel qt5-x11extras-devel qt5-tools-devel - kwallet-devel kio-devel purpose-devel" + qt5-webengine-devel qt5-location-devel qt5-x11extras-devel qt5-tools-devel" depends="qt5-plugin-sqlite" short_desc="Cross-platform Qt Web Browser" maintainer="Helmut Pozimski " @@ -18,3 +17,14 @@ distfiles="${KDE_SITE}/falkon/${version%.*}/falkon-${version}.tar.xz" checksum=ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587 LDFLAGS="-Wl,--no-fatal-warnings" + +build_options="kde" +build_options_default="kde" +desc_option_kde="KDE integration" + +if [ "$build_option_kde" ]; then + hostmakedepends+=" kcoreaddons" + makedepends+=" kwallet-devel kio-devel purpose-devel" +else + makedepends+=" ki18n-devel xcb-util-devel" +fi From 21a483f055f62907086c98c2f3e367e34e8452ae Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 30 Sep 2020 19:53:07 -0700 Subject: [PATCH 2/2] falkon: add KDE build option. This allows to build falkon without optional KDE libraries. --- srcpkgs/falkon/template | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template index e4253b8c5db..70d3df9a9c0 100644 --- a/srcpkgs/falkon/template +++ b/srcpkgs/falkon/template @@ -4,10 +4,11 @@ version=3.1.0 revision=4 build_style=cmake hostmakedepends="extra-cmake-modules gettext pkg-config - qt5-qmake qt5-host-tools python3" + qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)" makedepends="qt5-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-declarative-devel qt5-webchannel-devel - qt5-webengine-devel qt5-location-devel qt5-x11extras-devel qt5-tools-devel" + qt5-webengine-devel qt5-location-devel qt5-x11extras-devel qt5-tools-devel + $(vopt_if kde 'kwallet-devel kio-devel purpose-devel' 'ki18n-devel xcb-util-devel')" depends="qt5-plugin-sqlite" short_desc="Cross-platform Qt Web Browser" maintainer="Helmut Pozimski " @@ -19,12 +20,5 @@ checksum=ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587 LDFLAGS="-Wl,--no-fatal-warnings" build_options="kde" -build_options_default="kde" desc_option_kde="KDE integration" - -if [ "$build_option_kde" ]; then - hostmakedepends+=" kcoreaddons" - makedepends+=" kwallet-devel kio-devel purpose-devel" -else - makedepends+=" ki18n-devel xcb-util-devel" -fi +build_options_default="kde"