1 |
commit: 2d69fd13e8bd0a2bd5dab3bbf225d3db6d775846 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 8 12:25:25 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 8 12:25:25 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d69fd13 |
7 |
|
8 |
kde-misc/basket: Project moved (back) to kde.org |
9 |
|
10 |
https://cgit.kde.org/sysadmin/repo-metadata.git/commit/?id=44c76e85b18f55ec24986aad45bf390dc7b414b3 |
11 |
|
12 |
Package-Manager: Portage-2.3.92, Repoman-2.3.20 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
kde-misc/basket/basket-9999.ebuild | 82 ++++++++++++++++++++++ |
16 |
.../files/basket-2.49b-libgit2-0.99-compat.patch | 32 +++++++++ |
17 |
.../files/basket-2.49b-xdg_mime_install_dir.patch | 35 +++++++++ |
18 |
kde-misc/basket/metadata.xml | 8 +++ |
19 |
4 files changed, 157 insertions(+) |
20 |
|
21 |
diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild |
22 |
new file mode 100644 |
23 |
index 0000000000..0a5c8dfa20 |
24 |
--- /dev/null |
25 |
+++ b/kde-misc/basket/basket-9999.ebuild |
26 |
@@ -0,0 +1,82 @@ |
27 |
+# Copyright 1999-2020 Gentoo Authors |
28 |
+# Distributed under the terms of the GNU General Public License v2 |
29 |
+ |
30 |
+EAPI=7 |
31 |
+ |
32 |
+ECM_TEST="true" |
33 |
+ECM_HANDBOOK="forceoptional" |
34 |
+KFMIN=5.60.0 |
35 |
+QTMIN=5.12.3 |
36 |
+VIRTUALX_REQUIRED="test" |
37 |
+inherit ecm kde.org |
38 |
+ |
39 |
+DESCRIPTION="Multiple information organizer - a DropDrawers clone" |
40 |
+HOMEPAGE="https://userbase.kde.org/BasKet https://github.com/basket-notepads/basket" |
41 |
+ |
42 |
+if [[ ${KDE_BUILD_TYPE} = release ]]; then |
43 |
+ SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
44 |
+ KEYWORDS="~amd64 ~arm64 ~x86" |
45 |
+fi |
46 |
+ |
47 |
+LICENSE="GPL-2" |
48 |
+SLOT="5" |
49 |
+IUSE="crypt git" |
50 |
+ |
51 |
+BDEPEND="git? ( virtual/pkgconfig )" |
52 |
+RDEPEND=" |
53 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
54 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
55 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
56 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
57 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
58 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
59 |
+ >=kde-frameworks/kcmutils-${KFMIN}:5 |
60 |
+ >=kde-frameworks/kcodecs-${KFMIN}:5 |
61 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
62 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
63 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
64 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
65 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
66 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
67 |
+ >=kde-frameworks/kfilemetadata-${KFMIN}:5 |
68 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
69 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
70 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
71 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
72 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
73 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
74 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
75 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
76 |
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5 |
77 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
78 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
79 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
80 |
+ media-libs/phonon[qt5(+)] |
81 |
+ x11-libs/libX11 |
82 |
+ crypt? ( app-crypt/gpgme:= ) |
83 |
+ git? ( dev-libs/libgit2:= ) |
84 |
+" |
85 |
+DEPEND="${RDEPEND} |
86 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
87 |
+" |
88 |
+ |
89 |
+PATCHES=( |
90 |
+ # TODO: upstream |
91 |
+ "${FILESDIR}/${PN}-2.49b-xdg_mime_install_dir.patch" |
92 |
+ "${FILESDIR}/${PN}-2.49b-libgit2-0.99-compat.patch" # bug #710832 |
93 |
+) |
94 |
+ |
95 |
+src_prepare() { |
96 |
+ ecm_src_prepare |
97 |
+ if ! use test; then |
98 |
+ sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die |
99 |
+ fi |
100 |
+} |
101 |
+ |
102 |
+src_configure() { |
103 |
+ local mycmakeargs=( |
104 |
+ $(cmake_use_find_package crypt Gpgme) |
105 |
+ $(cmake_use_find_package git Libgit2) |
106 |
+ ) |
107 |
+ ecm_src_configure |
108 |
+} |
109 |
|
110 |
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 |
111 |
new file mode 100644 |
112 |
index 0000000000..94793a090f |
113 |
--- /dev/null |
114 |
+++ b/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch |
115 |
@@ -0,0 +1,32 @@ |
116 |
+From 094580f207b5ba9f44e9af00834f9c93f06fb440 Mon Sep 17 00:00:00 2001 |
117 |
+From: Dan Goodliffe <dan@××××××××××××××××.net> |
118 |
+Date: Thu, 27 Feb 2020 18:04:21 +0000 |
119 |
+Subject: [PATCH] Use LIBGIT2_VER_MINOR for version test |
120 |
+ |
121 |
+Addresses compatibility with libgit2-0.99 |
122 |
+--- |
123 |
+ src/application.cpp | 4 ++-- |
124 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
125 |
+ |
126 |
+diff --git a/src/application.cpp b/src/application.cpp |
127 |
+index c52fb574..81fcd121 100644 |
128 |
+--- a/src/application.cpp |
129 |
++++ b/src/application.cpp |
130 |
+@@ -56,7 +56,7 @@ Application::Application(int &argc, char **argv) |
131 |
+ |
132 |
+ |
133 |
+ #ifdef WITH_LIBGIT2 |
134 |
+- #if LIBGIT2_SOVERSION >= 22 |
135 |
++ #if LIBGIT2_VER_MINOR >= 22 |
136 |
+ git_libgit2_init(); |
137 |
+ #else |
138 |
+ git_threads_init(); |
139 |
+@@ -67,7 +67,7 @@ Application::Application(int &argc, char **argv) |
140 |
+ Application::~Application() |
141 |
+ { |
142 |
+ #ifdef WITH_LIBGIT2 |
143 |
+- #if LIBGIT2_SOVERSION >= 22 |
144 |
++ #if LIBGIT2_VER_MINOR >= 22 |
145 |
+ git_libgit2_shutdown(); |
146 |
+ #else |
147 |
+ git_threads_shutdown(); |
148 |
|
149 |
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 |
150 |
new file mode 100644 |
151 |
index 0000000000..d118cb2baa |
152 |
--- /dev/null |
153 |
+++ b/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch |
154 |
@@ -0,0 +1,35 @@ |
155 |
+From 4c80df2dd6aeb7a90677d983a292e4f9a95f2a70 Mon Sep 17 00:00:00 2001 |
156 |
+From: Andreas Sturmlechner <asturm@g.o> |
157 |
+Date: Thu, 14 Nov 2019 13:35:42 +0100 |
158 |
+Subject: [PATCH] Fix install basket.xml to XDG_MIME_INSTALL_DIR |
159 |
+ |
160 |
+Previous code did not work at all in a sandboxed packaging build. |
161 |
+--- |
162 |
+ file-integration/CMakeLists.txt | 14 ++------------ |
163 |
+ 1 file changed, 2 insertions(+), 12 deletions(-) |
164 |
+ |
165 |
+diff --git a/file-integration/CMakeLists.txt b/file-integration/CMakeLists.txt |
166 |
+index c3774fe..77e4692 100644 |
167 |
+--- a/file-integration/CMakeLists.txt |
168 |
++++ b/file-integration/CMakeLists.txt |
169 |
+@@ -11,15 +11,5 @@ install(TARGETS basketthumbcreator DESTINATION ${PLUGIN_INSTALL_DIR}) |
170 |
+ |
171 |
+ ########### install files ############### |
172 |
+ |
173 |
+-find_program(XDG-MIME_EXECUTABLE xdg-mime) |
174 |
+-find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu) |
175 |
+- |
176 |
+-install(FILES basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR}) |
177 |
+-install(CODE " |
178 |
+-execute_process(COMMAND ${XDG-MIME_EXECUTABLE} install --novendor |
179 |
+- ${CMAKE_CURRENT_SOURCE_DIR}/basket.xml) |
180 |
+-execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install |
181 |
+- --novendor ${CMAKE_SOURCE_DIR}/src/basket.desktop) |
182 |
+-execute_process(COMMAND ${XDG-MIME_EXECUTABLE} default |
183 |
+- ${CMAKE_SOURCE_DIR}/src/basket.desktop application/x-basket-item) |
184 |
+-") |
185 |
++install(FILES basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR}) |
186 |
++install(FILES basket.xml DESTINATION ${XDG_MIME_INSTALL_DIR}) |
187 |
+-- |
188 |
+2.24.0 |
189 |
+ |
190 |
|
191 |
diff --git a/kde-misc/basket/metadata.xml b/kde-misc/basket/metadata.xml |
192 |
new file mode 100644 |
193 |
index 0000000000..5f4d9f3f7c |
194 |
--- /dev/null |
195 |
+++ b/kde-misc/basket/metadata.xml |
196 |
@@ -0,0 +1,8 @@ |
197 |
+<?xml version='1.0' encoding='UTF-8'?> |
198 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
199 |
+<pkgmetadata> |
200 |
+ <maintainer type="project"> |
201 |
+ <email>kde@g.o</email> |
202 |
+ <name>Gentoo KDE Project</name> |
203 |
+ </maintainer> |
204 |
+</pkgmetadata> |