[gentoo-commits] repo/gentoo:master commit in: x11-misc/wbar/, x11-misc/wbar/files/
commit: ab316264dd99db30b445df7837a2408aa78e95f2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 7 09:10:51 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 7 09:15:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab316264
x11-misc/wbar: Drop 2.3.4-r2, EAPI5--
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/wbar/files/wbar-2.3.3-cfg.patch | 11 ---
x11-misc/wbar/wbar-2.3.4-r2.ebuild | 55
2 files changed, 66 deletions(-)
diff --git a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
deleted file mode 100644
index 5d64909d28b..000
--- a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/etc/wbar.cfg.in
-+++ b/etc/wbar.cfg.in
-@@ -2,8 +2,3 @@
- c: @PACKAGE_NAME@ @DEFAULT_ARGV@
- t: none
-
--i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png
--c: wbar-config
--t: Config
--
--
diff --git a/x11-misc/wbar/wbar-2.3.4-r2.ebuild
b/x11-misc/wbar/wbar-2.3.4-r2.ebuild
deleted file mode 100644
index d5e6928b2a8..000
--- a/x11-misc/wbar/wbar-2.3.4-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools bash-completion-r1 eutils
-
-DESCRIPTION="A fast, lightweight quick launch bar"
-HOMEPAGE="https://github.com/rodolf0/wbar;
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="media-libs/imlib2[X]
- x11-libs/libX11
- gtk? ( gnome-base/libglade
- media-libs/freetype:2
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-src_prepare() {
- use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch
-
- epatch \
- "${FILESDIR}"/${PN}-2.3.3-desktopfile.patch \
- "${FILESDIR}"/${PN}-2.3.3-nowerror.patch \
- "${FILESDIR}"/${PN}-2.3.3-test.patch \
- "${FILESDIR}"/${P}-automake-1.13.patch \
- "${FILESDIR}"/${P}-completion.patch
-
- sed -i \
- -e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \
- etc/Makefile.am || die #482358
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable gtk wbar-config)
-}
-
-pkg_postinst() {
- einfo
- elog "media-libs/imlib2 needs to be compiled with the appropriate
useflags"
- elog "depending on your choice of image files (such as png, jpeg...)"
- einfo
-}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wbar/
commit: 360cdc9d7753043bdda0852e3bc1828750410401
Author: Sam James gentoo org>
AuthorDate: Sun Feb 7 08:57:30 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 7 08:57:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=360cdc9d
x11-misc/wbar: Stabilize 2.3.4-r3 amd64, #769143
Signed-off-by: Sam James gentoo.org>
x11-misc/wbar/wbar-2.3.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/wbar/wbar-2.3.4-r3.ebuild
b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
index e348dcdfefc..a8f75375093 100644
--- a/x11-misc/wbar/wbar-2.3.4-r3.ebuild
+++ b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz;
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="gtk"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wbar/
commit: cd7582d7e12e5dea936e075428976705614e19bc
Author: Sam James gentoo org>
AuthorDate: Sun Feb 7 01:06:04 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 7 01:06:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7582d7
x11-misc/wbar: Stabilize 2.3.4-r3 x86, #769143
Signed-off-by: Sam James gentoo.org>
x11-misc/wbar/wbar-2.3.4-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/wbar/wbar-2.3.4-r3.ebuild
b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
index f46e060720d..e348dcdfefc 100644
--- a/x11-misc/wbar/wbar-2.3.4-r3.ebuild
+++ b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz;
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="gtk"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wbar/, x11-misc/wbar/files/
commit: 6d78e77332db5e494cb3d82e7f4666d92250d3f6
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu May 9 07:48:35 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu May 9 08:03:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d78e773
x11-misc/wbar: Fix automagic dev-libs/glib dependency
* Fix a bunch of C++11 warnings
* USE=-gtk should patch out AM_GLIB_GNU_GETTEXT and @INTLLIBS@
* USE=gtk should depend on dev-libs/glib
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/685068
Signed-off-by: Jeroen Roovers gentoo.org>
x11-misc/wbar/files/wbar-2.3.4-c++11.patch | 54
x11-misc/wbar/files/wbar-2.3.4-gtk.patch | 32 +
x11-misc/wbar/wbar-2.3.4-r3.ebuild | 57 ++
3 files changed, 143 insertions(+)
diff --git a/x11-misc/wbar/files/wbar-2.3.4-c++11.patch
b/x11-misc/wbar/files/wbar-2.3.4-c++11.patch
new file mode 100644
index 000..fead9e9b4cb
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-c++11.patch
@@ -0,0 +1,54 @@
+--- a/src/config/Functions.cc
b/src/config/Functions.cc
+@@ -11,7 +11,7 @@
+ #include "Run.h"
+ #include "OptParser.h"
+
+-#define ICON_DEFAULT PIXMAPDIR"/"PACKAGE_NAME".png"
++#define ICON_DEFAULT PIXMAPDIR "/" PACKAGE_NAME ".png"
+
+ static const gchar *authors[] =
+ {
+@@ -304,7 +304,7 @@
+
+ if (command.empty())
+ {
+-command = PACKAGE_NAME" "DEFAULT_ARGV;
++command = PACKAGE_NAME " " DEFAULT_ARGV;
+ }
+
+ if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG ))
+--- a/src/config/Run.cc
b/src/config/Run.cc
+@@ -125,9 +125,9 @@
+
+ bool Run::start(std::string command)
+ {
+-if (system ((PACKAGE_NAME" " + command + " &").c_str()) != 0)
++if (system ((PACKAGE_NAME " " + command + " &").c_str()) != 0)
+ {
+-std::cout << _("Error run program: ") << PACKAGE_NAME" " + command <<
std::endl;
++std::cout << _("Error run program: ") << PACKAGE_NAME " " + command
<< std::endl;
+ }
+ return Run::getPID() > 0;
+ }
+@@ -136,7 +136,7 @@
+ {
+ if (Run::getPID() > 0)
+ {
+-if (system ("killall "PACKAGE_NAME) != 0)
++if (system ("killall " PACKAGE_NAME) != 0)
+ {
+ std::cout << _("Error kill program: ") << PACKAGE_NAME <<
std::endl;
+ }
+--- a/src/core/Main.cc
b/src/core/Main.cc
+@@ -81,7 +81,7 @@
+
+ if (command.empty())
+ {
+-command = PACKAGE_NAME" "DEFAULT_ARGV;
++command = PACKAGE_NAME " " DEFAULT_ARGV;
+ }
+
+ if (argc <= 1 || tmpoptparser.isSet( OptParser::CONFIG ))
diff --git a/x11-misc/wbar/files/wbar-2.3.4-gtk.patch
b/x11-misc/wbar/files/wbar-2.3.4-gtk.patch
new file mode 100644
index 000..76f2b902759
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-gtk.patch
@@ -0,0 +1,32 @@
+--- a/configure.ac
b/configure.ac
+@@ -59,7 +59,6 @@
+ AC_DEFINE_UNQUOTED(DEFAULT_ARGV, "$DEFAULT_ARGV" , [ The default argv ])
+
+ AC_PROG_INTLTOOL()
+-AM_GLIB_GNU_GETTEXT
+ PKG_PROG_PKG_CONFIG
+
+ PKG_CHECK_MODULES(modules, [imlib2 x11])
+--- a/etc/wbar.cfg.in
b/etc/wbar.cfg.in
+@@ -2,8 +2,3 @@
+ c: @PACKAGE_NAME@ @DEFAULT_ARGV@
+ t: none
+
+-i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png
+-c: wbar-config
+-t: Config
+-
+-
+--- a/src/Makefile.am
b/src/Makefile.am
+@@ -51,7 +51,7 @@
+ $(top_srcdir)/src/utils/i18n.h
+
+ wbar_CXXFLAGS = @modules_CFLAGS@
+-wbar_LDADD = @modules_LIBS@ @INTLLIBS@
++wbar_LDADD = @modules_LIBS@
+
+ if WBAR_CONFIG
+ wbar_config_CXXFLAGS = @gui_modules_CFLAGS@
diff --git a/x11-misc/wbar/wbar-2.3.4-r3.ebuild
b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
new file mode 100644
index 000..f46e060720d
--- /dev/null
+++ b/x11-misc/wbar/wbar-2.3.4-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A fast, lightweight quick launch bar"
+HOMEPAGE="https://github.com/rodolf0/wbar;
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk"
+RDEPEND="
+ media-libs/imlib2[X]
+ x11-libs/libX11
+ gtk? (
+ dev-libs/glib
+ gnome-base/libglade
+ media-libs/freetype:2
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.3-desktopfile.patch
+ "${FILESDIR}"/${PN}-2.3.3-nowerror.patch
+ "${FILESDIR}"/${PN}-2.3.3-test.patch
+ "${FILESDIR}"/${PN}-2.3.4-automake-1.13.patch
+ "${FILESDIR}"/${PN}-2.3.4-c++11.patch
+ "${FILESDIR}"/${PN}-2.3.4-completion.patch
+)
+
+src_prepare() {
+ default
+
+ use gtk ||
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wbar/files/
commit: dcbb4f602b9684c8c96f38d49c47bc278479ee04 Author: Jeroen Roovers gentoo org> AuthorDate: Thu May 9 07:44:27 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu May 9 08:03:59 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcbb4f60 x11-misc/wbar: Clean up patches Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Jeroen Roovers gentoo.org> x11-misc/wbar/files/wbar-2.3.3-cfg.patch | 4 x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch | 18 -- x11-misc/wbar/files/wbar-2.3.3-nowerror.patch| 4 x11-misc/wbar/files/wbar-2.3.3-test.patch| 4 4 files changed, 30 deletions(-) diff --git a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch index 5ffd8286998..5d64909d28b 100644 --- a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch +++ b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch @@ -1,7 +1,3 @@ -From: Julian Ospald -Date: Fri Sep 21 21:45:22 UTC 2012 -Subject: remove wbar-config for -gtk - --- a/etc/wbar.cfg.in +++ b/etc/wbar.cfg.in @@ -2,8 +2,3 @@ diff --git a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch index 79a5de15629..d2032dfa79f 100644 --- a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch +++ b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch @@ -1,10 +1,3 @@ -From: Julian Ospald -Date: Fri Sep 21 17:08:32 2012 +0200 - - fix desktop file destination and QA issues - -diff --git a/configure.ac b/configure.ac -index 00ad0b6..48fe73d 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,7 @@ AC_DEFINE_UNQUOTED(PIDOF_BIN, "$PIDOF_BIN ", [ program to retreive wbar pid ]) @@ -15,8 +8,6 @@ index 00ad0b6..48fe73d 100644 etc/Makefile \ etc/wbar.cfg \ etc/wbar.desktop.in \ -diff --git a/etc/Makefile.am b/etc/Makefile.am -index ec41c76..d78525e 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -3,7 +3,7 @@ CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop) @@ -28,8 +19,6 @@ index ec41c76..d78525e 100644 autostart_DATA = $(wbardesktop:.desktop.in.in=.desktop) bashcompletiondir = /etc/bash_completion.d -diff --git a/po/POTFILES.in b/po/POTFILES.in -index ddf920c..16ee6dd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ @@ -37,16 +26,12 @@ index ddf920c..16ee6dd 100644 share/wbar.glade src/config/Functions.cc src/config/Functions.h -diff --git a/po/POTFILES.skip b/po/POTFILES.skip -index 327f139..27a8f48 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,2 +1,3 @@ etc/wbar.desktop.in.in +share/wbar.desktop.in.in -diff --git a/share/Makefile.am b/share/Makefile.am -index 87c736b..66027d4 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -1,8 +1,17 @@ @@ -69,9 +54,6 @@ index 87c736b..66027d4 100644 +$(wbardesktop) \ +$(wbardesktop:.desktop.in.in=.desktop.in) -diff --git a/share/wbar.desktop.in.in b/share/wbar.desktop.in.in -new file mode 100644 -index 000..48fc33c --- /dev/null +++ b/share/wbar.desktop.in.in @@ -0,0 +1,12 @@ diff --git a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch index 2cf163bc464..32c341b26e0 100644 --- a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch +++ b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch @@ -1,7 +1,3 @@ -From: Julian Ospald -Date: Sun Aug 26 17:18:37 UTC 2012 -Subject: remove Werror - --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,6 @@ diff --git a/x11-misc/wbar/files/wbar-2.3.3-test.patch b/x11-misc/wbar/files/wbar-2.3.3-test.patch index 4468791a420..fc2cb7c5498 100644 --- a/x11-misc/wbar/files/wbar-2.3.3-test.patch +++ b/x11-misc/wbar/files/wbar-2.3.3-test.patch @@ -1,7 +1,3 @@ -From: Julian Ospald -Date: Fri Sep 21 21:50:34 UTC 2012 -Subject: fix test phase - --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wbar/
commit: a0de3883439544d0ac722afdad7c4e53d707616f
Author: Harri Nieminen gmail com>
AuthorDate: Tue Mar 28 18:25:11 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Apr 1 10:22:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0de3883
x11-misc/wbar: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4319
x11-misc/wbar/wbar-2.3.4-r1.ebuild | 53 --
1 file changed, 53 deletions(-)
diff --git a/x11-misc/wbar/wbar-2.3.4-r1.ebuild
b/x11-misc/wbar/wbar-2.3.4-r1.ebuild
deleted file mode 100644
index 40424acd149..000
--- a/x11-misc/wbar/wbar-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools bash-completion-r1 eutils
-
-DESCRIPTION="A fast, lightweight quick launch bar"
-HOMEPAGE="https://github.com/rodolf0/wbar;
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="media-libs/imlib2[X]
- x11-libs/libX11
- gtk? ( gnome-base/libglade
- media-libs/freetype:2
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-src_prepare() {
- use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch
- epatch \
- "${FILESDIR}"/${PN}-2.3.3-desktopfile.patch \
- "${FILESDIR}"/${PN}-2.3.3-nowerror.patch \
- "${FILESDIR}"/${PN}-2.3.3-test.patch \
- "${FILESDIR}"/${P}-automake-1.13.patch
-
- sed -i \
- -e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \
- etc/Makefile.am || die #482358
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable gtk wbar-config)
-}
-
-pkg_postinst() {
- einfo
- elog "media-libs/imlib2 needs to be compiled with the appropriate
useflags"
- elog "depending on your choice of image files (such as png, jpeg...)"
- einfo
-}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wbar/
commit: cafe3ff2c99f37abd423791915c3dbbb3cca2825
Author: Tobias Klausmann gentoo org>
AuthorDate: Tue Sep 1 20:10:11 2015 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Tue Sep 1 20:10:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafe3ff2
x11-misc/wbar: Fixing HOMEPAGE move due to code.google.com shutdown
Package-Manager: portage-2.2.20.1
x11-misc/wbar/wbar-2.3.4-r1.ebuild | 2 +-
x11-misc/wbar/wbar-2.3.4-r2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/wbar/wbar-2.3.4-r1.ebuild
b/x11-misc/wbar/wbar-2.3.4-r1.ebuild
index 44eaf24..7970c13 100644
--- a/x11-misc/wbar/wbar-2.3.4-r1.ebuild
+++ b/x11-misc/wbar/wbar-2.3.4-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit autotools bash-completion-r1 eutils
DESCRIPTION="A fast, lightweight quick launch bar"
-HOMEPAGE="https://code.google.com/p/wbar/;
+HOMEPAGE="https://github.com/rodolf0/wbar;
SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz;
LICENSE="GPL-3"
diff --git a/x11-misc/wbar/wbar-2.3.4-r2.ebuild
b/x11-misc/wbar/wbar-2.3.4-r2.ebuild
index 99cd1f5..5df2030 100644
--- a/x11-misc/wbar/wbar-2.3.4-r2.ebuild
+++ b/x11-misc/wbar/wbar-2.3.4-r2.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit autotools bash-completion-r1 eutils
DESCRIPTION="A fast, lightweight quick launch bar"
-HOMEPAGE="https://code.google.com/p/wbar/;
+HOMEPAGE="https://github.com/rodolf0/wbar;
SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz;
LICENSE="GPL-3"
