* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpi/files/, x11-plugins/wmacpi/
@ 2020-05-29 20:48 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2020-05-29 20:48 UTC (permalink / raw
To: gentoo-commits
commit: 08bd26cc0c8e46eb41df8e6ddb2b0b6070c6c25f
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri May 29 20:35:54 2020 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri May 29 20:45:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08bd26cc
x11-plugins/wmacpi: fix build with -fno-common
Application needed a specific fix in addition to libdockapp one
Closes: https://bugs.gentoo.org/723168
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../wmacpi/files/wmacpi-2.3-fno-common.patch | 27 ++++++++++++++++++++++
x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild | 8 +++++--
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
new file mode 100644
index 00000000000..49ee8446fc4
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
@@ -0,0 +1,27 @@
+diff -Naur dockapps.orig/libacpi.c dockapps/libacpi.c
+--- dockapps.orig/libacpi.c 2015-01-12 11:24:15.000000000 +0100
++++ dockapps/libacpi.c 2020-05-29 22:33:52.526826841 +0200
+@@ -17,6 +17,9 @@
+ #define SYSFS_DATA_SOURCE 1
+ static int data_source;
+
++battery_t batteries[MAXBATT];
++int verbosity;
++
+ /* local proto */
+ int acpi_get_design_cap(int batt);
+
+diff -Naur dockapps.orig/libacpi.h dockapps/libacpi.h
+--- dockapps.orig/libacpi.h 2015-01-12 11:24:15.000000000 +0100
++++ dockapps/libacpi.h 2020-05-29 22:33:36.393811163 +0200
+@@ -128,8 +128,8 @@
+
+
+ /* Since these /are/ needed here . . . */
+-battery_t batteries[MAXBATT];
+-int verbosity;
++extern battery_t batteries[MAXBATT];
++extern int verbosity;
+
+ /* check if apm/acpi is enabled, etc */
+ int power_init(global_t *globals);
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
index 5a0d2945eb4..9ee992963ca 100644
--- a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,9 +17,13 @@ DEPEND=">=x11-libs/libdockapp-0.7:=
S=${WORKDIR}/dockapps
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+ )
+
src_prepare() {
default
- eapply "${FILESDIR}"/${P}-makefile.patch
sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpi/files/, x11-plugins/wmacpi/
@ 2021-05-04 22:17 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-05-04 22:17 UTC (permalink / raw
To: gentoo-commits
commit: fd66b19c5899056739734378f2ed5c75776467e4
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Apr 29 22:00:45 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=fd66b19c
x11-plugins/wmacpi: Respect CFLAGS
Closes: https://bugs.gentoo.org/726270
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/20606
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch | 19 ++++++++++---------
x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild | 14 ++++++++------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
index 2bf80a3190d..60629e22ad2 100644
--- a/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
@@ -1,17 +1,18 @@
---- a/Makefile 2015-01-12 11:27:07.396319323 +0100
-+++ b/Makefile 2015-01-12 11:29:21.531298827 +0100
-@@ -13,8 +13,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,9 +12,8 @@ BUILD_CLI = 1
+ # debugging options (don't bother with these)
#OPT = -pg -g
- CC := gcc
+-CC := gcc
-CFLAGS += $(OPT) -Wall -W -g -ansi
-LDFLAGS += $(OPT) -lX11 -ldockapp
-+CFLAGS := -Wall -W -g -ansi
-+LIBS := -lX11 -ldockapp
++CFLAGS ?= -Wall -W -g -ansi
++LIBS += -lX11 -ldockapp
WMSRC := wmacpi.c libacpi.c
HEADERS := libacpi.h wmacpi.h
-@@ -26,7 +26,7 @@
+@@ -26,7 +25,7 @@ targets += wmacpi-cli
doc_targets += wmacpi-cli.1
endif
@@ -20,7 +21,7 @@
all: $(targets)
-@@ -37,7 +37,7 @@
+@@ -37,7 +36,7 @@ WMOBJ := $(patsubst %.c,%.o,$(filter %.c,$(WMSRC)))
-include $(WMOBJ:.o=.d)
wmacpi: $(WMOBJ)
@@ -29,7 +30,7 @@
# for the Debian package, we want to make building the command line tools
# optional. So, we hide all the necessary stuff here . . .
-@@ -47,13 +47,13 @@
+@@ -47,13 +46,13 @@ CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC)))
-include $(CLOBJ:.o=.d)
wmacpi-cli: $(CLOBJ)
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
index 9ee992963ca..1c24cbb6058 100644
--- a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit toolchain-funcs
DESCRIPTION="DockApp ACPI status monitor for laptops"
HOMEPAGE="https://www.dockapps.net/wmacpi"
SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+S="${WORKDIR}/dockapps"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 -ppc -sparc x86"
-DEPEND=">=x11-libs/libdockapp-0.7:=
+DEPEND="
+ >=x11-libs/libdockapp-0.7:=
x11-libs/libX11"
-
-S=${WORKDIR}/dockapps
+RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-makefile.patch
@@ -28,6 +30,6 @@ src_prepare() {
sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
}
-src_compile() {
- emake CC="$(tc-getCC)"
+src_configure() {
+ tc-export CC
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpi/files/, x11-plugins/wmacpi/
@ 2020-06-15 15:48 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2020-06-15 15:48 UTC (permalink / raw
To: gentoo-commits
commit: e2970576097f155e2b102aa143e8ac6475a3b246
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 15:36:10 2020 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 15:41:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2970576
x11-plugins/wmacpi: 2.4 bump
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
x11-plugins/wmacpi/Manifest | 1 +
x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch | 48 ++++++++++++++++++++++
x11-plugins/wmacpi/wmacpi-2.4.ebuild | 24 +++++++++++
3 files changed, 73 insertions(+)
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index ed795d99c08..faffd59389d 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1 +1,2 @@
DIST wmacpi-2.3.tar.gz 39374 BLAKE2B bcf55a801fbc7b7c4484cc8987366786e1a1dbaf4d9ff6800975de14bd295ced774eaeedfe0c9da524b774de7633d5d250e7be55742fca7893f7314b8b4fe6fc SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9
+DIST wmacpi-2.4.tar.gz 40265 BLAKE2B 5acd0b8506b762909893bb8d3ac28dc193166db67195bc14fb321b1d7f3a177cf60412b5d854d039ec0d6289dfefd9ea660a98e69a41148930b71437405ca65a SHA512 56a2967354a16f1ae03ee159dfe787a96c0d7ecf654852833ed71c7f65ca9a3717d9a582f2900a9fd925b0648ef5fcdf08cc4c68e78e75dedbd44a0a35ce752b
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch
new file mode 100644
index 00000000000..d772c99b6ed
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch
@@ -0,0 +1,48 @@
+diff -Naur wmacpi-2.4.orig/Makefile wmacpi-2.4/Makefile
+--- wmacpi-2.4.orig/Makefile 2020-05-03 14:30:36.000000000 +0200
++++ wmacpi-2.4/Makefile 2020-06-15 17:32:49.549006100 +0200
+@@ -15,8 +15,8 @@
+ #OPT = -pg -g
+
+ CC := gcc
+-CFLAGS += $(OPT) -Wall -W -g -ansi -DWMACPI_VER='"$(WMACPI_VER)"'
+-LDFLAGS += $(OPT) -lX11 -ldockapp
++CFLAGS += -DWMACPI_VER='"$(WMACPI_VER)"'
++LIBS := -lX11 -ldockapp
+
+ WMSRC := wmacpi.c libacpi.c
+ HEADERS := libacpi.h
+@@ -28,7 +28,7 @@
+ doc_targets += wmacpi-cli.1
+ endif
+
+-PREFIX := /usr/local
++PREFIX := /usr
+
+ all: $(targets)
+
+@@ -39,7 +39,7 @@
+ -include $(WMOBJ:.o=.d)
+
+ wmacpi: $(WMOBJ)
+- $(CC) -o $@ $^ $(LDFLAGS)
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ # for the Debian package, we want to make building the command line tools
+ # optional. So, we hide all the necessary stuff here . . .
+@@ -49,13 +49,13 @@
+ -include $(CLOBJ:.o=.d)
+
+ wmacpi-cli: $(CLOBJ)
+- $(CC) $(LDFLAGS) -o $@ $^
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ endif
+
+ # build per-file dependencies - note that -MM may not be supported
+ # in gcc versions older than 2.95.4, but most likely is.
+ %.d: %.c
+- gcc -MM $(CFLAGS) $< > $@
++ $(CC) -MM $(CFLAGS) $< > $@
+
+ clean:
+ rm -f TAGS *.o *~ trace *.out *.bb *.bbg
diff --git a/x11-plugins/wmacpi/wmacpi-2.4.ebuild b/x11-plugins/wmacpi/wmacpi-2.4.ebuild
new file mode 100644
index 00000000000..b2ad3b89acc
--- /dev/null
+++ b/x11-plugins/wmacpi/wmacpi-2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="DockApp ACPI status monitor for laptops"
+HOMEPAGE="https://www.dockapps.net/wmacpi"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
+
+DEPEND=">=x11-libs/libdockapp-0.7:=
+ x11-libs/libX11"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ )
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpi/files/, x11-plugins/wmacpi/
@ 2020-03-29 15:17 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2020-03-29 15:17 UTC (permalink / raw
To: gentoo-commits
commit: 871cbf857f01091e71c535bef0747d2d6d351c53
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 15:12:09 2020 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 15:16:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871cbf85
x11-plugins/wmacpi: undo last bump
libdockapp fix is enough to build with -fno-common
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../wmacpi/files/wmacpi-2.3-fno-common.patch | 11 --------
x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild | 33 ----------------------
2 files changed, 44 deletions(-)
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
deleted file mode 100644
index 068c00c592f..00000000000
--- a/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur dockapps.orig/wmacpi.c dockapps/wmacpi.c
---- dockapps.orig/wmacpi.c 2015-01-12 11:24:15.000000000 +0100
-+++ dockapps/wmacpi.c 2020-03-29 13:11:56.712022800 +0200
-@@ -72,6 +72,7 @@
-
- /* globals */
- struct dockapp *dockapp;
-+Display *display;
- /* global_t *globals; */
-
- /* this gives us a variable scroll rate, depending on the importance of the
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild
deleted file mode 100644
index 25640e9e028..00000000000
--- a/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="DockApp ACPI status monitor for laptops"
-HOMEPAGE="https://www.dockapps.net/wmacpi"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -ppc -sparc ~x86"
-
-DEPEND=">=x11-libs/libdockapp-0.7-r1:=
- x11-libs/libX11"
-
-S=${WORKDIR}/dockapps
-
-PATCHES=(
- "${FILESDIR}"/${P}-makefile.patch
- "${FILESDIR}"/${P}-fno-common.patch
- )
-
-src_prepare() {
- default
-
- sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpi/files/, x11-plugins/wmacpi/
@ 2020-03-29 11:35 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2020-03-29 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 583b4210a0e3aff5c029a3d569aa18e0ee2bfb2c
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 11:13:14 2020 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 11:35:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=583b4210
x11-plugins/wmacpi: fix build with -fno-common
Latest libdockapp revbump now defines a global variable as extern
Closes: https://bugs.gentoo.org/715260
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../wmacpi/files/wmacpi-2.3-fno-common.patch | 11 ++++++++
x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild | 33 ++++++++++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
new file mode 100644
index 00000000000..068c00c592f
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
@@ -0,0 +1,11 @@
+diff -Naur dockapps.orig/wmacpi.c dockapps/wmacpi.c
+--- dockapps.orig/wmacpi.c 2015-01-12 11:24:15.000000000 +0100
++++ dockapps/wmacpi.c 2020-03-29 13:11:56.712022800 +0200
+@@ -72,6 +72,7 @@
+
+ /* globals */
+ struct dockapp *dockapp;
++Display *display;
+ /* global_t *globals; */
+
+ /* this gives us a variable scroll rate, depending on the importance of the
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild
new file mode 100644
index 00000000000..25640e9e028
--- /dev/null
+++ b/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="DockApp ACPI status monitor for laptops"
+HOMEPAGE="https://www.dockapps.net/wmacpi"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
+
+DEPEND=">=x11-libs/libdockapp-0.7-r1:=
+ x11-libs/libX11"
+
+S=${WORKDIR}/dockapps
+
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+ )
+
+src_prepare() {
+ default
+
+ sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpi/files/, x11-plugins/wmacpi/
@ 2018-07-19 13:24 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2018-07-19 13:24 UTC (permalink / raw
To: gentoo-commits
commit: c2bb5bfcfa192173470fd36824424c41e5d024bd
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jul 8 12:05:39 2018 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 13:24:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2bb5bfc
x11-plugins/wmacpi: EAPI7, improve ebuild
x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch | 4 +--
x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild | 29 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
index d1ec4968906..2bf80a3190d 100644
--- a/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig 2015-01-12 11:27:07.396319323 +0100
-+++ Makefile 2015-01-12 11:29:21.531298827 +0100
+--- a/Makefile 2015-01-12 11:27:07.396319323 +0100
++++ b/Makefile 2015-01-12 11:29:21.531298827 +0100
@@ -13,8 +13,8 @@
#OPT = -pg -g
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
new file mode 100644
index 00000000000..fbc57d04894
--- /dev/null
+++ b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="DockApp ACPI status monitor for laptops"
+HOMEPAGE="https://www.dockapps.net/wmacpi"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
+
+DEPEND=">=x11-libs/libdockapp-0.7:=
+ x11-libs/libX11"
+
+S=${WORKDIR}/dockapps
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${P}-makefile.patch
+
+ sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpi/files/, x11-plugins/wmacpi/
@ 2017-11-24 10:10 Bernard Cafarelli
0 siblings, 0 replies; 7+ messages in thread
From: Bernard Cafarelli @ 2017-11-24 10:10 UTC (permalink / raw
To: gentoo-commits
commit: b5d07704aa60b0210f59b1744897a2b15688fedc
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 10:03:07 2017 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 10:03:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d07704
x11-plugins/wmacpi: drop old
Package-Manager: Portage-2.3.16, Repoman-2.3.6
x11-plugins/wmacpi/Manifest | 2 -
x11-plugins/wmacpi/files/1.34-acpi.patch | 17 ------
x11-plugins/wmacpi/files/1.34-apm.patch | 17 ------
.../wmacpi/files/wmacpi-2.2_rc1-makefile.patch | 71 ----------------------
x11-plugins/wmacpi/wmacpi-1.34.ebuild | 37 -----------
x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild | 43 -------------
6 files changed, 187 deletions(-)
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index 62bfd77739f..bcbac8f1cde 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,3 +1 @@
-DIST wmacpi-1.34.tar.gz 15509 SHA256 65f7a1da06fd3489ed97391d1c9b77b570bc30c14b1f846007028353d0fa51e2 SHA512 d2e3fb2b5ba9fc4d0996262d63cf935c4fe1bfda9d04acc3aec174172551bfa97b656aa445c747c3e9c58e32d2f4b1eba69e6d8b9b754b3d9066a84277b8f286 WHIRLPOOL 67263284e36be7257dbd662b8e78714f02f16f93accbc51433ce15754e0714c8c05a6306d70028914bf18a8d7d1bbb9d516afb7ee09fdbcbffb26ea1825270a5
-DIST wmacpi-2.2rc1.tar.bz2 30233 SHA256 25fc405e6e653caf9cfd90104b184cb4ed73114e710e229ed012ec155083a11f SHA512 491709b5f0019084f6423737bbb47de4353f297f2469b72cd8eec1e93d62487db5d590235b0b774ce3828a26f6f589ddf9bf9896cfecd47249c37e6e230b739e WHIRLPOOL 7eb717cde21490e395beacacb89bb3df6bffae7f64c6a5298f955a8c68abae36fabe271d9815de4c3a45c9fa3e579dc5f46f85a6441bb566c11efaca86aa8575
DIST wmacpi-2.3.tar.gz 39374 SHA256 5ae0ae6ca447e29acaf206f2321a50207509eb2a17ccb98ed196adf734263105 SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9 WHIRLPOOL 0735582a3ee47144ab6ae57a5f6095a2adb006e62b536620b1036dab9ccee4b3ef6e581fde314440398cfc622f4db1ff150ec6c64ce08e791c2559397ef7cb8d
diff --git a/x11-plugins/wmacpi/files/1.34-acpi.patch b/x11-plugins/wmacpi/files/1.34-acpi.patch
deleted file mode 100644
index 76a94e57f77..00000000000
--- a/x11-plugins/wmacpi/files/1.34-acpi.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.orig 2003-09-04 13:00:48.784055072 -0400
-+++ Makefile 2003-09-04 13:03:41.399813488 -0400
-@@ -11,11 +11,11 @@
- #OPT = -pg -g -DPRO -DACPI
-
- CC = gcc
--CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include
-+CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include -DACPI
- LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
-
--SRCS = wmacpi.c libapm.c libacpi.c
--OBJS = wmacpi.o libapm.o libacpi.o
-+SRCS = wmacpi.c libacpi.c
-+OBJS = wmacpi.o libacpi.o
-
- all: wmacpi
-
diff --git a/x11-plugins/wmacpi/files/1.34-apm.patch b/x11-plugins/wmacpi/files/1.34-apm.patch
deleted file mode 100644
index 6b640b781b1..00000000000
--- a/x11-plugins/wmacpi/files/1.34-apm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.orig 2003-09-04 13:00:48.784055072 -0400
-+++ Makefile 2003-09-04 13:04:23.297444080 -0400
-@@ -11,11 +11,11 @@
- #OPT = -pg -g -DPRO -DACPI
-
- CC = gcc
--CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include
-+CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include -DAPM
- LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
-
--SRCS = wmacpi.c libapm.c libacpi.c
--OBJS = wmacpi.o libapm.o libacpi.o
-+SRCS = wmacpi.c libapm.c
-+OBJS = wmacpi.o libapm.o
-
- all: wmacpi
-
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch
deleted file mode 100644
index af142fd574e..00000000000
--- a/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- Makefile.orig 2007-07-13 17:26:30.000000000 +0200
-+++ Makefile 2008-01-28 16:36:41.000000000 +0100
-@@ -13,8 +13,8 @@
- #OPT = -pg -g
-
- CC := gcc
--CFLAGS := $(OPT) -Wall -W -g -ansi -I/usr/X11R6/include
--LDFLAGS := $(OPT) -lX11 -ldockapp
-+CFLAGS := $(OPT) -Wall -W -g -ansi -I/usr/include
-+LDFLAGS += -lX11 -ldockapp
-
- WMSRC := wmacpi.c libacpi.c
- HEADERS := libacpi.h wmacpi.h
-@@ -22,11 +22,12 @@
- doc_targets := wmacpi.1
-
- ifdef BUILD_CLI
--targets += acpi
--doc_targets += acpi.1
-+targets += acpi-batt-status
-+doc_targets += acpi-batt-status.1
- endif
-
--PREFIX := /usr/local
-+PREFIX := /usr
-+MANDIR := $(PREFIX)/share/man
-
- all: $(targets)
-
-@@ -34,20 +35,20 @@
- WMOBJ := $(patsubst %.c,%.o,$(filter %.c,$(WMSRC)))
-
- # include per-file dependencies
---include $(WMOBJ:.o=.d)
-+#-include $(WMOBJ:.o=.d)
-
- wmacpi: $(WMOBJ)
-- $(CC) $(LDFLAGS) -o $@ $^
-+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
-
- # for the Debian package, we want to make building the command line tools
- # optional. So, we hide all the necessary stuff here . . .
- ifdef BUILD_CLI
--CLSRC := acpi.c libacpi.c
-+CLSRC := acpi-batt-status.c libacpi.c
- CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC)))
---include $(CLOBJ:.o=.d)
-+#-include $(CLOBJ:.o=.d)
-
--acpi: $(CLOBJ)
-- $(CC) $(LDFLAGS) -o $@ $^
-+acpi-batt-status: $(CLOBJ)
-+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
- endif
-
- # build per-file dependencies - note that -MM may not be supported
-@@ -62,10 +63,10 @@
- rm -f *.d $(targets)
-
- install: $(targets)
-- install -d $(PREFIX)/bin/
-- install -pc $(targets) $(PREFIX)/bin/
-- install -d $(PREFIX)/man/man1/
-- install -pc $(doc_targets) $(PREFIX)/man/man1/
-+ install -d $(DESTDIR)$(PREFIX)/bin/
-+ install -pc $(targets) $(DESTDIR)$(PREFIX)/bin/
-+ install -d $(DESTDIR)$(MANDIR)/man1/
-+ install -p -m 0644 $(doc_targets) $(DESTDIR)$(MANDIR)/man1/
-
- tags:
- etags $(WMSRC) $(CLSRC) $(HEADERS)
diff --git a/x11-plugins/wmacpi/wmacpi-1.34.ebuild b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
deleted file mode 100644
index 54fe653240d..00000000000
--- a/x11-plugins/wmacpi/wmacpi-1.34.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
-HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc -sparc x86"
-IUSE="acpi apm"
-
-DEPEND="<x11-libs/libdockapp-0.7"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- use apm && use acpi && eerror "APM and ACPI are in USE ... defaulting to ACPI"
- use apm || use acpi || eerror "Neither APM or ACPI are in USE ... defaulting to ACPI"
- if use acpi || ! use apm ; then
- epatch "${FILESDIR}"/${PV}-acpi.patch
- else
- epatch "${FILESDIR}"/${PV}-apm.patch
- fi
-}
-
-src_compile() {
- emake OPT="${CFLAGS}" || die "emake failed."
-}
-
-src_install() {
- dobin wmacpi || die "dobin failed."
- dodoc AUTHORS ChangeLog README
-}
diff --git a/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild b/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild
deleted file mode 100644
index f994beede5f..00000000000
--- a/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
-HOMEPAGE="http://himi.org/wmacpi/"
-MY_PV="${PV/_}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://himi.org/wmacpi/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -ppc -sparc x86"
-IUSE=""
-
-DEPEND="<x11-libs/libdockapp-0.7
- x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # acpi and acpi.1 conflict with sys-power/acpi - Bug #60685
- mv acpi.c acpi-batt-status.c
- mv acpi.1 acpi-batt-status.1
- epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" OPT="${CFLAGS}" || die "compile failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS ChangeLog README TODO
-}
-
-pkg_postinst() {
- elog "The command-line utility are corresponding manpage are installed"
- elog "as acpi-batt-status to prevent collisions with sys-power/acpi"
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-05-04 22:18 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-29 20:48 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpi/files/, x11-plugins/wmacpi/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2021-05-04 22:17 Sam James
2020-06-15 15:48 Bernard Cafarelli
2020-03-29 15:17 Bernard Cafarelli
2020-03-29 11:35 Bernard Cafarelli
2018-07-19 13:24 Bernard Cafarelli
2017-11-24 10:10 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox