* [gentoo-commits] repo/gentoo:master commit in: x11-wm/lumina/, x11-wm/lumina/files/
@ 2017-07-20 13:29 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2017-07-20 13:29 UTC (permalink / raw
To: gentoo-commits
commit: 1009be81becb469ad7408544c67173db79312aca
Author: charIes17 <charles17 <AT> arcor <DOT> de>
AuthorDate: Mon Jul 10 06:46:59 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 13:26:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1009be81
x11-wm/lumina: Bug 617838 and more
Fix for https://bugs.gentoo.org/617838
Fix for https://bugs.gentoo.org/616590
Switch HOMEPAGE to https://
Introduce desktop-utils USE flag for Lumina's desktop utilities
Use ${PV/_/-} for Lumina's patchsets
Patch 1.2.0-desktop-files.patch
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/5002
x11-wm/lumina/files/1.2.0-desktop-files.patch | 33 +++++++++++++++++++++++++++
x11-wm/lumina/lumina-1.2.0-r1.ebuild | 27 ++++++++++++++--------
x11-wm/lumina/metadata.xml | 3 +++
3 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/x11-wm/lumina/files/1.2.0-desktop-files.patch b/x11-wm/lumina/files/1.2.0-desktop-files.patch
new file mode 100644
index 00000000000..f86c1c49c38
--- /dev/null
+++ b/x11-wm/lumina/files/1.2.0-desktop-files.patch
@@ -0,0 +1,33 @@
+--- ./src-qt5/core/lumina-info/lumina-support.desktop
++++ ./src-qt5/core/lumina-info/lumina-support.desktop
+@@ -2,8 +2,7 @@
+ Type=Link
+ URL=https://webchat.freenode.net/?channels=%23lumina-desktop
+ Icon=Lumina-DE
+-Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Community Support
+ GenericName=Get Desktop Help
+ Comment=Ask for desktop support on the community IRC channel
+
+--- ./src-qt5/core-utils/lumina-config/lumina-config.desktop
++++ ./src-qt5/core-utils/lumina-config/lumina-config.desktop
+@@ -7,4 +7,4 @@
+ Categories=Settings;
+ Name=Desktop Configuration
+ Comment=Modify the desktop
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+
+--- ./src-qt5/core/lumina-info/lumina-info.desktop
++++ ./src-qt5/core/lumina-info/lumina-info.desktop
+@@ -5,7 +5,7 @@
+ Type=Application
+ StartupNotify=true
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Desktop Information
+ GenericName=Version and Legal Information
+ Comment=View information about the Lumina Desktop Environment
diff --git a/x11-wm/lumina/lumina-1.2.0-r1.ebuild b/x11-wm/lumina/lumina-1.2.0-r1.ebuild
index a0b45fb1806..6ea490a4cf1 100644
--- a/x11-wm/lumina/lumina-1.2.0-r1.ebuild
+++ b/x11-wm/lumina/lumina-1.2.0-r1.ebuild
@@ -5,14 +5,13 @@ EAPI=6
inherit qmake-utils
DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="http://lumina-desktop.org/"
-I18N="161211"
-SRC_URI="https://github.com/trueos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://lumina-desktop.org/"
+SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-
-IUSE=""
+IUSE="desktop-utils"
COMMON_DEPEND="dev-qt/qtcore:5
dev-qt/qtconcurrent:5
@@ -37,23 +36,31 @@ RDEPEND="$COMMON_DEPEND
sys-fs/inotify-tools
x11-misc/numlockx
x11-wm/fluxbox
- x11-apps/xbacklight
+ || ( x11-apps/xbacklight
+ sys-power/acpilight )
media-sound/alsa-utils
sys-power/acpi
app-admin/sysstat"
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+ "${FILESDIR}/1.2.0-desktop-files.patch"
+)
+
src_prepare(){
default
- rm -rf src-qt5/desktop-utils || die
-
- sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+ if use !desktop-utils ; then
+ rm -rf src-qt5/desktop-utils || die
+ sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+ fi
}
src_configure(){
eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \
L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N
+ LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
}
src_install(){
diff --git a/x11-wm/lumina/metadata.xml b/x11-wm/lumina/metadata.xml
index b5c7881c166..22f3211032e 100644
--- a/x11-wm/lumina/metadata.xml
+++ b/x11-wm/lumina/metadata.xml
@@ -9,6 +9,9 @@
<email>proxy-maint@gentoo.org</email>
<name>Gentoo Proxy Maintainers Project</name>
</maintainer>
+ <use>
+ <flag name="desktop-utils">Build and install lumina's desktop-utils</flag>
+ </use>
<upstream>
<maintainer status="active">
<email>ken@pcbsd.org</email>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/lumina/, x11-wm/lumina/files/
@ 2017-07-20 13:29 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2017-07-20 13:29 UTC (permalink / raw
To: gentoo-commits
commit: d2fa463a157576018ec37817f77843e73c35bf53
Author: charIes17 <charles17 <AT> arcor <DOT> de>
AuthorDate: Mon Jul 10 07:36:17 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 13:26:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2fa463a
x11-wm/lumina: Version bump lumina-1.3.0_p1
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/5002
x11-wm/lumina/Manifest | 1 +
x11-wm/lumina/files/1.3.0-OS-detect.patch | 11 +++++
x11-wm/lumina/lumina-1.3.0_p1.ebuild | 71 +++++++++++++++++++++++++++++++
3 files changed, 83 insertions(+)
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index f2917ea29c6..854b3bcadc4 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,4 +1,5 @@
DIST lumina-0.8.8_p1.tar.gz 53783856 SHA256 52bd8ec956e0a9f89c87bd957e308705aab3ac8c72130a606746af982bf361b7 SHA512 5fbfb6ad19a10b286001252cb2c93e92d4e2ed12a94c29f178afd777d0f2ff5f4d44b0300a40446f89d6c73237155d5963cda966c3fe16d4e9f07fcd4bddc6bb WHIRLPOOL 2e772fe413610ec7814c0e1de9c263c0d84afc45d9a308759ae442f8951fec7c82b16d5c8cb7eba5ce0e6f96f35a5410873370b1732e572ed469133089ad6906
DIST lumina-1.1.0.tar.gz 55828227 SHA256 b6b4eb9c671f0eef9760b0fbd93ebd992248ac619cc7025185fc3f82d6a00373 SHA512 79b48e70fd7be3708966221c25025a8013a3ef96e00681056e99dfdd60809a3ff9d2048b3767d9fbc57c1c4f7e00fb36659cdca86fa41a322f125e9e061e88e0 WHIRLPOOL 9be956b16d04850d0ca4d32166c4c0135f088ce65a754ff0bd7ccf6d95a5c9ede42bc87ad5d617185d008e3efbbe5edfab55dca298724fcb3403973fc6a4f557
DIST lumina-1.2.0.tar.gz 56031811 SHA256 fe7bc2a38ed8397194e6fdf95397e0d38b6fd6416d96240dfd348cd3a36b7336 SHA512 c0843b638999efeebca3b7bc8bdf3187b1606909554fdca1e9158e49ff93cc13a2061bd2697add589d33eefe2bb3a662c5938161622d7fc796f693a61ec9bd40 WHIRLPOOL 7c3e8255db4e1ef349943e9dacb2ac7f6f63156342f204a549e56634c4d87359bbbc8ce60234b08cba43cb0cc5aaebfcce3bc90447cf9f37ead68ff48f9e3f7d
+DIST lumina-1.3.0_p1.tar.gz 86451718 SHA256 76f2b6d45d37d154426cb100d46e3ca4e5e7eca51a7f9f9e442261bfe61b1c31 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707 WHIRLPOOL 6f3af86b66adc66a1b76732e23189946ad35e4897e4bd00912742e3d972bcf0d816b60055098c8ac1104e7e20ce938e7e4727c7501b5e7c92dcb49794c1bb38e
DIST lumina-i18n-161211.tar.bz2 366262 SHA256 84b7b669b30de627d652e74aa520e2a9d82b43885fdb1046b3d708c74801584b SHA512 0b1679e70f8959fed899cfcd7a36c3257b85144bde02ff0e88212c94993ca6439608c1b3744ecc690cfdd5703b7ac9c55b9877eb81bb9b48dd85f7efbfa19ea9 WHIRLPOOL 532d6494ef09071d75c9165dceba7f23fc9d99b2ea0b79dc8401e850b55f5107db58df03395a2b1b64d3a714f4b981093b79c5f15dc53cdd20923dd5da6a9ca5
diff --git a/x11-wm/lumina/files/1.3.0-OS-detect.patch b/x11-wm/lumina/files/1.3.0-OS-detect.patch
new file mode 100644
index 00000000000..e1b71b2a789
--- /dev/null
+++ b/x11-wm/lumina/files/1.3.0-OS-detect.patch
@@ -0,0 +1,11 @@
+--- ./src-qt5/OS-detect.pri
++++ ./src-qt5/OS-detect.pri
+@@ -94,7 +94,7 @@
+ isEmpty(L_SHAREDIR){ L_SHAREDIR = $${PREFIX}/share }
+ isEmpty(L_INCLUDEDIR){ L_INCLUDEDIR = $${PREFIX}/include }
+ isEmpty(L_SESSDIR){ L_SESSDIR = $${L_SHAREDIR}/xsessions }
+- isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/man }
++ isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man }
+ isEmpty(LRELEASE){ LRELEASE = $$[QT_INSTALL_BINS]/lrelease }
+ isEmpty(MAN_ZIP){ MAN_ZIP = "gzip -c" }
+ !exists(LRELEASE){ NO_I18N=true } #translations unavailable
diff --git a/x11-wm/lumina/lumina-1.3.0_p1.ebuild b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
new file mode 100644
index 00000000000..856b11d1af7
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/"
+SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="desktop-utils"
+
+COMMON_DEPEND="dev-qt/qtcore:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtmultimedia:5[widgets]
+ dev-qt/qtsvg:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtgui:5
+ dev-qt/qtdeclarative:5
+ x11-libs/libxcb:0
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-wm"
+
+DEPEND="$COMMON_DEPEND
+ dev-qt/linguist-tools:5"
+
+RDEPEND="$COMMON_DEPEND
+ || ( virtual/freedesktop-icon-theme
+ x11-themes/hicolor-icon-theme )
+ sys-fs/inotify-tools
+ x11-misc/numlockx
+ x11-wm/fluxbox
+ || ( x11-apps/xbacklight
+ sys-power/acpilight )
+ media-sound/alsa-utils
+ sys-power/acpi
+ app-admin/sysstat"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+ "${FILESDIR}/1.2.0-desktop-files.patch"
+ "${FILESDIR}/1.3.0-OS-detect.patch"
+)
+
+src_prepare(){
+ default
+
+ if use !desktop-utils ; then
+ rm -rf src-qt5/desktop-utils || die
+ sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+ fi
+}
+
+src_configure(){
+ eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \
+ L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install(){
+ default
+ mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
+ rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/lumina/, x11-wm/lumina/files/
@ 2020-02-20 14:39 Andrey Grozin
0 siblings, 0 replies; 5+ messages in thread
From: Andrey Grozin @ 2020-02-20 14:39 UTC (permalink / raw
To: gentoo-commits
commit: e4f106c3db726d93da2e81924940eaf1a4e66365
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 20 14:38:57 2020 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Thu Feb 20 14:38:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f106c3
x11-wm/lumina: clean old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
x11-wm/lumina/Manifest | 2 -
x11-wm/lumina/files/1.3.0-OS-detect.patch | 14 -----
x11-wm/lumina/files/1.4.0-poppler.patch | 10 ----
x11-wm/lumina/lumina-1.3.0_p1.ebuild | 68 -----------------------
x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild | 92 -------------------------------
5 files changed, 186 deletions(-)
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 5b19a03b35b..05d06caf634 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,3 +1 @@
-DIST lumina-1.3.0_p1.tar.gz 86451718 BLAKE2B 7834fad1541144524fc44d5e2cc1af21e82878c05f0cc2da4cf90f8f7e51614f535bab1bcb81c6d5929e14b2fa7ba7df8e66e53a9a81b55c973511f3b3e7cc17 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707
-DIST lumina-1.4.0_p1.tar.gz 22489599 BLAKE2B 0c183763dae0ca046fa5d1cebc184a7ba5987113a12f72285e5dabfe25ca763683a23cb76889673ac3c2817feb2233e8b7da9fefed41040f91b0bb01d8ce03ae SHA512 340079832f4f6c9c9c70f11d7743b7c7db6772897f6411a966bf2bd77124bab1fbac8f5751164fb8a08a12c4443f515aaee76b117b4f959263eeaa98dbcbe41e
DIST lumina-1.5.0.tar.gz 20657364 BLAKE2B 62b064e1be3ce69c078e68524e011a8ce4d61c680a4732da7992a7b72833363fceb0a0895a228ec9de7921d989253c70c518810b91c23226aded1f54b23b1aea SHA512 37106d71a9ba7188c4ded0614d2d4424f732519e11288ae312dfcd9a0b5b26dd31dfa812e74a96c0e3e0fb99fae4dc00806fd7a24183746688c72d997054af7d
diff --git a/x11-wm/lumina/files/1.3.0-OS-detect.patch b/x11-wm/lumina/files/1.3.0-OS-detect.patch
deleted file mode 100644
index 48a2076f3aa..00000000000
--- a/x11-wm/lumina/files/1.3.0-OS-detect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src-qt5/OS-detect.pri
-+++ ./src-qt5/OS-detect.pri
-@@ -76,6 +76,11 @@
- equals(LINUX_DISTRO,"Fedora"){
- isEmpty(L_ETCDIR){ L_ETCDIR=/etc }
- }
-+ equals(LINUX_DISTRO,"Gentoo"){
-+ isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin }
-+ isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/../etc }
-+ isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man }
-+ }
- }else{
- OS="Unknown";
- }
diff --git a/x11-wm/lumina/files/1.4.0-poppler.patch b/x11-wm/lumina/files/1.4.0-poppler.patch
deleted file mode 100644
index 8b9399aed9c..00000000000
--- a/x11-wm/lumina/files/1.4.0-poppler.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 lumina-1.4.0.orig/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro lumina-1.4.0/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro
---- lumina-1.4.0.orig/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro 2017-11-21 23:21:47.000000000 +0700
-+++ lumina-1.4.0/src-qt5/desktop-utils/lumina-pdf/lumina-pdf.pro 2017-11-25 19:17:01.771778161 +0700
-@@ -26,5 +26,5 @@
-
- LIBS += -lpoppler-qt5
--INCLUDEPATH+= $${L_INCLUDEDIR}/poppler/qt5
-+INCLUDEPATH+= /usr/include/poppler/qt5
-
- TRANSLATIONS = i18n/l-pdf_af.ts \
diff --git a/x11-wm/lumina/lumina-1.3.0_p1.ebuild b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
deleted file mode 100644
index bacd2527eb9..00000000000
--- a/x11-wm/lumina/lumina-1.3.0_p1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="https://lumina-desktop.org/"
-SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="desktop-utils"
-
-COMMON_DEPEND="dev-qt/qtcore:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtsvg:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dev-qt/qtgui:5
- dev-qt/qtdeclarative:5
- x11-libs/libxcb:0
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- x11-libs/xcb-util-wm"
-
-DEPEND="$COMMON_DEPEND
- dev-qt/linguist-tools:5"
-
-RDEPEND="$COMMON_DEPEND
- sys-fs/inotify-tools
- x11-misc/numlockx
- x11-wm/fluxbox
- || ( x11-apps/xbacklight
- sys-power/acpilight )
- media-sound/alsa-utils
- sys-power/acpi
- app-admin/sysstat"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
- "${FILESDIR}/1.2.0-desktop-files.patch"
- "${FILESDIR}/1.3.0-OS-detect.patch"
-)
-
-src_prepare(){
- default
-
- if use !desktop-utils ; then
- rm -rf src-qt5/desktop-utils || die
- sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
- fi
-}
-
-src_configure(){
- eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
- DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
-}
-
-src_install(){
- default
- mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
- rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
-}
diff --git a/x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild b/x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild
deleted file mode 100644
index 27374bbd02d..00000000000
--- a/x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
-
-inherit qmake-utils l10n xdg-utils gnome2-utils
-DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="https://lumina-desktop.org/"
-SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="desktop-utils"
-
-COMMON_DEPEND="dev-qt/qtcore:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtsvg:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dev-qt/qtgui:5
- dev-qt/qtdeclarative:5
- dev-qt/qtprintsupport:5
- x11-libs/libxcb:0
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- x11-libs/xcb-util-wm
- desktop-utils? ( app-text/poppler[qt5] )"
-
-DEPEND="$COMMON_DEPEND
- dev-qt/linguist-tools:5"
-
-RDEPEND="$COMMON_DEPEND
- sys-fs/inotify-tools
- x11-misc/numlockx
- x11-wm/fluxbox
- || ( x11-apps/xbacklight
- sys-power/acpilight )
- media-sound/alsa-utils
- sys-power/acpi
- app-admin/sysstat"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
- "${FILESDIR}/1.2.0-desktop-files.patch"
- "${FILESDIR}/1.4.0-poppler.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare(){
- default
-
- if use !desktop-utils ; then
- rm -rf src-qt5/desktop-utils || die
- sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
- fi
-
- l10n_find_plocales_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
-}
-
-src_configure(){
- eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
- CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
-}
-
-src_install(){
- emake install INSTALL_ROOT="${D}"
- einstalldocs
-
- remove_locale() {
- rm -f "${ED%/}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
-
- }
- l10n_for_each_disabled_locale_do remove_locale
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/lumina/, x11-wm/lumina/files/
@ 2021-12-05 6:30 Andrey Grozin
0 siblings, 0 replies; 5+ messages in thread
From: Andrey Grozin @ 2021-12-05 6:30 UTC (permalink / raw
To: gentoo-commits
commit: bab789f4412b8938a09bd6a18ad3a4dad44b8fbe
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 5 06:30:23 2021 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Dec 5 06:30:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab789f4
x11-wm/lumina: bump to 1.6.1
Closes: https://bugs.gentoo.org/823792
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
x11-wm/lumina/Manifest | 1 +
x11-wm/lumina/files/1.6.1-chmod.patch | 13 ++++
x11-wm/lumina/files/1.6.1-desktop-files.patch | 33 ++++++++++
x11-wm/lumina/lumina-1.6.1.ebuild | 90 +++++++++++++++++++++++++++
4 files changed, 137 insertions(+)
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 03c66fda5166..1f5a99c7b878 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1 +1,2 @@
DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
+DIST lumina-1.6.1.tar.gz 20614263 BLAKE2B c0ad6a48d06ec9b2c0856a673319cb6a022416465e5f15fce47aac62d7e1817dc8b01acc7c55eaf3664217f2f27ef1b4d7a603a355cd9e22b707b481b322783a SHA512 ff4a77812e8d91478cbfd123ddc545e5a4aaabf3d9f96e6dedc769eb9490e4ac372c4243dca9444cdf986886c08e2eaa587470c9bc8a5a00bbe10ff80ad64c96
diff --git a/x11-wm/lumina/files/1.6.1-chmod.patch b/x11-wm/lumina/files/1.6.1-chmod.patch
new file mode 100644
index 000000000000..ca6460eb2dda
--- /dev/null
+++ b/x11-wm/lumina/files/1.6.1-chmod.patch
@@ -0,0 +1,13 @@
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-checkpass/lumina-checkpass.pro lumina-1.6.1/src-qt5/core/lumina-checkpass/lumina-checkpass.pro
+--- lumina-1.6.1.orig/src-qt5/core/lumina-checkpass/lumina-checkpass.pro 2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-checkpass/lumina-checkpass.pro 2021-12-05 12:55:00.656682056 +0700
+@@ -12,7 +12,7 @@
+
+ SOURCES += main.c
+
+-perms.path = $$DESTDIR$${PREFIX}/sbin
+-perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass"
++#perms.path = $$DESTDIR$${PREFIX}/sbin
++#perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass"
+
+ INSTALLS += target perms
diff --git a/x11-wm/lumina/files/1.6.1-desktop-files.patch b/x11-wm/lumina/files/1.6.1-desktop-files.patch
new file mode 100644
index 000000000000..33a7165b5901
--- /dev/null
+++ b/x11-wm/lumina/files/1.6.1-desktop-files.patch
@@ -0,0 +1,33 @@
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-info.desktop lumina-1.6.1/src-qt5/core/lumina-info/lumina-info.desktop
+--- lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-info.desktop 2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-info/lumina-info.desktop 2021-12-05 11:42:18.142573885 +0700
+@@ -5,7 +5,7 @@
+ Type=Application
+ StartupNotify=true
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Desktop Information
+ Name[pt]=Informações do ambiente de trabalho
+ GenericName=Version and Legal Information
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-support.desktop lumina-1.6.1/src-qt5/core/lumina-info/lumina-support.desktop
+--- lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-support.desktop 2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-info/lumina-support.desktop 2021-12-05 11:41:50.668573204 +0700
+@@ -3,7 +3,7 @@
+ URL=https://t.me/luminadesktop
+ Icon=Lumina-DE
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Community Support
+ Name[pt]=Suporte da comunidade
+ GenericName=Get Desktop Help
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop lumina-1.6.1/src-qt5/core-utils/lumina-config/lumina-config.desktop
+--- lumina-1.6.1.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop 2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core-utils/lumina-config/lumina-config.desktop 2021-12-05 11:42:58.002574873 +0700
+@@ -9,4 +9,4 @@
+ Name[pt]=Configurar ambiente de trabalho
+ Comment=Modify the desktop
+ Comment[pt]=Modificar ambiente de trabalho
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
diff --git a/x11-wm/lumina/lumina-1.6.1.ebuild b/x11-wm/lumina/lumina-1.6.1.ebuild
new file mode 100644
index 000000000000..3992057d88a8
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.6.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
+inherit plocale qmake-utils xdg
+
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/"
+SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="desktop-utils"
+
+DEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets]
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libxcb:0
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-wm
+ desktop-utils? ( app-text/poppler[qt5] )"
+
+RDEPEND="${DEPEND}
+ app-admin/sysstat
+ media-sound/alsa-utils
+ sys-fs/inotify-tools
+ sys-power/acpi
+ || (
+ x11-apps/xbacklight
+ sys-power/acpilight
+ )
+ x11-misc/numlockx
+ x11-wm/fluxbox"
+
+BDEPEND="
+ dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=(
+ "${FILESDIR}/1.6.1-desktop-files.patch"
+ "${FILESDIR}/1.6.1-chmod.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+ default
+
+ if ! use desktop-utils ; then
+ rm -rf src-qt5/desktop-utils || die
+ sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+ fi
+
+ plocale_find_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
+}
+
+src_configure() {
+ eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+ CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+ einstalldocs
+ chmod 4555 "${D}"/usr/sbin/lumina-checkpass
+ mkdir -p "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot create the icons dir"
+ mv "${D}"/usr/share/icons/hicolor/scalable/apps/*.png "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot mv png icons"
+ exeinto /etc/X11/Sessions
+ newexe "${FILESDIR}/lumina-session" lumina ||die
+
+ remove_locale() {
+ rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+
+ }
+ plocale_for_each_disabled_locale remove_locale
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/lumina/, x11-wm/lumina/files/
@ 2025-01-16 5:24 Andrey Grozin
0 siblings, 0 replies; 5+ messages in thread
From: Andrey Grozin @ 2025-01-16 5:24 UTC (permalink / raw
To: gentoo-commits
commit: b8a7094841117d9bdb361ff202ebcf7c3a380ee6
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 05:24:36 2025 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 05:24:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a70948
x11-wm/lumina: add missing deps
Closes: https://bugs.gentoo.org/801352
Closes: https://bugs.gentoo.org/828417
Closes: https://bugs.gentoo.org/923710
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
x11-wm/lumina/files/desktop-files.patch | 34 ++++++++++++
x11-wm/lumina/lumina-1.6.2-r3.ebuild | 92 +++++++++++++++++++++++++++++++++
2 files changed, 126 insertions(+)
diff --git a/x11-wm/lumina/files/desktop-files.patch b/x11-wm/lumina/files/desktop-files.patch
new file mode 100644
index 000000000000..be2043ca8a99
--- /dev/null
+++ b/x11-wm/lumina/files/desktop-files.patch
@@ -0,0 +1,34 @@
+diff '--color=auto' -r -U3 lumina-1.6.2.orig/src-qt5/core/lumina-info/lumina-info.desktop lumina-1.6.2/src-qt5/core/lumina-info/lumina-info.desktop
+--- lumina-1.6.2.orig/src-qt5/core/lumina-info/lumina-info.desktop 2021-12-26 09:33:45.000000000 +0700
++++ lumina-1.6.2/src-qt5/core/lumina-info/lumina-info.desktop 2025-01-16 11:34:04.805877243 +0700
+@@ -5,7 +5,7 @@
+ Type=Application
+ StartupNotify=true
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Desktop Information
+ Name[pt]=Informações do ambiente de trabalho
+ GenericName=Version and Legal Information
+diff '--color=auto' -r -U3 lumina-1.6.2.orig/src-qt5/core/lumina-info/lumina-support.desktop lumina-1.6.2/src-qt5/core/lumina-info/lumina-support.desktop
+--- lumina-1.6.2.orig/src-qt5/core/lumina-info/lumina-support.desktop 2021-12-26 09:33:45.000000000 +0700
++++ lumina-1.6.2/src-qt5/core/lumina-info/lumina-support.desktop 2025-01-16 11:36:39.415880173 +0700
+@@ -2,8 +2,7 @@
+ Type=Link
+ URL=https://t.me/luminadesktop
+ Icon=Lumina-DE
+-Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Community Support
+ Name[pt]=Suporte da comunidade
+ GenericName=Get Desktop Help
+diff '--color=auto' -r -U3 lumina-1.6.2.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop lumina-1.6.2/src-qt5/core-utils/lumina-config/lumina-config.desktop
+--- lumina-1.6.2.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop 2021-12-26 09:33:45.000000000 +0700
++++ lumina-1.6.2/src-qt5/core-utils/lumina-config/lumina-config.desktop 2025-01-16 11:34:04.805877243 +0700
+@@ -9,4 +9,4 @@
+ Name[pt]=Configurar ambiente de trabalho
+ Comment=Modify the desktop
+ Comment[pt]=Modificar ambiente de trabalho
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
diff --git a/x11-wm/lumina/lumina-1.6.2-r3.ebuild b/x11-wm/lumina/lumina-1.6.2-r3.ebuild
new file mode 100644
index 000000000000..848e0aadbdcd
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.6.2-r3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
+inherit plocale qmake-utils xdg
+
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="https://lumina-desktop.org/"
+SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="desktop-utils"
+
+DEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets]
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-wm
+ desktop-utils? ( app-text/poppler[qt5] )"
+
+RDEPEND="${DEPEND}
+ app-admin/sysstat
+ media-sound/alsa-utils
+ sys-apps/dbus
+ sys-fs/inotify-tools
+ sys-power/acpi
+ || (
+ x11-apps/xbacklight
+ sys-power/acpilight
+ )
+ x11-apps/xinit
+ x11-apps/xrandr
+ x11-misc/numlockx
+ x11-misc/xcompmgr
+ x11-misc/xscreensaver
+ x11-wm/fluxbox"
+
+BDEPEND="
+ dev-qt/linguist-tools:5"
+
+PATCHES=(
+ "${FILESDIR}/desktop-files.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+ default
+
+ if ! use desktop-utils ; then
+ rm -rf src-qt5/desktop-utils || die
+ sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+ fi
+
+ plocale_find_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
+}
+
+src_configure() {
+ eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+ CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+ einstalldocs
+ exeinto /etc/X11/Sessions
+ newexe "${FILESDIR}/lumina-session" lumina ||die
+
+ remove_locale() {
+ rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+
+ }
+ plocale_for_each_disabled_locale remove_locale
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-01-16 5:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-20 13:29 [gentoo-commits] repo/gentoo:master commit in: x11-wm/lumina/, x11-wm/lumina/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2017-07-20 13:29 Lars Wendler
2020-02-20 14:39 Andrey Grozin
2021-12-05 6:30 Andrey Grozin
2025-01-16 5:24 Andrey Grozin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox