* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmem/, x11-plugins/asmem/files/
@ 2016-08-28 16:37 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2016-08-28 16:37 UTC (permalink / raw
To: gentoo-commits
commit: 01fa5298a358a092d7f328b454af09dc6ed020c3
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 16:32:07 2016 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 16:36:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01fa5298
x11-plugins/asmem: new EAPI=6 revision that respects LDFLAGS.
This new revision is based on the ebuild supplied by Michael
Mair-Keimberger in bug 334771. I turned his sed command into a patch,
and further updated the ebuild to EAPI=6.
Gentoo-Bug: 334771
Package-Manager: portage-2.2.28
x11-plugins/asmem/asmem-1.12-r1.ebuild | 41 +++++++++++++++++++++++++++
x11-plugins/asmem/files/respect-ldflags.patch | 27 ++++++++++++++++++
2 files changed, 68 insertions(+)
diff --git a/x11-plugins/asmem/asmem-1.12-r1.ebuild b/x11-plugins/asmem/asmem-1.12-r1.ebuild
new file mode 100644
index 00000000..dfe5d5c
--- /dev/null
+++ b/x11-plugins/asmem/asmem-1.12-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Monitor the utilization level of memory, cache and swap space"
+HOMEPAGE="http://www.tigr.net/"
+SRC_URI="${HOMEPAGE}afterstep/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="jpeg"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXpm
+ x11-libs/libXext
+ jpeg? ( virtual/jpeg:0 )"
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
+
+PATCHES=( "${FILESDIR}/respect-ldflags.patch" )
+
+src_configure() {
+ econf $(use_enable jpeg)
+}
+
+src_compile() {
+ emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin "${PN}"
+ newman "${PN}.man" "${PN}.1"
+ einstalldocs
+}
diff --git a/x11-plugins/asmem/files/respect-ldflags.patch b/x11-plugins/asmem/files/respect-ldflags.patch
new file mode 100644
index 00000000..75deb42
--- /dev/null
+++ b/x11-plugins/asmem/files/respect-ldflags.patch
@@ -0,0 +1,27 @@
+From 1f02c866884bd08dda27aada5ebaa92e560144d4 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 28 Aug 2016 12:15:34 -0400
+Subject: [PATCH 1/1] autoconf/Makefile.common.in: add $LDFLAGS to the linker
+ command.
+
+Gentoo-Bug: 334771
+---
+ autoconf/Makefile.common.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/autoconf/Makefile.common.in b/autoconf/Makefile.common.in
+index 2409579..08e01a9 100644
+--- a/autoconf/Makefile.common.in
++++ b/autoconf/Makefile.common.in
+@@ -34,7 +34,7 @@ indent:
+ done
+
+ $(PROG): $(OBJS)
+- $(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
++ $(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) $(LDFLAGS)
+
+ .c.o:
+ $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
+--
+2.7.3
+
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmem/, x11-plugins/asmem/files/
@ 2022-09-18 1:34 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-09-18 1:34 UTC (permalink / raw
To: gentoo-commits
commit: c866f812d4ed8fd185016b97b5fdc9ac6a43d458
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 01:25:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 01:26:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c866f812
x11-plugins/asmem: update EAPI 6 -> 8, fix implicit func. declarations
Closes: https://bugs.gentoo.org/870679
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{asmem-1.12-r1.ebuild => asmem-1.12-r2.ebuild} | 26 ++++++++++++++--------
.../files/configure-implicit-func-decls.patch | 14 ++++++++++++
2 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/x11-plugins/asmem/asmem-1.12-r1.ebuild b/x11-plugins/asmem/asmem-1.12-r2.ebuild
similarity index 69%
rename from x11-plugins/asmem/asmem-1.12-r1.ebuild
rename to x11-plugins/asmem/asmem-1.12-r2.ebuild
index b8aeeafc0159..47c255eede9c 100644
--- a/x11-plugins/asmem/asmem-1.12-r1.ebuild
+++ b/x11-plugins/asmem/asmem-1.12-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
@@ -14,16 +14,23 @@ SLOT="0"
KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE="jpeg"
-RDEPEND="x11-libs/libX11
+RDEPEND="
+ x11-libs/libX11
x11-libs/libICE
x11-libs/libSM
x11-libs/libXpm
x11-libs/libXext
- jpeg? ( virtual/jpeg:0 )"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}/respect-ldflags.patch" )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+
+PATCHES=(
+ "${FILESDIR}"/respect-ldflags.patch
+ "${FILESDIR}"/configure-implicit-func-decls.patch
+)
src_configure() {
econf $(use_enable jpeg)
@@ -34,7 +41,8 @@ src_compile() {
}
src_install() {
- dobin "${PN}"
- newman "${PN}.man" "${PN}.1"
einstalldocs
+
+ dobin ${PN}
+ newman ${PN}.man ${PN}.1
}
diff --git a/x11-plugins/asmem/files/configure-implicit-func-decls.patch b/x11-plugins/asmem/files/configure-implicit-func-decls.patch
new file mode 100644
index 000000000000..0361c3e6e9b4
--- /dev/null
+++ b/x11-plugins/asmem/files/configure-implicit-func-decls.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/870679
+
+Generated file and configure.in is written for autoconf 2.13.
+--- a/configure
++++ b/configure
+@@ -751,7 +751,7 @@ cat > conftest.$ac_ext << EOF
+ #line 752 "configure"
+ #include "confdefs.h"
+
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_cv_prog_cc_works=yes
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmem/, x11-plugins/asmem/files/
@ 2022-10-09 5:31 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2022-10-09 5:31 UTC (permalink / raw
To: gentoo-commits
commit: d2bf161e24a6e2f193ff0adc36cfbb6e539bc31e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 05:17:51 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 05:31:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2bf161e
x11-plugins/asmem: fix configure further with upcoming clang16
autoconf/ seems like a mess, so just adding a rough addition to
the earlier direct configure patch.
Also replace CC= by tc-export CC pre-configure, or it fails
with -native-symlinks if CC is unset (due to old autoconf).
Closes: https://bugs.gentoo.org/871279
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-plugins/asmem/asmem-1.12-r2.ebuild | 6 ++++--
.../files/configure-implicit-func-decls.patch | 14 ------------
x11-plugins/asmem/files/configure-implicits.patch | 25 ++++++++++++++++++++++
3 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/x11-plugins/asmem/asmem-1.12-r2.ebuild b/x11-plugins/asmem/asmem-1.12-r2.ebuild
index 47c255eede9c..02804f6c2ddb 100644
--- a/x11-plugins/asmem/asmem-1.12-r2.ebuild
+++ b/x11-plugins/asmem/asmem-1.12-r2.ebuild
@@ -29,15 +29,17 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/respect-ldflags.patch
- "${FILESDIR}"/configure-implicit-func-decls.patch
+ "${FILESDIR}"/configure-implicits.patch
)
src_configure() {
+ tc-export CC # old autoconf
+
econf $(use_enable jpeg)
}
src_compile() {
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+ emake LDFLAGS="${LDFLAGS}"
}
src_install() {
diff --git a/x11-plugins/asmem/files/configure-implicit-func-decls.patch b/x11-plugins/asmem/files/configure-implicit-func-decls.patch
deleted file mode 100644
index 0361c3e6e9b4..000000000000
--- a/x11-plugins/asmem/files/configure-implicit-func-decls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/870679
-
-Generated file and configure.in is written for autoconf 2.13.
---- a/configure
-+++ b/configure
-@@ -751,7 +751,7 @@ cat > conftest.$ac_ext << EOF
- #line 752 "configure"
- #include "confdefs.h"
-
--main(){return(0);}
-+int main(){return(0);}
- EOF
- if { (eval echo configure:757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cc_works=yes
diff --git a/x11-plugins/asmem/files/configure-implicits.patch b/x11-plugins/asmem/files/configure-implicits.patch
new file mode 100644
index 000000000000..14eff8f58e3a
--- /dev/null
+++ b/x11-plugins/asmem/files/configure-implicits.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/870679
+https://bugs.gentoo.org/871279
+
+Generated file and configure.in is written for autoconf 2.13.
+--- a/configure
++++ b/configure
+@@ -752,5 +752,5 @@
+ #include "confdefs.h"
+
+-main(){return(0);}
++int main(void){return(0);}
+ EOF
+ if { (eval echo configure:757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -1356,4 +1356,5 @@
+ #include "confdefs.h"
+
++void ${x_direct_test_function}(void);
+ int main() {
+ ${x_direct_test_function}()
+@@ -2440,4 +2441,5 @@
+ #include "confdefs.h"
+
++void XpmReadFileToPixmap(void);
+ int main() {
+ XpmReadFileToPixmap()
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-09 5:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-28 16:37 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/asmem/, x11-plugins/asmem/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2022-09-18 1:34 Sam James
2022-10-09 5:31 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox