* [gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/files/, x11-misc/fbpanel/
@ 2020-02-01 14:03 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2020-02-01 14:03 UTC (permalink / raw
To: gentoo-commits
commit: 9cd2c526d77f0e7a7ab5bb10111b82095f0d0883
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 1 14:03:43 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 1 14:03:57 2020 +0000
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 <jer <AT> 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 00000000000..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 <stdio.h>
+ #include "panel.h"
+
+-struct _plugin_instance *stam;
++extern struct _plugin_instance *stam;
+
+ typedef struct {
+ /* common */
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/files/, x11-misc/fbpanel/
@ 2020-09-23 11:07 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2020-09-23 11:07 UTC (permalink / raw
To: gentoo-commits
commit: a6c0cf895cb547798bd8d14253013c524b48ffc7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 11:01:54 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 11:07:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6c0cf89
x11-misc/fbpanel: Remove old
Signed-off-by: Michał Górny <mgorny <AT> 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..00000000000
--- 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..00000000000
--- 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..00000000000
--- 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
-+#!/usr/bin/env python2
-
- import subprocess as sp
- import re, tempfile
---- a/configure
-+++ b/configure
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python2
-
- 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 reported including full path. Suitable for cross-compiling
---- a/scripts/update-proj.sh
-+++ b/scripts/update-proj.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- function usage ()
- {
---- a/www/plugins/mk_gallery
-+++ b/www/plugins/mk_gallery
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env sh
-
- echo > "$1"
- #echo '<table cellpadding="0" cellspacing="0" border="0" align="left" bgcolor="#ffffff">' >> "$1"
---- a/www/shots/mk_gallery
-+++ b/www/shots/mk_gallery
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env sh
-
- function help ()
- {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/files/, x11-misc/fbpanel/
@ 2022-02-11 23:16 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2022-02-11 23:16 UTC (permalink / raw
To: gentoo-commits
commit: 3f19d64e7302ed98bc86c9e464c5b2e3b6a306a4
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 17:39:05 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 23:13:55 2022 +0000
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 <ionen <AT> 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 000000000000..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',
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-11 23:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-11 23:16 [gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/files/, x11-misc/fbpanel/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2020-09-23 11:07 Michał Górny
2020-02-01 14:03 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox