From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] signon-plugin-oauth2: fix conflict with kaccounts-providers
Date: Sun, 14 Jul 2019 01:11:14 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-13098@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
There is a new pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org signon-plugin-oauth2
https://github.com/void-linux/void-packages/pull/13098
signon-plugin-oauth2: fix conflict with kaccounts-providers
closes #13092
A patch file from https://github.com/void-linux/void-packages/pull/13098.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-signon-plugin-oauth2-13098.patch --]
[-- Type: application/text/x-diff, Size: 1593 bytes --]
From ce567d27ca000232e5026c82e604a33a89c7718b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sun, 14 Jul 2019 01:08:33 +0200
Subject: [PATCH] signon-plugin-oauth2: fix conflict with kaccounts-providers
closes #13092
---
srcpkgs/signon-plugin-oauth2/template | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/signon-plugin-oauth2/template b/srcpkgs/signon-plugin-oauth2/template
index e1132c3c82d..d6106197b5a 100644
--- a/srcpkgs/signon-plugin-oauth2/template
+++ b/srcpkgs/signon-plugin-oauth2/template
@@ -1,7 +1,7 @@
# Template file for 'signon-plugin-oauth2'
pkgname=signon-plugin-oauth2
version=0.24
-revision=1
+revision=2
wrksrc="signon-plugin-oauth2-VERSION_${version}"
build_style=qmake
configure_args="LIBDIR=/usr/lib"
@@ -14,6 +14,10 @@ homepage="https://gitlab.com/accounts-sso/signon-plugin-oauth2"
distfiles="https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/archive/VERSION_${version}/signon-plugin-oauth2-VERSION_${version}.tar.bz2"
checksum=d37f6c93b6cd2885b517fd93cdb2407b0164655454ded2ed56e41704f81f05c4
+pre_configure() {
+ vsed -i common-project-config.pri -e 's/ -Werror/& -Wno-error=deprecated-declarations/'
+}
+
if [ "$CROSS_BUILD" ]; then
CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5"
for i in ${XBPS_CROSS_BASE}/usr/include/qt5/*; do
@@ -23,4 +27,6 @@ fi
post_install() {
rm "${DESTDIR}/usr/bin/signon-oauth2plugin-tests"
+ # conflict with kaccounts-providers, this file is less useful
+ rm "${DESTDIR}/etc/signon-ui/webkit-options.d/www.facebook.com.conf"
}
next reply other threads:[~2019-07-13 23:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-13 23:11 voidlinux-github [this message]
2019-07-13 23:34 ` [PR PATCH] [Merged]: " voidlinux-github
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-13098@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--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).