Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/albert/files/, x11-misc/albert/
Date: Sun, 04 Sep 2022 16:11:46
Message-Id: 1662307866.5697fab06d40fc2c70352708de9469de237fbed2.juippis@gentoo
1 commit: 5697fab06d40fc2c70352708de9469de237fbed2
2 Author: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
3 AuthorDate: Sun Aug 21 03:09:14 2022 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 4 16:11:06 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5697fab0
7
8 x11-misc/albert: version bump to 0.17.3
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
12 Closes: https://github.com/gentoo/gentoo/pull/26937
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 x11-misc/albert/Manifest | 5 ++
16 x11-misc/albert/albert-0.17.3.ebuild | 94 ++++++++++++++++++++++
17 ...find-and-use-python-libraries-and-headers.patch | 33 ++++++++
18 3 files changed, 132 insertions(+)
19
20 diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
21 index 1c8475d3735a..6fa10387b2e4 100644
22 --- a/x11-misc/albert/Manifest
23 +++ b/x11-misc/albert/Manifest
24 @@ -4,3 +4,8 @@ DIST albert-0.17.2-pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b
25 DIST albert-0.17.2-python-extensions.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294be5cd77fe3f9b4abd985541bd995d1665e5e4a3a9dd64b393c5aba6f00347e0a4c031df2a04672246caff1038858df286c271dd33975 SHA512 13e14ce180787cde9abd0c06970109d9217f67e0b4596d73768efb1a183f6493552766e89bea6fc83703a4c0cc1b4961459cbbf5953c530d2c09d53e686ccc53
26 DIST albert-0.17.2-xkcd-python-extension.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402
27 DIST albert-0.17.2.tar.gz 72652 BLAKE2B af5398307bf4dce928cfe92766551c761c407d9d98cc0a4b730cc8e95509d15c5b8ccfaef6e19d3dd2ded5e56403b14c3ac08fce90845abdfdb74ce7b3ff8b71 SHA512 ce2e32fa0018b210196e09cda8a3cce0a2cafecfdef5edae4610c621c39b66e3b4b039449d1900deb9689b5fa14178d079f7f0a7917cc1019d26b48a0a3ca415
28 +DIST albert-0.17.3.tar.gz 73536 BLAKE2B 21755a9dfa2532ad43b812bb7de70d381c8ad75b815520f51ca7b2afd98c78bb83ec55b715c7f5cfdf065b4e0db51f4e645d7c21d22a128d8337a01ec9029959 SHA512 2734eb2a05067883c9e55bd6533928256240bfc7fd10be2bf0c2fa80da60cf19f62e23843ae4a1a009c5f8d937e791bbb5af9db30f7b0741e28c34b7780e8cf9
29 +DIST albert-jetbrains-python-extension-b7157473cc923fe4f15023c85a032eeab3627652.tar.gz 17062 BLAKE2B fa5da8a7df5e1bb337af75a30b7fbb2584eaa49745d14e88eeea18037d70c55e9885fdbeaeab8aaaa94531e73286c69e14b4864011875d59dcb790a10fd91e88 SHA512 53b9a0d9f972dd495648dd563df8d3b1c973aa02dce99ce7bb8a9da3bcf43174094d5a03035fbaf132072d834ccf918b17076d4f522265bea77c4220140b31de
30 +DIST albert-plugins-ee55048e138028b4889d71e0574e85b2c4d69541.tar.gz 548351 BLAKE2B 6433ccf690cc57a649e6bfabe378c4458e005306529c6f3a143c0e7c0fb64e2c4216a9f17b7283a69684b36f676c5a9e27bcba8a76fc04f5ea4d7d4812f62d1d SHA512 85c6c6cabbdad91b926c446e44c02684cc2f619ca041faf3a23b432046db1f02413fc82dea9eba9aece560ac442a3202d2e9246b98fd36bdadf47470ff160c5a
31 +DIST albert-python-extensions-7f571aceaf8e60eee8bb21e1ec4efa0e95523d13.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294be5cd77fe3f9b4abd985541bd995d1665e5e4a3a9dd64b393c5aba6f00347e0a4c031df2a04672246caff1038858df286c271dd33975 SHA512 13e14ce180787cde9abd0c06970109d9217f67e0b4596d73768efb1a183f6493552766e89bea6fc83703a4c0cc1b4961459cbbf5953c530d2c09d53e686ccc53
32 +DIST albert-xkcd-python-extension-bf88a964473d65b39c9e09eb48dabb847206f06f.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402
33
34 diff --git a/x11-misc/albert/albert-0.17.3.ebuild b/x11-misc/albert/albert-0.17.3.ebuild
35 new file mode 100644
36 index 000000000000..eab6ec58d30e
37 --- /dev/null
38 +++ b/x11-misc/albert/albert-0.17.3.ebuild
39 @@ -0,0 +1,94 @@
40 +# Copyright 1999-2022 Gentoo Authors
41 +# Distributed under the terms of the GNU General Public License v2
42 +
43 +EAPI=8
44 +
45 +PYTHON_COMPAT=( python3_{8..11} )
46 +
47 +inherit cmake python-single-r1 xdg-utils
48 +
49 +DESCRIPTION="A fast and flexible keyboard launcher"
50 +HOMEPAGE="https://albertlauncher.github.io/"
51 +
52 +PLUGINS_HASH="ee55048e138028b4889d71e0574e85b2c4d69541"
53 +PYTHON_EXTENSIONS_COMMIT="7f571aceaf8e60eee8bb21e1ec4efa0e95523d13"
54 +JETBRAINS_PYTHON_EXTENSION_COMMIT="b7157473cc923fe4f15023c85a032eeab3627652"
55 +XKCD_PYTHON_EXTENSION_COMMIT="bf88a964473d65b39c9e09eb48dabb847206f06f"
56 +
57 +SRC_URI="
58 + https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
59 + https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_HASH}.tar.gz
60 + python-extensions? (
61 + https://github.com/albertlauncher/python/archive/${PYTHON_EXTENSIONS_COMMIT}.tar.gz -> ${PN}-python-extensions-${PYTHON_EXTENSIONS_COMMIT}.tar.gz
62 + https://github.com/mqus/jetbrains-albert-plugin/archive/${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-jetbrains-python-extension-${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz
63 + https://github.com/bergercookie/xkcd-albert-plugin/archive/${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-xkcd-python-extension-${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz
64 + )
65 +"
66 +
67 +LICENSE="all-rights-reserved" # unclear licensing #766129
68 +SLOT="0"
69 +KEYWORDS="~amd64"
70 +IUSE="debug +python +python-extensions +statistics virtualbox"
71 +RESTRICT="mirror bindist"
72 +
73 +REQUIRED_USE="
74 + python-extensions? ( python )
75 + python? ( ${PYTHON_REQUIRED_USE} )
76 +"
77 +
78 +RDEPEND="
79 + dev-cpp/muParser
80 + dev-qt/qtconcurrent:5
81 + dev-qt/qtcore:5
82 + dev-qt/qtdbus:5
83 + dev-qt/qtdeclarative:5
84 + dev-qt/qtgraphicaleffects:5
85 + dev-qt/qtgui:5
86 + dev-qt/qtnetwork:5
87 + dev-qt/qtsql:5[sqlite]
88 + dev-qt/qtsvg:5
89 + dev-qt/qtwidgets:5
90 + dev-qt/qtx11extras:5
91 + x11-libs/libX11
92 + python? ( ${PYTHON_DEPS} )
93 + statistics? (
94 + dev-qt/qtcharts:5
95 + dev-qt/qtxml:5
96 + )
97 + virtualbox? ( app-emulation/virtualbox[sdk,vboxwebsrv] )
98 +"
99 +DEPEND="${RDEPEND}
100 + python? ( $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') )"
101 +
102 +PATCHES=("${FILESDIR}/${P}-find-and-use-python-libraries-and-headers.patch")
103 +
104 +src_prepare() {
105 + mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins || die
106 + if use python-extensions; then
107 + mv "${WORKDIR}"/python-${PYTHON_EXTENSIONS_COMMIT}/* "${S}"/plugins/python/share/modules || die
108 + mv "${WORKDIR}"/jetbrains-albert-plugin-${JETBRAINS_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/jetbrains_projects || die
109 + mv "${WORKDIR}"/xkcd-albert-plugin-${XKCD_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/xkcd || die
110 + fi
111 +
112 + cmake_src_prepare
113 +}
114 +
115 +src_configure() {
116 + local mycmakeargs=(
117 + -DBUILD_DEBUG=$(usex debug)
118 + -DBUILD_PYTHON=$(usex python)
119 + -DBUILD_VIRTUALBOX=$(usex virtualbox)
120 + -DBUILD_WITH_QTCHARTS=$(usex statistics)
121 + )
122 +
123 + cmake_src_configure
124 +}
125 +
126 +pkg_postinst() {
127 + xdg_desktop_database_update
128 + xdg_icon_cache_update
129 +}
130 +
131 +pkg_postrm() {
132 + xdg_desktop_database_update
133 +}
134
135 diff --git a/x11-misc/albert/files/albert-0.17.3-find-and-use-python-libraries-and-headers.patch b/x11-misc/albert/files/albert-0.17.3-find-and-use-python-libraries-and-headers.patch
136 new file mode 100644
137 index 000000000000..943e5d8acf2d
138 --- /dev/null
139 +++ b/x11-misc/albert/files/albert-0.17.3-find-and-use-python-libraries-and-headers.patch
140 @@ -0,0 +1,33 @@
141 +From aa89c47db62163eddea623beb48f7ffd8d76062c Mon Sep 17 00:00:00 2001
142 +From: Buchan Milne <bgmilne@×××××.com>
143 +Date: Thu, 14 Jun 2018 08:10:31 +0200
144 +Subject: [PATCH] Find and use python libraries and headers
145 +
146 +---
147 + plugins/python/CMakeLists.txt | 3 +++
148 + 1 file changed, 3 insertions(+)
149 +
150 +diff --git a/plugins/python/CMakeLists.txt b/plugins/python/CMakeLists.txt
151 +index 2dd085d..0dc9b91 100644
152 +--- a/plugins/python/CMakeLists.txt
153 ++++ b/plugins/python/CMakeLists.txt
154 +@@ -5,7 +5,8 @@ PROJECT(python)
155 + FILE(GLOB_RECURSE SRC src/*)
156 +
157 + find_package(Qt5 5.5.0 REQUIRED COMPONENTS Widgets)
158 +-add_subdirectory(pybind11)
159 ++find_package(PythonLibs)
160 ++include_directories(${PYTHON_INCLUDE_DIRS})
161 +
162 + add_library(${PROJECT_NAME} SHARED ${SRC} ${PROJECT_NAME}.qrc metadata.json)
163 +
164 +@@ -14,8 +15,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE src/)
165 + target_link_libraries(${PROJECT_NAME}
166 + PUBLIC
167 + Qt5::Widgets
168 ++ ${PYTHON_LIBRARIES}
169 + PRIVATE
170 +- pybind11::embed
171 + albert::lib
172 + xdg
173 + )