* [gentoo-commits] proj/kde:master commit in: kde-misc/basket/, kde-misc/basket/files/
@ 2020-03-08 12:35 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-03-08 12:35 UTC (permalink / raw
To: gentoo-commits
commit: 2d69fd13e8bd0a2bd5dab3bbf225d3db6d775846
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 8 12:25:25 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 8 12:25:25 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d69fd13
kde-misc/basket: Project moved (back) to kde.org
https://cgit.kde.org/sysadmin/repo-metadata.git/commit/?id=44c76e85b18f55ec24986aad45bf390dc7b414b3
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/basket/basket-9999.ebuild | 82 ++++++++++++++++++++++
.../files/basket-2.49b-libgit2-0.99-compat.patch | 32 +++++++++
.../files/basket-2.49b-xdg_mime_install_dir.patch | 35 +++++++++
kde-misc/basket/metadata.xml | 8 +++
4 files changed, 157 insertions(+)
diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild
new file mode 100644
index 0000000000..0a5c8dfa20
--- /dev/null
+++ b/kde-misc/basket/basket-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Multiple information organizer - a DropDrawers clone"
+HOMEPAGE="https://userbase.kde.org/BasKet https://github.com/basket-notepads/basket"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="crypt git"
+
+BDEPEND="git? ( virtual/pkgconfig )"
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kfilemetadata-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ media-libs/phonon[qt5(+)]
+ x11-libs/libX11
+ crypt? ( app-crypt/gpgme:= )
+ git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+PATCHES=(
+ # TODO: upstream
+ "${FILESDIR}/${PN}-2.49b-xdg_mime_install_dir.patch"
+ "${FILESDIR}/${PN}-2.49b-libgit2-0.99-compat.patch" # bug #710832
+)
+
+src_prepare() {
+ ecm_src_prepare
+ if ! use test; then
+ sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package crypt Gpgme)
+ $(cmake_use_find_package git Libgit2)
+ )
+ ecm_src_configure
+}
diff --git a/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch b/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
new file mode 100644
index 0000000000..94793a090f
--- /dev/null
+++ b/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
@@ -0,0 +1,32 @@
+From 094580f207b5ba9f44e9af00834f9c93f06fb440 Mon Sep 17 00:00:00 2001
+From: Dan Goodliffe <dan@randomdan.homeip.net>
+Date: Thu, 27 Feb 2020 18:04:21 +0000
+Subject: [PATCH] Use LIBGIT2_VER_MINOR for version test
+
+Addresses compatibility with libgit2-0.99
+---
+ src/application.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/application.cpp b/src/application.cpp
+index c52fb574..81fcd121 100644
+--- a/src/application.cpp
++++ b/src/application.cpp
+@@ -56,7 +56,7 @@ Application::Application(int &argc, char **argv)
+
+
+ #ifdef WITH_LIBGIT2
+- #if LIBGIT2_SOVERSION >= 22
++ #if LIBGIT2_VER_MINOR >= 22
+ git_libgit2_init();
+ #else
+ git_threads_init();
+@@ -67,7 +67,7 @@ Application::Application(int &argc, char **argv)
+ Application::~Application()
+ {
+ #ifdef WITH_LIBGIT2
+- #if LIBGIT2_SOVERSION >= 22
++ #if LIBGIT2_VER_MINOR >= 22
+ git_libgit2_shutdown();
+ #else
+ git_threads_shutdown();
diff --git a/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch b/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch
new file mode 100644
index 0000000000..d118cb2baa
--- /dev/null
+++ b/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch
@@ -0,0 +1,35 @@
+From 4c80df2dd6aeb7a90677d983a292e4f9a95f2a70 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 14 Nov 2019 13:35:42 +0100
+Subject: [PATCH] Fix install basket.xml to XDG_MIME_INSTALL_DIR
+
+Previous code did not work at all in a sandboxed packaging build.
+---
+ file-integration/CMakeLists.txt | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/file-integration/CMakeLists.txt b/file-integration/CMakeLists.txt
+index c3774fe..77e4692 100644
+--- a/file-integration/CMakeLists.txt
++++ b/file-integration/CMakeLists.txt
+@@ -11,15 +11,5 @@ install(TARGETS basketthumbcreator DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ ########### install files ###############
+
+-find_program(XDG-MIME_EXECUTABLE xdg-mime)
+-find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
+-
+-install(FILES basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+-install(CODE "
+-execute_process(COMMAND ${XDG-MIME_EXECUTABLE} install --novendor
+- ${CMAKE_CURRENT_SOURCE_DIR}/basket.xml)
+-execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install
+- --novendor ${CMAKE_SOURCE_DIR}/src/basket.desktop)
+-execute_process(COMMAND ${XDG-MIME_EXECUTABLE} default
+- ${CMAKE_SOURCE_DIR}/src/basket.desktop application/x-basket-item)
+-")
++install(FILES basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
++install(FILES basket.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+--
+2.24.0
+
diff --git a/kde-misc/basket/metadata.xml b/kde-misc/basket/metadata.xml
new file mode 100644
index 0000000000..5f4d9f3f7c
--- /dev/null
+++ b/kde-misc/basket/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-misc/basket/, kde-misc/basket/files/
@ 2020-03-11 22:34 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-03-11 22:34 UTC (permalink / raw
To: gentoo-commits
commit: 764400c6e7668baba409c5862f88b7157fa3efc3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 18:04:51 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 11 22:33:40 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=764400c6
kde-misc/basket: Drop obsolete patch
Upstream commit 090ac46912025f94aca710355e51a8154df36a56
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/basket/basket-9999.ebuild | 6 +---
.../files/basket-2.49b-libgit2-0.99-compat.patch | 32 ----------------------
2 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild
index 0a5c8dfa20..0036ef6b46 100644
--- a/kde-misc/basket/basket-9999.ebuild
+++ b/kde-misc/basket/basket-9999.ebuild
@@ -60,11 +60,7 @@ DEPEND="${RDEPEND}
>=dev-qt/qtconcurrent-${QTMIN}:5
"
-PATCHES=(
- # TODO: upstream
- "${FILESDIR}/${PN}-2.49b-xdg_mime_install_dir.patch"
- "${FILESDIR}/${PN}-2.49b-libgit2-0.99-compat.patch" # bug #710832
-)
+PATCHES=( "${FILESDIR}/${PN}-2.49b-xdg_mime_install_dir.patch" ) # TODO: upstream
src_prepare() {
ecm_src_prepare
diff --git a/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch b/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
deleted file mode 100644
index 94793a090f..0000000000
--- a/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 094580f207b5ba9f44e9af00834f9c93f06fb440 Mon Sep 17 00:00:00 2001
-From: Dan Goodliffe <dan@randomdan.homeip.net>
-Date: Thu, 27 Feb 2020 18:04:21 +0000
-Subject: [PATCH] Use LIBGIT2_VER_MINOR for version test
-
-Addresses compatibility with libgit2-0.99
----
- src/application.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/application.cpp b/src/application.cpp
-index c52fb574..81fcd121 100644
---- a/src/application.cpp
-+++ b/src/application.cpp
-@@ -56,7 +56,7 @@ Application::Application(int &argc, char **argv)
-
-
- #ifdef WITH_LIBGIT2
-- #if LIBGIT2_SOVERSION >= 22
-+ #if LIBGIT2_VER_MINOR >= 22
- git_libgit2_init();
- #else
- git_threads_init();
-@@ -67,7 +67,7 @@ Application::Application(int &argc, char **argv)
- Application::~Application()
- {
- #ifdef WITH_LIBGIT2
-- #if LIBGIT2_SOVERSION >= 22
-+ #if LIBGIT2_VER_MINOR >= 22
- git_libgit2_shutdown();
- #else
- git_threads_shutdown();
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-misc/basket/, kde-misc/basket/files/
@ 2020-03-12 14:22 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-03-12 14:22 UTC (permalink / raw
To: gentoo-commits
commit: f4f34713ec12462b1546023976d10308298effd0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 14:21:19 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 14:21:32 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4f34713
kde-misc/basket: Patch upstreamed
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/basket/basket-9999.ebuild | 2 --
.../files/basket-2.49b-xdg_mime_install_dir.patch | 35 ----------------------
2 files changed, 37 deletions(-)
diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild
index 0036ef6b46..8a34e75f05 100644
--- a/kde-misc/basket/basket-9999.ebuild
+++ b/kde-misc/basket/basket-9999.ebuild
@@ -60,8 +60,6 @@ DEPEND="${RDEPEND}
>=dev-qt/qtconcurrent-${QTMIN}:5
"
-PATCHES=( "${FILESDIR}/${PN}-2.49b-xdg_mime_install_dir.patch" ) # TODO: upstream
-
src_prepare() {
ecm_src_prepare
if ! use test; then
diff --git a/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch b/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch
deleted file mode 100644
index d118cb2baa..0000000000
--- a/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4c80df2dd6aeb7a90677d983a292e4f9a95f2a70 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 14 Nov 2019 13:35:42 +0100
-Subject: [PATCH] Fix install basket.xml to XDG_MIME_INSTALL_DIR
-
-Previous code did not work at all in a sandboxed packaging build.
----
- file-integration/CMakeLists.txt | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/file-integration/CMakeLists.txt b/file-integration/CMakeLists.txt
-index c3774fe..77e4692 100644
---- a/file-integration/CMakeLists.txt
-+++ b/file-integration/CMakeLists.txt
-@@ -11,15 +11,5 @@ install(TARGETS basketthumbcreator DESTINATION ${PLUGIN_INSTALL_DIR})
-
- ########### install files ###############
-
--find_program(XDG-MIME_EXECUTABLE xdg-mime)
--find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
--
--install(FILES basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--install(CODE "
--execute_process(COMMAND ${XDG-MIME_EXECUTABLE} install --novendor
-- ${CMAKE_CURRENT_SOURCE_DIR}/basket.xml)
--execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install
-- --novendor ${CMAKE_SOURCE_DIR}/src/basket.desktop)
--execute_process(COMMAND ${XDG-MIME_EXECUTABLE} default
-- ${CMAKE_SOURCE_DIR}/src/basket.desktop application/x-basket-item)
--")
-+install(FILES basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-+install(FILES basket.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
---
-2.24.0
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-12 14:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-08 12:35 [gentoo-commits] proj/kde:master commit in: kde-misc/basket/, kde-misc/basket/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-03-11 22:34 Andreas Sturmlechner
2020-03-12 14:22 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox