summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexKurisu2022-02-09 08:59:55 +0300
committerAlexKurisu2022-02-09 08:59:55 +0300
commitd377db10882c9a0937ef80598bae2eb2d9102cce (patch)
tree0d55b2be43fd8bccb12055868a0b42f5ac2dd967
parent234a71dbc137a38e3ceba26ce275d6681200ba40 (diff)
downloadaur-d377db10882c9a0937ef80598bae2eb2d9102cce.tar.gz
Fix build with latest version of patch (thanks to @HurricanePootis)
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--cmake.patch11
3 files changed, 20 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4b6529d68b46..d765f713ec49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,9 +23,11 @@ pkgbase = kwallet-secrets
source = https://download.kde.org/stable/frameworks/5.90/kwallet-5.90.0.tar.xz
source = https://download.kde.org/stable/frameworks/5.90/kwallet-5.90.0.tar.xz.sig
source = https://invent.kde.org/frameworks/kwallet/-/merge_requests/11.patch
+ source = cmake.patch
validpgpkeys = 53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB
- sha256sums = 3034db91605f287460420e4ce66bc8fa5f09076c8dfb2ed1895616aab422c3fb
+ sha256sums = 74aa1144a358a1a43a133dabf1b0936ae01dc290e585573dec88e52d097ace19
sha256sums = SKIP
- sha256sums = 1961e04942c948d8e70436c1401d8239e182582f67cbcc1e062d229ecbcbb282
+ sha256sums = 87455cec3a1221ce9e9cee85b92be58b51b1e70126d93f275f22e08bb2050834
+ sha256sums = 18010e9d2ee0985749ac5a3090ff6bd8724bc2024132b36d9f7f2072f91fec4d
pkgname = kwallet-secrets
diff --git a/PKGBUILD b/PKGBUILD
index c0e6d1a1e302..dc1c147777e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,14 +17,17 @@ provides=(org.freedesktop.secrets kwallet)
conflicts=(kwallet)
groups=(kf5)
source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$o_pkgname-$pkgver.tar.xz{,.sig}
- https://invent.kde.org/frameworks/kwallet/-/merge_requests/11.patch)
+ https://invent.kde.org/frameworks/kwallet/-/merge_requests/11.patch
+ cmake.patch)
sha256sums=('74aa1144a358a1a43a133dabf1b0936ae01dc290e585573dec88e52d097ace19'
'SKIP'
- '1961e04942c948d8e70436c1401d8239e182582f67cbcc1e062d229ecbcbb282')
+ '87455cec3a1221ce9e9cee85b92be58b51b1e70126d93f275f22e08bb2050834'
+ '18010e9d2ee0985749ac5a3090ff6bd8724bc2024132b36d9f7f2072f91fec4d')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>
prepare() {
cd "$o_pkgname-$pkgver"
+ patch -Np1 -i "${srcdir}/cmake.patch" # patch by HurricanePootis <hurricanepootis@protonmail.com>
patch -Np1 -i "${srcdir}/11.patch"
}
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 000000000000..2529feb005ac
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,11 @@
+--- a/src/runtime/kwalletd/backend/CMakeLists.txt 2022-02-08 21:52:08.823207972 -0600
++++ b/src/runtime/kwalletd/backend/CMakeLists.txt 2022-02-08 21:53:17.571101142 -0600
+@@ -56,7 +56,7 @@
+
+ ecm_setup_version(${KF_VERSION} VARIABLE_PREFIX KWALLETBACKEND SOVERSION 5)
+
+-target_link_libraries(kwalletbackend5 Qt5::Widgets KF5::WidgetsAddons KF5::CoreAddons KF5::Notifications KF5::I18n ${LIBGCRYPT_LIBRARIES})
++target_link_libraries(kwalletbackend5 Qt${QT_MAJOR_VERSION}::Widgets KF5::WidgetsAddons KF5::CoreAddons KF5::Notifications KF5::I18n ${LIBGCRYPT_LIBRARIES})
+ if(Gpgmepp_FOUND)
+ target_link_libraries(kwalletbackend5 Gpgmepp)
+ endif(Gpgmepp_FOUND)