[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: 29b1c8de97636f3d1967ea877443c5ab690caacc Author: Joonas Niilola gentoo org> AuthorDate: Wed May 29 06:00:48 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Wed May 29 06:00:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29b1c8de x11-misc/fbpanel: Stabilize 7.0-r4 x86, #933062 Signed-off-by: Joonas Niilola gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild index 0cf6321dbf90..af1a48f65d19 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT LGPL-2+ GPL-2+" # bug #795591 SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 x86" IUSE="alsa" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: 780963ba22cf76ecd2b2bfa2df501f5296135891 Author: Sam James gentoo org> AuthorDate: Tue May 28 22:00:57 2024 + Commit: Sam James gentoo org> CommitDate: Tue May 28 22:00:57 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780963ba x11-misc/fbpanel: Stabilize 7.0-r4 amd64, #933062 Signed-off-by: Sam James gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild index e0b05b891ca7..0cf6321dbf90 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT LGPL-2+ GPL-2+" # bug #795591 SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ppc ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 ~x86" IUSE="alsa" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: bff4a66519bfb30cc48a0a57f1c7cdeaac063488 Author: Sam James gentoo org> AuthorDate: Tue May 28 16:58:54 2024 + Commit: Sam James gentoo org> CommitDate: Tue May 28 16:58:54 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff4a665 x11-misc/fbpanel: Stabilize 7.0-r4 ppc, #933062 Signed-off-by: Sam James gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild index ecba0f60608c..e0b05b891ca7 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT LGPL-2+ GPL-2+" # bug #795591 SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ppc64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~mips ppc ppc64 ~x86" IUSE="alsa" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: b9f56be40b84fffdb77b6b377389da2a45342c3f Author: Sam James gentoo org> AuthorDate: Tue May 28 16:58:52 2024 + Commit: Sam James gentoo org> CommitDate: Tue May 28 16:58:52 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f56be4 x11-misc/fbpanel: Stabilize 7.0-r4 ppc64, #933062 Signed-off-by: Sam James gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild index 04f05780e684..ecba0f60608c 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT LGPL-2+ GPL-2+" # bug #795591 SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ppc64 ~x86" IUSE="alsa" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: 3e29e0df686c3cb43b6e684e5274abd536fdb6fe Author: Viorel Munteanu gentoo org> AuthorDate: Sun Apr 21 08:16:58 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun Apr 21 08:26:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e29e0df x11-misc/fbpanel: enable py3.12 Enable Python 3.12. Only used at build, still works. Update license. Closes: https://bugs.gentoo.org/795591 Closes: https://bugs.gentoo.org/929884 Signed-off-by: Viorel Munteanu gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r4.ebuild | 70 ++ 1 file changed, 70 insertions(+) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild new file mode 100644 index ..04f05780e684 --- /dev/null +++ b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit edo python-any-r1 toolchain-funcs + +DESCRIPTION="Light-weight X11 desktop panel" +HOMEPAGE="https://aanatoly.github.io/fbpanel/; +SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT LGPL-2+ GPL-2+" # bug #795591 +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="alsa" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libX11 + alsa? ( media-libs/alsa-lib ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1-underlinking.patch + "${FILESDIR}"/${PN}-7.0-clang.patch + "${FILESDIR}"/${PN}-7.0-fno-common.patch + "${FILESDIR}"/${PN}-7.0-images.patch + "${FILESDIR}"/${PN}-7.0-python3-shebangs.patch + "${FILESDIR}"/${PN}-7.0-remove-gdk-pixbuf-xlib.h.patch + "${FILESDIR}"/${PN}-7.0-python3.10.patch +) + +src_prepare() { + default + 2to3 -n -w --no-diffs configure .config/*.py || die +} + +src_configure() { + tc-export CC + + # not autotools based + local confargs=( + V=1 + --mandir="${EPREFIX}"/usr/share/man/man1 + --datadir="${EPREFIX}"/usr/share/${PN} + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} + $(usex alsa --sound --no-sound) + ) + + edo ./configure "${confargs[@]}" +} + +pkg_postinst() { + elog "For the volume plugin to work, you need to configure your kernel" + elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means" + elog "that provide the /dev/mixer device node." +}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: 88f14a18afb9867e38902c690cb0e725914dc526 Author: Ionen Wolkens gentoo org> AuthorDate: Mon May 1 08:50:50 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon May 1 09:11:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f14a18 x11-misc/fbpanel: EAPI7->8, enable py3.11 Not really tested but python is only used for building and that still looks fine. Closes: https://bugs.gentoo.org/897346 Signed-off-by: Ionen Wolkens gentoo.org> .../{fbpanel-7.0-r2.ebuild => fbpanel-7.0-r3.ebuild}| 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r3.ebuild similarity index 86% rename from x11-misc/fbpanel/fbpanel-7.0-r2.ebuild rename to x11-misc/fbpanel/fbpanel-7.0-r3.ebuild index be22542d46ae..ded711fabf0b 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r3.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-r1 toolchain-funcs +inherit edo python-any-r1 toolchain-funcs -DESCRIPTION="light-weight X11 desktop panel" +DESCRIPTION="Light-weight X11 desktop panel" HOMEPAGE="https://aanatoly.github.io/fbpanel/; SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -49,17 +49,18 @@ src_prepare() { src_configure() { tc-export CC + # not autotools based - local myconfigure=( - ./configure V=1 + local confargs=( + V=1 --mandir="${EPREFIX}"/usr/share/man/man1 --datadir="${EPREFIX}"/usr/share/${PN} --prefix="${EPREFIX}"/usr --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} $(usex alsa --sound --no-sound) ) - echo ${myconfigure[@]} || die - ${myconfigure[@]} || die + + edo ./configure "${confargs[@]}" } pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/files/, x11-misc/fbpanel/
commit: 3f19d64e7302ed98bc86c9e464c5b2e3b6a306a4 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Feb 11 17:39:05 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Feb 11 23:13:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f19d64e x11-misc/fbpanel: enable py3.10 With a very trivial (straight-to-stable) build script patch. Signed-off-by: Ionen Wolkens gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r2.ebuild | 5 +++-- x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch | 9 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild index bec7e0e0220b..94e70477e409 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-any-r1 toolchain-funcs @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-images.patch "${FILESDIR}"/${PN}-7.0-python3-shebangs.patch "${FILESDIR}"/${PN}-7.0-remove-gdk-pixbuf-xlib.h.patch + "${FILESDIR}"/${PN}-7.0-python3.10.patch ) src_prepare() { diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch b/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch new file mode 100644 index ..1c7a5c0ac38e --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch @@ -0,0 +1,9 @@ +python3.10 does not allow concatenating a string with None and +this shouldn't be ran either way if None. +--- a/configure b/configure +@@ -75,3 +75,3 @@ + self).add_argument_group(title, description) +-if name != 'help' and len(name.split()) == 1: ++if name != 'help' and len(name.split()) == 1 and title is not None: + self.add_argument("--help-" + name, group = 'help',
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: 7eba7572da28e2f10bc92a4e0b0a54a7455153d2 Author: Jonas Stein gentoo org> AuthorDate: Sat Jun 12 12:13:31 2021 + Commit: Jonas Stein gentoo org> CommitDate: Sat Jun 12 12:13:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eba7572 x11-misc/fbpanel: drop project desktop-misc Drop project desktop-misc from the list of maintainers. Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Jonas Stein gentoo.org> x11-misc/fbpanel/metadata.xml | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/x11-misc/fbpanel/metadata.xml b/x11-misc/fbpanel/metadata.xml index 2e82215a420..f2b886e8710 100644 --- a/x11-misc/fbpanel/metadata.xml +++ b/x11-misc/fbpanel/metadata.xml @@ -1,12 +1,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -desktop-m...@gentoo.org -Gentoo Desktop Miscellaneous Project - + -fbpanel aanatoly/fbpanel
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: c7cc54b37b56f01e0446d812647dcadbfcb2ba12 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Jun 3 06:19:44 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Thu Jun 3 06:31:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7cc54b3 x11-misc/fbpanel: add python3_9 3_10 left out as it currently breaks build Signed-off-by: Ionen Wolkens gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r2.ebuild | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild index 1014743e1e7..bec7e0e0220 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) + +PYTHON_COMPAT=( python3_{8,9} ) + inherit python-any-r1 toolchain-funcs DESCRIPTION="light-weight X11 desktop panel"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: d7e68203a37e287583277c26636cb6796beb73aa Author: Matt Turner gentoo org> AuthorDate: Wed Nov 11 20:28:08 2020 + Commit: Matt Turner gentoo org> CommitDate: Wed Nov 11 20:29:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e68203 x11-misc/fbpanel: Remove USE=X gdk-pixbuf dependency This was my fault. Bug: https://bugs.gentoo.org/753908 Signed-off-by: Matt Turner gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild index b108230e45f..d68e30e9802 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild @@ -16,7 +16,7 @@ IUSE="alsa" RDEPEND=" dev-libs/glib:2 - x11-libs/gdk-pixbuf:2[X] + x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 alsa? ( media-libs/alsa-lib )
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/, x11-misc/fbpanel/files/
commit: 89f767ce51e8550a8dd8e88959f4b74d4d1ad6da Author: Ionen Wolkens gmail com> AuthorDate: Wed Nov 11 19:13:42 2020 + Commit: Matt Turner gentoo org> CommitDate: Wed Nov 11 19:14:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f767ce x11-misc/fbpanel: Remove unnecessary gdk-pixbuf-xlib.h includes Closes: https://bugs.gentoo.org/753908 Signed-off-by: Ionen Wolkens gmail.com> Signed-off-by: Matt Turner gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r2.ebuild | 1 + .../fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch | 26 ++ 2 files changed, 27 insertions(+) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild index ddb2acb616c..b108230e45f 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild @@ -36,6 +36,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-fno-common.patch "${FILESDIR}"/${PN}-7.0-images.patch "${FILESDIR}"/${PN}-7.0-python3-shebangs.patch + "${FILESDIR}"/${PN}-7.0-remove-gdk-pixbuf-xlib.h.patch ) src_prepare() { diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch b/x11-misc/fbpanel/files/fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch new file mode 100644 index 000..b2a0375bbb1 --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/753908 + +--- a/panel/plugin.c 2015-12-05 01:34:19.0 -0500 b/panel/plugin.c 2020-11-10 13:35:27.794816516 -0500 +@@ -3,5 +3,4 @@ + + #include +-#include + #include + #include +--- a/plugins/icons/icons.c2015-12-05 01:34:19.0 -0500 b/plugins/icons/icons.c2020-11-10 13:35:49.852850997 -0500 +@@ -9,5 +9,4 @@ + + #include +-#include + #include + +--- a/plugins/taskbar/taskbar.c2015-12-05 01:34:19.0 -0500 b/plugins/taskbar/taskbar.c2020-11-10 13:35:35.950782862 -0500 +@@ -9,5 +9,4 @@ + + #include +-#include + #include +
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/files/, x11-misc/fbpanel/
commit: a6c0cf895cb547798bd8d14253013c524b48ffc7 Author: Michał Górny gentoo org> AuthorDate: Wed Sep 23 11:01:54 2020 + Commit: Michał Górny gentoo org> CommitDate: Wed Sep 23 11:07:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6c0cf89 x11-misc/fbpanel: Remove old Signed-off-by: Michał Górny gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r1.ebuild| 59 --- x11-misc/fbpanel/fbpanel-7.0.ebuild | 57 -- x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch | 120 -- 3 files changed, 236 deletions(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild deleted file mode 100644 index b468b2a537e..000 --- a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 toolchain-funcs - -DESCRIPTION="light-weight X11 desktop panel" -HOMEPAGE="https://aanatoly.github.io/fbpanel/; -SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="alsa" - -RDEPEND=" - dev-libs/glib:2 - alsa? ( media-libs/alsa-lib ) - x11-libs/gdk-pixbuf:2[X] - x11-libs/gtk+:2 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - x11-base/xorg-proto -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.1-underlinking.patch - "${FILESDIR}"/${PN}-7.0-clang.patch - "${FILESDIR}"/${PN}-7.0-images.patch - "${FILESDIR}"/${PN}-7.0-shebangs.patch - "${FILESDIR}"/${PN}-7.0-fno-common.patch -) - -src_configure() { - tc-export CC - # not autotools based - local myconfigure=( - ./configure V=1 - --mandir="${EPREFIX}"/usr/share/man/man1 - --datadir="${EPREFIX}"/usr/share/${PN} - --prefix="${EPREFIX}"/usr - --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} - $(usex alsa --sound --no-sound) - ) - echo ${myconfigure[@]} || die - ${myconfigure[@]} || die -} - -pkg_postinst() { - elog "For the volume plugin to work, you need to configure your kernel" - elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means" - elog "that provide the /dev/mixer device node." -} diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0.ebuild deleted file mode 100644 index 81e254f58b8..000 --- a/x11-misc/fbpanel/fbpanel-7.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 toolchain-funcs - -DESCRIPTION="light-weight X11 desktop panel" -HOMEPAGE="https://aanatoly.github.io/fbpanel/; -SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 x86" -IUSE="alsa" - -RDEPEND=" - dev-libs/glib:2 - alsa? ( media-libs/alsa-lib ) - x11-libs/gdk-pixbuf:2[X] - x11-libs/gtk+:2 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - x11-base/xorg-proto -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.1-underlinking.patch - "${FILESDIR}"/${P}-shebangs.patch - "${FILESDIR}"/${P}-clang.patch -) - -src_configure() { - tc-export CC - # not autotools based - local myconfigure=( - ./configure V=1 - --mandir="${EPREFIX}"/usr/share/man/man1 - --datadir="${EPREFIX}"/usr/share/${PN} - --prefix="${EPREFIX}"/usr - --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} - $(usex alsa --sound --no-sound) - ) - echo ${myconfigure[@]} || die - ${myconfigure[@]} || die -} - -pkg_postinst() { - elog "For the volume plugin to work, you need to configure your kernel" - elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means" - elog "that provide the /dev/mixer device node." -} diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch b/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch deleted file mode 100644 index cdbe998e066..000 --- a/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch +++ /dev/null @@ -1,120 +0,0 @@ a/.config/help -+++ b/.config/help -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python2 - - import re, os, sys, textwrap - # Formats help message a/.config/repl.py -+++ b/.config/repl.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python2 - - import re, sys - a/.config/tar.py -+++ b/.config/tar.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: fdbe458a3a2ef038ef7a3a0c0b8874dc459418de Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Sep 23 10:34:23 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Sep 23 10:34:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdbe458a x11-misc/fbpanel: x86 stable wrt bug #743574 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild index 1ce5c4cc01c..ddb2acb616c 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 x86" IUSE="alsa" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: d547b42223264107c5f435cd40c3dae5325e8ff9 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Sep 23 10:27:55 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Sep 23 10:29:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d547b422 x11-misc/fbpanel: ppc64 stable wrt bug #743574 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild index 74dc9b3615e..1ce5c4cc01c 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~mips ppc ~ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 ~x86" IUSE="alsa" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: ce5e0cbf74ac5c3c1318a7edd09c8c834862cbc2 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Sep 23 10:23:50 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Sep 23 10:23:50 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5e0cbf x11-misc/fbpanel: ppc stable wrt bug #743574 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild index 171340352a9..74dc9b3615e 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm ~mips ppc ~ppc64 ~x86" IUSE="alsa" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: b5bc132caf1bb54d7a4e6e10825e0393b1b63aa3 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Sep 23 10:17:30 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Sep 23 10:17:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bc132c x11-misc/fbpanel: amd64 stable wrt bug #743574 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild index b122768dea1..171340352a9 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~x86" IUSE="alsa" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/, x11-misc/fbpanel/files/
commit: 377404e63724561b7fe5b7b559a16893d8468bec Author: Jeroen Roovers gentoo org> AuthorDate: Thu Jul 9 10:12:54 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Jul 9 10:14:28 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=377404e6 x11-misc/fbpanel: Add python3 support, drop python2 support - Convert build system to python3 thanks to Alexey Mishustin - Set BDEPEND Package-Manager: Portage-2.3.103, Repoman-2.3.23 Closes: https://bugs.gentoo.org/731308 Signed-off-by: Jeroen Roovers gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r2.ebuild | 65 +++ .../files/fbpanel-7.0-python3-shebangs.patch | 120 + 2 files changed, 185 insertions(+) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild new file mode 100644 index 000..b122768dea1 --- /dev/null +++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit python-any-r1 toolchain-funcs + +DESCRIPTION="light-weight X11 desktop panel" +HOMEPAGE="https://aanatoly.github.io/fbpanel/; +SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="alsa" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2[X] + x11-libs/gtk+:2 + x11-libs/libX11 + alsa? ( media-libs/alsa-lib ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1-underlinking.patch + "${FILESDIR}"/${PN}-7.0-clang.patch + "${FILESDIR}"/${PN}-7.0-fno-common.patch + "${FILESDIR}"/${PN}-7.0-images.patch + "${FILESDIR}"/${PN}-7.0-python3-shebangs.patch +) + +src_prepare() { + default + 2to3 -n -w --no-diffs configure .config/*.py || die +} + +src_configure() { + tc-export CC + # not autotools based + local myconfigure=( + ./configure V=1 + --mandir="${EPREFIX}"/usr/share/man/man1 + --datadir="${EPREFIX}"/usr/share/${PN} + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} + $(usex alsa --sound --no-sound) + ) + echo ${myconfigure[@]} || die + ${myconfigure[@]} || die +} + +pkg_postinst() { + elog "For the volume plugin to work, you need to configure your kernel" + elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means" + elog "that provide the /dev/mixer device node." +} diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-python3-shebangs.patch b/x11-misc/fbpanel/files/fbpanel-7.0-python3-shebangs.patch new file mode 100644 index 000..5f98657b42c --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-python3-shebangs.patch @@ -0,0 +1,120 @@ +--- a/.config/help b/.config/help +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python3 + + import re, os, sys, textwrap + # Formats help message +--- a/.config/repl.py b/.config/repl.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python3 + + import re, sys + +--- a/.config/tar.py b/.config/tar.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python3 + + import subprocess as sp + import re, tempfile +--- a/configure b/configure +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python3 + + import sys + if sys.version_info < (2, 7): +--- a/exec/make_profile.in b/exec/make_profile.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + umask 0077 + # new profile directory +--- a/exec/xlogout b/exec/xlogout +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + # xlogout - logs user out of its X session + # Linux specific since uses /proc +--- a/scripts/endianess.sh b/scripts/endianess.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + # When cross compiling, you may put cross compiler directory + # in PATH before native gcc (aka spoofing), or you may set CC +--- a/scripts/install_locale.sh b/scripts/install_locale.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + dir=/tmp/lo-$$ + mkdir $dir +--- a/scripts/install_locale.sh.in b/scripts/install_locale.sh.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + dir=/tmp/lo-$$ + mkdir $dir +--- a/scripts/install.sh b/scripts/install.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + usage () + { +--- a/scripts/mk_tar b/scripts/mk_tar +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + + function info() +--- a/scripts/rfs-pkg-config b/scripts/rfs-pkg-config +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + # Tt runs pkg-config in a way that everything is searched under RFS + # but
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/files/, x11-misc/fbpanel/
commit: 9cd2c526d77f0e7a7ab5bb10111b82095f0d0883 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Feb 1 14:03:43 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Sat Feb 1 14:03:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd2c526 x11-misc/fbpanel: Fix CFLAGS=-fno-common Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Jeroen Roovers gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r1.ebuild | 3 ++- x11-misc/fbpanel/files/fbpanel-7.0-fno-common.patch | 21 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild index 9acb74d5c5f..b468b2a537e 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-clang.patch "${FILESDIR}"/${PN}-7.0-images.patch "${FILESDIR}"/${PN}-7.0-shebangs.patch + "${FILESDIR}"/${PN}-7.0-fno-common.patch ) src_configure() { diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-fno-common.patch b/x11-misc/fbpanel/files/fbpanel-7.0-fno-common.patch new file mode 100644 index 000..aafd8c4cc67 --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-fno-common.patch @@ -0,0 +1,21 @@ +--- a/panel/plugin.c b/panel/plugin.c +@@ -22,6 +22,7 @@ + /**/ + static GHashTable *class_ht; + ++struct _plugin_instance *stam; + + void + class_register(plugin_class *p) +--- a/panel/plugin.h b/panel/plugin.h +@@ -9,7 +9,7 @@ + #include + #include "panel.h" + +-struct _plugin_instance *stam; ++extern struct _plugin_instance *stam; + + typedef struct { + /* common */
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: 61d53138198fde835759b6db8bbd53ccc52bedbc Author: David Seifert gentoo org> AuthorDate: Mon Jan 13 10:06:27 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Jan 13 10:06:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d53138 x11-misc/fbpanel: [QA] Fix HomepageInSrcUri Signed-off-by: David Seifert gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild index 1bbb80f5568..9acb74d5c5f 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild @@ -8,7 +8,7 @@ inherit python-any-r1 toolchain-funcs DESCRIPTION="light-weight X11 desktop panel" HOMEPAGE="https://aanatoly.github.io/fbpanel/; -SRC_URI="${HOMEPAGE}archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: f7d815911d39deb16257b049c351f5f0fd41c205 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Dec 30 18:01:18 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Dec 30 18:01:27 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d81591 x11-misc/fbpanel: use ASCII whitespace Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Sergei Trofimovich gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r1.ebuild | 2 +- x11-misc/fbpanel/fbpanel-7.0.ebuild| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild index 4fa27690725..1bbb80f5568 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild @@ -48,7 +48,7 @@ src_configure() { $(usex alsa --sound --no-sound) ) echo ${myconfigure[@]} || die - ${myconfigure[@]} || die + ${myconfigure[@]} || die } pkg_postinst() { diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0.ebuild index 60b62d30aa6..81e254f58b8 100644 --- a/x11-misc/fbpanel/fbpanel-7.0.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -47,7 +47,7 @@ src_configure() { $(usex alsa --sound --no-sound) ) echo ${myconfigure[@]} || die - ${myconfigure[@]} || die + ${myconfigure[@]} || die } pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/, x11-misc/fbpanel/files/
commit: c532a8aa1e5c3ad81f30ba190227c290348de228 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Feb 7 09:47:42 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Feb 7 09:48:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c532a8aa x11-misc/fbpanel: Fix image permissions Package-Manager: Portage-2.3.59, Repoman-2.3.12 Fixes: https://bugs.gentoo.org/677390 Signed-off-by: Jeroen Roovers gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r1.ebuild | 58 + x11-misc/fbpanel/files/fbpanel-7.0-images.patch | 10 + 2 files changed, 68 insertions(+) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild new file mode 100644 index 000..4fa27690725 --- /dev/null +++ b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) + +inherit python-any-r1 toolchain-funcs + +DESCRIPTION="light-weight X11 desktop panel" +HOMEPAGE="https://aanatoly.github.io/fbpanel/; +SRC_URI="${HOMEPAGE}archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="alsa" + +RDEPEND=" + dev-libs/glib:2 + alsa? ( media-libs/alsa-lib ) + x11-libs/gdk-pixbuf:2[X] + x11-libs/gtk+:2 + x11-libs/libX11 +" +DEPEND=" + ${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1-underlinking.patch + "${FILESDIR}"/${PN}-7.0-clang.patch + "${FILESDIR}"/${PN}-7.0-images.patch + "${FILESDIR}"/${PN}-7.0-shebangs.patch +) + +src_configure() { + tc-export CC + # not autotools based + local myconfigure=( + ./configure V=1 + --mandir="${EPREFIX}"/usr/share/man/man1 + --datadir="${EPREFIX}"/usr/share/${PN} + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} + $(usex alsa --sound --no-sound) + ) + echo ${myconfigure[@]} || die + ${myconfigure[@]} || die +} + +pkg_postinst() { + elog "For the volume plugin to work, you need to configure your kernel" + elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means" + elog "that provide the /dev/mixer device node." +} diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-images.patch b/x11-misc/fbpanel/files/fbpanel-7.0-images.patch new file mode 100644 index 000..c1b9faf6304 --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-images.patch @@ -0,0 +1,10 @@ +--- a/data/images/Makefile b/data/images/Makefile +@@ -31,6 +31,6 @@ + + install : + $Qinstall -d $(DESTDIR)$(DATADIR)/images +- $Qinstall $(IMAGES) $(DESTDIR)$(DATADIR)/images ++ $Qinstall -m 0644 $(IMAGES) $(DESTDIR)$(DATADIR)/images + + include $(TOPDIR)/.config/rules.mk
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/files/
commit: 65925d39c9814fa0381b3d438a683731bdfa69e7 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Oct 27 01:46:51 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Oct 27 01:47:08 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65925d39 x11-misc/fbpanel: Obsolete patch. Package-Manager: Portage-2.3.12, Repoman-2.3.4 x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch | 13 - 1 file changed, 13 deletions(-) diff --git a/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch b/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch deleted file mode 100644 index 8adf4bf4cf7..000 --- a/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch +++ /dev/null @@ -1,13 +0,0 @@ -Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=501804 -Upstream: https://sourceforge.net/p/fbpanel/code/474/ - -Signed-off-by: Markos Chandras- a/exec/xlogout -+++ b/exec/xlogout -@@ -45,5 +45,5 @@ - [ -z "$SPID" ] && exit 1 - echo "Session start up script" - ps -o uid,pid,ppid,sess,cmd --pid $SPID --kill -SIGTERM -$SPID -+kill -SIGTERM -$SPID $SPID
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/
commit: 070b04a41afcf42b94d6025fd7ed2723d889558a Author: Michael Weber gentoo org> AuthorDate: Tue Mar 21 10:02:53 2017 + Commit: Michael Weber gentoo org> CommitDate: Tue Mar 21 10:08:10 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=070b04a4 x11-misc/fbpanel: ppc64 stable (bug 613104) Package-Manager: Portage-2.3.5, Repoman-2.3.2 RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64" x11-misc/fbpanel/fbpanel-7.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0.ebuild index 81bac3373fe..f9dcd6a1801 100644 --- a/x11-misc/fbpanel/fbpanel-7.0.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ppc64 ~x86" IUSE="alsa" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/, x11-misc/fbpanel/files/
commit: da2b848f594f74c10e1f97dc4429fa1abd607e79 Author: Harri Nieminen gmail com> AuthorDate: Sat Feb 25 18:13:38 2017 + Commit: David Seifert gentoo org> CommitDate: Tue Feb 28 19:10:37 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2b848f x11-misc/fbpanel: Version bump to 7.0 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/4085 x11-misc/fbpanel/Manifest | 1 + x11-misc/fbpanel/fbpanel-7.0.ebuild | 58 +++ x11-misc/fbpanel/files/fbpanel-7.0-clang.patch| 57 ++ x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch | 120 ++ 4 files changed, 236 insertions(+) diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest index ee89550ced..37e46383f5 100644 --- a/x11-misc/fbpanel/Manifest +++ b/x11-misc/fbpanel/Manifest @@ -1 +1,2 @@ DIST fbpanel-6.1.tbz2 190266 SHA256 e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965 SHA512 10ffa422d811725dff68f43af9735d79c7859114bdf06f49b05e0bc4b0fd5eb8a3ea196cd07753f261d60c0bd0716baa6d5a22c860dde6597c70bfcfb0f7078e WHIRLPOOL 362d4beaa383ad716a851d4fe1a5e583d635c300a0d97ba36d07e2709b8ca09cd6756c7bf8f7fc62508c547dc23c043b6ad0e90787dc629b3dda280d2b55e97e +DIST fbpanel-7.0.tar.gz 3746477 SHA256 711570954f8f99235d6afb7ec3226dede20b832eb712a5bd00e4f793b75ac5bb SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874 WHIRLPOOL 37fc5f86b80474026b660491b83ee26c4e9e260cadafff9673d161feb79efe2b2d6c89f1c83c76ebfe4161e83cf3dc271667d4a2aeefe37c5e93c30f8e31 diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0.ebuild new file mode 100644 index 00..408fcdd3aa --- /dev/null +++ b/x11-misc/fbpanel/fbpanel-7.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit python-any-r1 toolchain-funcs + +DESCRIPTION="light-weight X11 desktop panel" +HOMEPAGE="https://aanatoly.github.io/fbpanel/; +SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="alsa" + +RDEPEND=" + dev-libs/glib:2 + alsa? ( media-libs/alsa-lib ) + x11-libs/gdk-pixbuf:2[X] + x11-libs/gtk+:2 + x11-libs/libX11 +" +DEPEND=" + ${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig + x11-proto/xproto +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1-underlinking.patch + "${FILESDIR}"/${P}-shebangs.patch + "${FILESDIR}"/${P}-clang.patch +) + +src_configure() { + tc-export CC + # not autotools based + local myconfigure=( + ./configure V=1 + --mandir="${EPREFIX}"/usr/share/man/man1 + --datadir="${EPREFIX}"/usr/share/${PN} + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} + $(usex alsa --sound --no-sound) + ) + echo ${myconfigure[@]} || die + ${myconfigure[@]} || die +} + +pkg_postinst() { + elog "For the volume plugin to work, you need to configure your kernel" + elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means" + elog "that provide the /dev/mixer device node." +} diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-clang.patch b/x11-misc/fbpanel/files/fbpanel-7.0-clang.patch new file mode 100644 index 00..69347c0f3a --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-clang.patch @@ -0,0 +1,57 @@ +diff -u -r fbpanel-7.0/plugins/battery/power_supply.c fbpanel-7.0-3/plugins/battery/power_supply.c +--- fbpanel-7.0/plugins/battery/power_supply.c 2015-12-05 08:34:19.0 +0200 fbpanel-7.0-3/plugins/battery/power_supply.c 2017-02-25 14:52:55.431202738 +0200 +@@ -154,7 +154,7 @@ + tmp->path = path; + tmp->name = NULL; + tmp->status = NULL; +-tmp->capacity = -1.0d; ++tmp->capacity = -1.0f; + return tmp; + } + +@@ -206,12 +206,12 @@ + bat->capacity = g_ascii_strtod(tmp_value, NULL); + } else { // for older kernels + tmp_value = (gchar*) g_hash_table_lookup(hash, SYS_ACPI_UEVENT_BAT_ENERGY_NOW_KEY); +-gdouble tmp = -1.0d; ++gdouble tmp = -1.0f; + if (tmp_value != NULL) { // ac off + tmp = g_ascii_strtod(tmp_value, NULL); + tmp_value = (gchar*) g_hash_table_lookup(hash, SYS_ACPI_UEVENT_BAT_ENERGY_FULL_KEY); +-if (tmp_value != NULL && tmp > 0.0d) { +-tmp = tmp / g_ascii_strtod(tmp_value, NULL) * 100.0d; ++if (tmp_value != NULL && tmp > 0.0f) { ++tmp = tmp /