[gentoo-commits] repo/gentoo:master commit in: app-backup/kup/, profiles/
commit: 4a6656d05b4628d6689f5e8a9bf6adc29b7a0346 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jun 6 19:59:32 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 6 20:13:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a6656d0 app-backup/kup: add 0.10.0 Signed-off-by: Andreas Sturmlechner gentoo.org> app-backup/kup/Manifest | 1 + app-backup/kup/kup-0.10.0.ebuild | 45 profiles/package.mask| 1 + 3 files changed, 47 insertions(+) diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest index 4f076b6f44c7..d9c2621faadb 100644 --- a/app-backup/kup/Manifest +++ b/app-backup/kup/Manifest @@ -1 +1,2 @@ +DIST kup-0.10.0.tar.xz 243176 BLAKE2B 081be05c54d9dcfc4f7a4f692efac3531d2d871c72d0ac71b514cd1d07b8ed78cde133ca2c27169113ad9986699bbc6613e118eab84d840c704dc7cd9a09be27 SHA512 3ee5241b4e918488cd4e6d2d54474bafa23749c9bf7132639ca3683ec0723eabb0626df7233f898f97bc0403fca36c7431386b37e1e3d4389d4ef614f5c916c9 DIST kup-0.9.1.tar.xz 205740 BLAKE2B a3200f69e1cd4500b3d74b0ba4bfaa53d63e00c8de73155075c579c7665663fd9285ca4c31e1b8abec62981b6e2d93b93a5db68820727567de77ebcf3d32fda1 SHA512 8906c33ce489fb049ce6223180693e1f5fa97762ff0a45eb68dbd8bad0b816b7ef500f13f1299a4ae75785a48825fc442b39fc0af1a5ef64b5f854d9fac9cc33 diff --git a/app-backup/kup/kup-0.10.0.ebuild b/app-backup/kup/kup-0.10.0.ebuild new file mode 100644 index ..1bce91f08a35 --- /dev/null +++ b/app-backup/kup/kup-0.10.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm kde.org + +DESCRIPTION="Backup scheduler for the Plasma desktop" +HOMEPAGE="https://apps.kde.org/kup/; +SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-libs/libgit2:= + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + kde-plasma/libplasma:6 + kde-plasma/plasma5support:6 +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + net-misc/rsync +" diff --git a/profiles/package.mask b/profiles/package.mask index bff9fdbd4327..3e0a0ff3d463 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -766,6 +766,7 @@ sec-keys/openpgp-keys-jiatan =net-misc/smb4k-3.2.5-r2 ~sys-auth/polkit-qt-0.200.0 ~x11-misc/sddm-0.21.0_p20240302 +~app-backup/kup-0.10.0 ~app-text/kjots-6.0.0 ~app-office/libreoffice-24.2.4.1 =app-office/libreoffice-24.2.3.2-r10
[gentoo-commits] repo/gentoo:master commit in: app-backup/kup/
commit: 803904e5b183d550116c5781f814e751153a3441 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 25 12:06:59 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 25 14:45:49 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=803904e5 app-backup/kup: add kde-invent upstream metadata Signed-off-by: Andreas Sturmlechner gentoo.org> app-backup/kup/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app-backup/kup/metadata.xml b/app-backup/kup/metadata.xml index d925f2439758..29d54eb24219 100644 --- a/app-backup/kup/metadata.xml +++ b/app-backup/kup/metadata.xml @@ -7,5 +7,6 @@ https://bugs.kde.org/ + system/kup
[gentoo-commits] repo/gentoo:master commit in: app-backup/kup/
commit: e10d67f4ef93cb2b89ac8cd282bb725904734493 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 2 10:49:53 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 2 11:03:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e10d67f4 app-backup/kup: Drop 0.8.0 Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-backup/kup/Manifest | 1 - app-backup/kup/kup-0.8.0.ebuild | 44 - 2 files changed, 45 deletions(-) diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest index 4d9e9cf7507..4f076b6f44c 100644 --- a/app-backup/kup/Manifest +++ b/app-backup/kup/Manifest @@ -1,2 +1 @@ -DIST kup-0.8.0.tar.xz 190548 BLAKE2B 7296aac8d32d2b8c33e9358706a5caab2ff83ba053c583316ac389b880051d34f66a5f18d4a92d27af1d6b94d75709b62716ddd08be70533be4a60a117271920 SHA512 b8e970a83c129200ed7d65ab9a1b80330fd1b847868f6fe3f3d202cf65224b843fd9032ffc300cdf1dfdebd0ab611bec456a814c4dfacf51ec5985748c87d2d8 DIST kup-0.9.1.tar.xz 205740 BLAKE2B a3200f69e1cd4500b3d74b0ba4bfaa53d63e00c8de73155075c579c7665663fd9285ca4c31e1b8abec62981b6e2d93b93a5db68820727567de77ebcf3d32fda1 SHA512 8906c33ce489fb049ce6223180693e1f5fa97762ff0a45eb68dbd8bad0b816b7ef500f13f1299a4ae75785a48825fc442b39fc0af1a5ef64b5f854d9fac9cc33 diff --git a/app-backup/kup/kup-0.8.0.ebuild b/app-backup/kup/kup-0.8.0.ebuild deleted file mode 100644 index 433744b3008..000 --- a/app-backup/kup/kup-0.8.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -inherit ecm kde.org - -DESCRIPTION="Backup scheduler for the Plasma desktop" -HOMEPAGE="https://apps.kde.org/kup/; -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-libs/libgit2:= - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - kde-frameworks/kcompletion:5 - kde-frameworks/kconfig:5 - kde-frameworks/kconfigwidgets:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/kdbusaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kidletime:5 - kde-frameworks/kinit:5 - kde-frameworks/kio:5 - kde-frameworks/kjobwidgets:5 - kde-frameworks/knotifications:5 - kde-frameworks/kwidgetsaddons:5 - kde-frameworks/kxmlgui:5 - kde-frameworks/plasma:5 - kde-frameworks/solid:5 -" -RDEPEND="${DEPEND} - dev-qt/qtdeclarative:5 - dev-qt/qtsvg:5 - net-misc/rsync -"
[gentoo-commits] repo/gentoo:master commit in: app-backup/kup/
commit: db7a6084ae4f6819b37414f72a9637c85dd91ac9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 4 18:37:20 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 4 20:58:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db7a6084 app-backup/kup: 0.9.1 version bump Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-backup/kup/Manifest | 1 + app-backup/kup/kup-0.9.1.ebuild | 44 + 2 files changed, 45 insertions(+) diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest index b4f9bb767dc..4d9e9cf7507 100644 --- a/app-backup/kup/Manifest +++ b/app-backup/kup/Manifest @@ -1 +1,2 @@ DIST kup-0.8.0.tar.xz 190548 BLAKE2B 7296aac8d32d2b8c33e9358706a5caab2ff83ba053c583316ac389b880051d34f66a5f18d4a92d27af1d6b94d75709b62716ddd08be70533be4a60a117271920 SHA512 b8e970a83c129200ed7d65ab9a1b80330fd1b847868f6fe3f3d202cf65224b843fd9032ffc300cdf1dfdebd0ab611bec456a814c4dfacf51ec5985748c87d2d8 +DIST kup-0.9.1.tar.xz 205740 BLAKE2B a3200f69e1cd4500b3d74b0ba4bfaa53d63e00c8de73155075c579c7665663fd9285ca4c31e1b8abec62981b6e2d93b93a5db68820727567de77ebcf3d32fda1 SHA512 8906c33ce489fb049ce6223180693e1f5fa97762ff0a45eb68dbd8bad0b816b7ef500f13f1299a4ae75785a48825fc442b39fc0af1a5ef64b5f854d9fac9cc33 diff --git a/app-backup/kup/kup-0.9.1.ebuild b/app-backup/kup/kup-0.9.1.ebuild new file mode 100644 index 000..61420977c73 --- /dev/null +++ b/app-backup/kup/kup-0.9.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +inherit ecm kde.org + +DESCRIPTION="Backup scheduler for the Plasma desktop" +HOMEPAGE="https://apps.kde.org/kup/; +SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-libs/libgit2:= + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + kde-frameworks/kcompletion:5 + kde-frameworks/kconfig:5 + kde-frameworks/kconfigwidgets:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kdbusaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kidletime:5 + kde-frameworks/kinit:5 + kde-frameworks/kio:5 + kde-frameworks/kjobwidgets:5 + kde-frameworks/knotifications:5 + kde-frameworks/kwidgetsaddons:5 + kde-frameworks/kxmlgui:5 + kde-frameworks/plasma:5 + kde-frameworks/solid:5 +" +RDEPEND="${DEPEND} + dev-qt/qtdeclarative:5 + dev-qt/qtsvg:5 + net-misc/rsync +"
[gentoo-commits] repo/gentoo:master commit in: app-backup/kup/
commit: fd92483d1593cb3e5b8b3a2abcdd91ad6d263bf6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 2 14:09:00 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 2 14:57:28 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd92483d app-backup/kup: 0.8.0 version bump w/o app-backup/bup dependency Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> app-backup/kup/Manifest | 1 + app-backup/kup/kup-0.8.0.ebuild | 44 + app-backup/kup/metadata.xml | 8 3 files changed, 53 insertions(+) diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest new file mode 100644 index 000..b4f9bb767dc --- /dev/null +++ b/app-backup/kup/Manifest @@ -0,0 +1 @@ +DIST kup-0.8.0.tar.xz 190548 BLAKE2B 7296aac8d32d2b8c33e9358706a5caab2ff83ba053c583316ac389b880051d34f66a5f18d4a92d27af1d6b94d75709b62716ddd08be70533be4a60a117271920 SHA512 b8e970a83c129200ed7d65ab9a1b80330fd1b847868f6fe3f3d202cf65224b843fd9032ffc300cdf1dfdebd0ab611bec456a814c4dfacf51ec5985748c87d2d8 diff --git a/app-backup/kup/kup-0.8.0.ebuild b/app-backup/kup/kup-0.8.0.ebuild new file mode 100644 index 000..ab78240f702 --- /dev/null +++ b/app-backup/kup/kup-0.8.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +inherit ecm kde.org + +DESCRIPTION="Backup scheduler for the Plasma desktop" +HOMEPAGE="https://www.linux-apps.com/p/1127689; +SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-libs/libgit2:= + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + kde-frameworks/kcompletion:5 + kde-frameworks/kconfig:5 + kde-frameworks/kconfigwidgets:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kdbusaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kidletime:5 + kde-frameworks/kinit:5 + kde-frameworks/kio:5 + kde-frameworks/kjobwidgets:5 + kde-frameworks/knotifications:5 + kde-frameworks/kwidgetsaddons:5 + kde-frameworks/kxmlgui:5 + kde-frameworks/plasma:5 + kde-frameworks/solid:5 +" +RDEPEND="${DEPEND} + dev-qt/qtdeclarative:5 + dev-qt/qtsvg:5 + net-misc/rsync +" diff --git a/app-backup/kup/metadata.xml b/app-backup/kup/metadata.xml new file mode 100644 index 000..2fdbf33d963 --- /dev/null +++ b/app-backup/kup/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + k...@gentoo.org + Gentoo KDE Project + +
[gentoo-commits] repo/gentoo:master commit in: app-backup/kup/, app-backup/kup/files/, profiles/
commit: 409d596d048a300233d0e439007f343b805c86ad Author: Michał Górny gentoo org> AuthorDate: Sat May 23 09:52:29 2020 + Commit: Michał Górny gentoo org> CommitDate: Sat May 23 09:53:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=409d596d app-backup/kup: Remove last-rited pkg Closes: https://bugs.gentoo.org/713366 Signed-off-by: Michał Górny gentoo.org> app-backup/kup/Manifest | 1 - app-backup/kup/files/kup-0.7.3-libgit2.patch | 140 --- app-backup/kup/kup-0.7.3.ebuild | 57 --- app-backup/kup/metadata.xml | 8 -- profiles/package.mask| 1 - 5 files changed, 207 deletions(-) diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest deleted file mode 100644 index 8b2e2f05fe3..000 --- a/app-backup/kup/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kup-0.7.3.tar.gz 1024916 BLAKE2B aab2a1c58bc7feb6cc734a61385841b9c9b47995ba0c7e66b0596ddd7ae77b2a2b750f23f452e591c609f4a59a894815f8cfcb82c8bc266769b6e908463c009c SHA512 62609eb3c9a873045a9f02d22be5413f73f909e77d82f287ff5b2f816d2d6930a8d8ca77537a52189a98fe11441eb10f5530dfdab02ed0c09b53a2c4b5b4be80 diff --git a/app-backup/kup/files/kup-0.7.3-libgit2.patch b/app-backup/kup/files/kup-0.7.3-libgit2.patch deleted file mode 100644 index a6b1c536afc..000 --- a/app-backup/kup/files/kup-0.7.3-libgit2.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 2ca19e917f895e24a5379be669b9ad77ff5692f5 Mon Sep 17 00:00:00 2001 -From: Simon Persson -Date: Mon, 16 Mar 2020 17:03:33 +0800 -Subject: Remove copy of libgit2 - -API seems to have stabilized a lot, such that different distros can be -expected to have a compatible version. - CMakeLists.txt | 13 +- - filedigger/CMakeLists.txt |2 +- - filedigger/main.cpp| 12 - - kioslave/CMakeLists.txt|2 +- - kioslave/bupslave.cpp |8 - - -From ee720980113162c019eecabc01dfa5763cfb7585 Mon Sep 17 00:00:00 2001 -From: Adriaan de Groot -Date: Mon, 6 Apr 2020 23:06:53 +0200 -Subject: Link to libgit2 via imported target - - filedigger/CMakeLists.txt | 2 +- - kioslave/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2118193..76a1367 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,18 +6,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) - - project(kup) - --# Use this option if you want to use the system LibGit2 library. --# This is not recommended unless you know what you are doing. --option(USE_SYSTEM_LIBGIT2 "Don't set this option unless your are sure that your system version of LibGit2 library is fully compatible with Kup." OFF) --if (USE_SYSTEM_LIBGIT2) -- find_package(LibGit2 REQUIRED) -- set(libgit_link_name git2) --else (USE_SYSTEM_LIBGIT2) -- set(BUILD_SHARED_LIBS ON) -- add_subdirectory(libgit2-0.19.0) -- include_directories(${CMAKE_SOURCE_DIR}/libgit2-0.19.0/include) -- set(libgit_link_name git24kup) --endif (USE_SYSTEM_LIBGIT2) -+find_package(LibGit2 REQUIRED) - - if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL "DebugFull") - message(WARNING "enabling debug output!") -diff --git a/filedigger/CMakeLists.txt b/filedigger/CMakeLists.txt -index 2fcdd82..fd6a3a0 100644 a/filedigger/CMakeLists.txt -+++ b/filedigger/CMakeLists.txt -@@ -37,7 +37,7 @@ KF5::I18n - KF5::I18n - KF5::IconThemes - KF5::JobWidgets --${libgit_link_name} -+LibGit2::LibGit2 - ) - - ### install files ### -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 --#else --#include --#endif - - #include - #include -@@ -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/CMakeLists.txt b/kioslave/CMakeLists.txt -index 7187f33..83e6122 100644 a/kioslave/CMakeLists.txt -+++ b/kioslave/CMakeLists.txt -@@ -17,7 +17,7 @@ target_link_libraries(kio_bup - Qt5::Core - KF5::KIOCore - KF5::I18n --${libgit_link_name} -+LibGit2::LibGit2 -
[gentoo-commits] repo/gentoo:master commit in: app-backup/kup/files/, app-backup/kup/
commit: 67c00c137efa4a35c34459d871f4b038709ac297 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 14 15:27:07 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 14 15:28:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c00c13 app-backup/kup: Fix build with newer dev-libs/libgit2 Closes: https://bugs.gentoo.org/717408 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> app-backup/kup/files/kup-0.7.3-libgit2.patch | 140 +++ app-backup/kup/kup-0.7.3.ebuild | 10 +- 2 files changed, 145 insertions(+), 5 deletions(-) diff --git a/app-backup/kup/files/kup-0.7.3-libgit2.patch b/app-backup/kup/files/kup-0.7.3-libgit2.patch new file mode 100644 index 000..a6b1c536afc --- /dev/null +++ b/app-backup/kup/files/kup-0.7.3-libgit2.patch @@ -0,0 +1,140 @@ +From 2ca19e917f895e24a5379be669b9ad77ff5692f5 Mon Sep 17 00:00:00 2001 +From: Simon Persson +Date: Mon, 16 Mar 2020 17:03:33 +0800 +Subject: Remove copy of libgit2 + +API seems to have stabilized a lot, such that different distros can be +expected to have a compatible version. +--- + CMakeLists.txt | 13 +- + filedigger/CMakeLists.txt |2 +- + filedigger/main.cpp| 12 - + kioslave/CMakeLists.txt|2 +- + kioslave/bupslave.cpp |8 - + +From ee720980113162c019eecabc01dfa5763cfb7585 Mon Sep 17 00:00:00 2001 +From: Adriaan de Groot +Date: Mon, 6 Apr 2020 23:06:53 +0200 +Subject: Link to libgit2 via imported target + +--- + filedigger/CMakeLists.txt | 2 +- + kioslave/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2118193..76a1367 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -6,18 +6,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + + project(kup) + +-# Use this option if you want to use the system LibGit2 library. +-# This is not recommended unless you know what you are doing. +-option(USE_SYSTEM_LIBGIT2 "Don't set this option unless your are sure that your system version of LibGit2 library is fully compatible with Kup." OFF) +-if (USE_SYSTEM_LIBGIT2) +- find_package(LibGit2 REQUIRED) +- set(libgit_link_name git2) +-else (USE_SYSTEM_LIBGIT2) +- set(BUILD_SHARED_LIBS ON) +- add_subdirectory(libgit2-0.19.0) +- include_directories(${CMAKE_SOURCE_DIR}/libgit2-0.19.0/include) +- set(libgit_link_name git24kup) +-endif (USE_SYSTEM_LIBGIT2) ++find_package(LibGit2 REQUIRED) + + if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL "DebugFull") + message(WARNING "enabling debug output!") +diff --git a/filedigger/CMakeLists.txt b/filedigger/CMakeLists.txt +index 2fcdd82..fd6a3a0 100644 +--- a/filedigger/CMakeLists.txt b/filedigger/CMakeLists.txt +@@ -37,7 +37,7 @@ KF5::I18n + KF5::I18n + KF5::IconThemes + KF5::JobWidgets +-${libgit_link_name} ++LibGit2::LibGit2 + ) + + ### install files ### +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 +-#else +-#include +-#endif + + #include + #include +@@ -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/CMakeLists.txt b/kioslave/CMakeLists.txt +index 7187f33..83e6122 100644 +--- a/kioslave/CMakeLists.txt b/kioslave/CMakeLists.txt +@@ -17,7 +17,7 @@ target_link_libraries(kio_bup + Qt5::Core + KF5::KIOCore + KF5::I18n +-${libgit_link_name} ++LibGit2::LibGit2 + ) + + install(TARGETS kio_bup DESTINATION ${PLUGIN_INSTALL_DIR}) +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 , const QByteArray ) + { + mRepository = nullptr; + mOpenFile = nullptr; +- #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24 + git_libgit2_init(); +- #else +- git_threads_init(); +- #endif + } + + BupSlave::~BupSlave() { +
[gentoo-commits] repo/gentoo:master commit in: app-backup/kup/
commit: f0cb212bc42531e5784f406efe64ff2df4ad7bdb Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 16 17:15:16 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 16 17:28:32 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0cb212b app-backup/kup: Port to ecm.eclass and kde.org.eclass Package-Manager: Portage-2.3.78, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> app-backup/kup/kup-0.7.3.ebuild | 56 + 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/app-backup/kup/kup-0.7.3.ebuild b/app-backup/kup/kup-0.7.3.ebuild index 36e2caeb59b..d479069e1b3 100644 --- a/app-backup/kup/kup-0.7.3.ebuild +++ b/app-backup/kup/kup-0.7.3.ebuild @@ -1,48 +1,50 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -KDE_HANDBOOK="forceoptional" -inherit kde5 +ECM_HANDBOOK="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org DESCRIPTION="Backup scheduler for KDE's Plasma desktop" HOMEPAGE="https://www.linux-apps.com/p/1127689; SRC_URI="https://github.com/spersson/${PN^}/archive/${P}.tar.gz; LICENSE="GPL-2" +SLOT="5" KEYWORDS="~amd64" IUSE="" DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kinit) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) dev-libs/libgit2:= + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 " RDEPEND="${DEPEND} - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtsvg) app-backup/bup + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 net-misc/rsync - !app-text/kup " S="${WORKDIR}/${PN^}-${P}" @@ -51,5 +53,5 @@ src_configure() { local mycmakeargs=( -DUSE_SYSTEM_LIBGIT2=ON ) - kde5_src_configure + ecm_src_configure }
[gentoo-commits] repo/gentoo:master commit in: app-backup/kup/
commit: cce99b0c3bd6f5ce56774670b657d5e973d8e1de Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 30 18:51:36 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 30 18:53:12 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce99b0c app-backup/kup: New package, 0.7.3 initial version For real this time. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> app-backup/kup/Manifest | 1 + app-backup/kup/kup-0.7.3.ebuild | 55 + app-backup/kup/metadata.xml | 8 ++ 3 files changed, 64 insertions(+) diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest new file mode 100644 index 000..8b2e2f05fe3 --- /dev/null +++ b/app-backup/kup/Manifest @@ -0,0 +1 @@ +DIST kup-0.7.3.tar.gz 1024916 BLAKE2B aab2a1c58bc7feb6cc734a61385841b9c9b47995ba0c7e66b0596ddd7ae77b2a2b750f23f452e591c609f4a59a894815f8cfcb82c8bc266769b6e908463c009c SHA512 62609eb3c9a873045a9f02d22be5413f73f909e77d82f287ff5b2f816d2d6930a8d8ca77537a52189a98fe11441eb10f5530dfdab02ed0c09b53a2c4b5b4be80 diff --git a/app-backup/kup/kup-0.7.3.ebuild b/app-backup/kup/kup-0.7.3.ebuild new file mode 100644 index 000..36e2caeb59b --- /dev/null +++ b/app-backup/kup/kup-0.7.3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="Backup scheduler for KDE's Plasma desktop" +HOMEPAGE="https://www.linux-apps.com/p/1127689; +SRC_URI="https://github.com/spersson/${PN^}/archive/${P}.tar.gz; + +LICENSE="GPL-2" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kidletime) + $(add_frameworks_dep kinit) + $(add_frameworks_dep kio) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep plasma) + $(add_frameworks_dep solid) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwidgets) + dev-libs/libgit2:= +" +RDEPEND="${DEPEND} + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtsvg) + app-backup/bup + net-misc/rsync + !app-text/kup +" + +S="${WORKDIR}/${PN^}-${P}" + +src_configure() { + local mycmakeargs=( + -DUSE_SYSTEM_LIBGIT2=ON + ) + kde5_src_configure +} diff --git a/app-backup/kup/metadata.xml b/app-backup/kup/metadata.xml new file mode 100644 index 000..2fdbf33d963 --- /dev/null +++ b/app-backup/kup/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + k...@gentoo.org + Gentoo KDE Project + +