* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/files/, x11-misc/xbattbar/
@ 2015-09-16 4:13 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2015-09-16 4:13 UTC (permalink / raw
To: gentoo-commits
commit: 7157442b92744d6b8ed5b1e45c42a0a79ed86750
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 04:13:28 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 04:13:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7157442b
x11-misc/xbattbar: Version bump.
Package-Manager: portage-2.2.20.1
x11-misc/xbattbar/Manifest | 1 +
x11-misc/xbattbar/files/xbattbar-1.4.8-const.patch | 11 +++++
x11-misc/xbattbar/xbattbar-1.4.8.ebuild | 51 ++++++++++++++++++++++
3 files changed, 63 insertions(+)
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest
index 8476368..c6c2072 100644
--- a/x11-misc/xbattbar/Manifest
+++ b/x11-misc/xbattbar/Manifest
@@ -1,3 +1,4 @@
DIST xbattbar_1.4.3.orig.tar.gz 15722 SHA256 8f4963bac20836538530a738b7b921543e1381ea01f457c26937efba981292d9
DIST xbattbar_1.4.4.orig.tar.gz 15922 SHA256 2e64855de0cef61f764a7eea81565f7a06fe82492db0b6a09662d6dd93b61448 SHA512 0cd09f4489d9ec551e202fc4791e250c5bf6fdb1801d9025662b79060eb7673c6e43dcf3c352370d42549587dd60879ccad6c6e401f86c7e2a641acbec176aa9 WHIRLPOOL 8eb4b95685ef92c783f9dbe26583cae9189490008630b92d32761548dea603b09cb2c0ed21f463694b7254aea9bd4dc60c835d2207a66812a9d33ef980b72740
DIST xbattbar_1.4.5.orig.tar.gz 16191 SHA256 01b75b2f902d1315a08ec7ddfdcdafc7686cf88662bbf2be5bfcc892294c4b80 SHA512 cc9719e98dc038e0b5bbe1a13acea5cf6c15495b8a133b25663bd86688635bf6f3fefb360a27fb9f00b2012ba16f58bc6f63bfc8ee7eb227e30ad5c9ee1def56 WHIRLPOOL e39aaff055e7ebb7de2a21af5ea263b64949a2ae5e783d47e8879eb51d46a3aa766b29e913eff79ae2585ac3ddbd53710eb7c164a625c7cfdfdf237bf38de884
+DIST xbattbar_1.4.8.orig.tar.gz 16254 SHA256 d7f5cb83a783c3f3376ddb83b90bec90a70d62ff30b8819cf674bf9341677939 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191 WHIRLPOOL 8cd6d35ee4d75df20babd4127ac7be6ac9ff2086fcc10572bff65af1a9d1635bf9ec2590d2aebec56b2c6aaf99d18368490092dc730325d92e4aa2eee2e88981
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.8-const.patch b/x11-misc/xbattbar/files/xbattbar-1.4.8-const.patch
new file mode 100644
index 0000000..818aa38
--- /dev/null
+++ b/x11-misc/xbattbar/files/xbattbar-1.4.8-const.patch
@@ -0,0 +1,11 @@
+--- a/xbattbar-check-apm.c
++++ b/xbattbar-check-apm.c
+@@ -210,7 +210,7 @@
+ #define APM_STAT_LINE_ON 1
+
+ typedef struct apm_info {
+- const char driver_version[10];
++ char driver_version[10];
+ int apm_version_major;
+ int apm_version_minor;
+ int apm_flags;
diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
new file mode 100644
index 0000000..18b2d30
--- /dev/null
+++ b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="Advanced Power Management battery status display for X"
+HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+ dev-lang/perl
+ x11-libs/libX11
+"
+RDEPEND="
+ ${DEPEND}
+ ${PYTHON_DEPS}
+ !ppc? ( >=sys-power/acpi-1.5 )
+" # ppc has APM
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-1.4.5.patch \
+ "${FILESDIR}"/${PN}-1.4.8-const.patch
+
+ sed -i \
+ -e "s:usr/lib:usr/$(get_libdir):" \
+ xbattbar.c || die
+
+ tc-export PKG_CONFIG
+}
+
+src_compile() {
+ use kernel_linux && append-flags -Dlinux
+ emake \
+ CC=$(tc-getCC) \
+ LIBDIR="$(get_libdir)" \
+ LDFLAGS="${LDFLAGS}"
+ python_fix_shebang ${PN}-check-sys
+}
+
+src_install() {
+ emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
+ dodoc README
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/files/, x11-misc/xbattbar/
@ 2017-03-07 9:14 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-03-07 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 3b16491e4dcaac0864cfe42d32cf72495777b508
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Mon Mar 6 15:12:47 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 09:12:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b16491e
x11-misc/xbattbar: Remove old
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4142
x11-misc/xbattbar/Manifest | 2 --
x11-misc/xbattbar/files/xbattbar-1.4.4.patch | 40 -----------------------
x11-misc/xbattbar/xbattbar-1.4.4.ebuild | 43 -------------------------
x11-misc/xbattbar/xbattbar-1.4.5.ebuild | 48 ----------------------------
4 files changed, 133 deletions(-)
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest
index f08aa2a917d..774f81bc99f 100644
--- a/x11-misc/xbattbar/Manifest
+++ b/x11-misc/xbattbar/Manifest
@@ -1,4 +1,2 @@
DIST xbattbar_1.4.3.orig.tar.gz 15722 SHA256 8f4963bac20836538530a738b7b921543e1381ea01f457c26937efba981292d9 SHA512 1c809de998cae1dd4652b20d5c8fecf8f674910893fd458115beae8f873452a82c276afeef9b1ce3293498e372a74add190dc6a447ef0de219df98c5c36fae32 WHIRLPOOL a6639a36f2473d2f47b01ae698817e5a5054db853306c3d793c5e3f1951bf7c6a576c28174b21723c72f1e9fb133df0a12dfef9f930b6448550f46d375708ced
-DIST xbattbar_1.4.4.orig.tar.gz 15922 SHA256 2e64855de0cef61f764a7eea81565f7a06fe82492db0b6a09662d6dd93b61448 SHA512 0cd09f4489d9ec551e202fc4791e250c5bf6fdb1801d9025662b79060eb7673c6e43dcf3c352370d42549587dd60879ccad6c6e401f86c7e2a641acbec176aa9 WHIRLPOOL 8eb4b95685ef92c783f9dbe26583cae9189490008630b92d32761548dea603b09cb2c0ed21f463694b7254aea9bd4dc60c835d2207a66812a9d33ef980b72740
-DIST xbattbar_1.4.5.orig.tar.gz 16191 SHA256 01b75b2f902d1315a08ec7ddfdcdafc7686cf88662bbf2be5bfcc892294c4b80 SHA512 cc9719e98dc038e0b5bbe1a13acea5cf6c15495b8a133b25663bd86688635bf6f3fefb360a27fb9f00b2012ba16f58bc6f63bfc8ee7eb227e30ad5c9ee1def56 WHIRLPOOL e39aaff055e7ebb7de2a21af5ea263b64949a2ae5e783d47e8879eb51d46a3aa766b29e913eff79ae2585ac3ddbd53710eb7c164a625c7cfdfdf237bf38de884
DIST xbattbar_1.4.8.orig.tar.gz 16254 SHA256 d7f5cb83a783c3f3376ddb83b90bec90a70d62ff30b8819cf674bf9341677939 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191 WHIRLPOOL 8cd6d35ee4d75df20babd4127ac7be6ac9ff2086fcc10572bff65af1a9d1635bf9ec2590d2aebec56b2c6aaf99d18368490092dc730325d92e4aa2eee2e88981
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.4.patch b/x11-misc/xbattbar/files/xbattbar-1.4.4.patch
deleted file mode 100644
index 0a17a4cd1a5..00000000000
--- a/x11-misc/xbattbar/files/xbattbar-1.4.4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -8,16 +8,16 @@
- all: $(TARGET) $(APM_CHECK)
-
- $(TARGET): obj/xbattbar.o
-- gcc -o $@ $< -lX11
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11
-
- obj/xbattbar.o: xbattbar.c obj/stamp
-- gcc -MMD -o $@ -c $<
-+ $(CC) $(LDFLAGS) $(CFLAGS) -MMD -o $@ -c $<
-
- $(APM_CHECK): obj/xbattbar-check-apm.o
-- gcc -o $@ $<
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
-
- obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
-- gcc -MMD -D$(OS_TYPE) -o $@ -c $<
-+ $(CC) $(LDFLAGS) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
-
- obj/stamp:
- mkdir obj
-@@ -29,12 +29,12 @@
-
-
- install: $(TARGET) $(APM_CHECK)
-- install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
-+ install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)
- install -d -m 0755 $(DESTDIR)/usr/bin
- install -d -m 0755 $(DESTDIR)/usr/share/man/man1
-- install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/
-- install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/
-- install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/lib/$(PROJECT)/
-+ install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
-+ install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
-+ install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
- install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/
- install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1
-
diff --git a/x11-misc/xbattbar/xbattbar-1.4.4.ebuild b/x11-misc/xbattbar/xbattbar-1.4.4.ebuild
deleted file mode 100644
index 1ad8948f287..00000000000
--- a/x11-misc/xbattbar/xbattbar-1.4.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="Advanced Power Management battery status display for X"
-HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
- dev-lang/perl
- x11-libs/libX11
-"
-RDEPEND="
- ${DEPEND}
- ${PYTHON_DEPS}
- !ppc? ( >=sys-power/acpi-1.5 )
-" # ppc has APM
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.4.4.patch
-
- sed -i \
- -e "s:usr/lib:usr/$(get_libdir):" \
- xbattbar.c || die
-}
-
-src_compile() {
- use kernel_linux && append-flags -Dlinux
- emake CC=$(tc-getCC) LIBDIR="$(get_libdir)"
- python_fix_shebang ${PN}-check-sys
-}
-
-src_install() {
- emake install DESTDIR="${D}" LIBDIR="$(get_libdir)"
- dodoc README
-}
diff --git a/x11-misc/xbattbar/xbattbar-1.4.5.ebuild b/x11-misc/xbattbar/xbattbar-1.4.5.ebuild
deleted file mode 100644
index 002d77a4795..00000000000
--- a/x11-misc/xbattbar/xbattbar-1.4.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="Advanced Power Management battery status display for X"
-HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
- dev-lang/perl
- x11-libs/libX11
-"
-RDEPEND="
- ${DEPEND}
- ${PYTHON_DEPS}
- !ppc? ( >=sys-power/acpi-1.5 )
-" # ppc has APM
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.4.5.patch
-
- sed -i \
- -e "s:usr/lib:usr/$(get_libdir):" \
- xbattbar.c || die
-
- tc-export PKG_CONFIG
-}
-
-src_compile() {
- use kernel_linux && append-flags -Dlinux
- emake \
- CC=$(tc-getCC) \
- LIBDIR="$(get_libdir)" \
- LDFLAGS="${LDFLAGS}"
- python_fix_shebang ${PN}-check-sys
-}
-
-src_install() {
- emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
- dodoc README
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/files/, x11-misc/xbattbar/
@ 2022-11-28 23:59 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2022-11-28 23:59 UTC (permalink / raw
To: gentoo-commits
commit: 0d2ce1ced242c7c6c73b41172a95c6289d0f4abe
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 23:57:57 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 23:59:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2ce1ce
x11-misc/xbattbar: EAPI7->8, fix w/ upcoming clang16
Closes: https://bugs.gentoo.org/875059
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch | 8 ++++++++
x11-misc/xbattbar/xbattbar-1.4.9.ebuild | 15 +++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch b/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch
new file mode 100644
index 000000000000..8ee0b80ecb3b
--- /dev/null
+++ b/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/875059
+--- a/xbattbar.c
++++ b/xbattbar.c
+@@ -234,3 +234,3 @@
+
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
index 660160d40073..ff02fcb15ecb 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit flag-o-matic toolchain-funcs
@@ -9,7 +9,7 @@ DESCRIPTION="Advanced Power Management battery status display for X"
HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html"
SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
@@ -24,14 +24,13 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-1.4.5-Makefile.patch
"${FILESDIR}"/${PN}-1.4.8-const.patch
+ "${FILESDIR}"/${PN}-1.4.9-implicit-int.patch
)
src_prepare() {
default
- sed -i \
- -e "s:usr/lib:usr/$(get_libdir):" \
- xbattbar.c || die
+ sed -i "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" xbattbar.c || die
}
src_configure() {
@@ -40,6 +39,6 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
- dodoc README
+ emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+ einstalldocs
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-29 0:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-28 23:59 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/files/, x11-misc/xbattbar/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2017-03-07 9:14 David Seifert
2015-09-16 4:13 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox