From fb1aa47ca7bdb79dd004c894dc6d9ab34dc41f4e Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Fri, 4 Dec 2020 11:39:10 +0100
Subject: [PATCH] community/signon-plugin-oauth2: upgrade to 0.25
---
community/signon-plugin-oauth2/APKBUILD | 16 ++++++++++------
.../signon-plugin-oauth2/disable-werror.patch | 19 +++++++++++++------
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/community/signon-plugin-oauth2/APKBUILD b/community/signon-plugin-oauth2/APKBUILD
index 9f7b54866dc3..966624b2e423 100644
--- a/community/signon-plugin-oauth2/APKBUILD
+++ b/community/signon-plugin-oauth2/APKBUILD
@@ -1,15 +1,19 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=signon-plugin-oauth2
-pkgver=0.24
-pkgrel=1
+pkgver=0.25
+pkgrel=0
arch="all"
url="https://gitlab.com/accounts-sso/signon-plugin-oauth2"
pkgdesc="Signond OAuth 1.0 and 2.0 plugin"
license="LGPL-2.1-only"
-makedepends="qt5-qtbase-dev signond-dev"
+makedepends="
+ qt5-qtbase-dev
+ signond-dev
+ "
source="https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/archive/VERSION_$pkgver/signon-plugin-oauth2-VERSION_$pkgver.tar.gz
- disable-werror.patch"
+ disable-werror.patch
+ "
subpackages="$pkgname-dev"
builddir="$srcdir/$pkgname-VERSION_$pkgver"
@@ -36,5 +40,5 @@ package() {
INSTALL_ROOT="$pkgdir" make install
}
-sha512sums="8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9 signon-plugin-oauth2-VERSION_0.24.tar.gz
-aaec3780ec164e20917a635c6f56ddf9d467a555972276a72d72e256a913f1addeb2952fbc9f4af184fa12fe528d3c812469c9bc613d4bc11ebcd03ee80ec6ec disable-werror.patch"
+sha512sums="721cd514ee0a1175e3b1bbaa78dc1a87fd382327bcbee8356de040f04455f7cc80ed173e3f33a6acf4c0d679847063a25282e9d5c9a9be99f730bec41be96451 signon-plugin-oauth2-VERSION_0.25.tar.gz
+76fc7dc6b3b735a399ed95f9243559bbda612ef1030a07bc0f8690aed67d3fe90e1995d4ee700dcd2cdfbc2068591a57e445a8810941b3cb6bb9b56b01eb0ab2 disable-werror.patch"
diff --git a/community/signon-plugin-oauth2/disable-werror.patch b/community/signon-plugin-oauth2/disable-werror.patch
index 484eddbef98d..48bf93058df9 100644
--- a/community/signon-plugin-oauth2/disable-werror.patch
+++ b/community/signon-plugin-oauth2/disable-werror.patch
@@ -1,11 +1,18 @@
---- signon-plugin-oauth2-VERSION_0.24.orig/common-project-config.pri
-+++ signon-plugin-oauth2-VERSION_0.24/common-project-config.pri
-@@ -18,7 +18,7 @@
+Upstream sets -Werror but is full of warnings which then block the build.
+Disable it to get it compiling
+
+Upstream issue: https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/issues/15
+
+diff --git a/common-project-config.pri b/common-project-config.pri
+index e149d90..557dc4d 100644
+--- a/common-project-config.pri
++++ b/common-project-config.pri
+@@ -19,8 +19,6 @@ UI_SOURCES_DIR = ui/src
+
QMAKE_CXXFLAGS += -fno-exceptions \
-fno-rtti
- # we don't like warnings...
--QMAKE_CXXFLAGS += -Werror
-+#QMAKE_CXXFLAGS += -Werror
+-# we don't like warnings...
+-unix:QMAKE_CXXFLAGS += -Werror
TOP_SRC_DIR = $$PWD
--
GitLab