[arch-commits] Commit in kup/trunk (PKGBUILD kup-libgit-1.0.patch)

[Antonio Rojas]

    Date: Tuesday, June 2, 2020 @ 07:22:06
  Author: arojas
Revision: 637955

Update to 0.8.0

Modified:
  kup/trunk/PKGBUILD
Deleted:
  kup/trunk/kup-libgit-1.0.patch

----------------------+
 PKGBUILD             |   31 +++++-------------------
 kup-libgit-1.0.patch |   63 -------------------------------------------------
 2 files changed, 7 insertions(+), 87 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-02 07:00:17 UTC (rev 637954)
+++ PKGBUILD	2020-06-02 07:22:06 UTC (rev 637955)
@@ -3,8 +3,8 @@
 # PKGBUILD base; Simper < simonpersson1 AT gmail DOT com >
 
 pkgname=kup
-pkgver=0.7.3
-pkgrel=5
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="A KDE bup backup software for helping people to keep up-to-date backups"
 arch=(x86_64)
 url="https://www.linux-apps.com/p/1127689/"
@@ -13,32 +13,15 @@
 makedepends=(extra-cmake-modules plasma-framework)
 optdepends=('bup: support for incremental backups'
             'rsync: support for synced backups')
-source=("https://github.com/spersson/Kup/archive/$pkgname-$pkgver.tar.gz"
-        kup-cmake-build-type.patch::"https://patch-diff.githubusercontent.com/raw/spersson/Kup/pull/81.patch"
-        kup-libgit-1.0.patch)
-sha256sums=('47b97314dd11579a6ecc723de687c9ebe7cafb300d2ce39f2510d36c17de2f3b'
-            '5ba2786dc43436774f24c72ca7abdc887bdf7e739bfe97b71f89c64912441f99'
-            '830045783bf76f260c935df0709f61ff6bb55e75fe9e02b5b8cd2f87eabe200b')
+source=("https://download.kde.org/stable/kup/kup-$pkgver.tar.xz")
+sha256sums=('79154cd12bcbef87b3b22851adcd505f5da7723483361c7a16ae4c3eea61f0bd')
 
-prepare() {
-  mkdir -p build
-
-  cd Kup-$pkgname-$pkgver
-  patch -p1 -i ../kup-cmake-build-type.patch # Fix build when CMAKE_BUILD_TYPE is not specified
-  patch -p1 -i ../kup-libgit-1.0.patch # Fix build with libgit 1.0
-}
-
 build() {
-  cd build
-  cmake ../Kup-$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DUSE_SYSTEM_LIBGIT2=ON \
+  cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }

Deleted: kup-libgit-1.0.patch
===================================================================
--- kup-libgit-1.0.patch	2020-06-02 07:00:17 UTC (rev 637954)
+++ kup-libgit-1.0.patch	2020-06-02 07:22:06 UTC (rev 637955)
@@ -1,63 +0,0 @@
-diff --git a/filedigger/main.cpp b/filedigger/main.cpp
-index 6682985..43fe9ae 100644
---- a/filedigger/main.cpp
-+++ b/filedigger/main.cpp
-@@ -21,11 +21,7 @@
- #include "filedigger.h"
- #include "mergedvfs.h"
- 
--#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
- #include <git2/global.h>
--#else
--#include <git2/threads.h>
--#endif
- 
- #include <KAboutData>
- #include <KLocalizedString>
-@@ -66,19 +62,11 @@ int main(int pArgCount, char **pArgArray) {
- 	}
- 
- 	// This needs to be called first thing, before any other calls to libgit2.
--	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
- 	git_libgit2_init();
--	#else
--	git_threads_init();
--	#endif
- 
- 	FileDigger *lFileDigger = new FileDigger(lRepoPath, lParser.value(QStringLiteral("branch")));
- 	lFileDigger->show();
- 	int lRetVal = lApp.exec();
--	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
- 	git_libgit2_shutdown();
--	#else
--	git_threads_shutdown();
--	#endif
- 	return lRetVal;
- }
-diff --git a/kioslave/bupslave.cpp b/kioslave/bupslave.cpp
-index 1a7e1a3..0812658 100644
---- a/kioslave/bupslave.cpp
-+++ b/kioslave/bupslave.cpp
-@@ -64,22 +64,14 @@ BupSlave::BupSlave(const QByteArray &pPoolSocket, const QByteArray &pAppSocket)
- {
- 	mRepository = nullptr;
- 	mOpenFile = nullptr;
--	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
- 	git_libgit2_init();
--	#else
--	git_threads_init();
--	#endif
- }
- 
- BupSlave::~BupSlave() {
- 	if(mRepository != nullptr) {
- 		delete mRepository;
- 	}
--	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
- 	git_libgit2_shutdown();
--	#else
--	git_threads_shutdown();
--	#endif
- }
- 
- void BupSlave::close() {