Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
merkuro
Commits:
e96e5ebe by Antonio Rojas at 2024-08-30T19:25:58+02:00
upgpkg: 24.08.0-3: Use upstream fix
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = merkuro
pkgdesc = A calendar application using Akonadi to sync with external
services
pkgver = 24.08.0
- pkgrel = 2
+ pkgrel = 3
url = https://apps.kde.org/merkuro.calendar/
arch = x86_64
groups = kde-applications
@@ -55,10 +55,12 @@ pkgbase = merkuro
replaces = kalendar
source =
https://download.kde.org/stable/release-service/24.08.0/src/merkuro-24.08.0.tar.xz
source =
https://download.kde.org/stable/release-service/24.08.0/src/merkuro-24.08.0.tar.xz.sig
+ source = https://invent.kde.org/pim/merkuro/-/commit/097e0db8.patch
validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
validpgpkeys = D81C0CB38EB725EF6691C385BB463350D6EF31EF
sha256sums =
726070bef38453eadd3dee68b68fb294dc215107b98c1a8edb461bad1c9fbdae
sha256sums = SKIP
+ sha256sums =
f3add2db9476adc502fd93e54e8f5d4e9ee952de17a82acbb69c26ae3afcf381
pkgname = merkuro
=====================================
PKGBUILD
=====================================
@@ -2,7 +2,7 @@
pkgname=merkuro
pkgver=24.08.0
-pkgrel=2
+pkgrel=3
pkgdesc='A calendar application using Akonadi to sync with external services'
arch=(x86_64)
url='https://apps.kde.org/merkuro.calendar/'
@@ -55,13 +55,19 @@ conflicts=(kalendar)
replaces=(kalendar)
groups=(kde-applications
kde-pim)
-source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
+source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}
+ https://invent.kde.org/pim/merkuro/-/commit/097e0db8.patch)
sha256sums=('726070bef38453eadd3dee68b68fb294dc215107b98c1a8edb461bad1c9fbdae'
- 'SKIP')
+ 'SKIP'
+ 'f3add2db9476adc502fd93e54e8f5d4e9ee952de17a82acbb69c26ae3afcf381')
validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid
<[email protected]>
F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck
<[email protected]>
D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker
<[email protected]>
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < 097e0db8.patch # Fix breakage with
--as-needed
+}
+
build() {
cmake -B build -S $pkgname-$pkgver \
-DBUILD_TESTING=OFF
@@ -70,7 +76,4 @@ build() {
package() {
DESTDIR="$pkgdir" cmake --install build
-# Workaround breakage with --as-needed
https://bugs.kde.org/show_bug.cgi?id=491808
- patchelf --add-needed libmerkuro_contact_plugin.so.6
"$pkgdir"/usr/bin/merkuro-calendar
- patchelf --add-needed libmerkuro_contact_plugin.so.6
"$pkgdir"/usr/bin/merkuro-contact
}
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/merkuro/-/commit/e96e5ebeaf497425993a5b0533d2f35049fa8388
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/merkuro/-/commit/e96e5ebeaf497425993a5b0533d2f35049fa8388
You're receiving this email because of your account on gitlab.archlinux.org.
