[arch-commits] Commit in kjots/repos/community-x86_64 (4 files)
Antonio Rojas
arojas at gemini.archlinux.org
Fri Apr 22 14:36:52 UTC 2022
Date: Friday, April 22, 2022 @ 14:36:51
Author: arojas
Revision: 1187340
archrelease: copy trunk to community-x86_64
Added:
kjots/repos/community-x86_64/PKGBUILD
(from rev 1187339, kjots/trunk/PKGBUILD)
kjots/repos/community-x86_64/kjots-deps.patch
(from rev 1187339, kjots/trunk/kjots-deps.patch)
Deleted:
kjots/repos/community-x86_64/PKGBUILD
kjots/repos/community-x86_64/kjots-deps.patch
------------------+
PKGBUILD | 76 ++++++++++++++++++++++++++++-------------------------
kjots-deps.patch | 64 ++++++++++++++++++++++----------------------
2 files changed, 73 insertions(+), 67 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-22 14:36:38 UTC (rev 1187339)
+++ PKGBUILD 2022-04-22 14:36:51 UTC (rev 1187340)
@@ -1,35 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=kjots
-pkgver=5.1.0
-pkgrel=2
-pkgdesc='A note taking application for KDE'
-url='https://www.kde.org/applications/utilities/kjots/'
-arch=(x86_64)
-license=(GPL)
-depends=(kontactinterface akonadi akonadi-notes kpimtextedit grantlee)
-makedepends=(extra-cmake-modules kdoctools boost)
-source=(https://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz
- kjots-deps.patch
- https://invent.kde.org/pim/kjots/-/commit/3d3cee8c.patch
- https://invent.kde.org/pim/kjots/-/commit/581548a1.patch)
-sha256sums=('0cee6238410ef4ae6ec66dc45a1499d8db92801122e4d7906060ce4623e812be'
- 'ce40361c97011c4ea7e984c403b7196d307eb552e05b36b54356600bca885f1a'
- '2f4ccaa9f8d98ea642ca5091bb4f863643729ad4a16133d0840fadfcc2232495'
- 'cbc9ee94ffba826a4aec4e09ff8c28eca5ffb1945249c6752598384bba4e84cd')
-
-prepare() {
- patch -d $pkgname-$pkgver -p1 < kjots-deps.patch # Remove unused dependencies
- patch -d $pkgname-$pkgver -p1 < 3d3cee8c.patch # Fix build with akonadi 21.12
- patch -d $pkgname-$pkgver -p1 < 581548a1.patch # Fix build with akonadi 21.12
-}
-
-build() {
- cmake -B build -S $pkgname-$pkgver \
- -DBUILD_TESTING=OFF
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-}
Copied: kjots/repos/community-x86_64/PKGBUILD (from rev 1187339, kjots/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-22 14:36:51 UTC (rev 1187340)
@@ -0,0 +1,41 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=kjots
+pkgver=5.1.0
+pkgrel=3
+pkgdesc='A note taking application for KDE'
+url='https://www.kde.org/applications/utilities/kjots/'
+arch=(x86_64)
+license=(GPL)
+depends=(kontactinterface akonadi akonadi-notes kpimtextedit grantlee)
+makedepends=(extra-cmake-modules kdoctools)
+source=(https://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz
+ kjots-deps.patch
+ https://invent.kde.org/pim/kjots/-/commit/3d3cee8c.patch
+ https://invent.kde.org/pim/kjots/-/commit/581548a1.patch
+ https://invent.kde.org/pim/kjots/-/commit/b9d91006.patch
+ https://invent.kde.org/pim/kjots/-/commit/17f373bb.patch)
+sha256sums=('0cee6238410ef4ae6ec66dc45a1499d8db92801122e4d7906060ce4623e812be'
+ 'ce40361c97011c4ea7e984c403b7196d307eb552e05b36b54356600bca885f1a'
+ '2f4ccaa9f8d98ea642ca5091bb4f863643729ad4a16133d0840fadfcc2232495'
+ 'cbc9ee94ffba826a4aec4e09ff8c28eca5ffb1945249c6752598384bba4e84cd'
+ 'c5cb52e33e46da5d5360fdbd35d188bf73641931bdf26d238279109da74aa587'
+ '89d8cb5b166d8a3f78eb7b443234e0319868ad80f5005e589c33c5b2b0b9e58c')
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < kjots-deps.patch # Remove unused dependencies
+ patch -d $pkgname-$pkgver -p1 < 3d3cee8c.patch # Fix build with akonadi 21.12
+ patch -d $pkgname-$pkgver -p1 < 581548a1.patch
+ patch -d $pkgname-$pkgver -p1 < b9d91006.patch # Fix build with akonadi 22.04
+ patch -d $pkgname-$pkgver -p1 < 17f373bb.patch
+}
+
+build() {
+ cmake -B build -S $pkgname-$pkgver \
+ -DBUILD_TESTING=OFF
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
Deleted: kjots-deps.patch
===================================================================
--- kjots-deps.patch 2022-04-22 14:36:38 UTC (rev 1187339)
+++ kjots-deps.patch 2022-04-22 14:36:51 UTC (rev 1187340)
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d79806..5204908 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,6 @@ set(KDEPIMLIBS_LIB_VERSION "5.1.0")
- set(KMIME_LIB_VERSION "4.87.0")
- set(KPIMTEXTEDIT_LIB_VERSION "5.14.44")
- set(KONTACTINTERFACE_LIB_VERSION "4.82.0")
--set(LIBKDEPIM_LIB_VERSION "5.14.1")
-
- #Qt Packages
- set(QT_REQUIRED_VERSION "5.6.0")
-@@ -45,7 +44,6 @@ find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
--find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
-
- find_package(Grantlee5 "5.0" CONFIG REQUIRED)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a512dab..e66e805 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -49,7 +49,6 @@ target_link_libraries(kjots_common
- KF5::PimTextEdit
- KF5::XmlGui
- KF5::KIOWidgets
-- KF5::Libkdepim
- Grantlee5::Templates
- Grantlee5::TextDocument
- )
Copied: kjots/repos/community-x86_64/kjots-deps.patch (from rev 1187339, kjots/trunk/kjots-deps.patch)
===================================================================
--- kjots-deps.patch (rev 0)
+++ kjots-deps.patch 2022-04-22 14:36:51 UTC (rev 1187340)
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d79806..5204908 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,6 @@ set(KDEPIMLIBS_LIB_VERSION "5.1.0")
+ set(KMIME_LIB_VERSION "4.87.0")
+ set(KPIMTEXTEDIT_LIB_VERSION "5.14.44")
+ set(KONTACTINTERFACE_LIB_VERSION "4.82.0")
+-set(LIBKDEPIM_LIB_VERSION "5.14.1")
+
+ #Qt Packages
+ set(QT_REQUIRED_VERSION "5.6.0")
+@@ -45,7 +44,6 @@ find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
+-find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
+
+ find_package(Grantlee5 "5.0" CONFIG REQUIRED)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a512dab..e66e805 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -49,7 +49,6 @@ target_link_libraries(kjots_common
+ KF5::PimTextEdit
+ KF5::XmlGui
+ KF5::KIOWidgets
+- KF5::Libkdepim
+ Grantlee5::Templates
+ Grantlee5::TextDocument
+ )
More information about the arch-commits
mailing list