diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-07 01:33:16 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-07 01:33:16 +0100 |
| commit | c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (patch) | |
| tree | 3ee550255947da075650f1a551dcc278f9a1b7f8 /x11-misc/xbattbar | |
| parent | a978c074e4272bb901fbe4a10de0a7b2af574f17 (diff) | |
gentoo resync : 07.05.2021
Diffstat (limited to 'x11-misc/xbattbar')
| -rw-r--r-- | x11-misc/xbattbar/Manifest | 4 | ||||
| -rw-r--r-- | x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch (renamed from x11-misc/xbattbar/files/xbattbar-1.4.5.patch) | 22 | ||||
| -rw-r--r-- | x11-misc/xbattbar/xbattbar-1.4.9.ebuild | 23 |
3 files changed, 26 insertions, 23 deletions
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest index a06ab3d35eaa..49971eb0f9f2 100644 --- a/x11-misc/xbattbar/Manifest +++ b/x11-misc/xbattbar/Manifest @@ -1,5 +1,5 @@ -AUX xbattbar-1.4.5.patch 1427 BLAKE2B 06142c445fbce221b8ca871c2717790e1bbe6b56f50d3003e82eb024ad012fc2677cbc4cbebaac7284e3291a9e95754c19f773fc3cfc1dd3ad9ee8c15b4dd451 SHA512 190df4894fcb29f5b2b5387523429947b967e48fb710ad256f8ba31bf33d22e04b4325ba3d6b3228aee14257e241815a5b99c4284d1cedb6b4e977e47a9c54df +AUX xbattbar-1.4.5-Makefile.patch 1869 BLAKE2B 98e103447e8bcad5f2ec1ec9d5138876bf6f741b79e9ba87ef2232df8e98544a0df7fb6886ede03ebd9b51e83204ed3ebc3dfa43fd547eae11ba513f34c3227b SHA512 b3da07fc8f01dc3716bbb2207b8245d56bd41818d3f36e521b8cde308d70f208022ea3bb6dffeb38cc82e6a9bfa03afcbd007b21ebf7ded78f56b02ac961e861 AUX xbattbar-1.4.8-const.patch 303 BLAKE2B d33ff7f8bc273e1ef3e493e2411b4aff025a36316163b31df52299a77c6409023b069a7ef2d2f55a189e2848b8e73d37a54a8957c9f71fdc3e51b6a48a179bda SHA512 987116af9d8e50b6ef96924199e5d348a9910030adbe2b2a8de0425107eee93cfe04740b343542c97edc6ed846bcff05724470b6fff1f5209c92c42e8648af0b DIST xbattbar_1.4.9.orig.tar.gz 19105 BLAKE2B e33631f02266150fc494312c0a78cba145813e3f19ffa4a8fd46ce3adde3e50cb820617e5118a9bb6935fb7be26840e6a9525bf95e2f2fbf585e4e2542d35228 SHA512 e6d0efe0a97b2cb7d0c8a992b7a68a26155dfb625649a5fc8abc4bc37b2c286224185b57d6b2d3671f571690d278970976da5380c1d1bbcd9212e2001f9c40b8 -EBUILD xbattbar-1.4.9.ebuild 963 BLAKE2B 5f2637b9390a2724e23e31e2b99fb582a425b41a354a854ca8b9fdddf3f99429a8e0fa7137d068acc836cb52cbd39c75007aac68df0c2349e59e83d97ed485ef SHA512 4dc53d522315947ae09a06b7820ed3229eebe1db637d099d470cf86b66934380a56af0b63a11c0e59c013fa50e5cff9ed69c597064513fb53b7c7428b10bdca6 +EBUILD xbattbar-1.4.9.ebuild 890 BLAKE2B 5a8c18d708c4516947a43fb3a70b8eaf1af59d2c323c027abedf59c04802d882c8658eb536c317012d1d648720e8243577ab43112968d55cb74b7153141da996 SHA512 2878dbf7bf1e03ab82e0b185d2bbb5c8f98e8d2f396c742e9278c18b7523e96c14e9c43a441b423046d04bbfeb3648c60e49ff20c44f0915af4d9671351f2153 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.5.patch b/x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch index 2602bb91187a..0cd1ca00b44c 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 8d25691b09ab..660160d40073 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() { |