From: travankor <travankor@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] falkon: add KDE build option.
Date: Thu, 01 Oct 2020 05:05:58 +0200 [thread overview]
Message-ID: <20201001030558.ksmqoELwGC-nS8yVFPFwRQK2YUz487-0G6_jKS0QcJA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25156@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
There is an updated pull request by travankor against master on the void-packages repository
https://github.com/travankor/void-packages falkon
https://github.com/void-linux/void-packages/pull/25156
falkon: add KDE build option.
None
A patch file from https://github.com/void-linux/void-packages/pull/25156.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-falkon-25156.patch --]
[-- Type: text/x-diff, Size: 3285 bytes --]
From 47a1668dc711843d01c50fefed0e43c6c556fa4f Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
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 <helmut@pozimski.eu>"
@@ -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 167081fc36bd268da403d44e79b2d98625a1d096 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
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..da9f55ecccf 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 puprose-devel' 'ki18n-devel xcb-util-devel')
depends="qt5-plugin-sqlite"
short_desc="Cross-platform Qt Web Browser"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -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"
next prev parent reply other threads:[~2020-10-01 3:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 16:42 [PR PATCH] " travankor
2020-09-28 19:00 ` pullmoll
2020-09-28 19:22 ` pullmoll
2020-09-28 19:22 ` pullmoll
2020-09-28 23:56 ` travankor
2020-09-28 23:57 ` travankor
2020-09-28 23:58 ` travankor
2020-09-29 11:24 ` pullmoll
2020-09-30 18:50 ` [PR REVIEW] " Piraty
2020-10-01 3:05 ` travankor [this message]
2020-10-01 3:08 ` [PR PATCH] [Updated] " travankor
2020-10-01 3:09 ` travankor
2020-10-01 3:10 ` [PR REVIEW] " travankor
2020-10-09 20:18 ` ericonr
2020-10-13 20:47 ` [PR PATCH] [Merged]: " Piraty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201001030558.ksmqoELwGC-nS8yVFPFwRQK2YUz487-0G6_jKS0QcJA@z \
--to=travankor@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).