Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
merkuro
Commits:
91c2f171 by Antonio Rojas at 2024-08-26T09:44:19+02:00
upgpkg: 24.08.0-2: Workaround breakage with --as-needed
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,13 +1,14 @@
pkgbase = merkuro
pkgdesc = A calendar application using Akonadi to sync with external
services
pkgver = 24.08.0
- pkgrel = 1
+ pkgrel = 2
url = https://apps.kde.org/merkuro.calendar/
arch = x86_64
groups = kde-applications
groups = kde-pim
license = GPL-2.0-or-later
makedepends = extra-cmake-modules
+ makedepends = patchelf
depends = akonadi-calendar
depends = akonadi-contacts
depends = akonadi-mime
=====================================
PKGBUILD
=====================================
@@ -2,7 +2,7 @@
pkgname=merkuro
pkgver=24.08.0
-pkgrel=1
+pkgrel=2
pkgdesc='A calendar application using Akonadi to sync with external services'
arch=(x86_64)
url='https://apps.kde.org/merkuro.calendar/'
@@ -49,7 +49,8 @@ depends=(akonadi-calendar
qt6-declarative
qt6-location
qt6-positioning)
-makedepends=(extra-cmake-modules)
+makedepends=(extra-cmake-modules
+ patchelf)
conflicts=(kalendar)
replaces=(kalendar)
groups=(kde-applications
@@ -69,4 +70,7 @@ 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/91c2f1718393abdd26cd779b6181bc4bf62f29c1
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/merkuro/-/commit/91c2f1718393abdd26cd779b6181bc4bf62f29c1
You're receiving this email because of your account on gitlab.archlinux.org.
