* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/, x11-misc/xbattbar/files/
@ 2018-05-09 15:14 Mikle Kolyada
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2018-05-09 15:14 UTC (permalink / raw
To: gentoo-commits
commit: f1ee029cfcbe924cd0e6234171eb05b7174e892e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed May 9 15:14:33 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed May 9 15:14:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ee029c
x11-misc/xbattbar: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
x11-misc/xbattbar/Manifest | 1 -
x11-misc/xbattbar/files/xbattbar-1.4.3.patch | 38 --------------------------
x11-misc/xbattbar/xbattbar-1.4.3.ebuild | 41 ----------------------------
3 files changed, 80 deletions(-)
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest
index 2f80979989a..bc459cb5132 100644
--- a/x11-misc/xbattbar/Manifest
+++ b/x11-misc/xbattbar/Manifest
@@ -1,2 +1 @@
-DIST xbattbar_1.4.3.orig.tar.gz 15722 BLAKE2B 85a6dbce98ec0109360881763fdf57501e0db21ab2d614b583996d2164c0d8aed94f3e20968cb6c91cf34a7181c66efe94a6e6f32007f6dc26dd94c163bb9d46 SHA512 1c809de998cae1dd4652b20d5c8fecf8f674910893fd458115beae8f873452a82c276afeef9b1ce3293498e372a74add190dc6a447ef0de219df98c5c36fae32
DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch b/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
deleted file mode 100644
index ad5b9e49c1f..00000000000
--- a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile
-+++ 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) $(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) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
-
- obj/stamp:
- mkdir obj
-@@ -29,11 +29,11 @@
-
-
- install: $(TARGET) $(APM_CHECK)
-- install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
-+ install -d -m 0755 $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(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 $(APM_CHECK) $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/
-+ install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(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.3.ebuild b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
deleted file mode 100644
index 50b76944e6f..00000000000
--- a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-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"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
- x11-libs/libX11"
-RDEPEND="${DEPEND}
- !ppc? ( >=sys-power/acpi-1.5 )" # ppc has APM
-
-# XXX: Avoiding imake in purpose here.
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}.patch
-
- sed -i \
- -e "s:usr/lib:usr/$(get_libdir):" \
- xbattbar.c || die
-}
-
-src_compile() {
- [[ $(tc-arch) == amd64 ]] && export LIB_SUFFIX=64
- tc-export CC
- use kernel_linux && append-flags -Dlinux
- emake || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc README
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/, x11-misc/xbattbar/files/
@ 2021-05-04 22:17 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-05-04 22:17 UTC (permalink / raw
To: gentoo-commits
commit: 5a2f8e82e4e907ae1c431a89b424fe5c84fda867
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Apr 29 21:56:41 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 4 22:17:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2f8e82
x11-misc/xbattbar: Respect CFLAGS
Closes: https://bugs.gentoo.org/726278
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...r-1.4.5.patch => xbattbar-1.4.5-Makefile.patch} | 22 +++++++++++++++------
x11-misc/xbattbar/xbattbar-1.4.9.ebuild | 23 ++++++++--------------
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.5.patch b/x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch
similarity index 62%
rename from x11-misc/xbattbar/files/xbattbar-1.4.5.patch
rename to x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch
index 2602bb91187..0cd1ca00b44 100644
--- a/x11-misc/xbattbar/files/xbattbar-1.4.5.patch
+++ b/x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch
@@ -1,27 +1,37 @@
--- a/Makefile
+++ b/Makefile
-@@ -11,16 +11,16 @@
+@@ -4,23 +4,23 @@ DESTDIR ?= /
+
+ TARGET = xbattbar
+ APM_CHECK = xbattbar-check-apm
+-CPPFLAGS = -D_FORTIFY_SOURCE=2
+-CFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security $(CPPFLAGS)
+-LDFLAGS = -Wl,-z,relro
++CPPFLAGS ?= -D_FORTIFY_SOURCE=2
++CFLAGS ?= -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security
++LDFLAGS ?= -Wl,-z,relro
+
all: $(TARGET) $(APM_CHECK)
$(TARGET): obj/xbattbar.o
- gcc -o $@ $< -lX11 $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11)
obj/xbattbar.o: xbattbar.c obj/stamp
- gcc -MMD -o $@ -c $< $(CFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -MMD -o $@ -c $<
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -MMD -o $@ -c $<
$(APM_CHECK): obj/xbattbar-check-apm.o
- gcc -o $@ $< $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
- gcc -MMD -D$(OS_TYPE) -o $@ -c $< $(CFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
obj/stamp:
mkdir obj
-@@ -32,12 +32,12 @@
+@@ -32,12 +32,12 @@ clean:
install: $(TARGET) $(APM_CHECK)
diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
index 8d25691b09a..660160d4007 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic multilib toolchain-funcs
+
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="Advanced Power Management battery status display for X"
HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html"
@@ -14,16 +15,14 @@ KEYWORDS="amd64 ppc x86"
DEPEND="
dev-lang/perl
- x11-libs/libX11
-"
+ x11-libs/libX11"
RDEPEND="
${DEPEND}
- !ppc? ( >=sys-power/acpi-1.5 )
-"
+ !ppc? ( >=sys-power/acpi-1.5 )"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-1.4.5.patch
+ "${FILESDIR}"/${PN}-1.4.5-Makefile.patch
"${FILESDIR}"/${PN}-1.4.8-const.patch
)
@@ -33,17 +32,11 @@ src_prepare() {
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}"
+src_configure() {
+ tc-export CC PKG_CONFIG
+ use kernel_linux && append-cppflags -Dlinux
}
src_install() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-04 22:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-04 22:17 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbattbar/, x11-misc/xbattbar/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2018-05-09 15:14 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox