[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmforkplop/
commit: b623307d26939791dbd07365a98840ab2903f406
Author: Bernard Cafarelli gentoo org>
AuthorDate: Thu May 23 22:04:31 2024 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Thu May 23 22:04:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b623307d
x11-plugins/wmforkplop: add USE dep on imlib2[text]
Closes: https://bugs.gentoo.org/925708
Signed-off-by: Bernard Cafarelli gentoo.org>
x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
index 2ecbefa3c127..b236d829259a 100644
--- a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
+++ b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
DEPEND="gnome-base/libgtop
- media-libs/imlib2[X]"
+ media-libs/imlib2[X,text(+)]"
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}"/${P}-configure.patch )
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmforkplop/files/
commit: 5ee919de2da1a6dd17d5e716c0a1bd481cc43dd5 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon Feb 21 08:37:24 2022 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Feb 21 08:37:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee919de x11-plugins/wmforkplop: fix gkrellm plugin disabling Closes: https://bugs.gentoo.org/833819 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernard Cafarelli gentoo.org> .../wmforkplop/files/wmforkplop-0.9.3-configure.patch | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-configure.patch b/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-configure.patch index 23063948e861..a0a8e78a85d8 100644 --- a/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-configure.patch +++ b/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-configure.patch @@ -1,6 +1,6 @@ diff -Naur wmforkplop-0.9.3.orig/configure.ac wmforkplop-0.9.3/configure.ac --- wmforkplop-0.9.3.orig/configure.ac 2006-12-01 12:32:10.0 +0100 -+++ wmforkplop-0.9.3/configure.ac 2022-02-20 16:45:58.096842874 +0100 wmforkplop-0.9.3/configure.ac 2022-02-21 09:32:50.447638884 +0100 @@ -1,11 +1,13 @@ -AC_INIT(wmforkplop.c) -AM_INIT_AUTOMAKE(wmforkplop, 0.9.3) @@ -101,6 +101,15 @@ diff -Naur wmforkplop-0.9.3.orig/configure.ac wmforkplop-0.9.3/configure.ac [ --enable-gkrellmbuild the gkrellm plugin (requires gtk2 and gkrellm developpement files) (Default is yes) --disable-gkrellm do not build the gkrellm plugin], [ if test "x$enableval" = "xno" ; then +@@ -77,7 +73,7 @@ + + + dnl GKFORKPLOP DISABLED! IS BROKEN +-build_gkforkplop="yes" ++build_gkforkplop="no" + + + @@ -90,8 +86,8 @@ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) GTK2_CFLAGS=$PACKAGE_CFLAGS; @@ -136,7 +145,7 @@ diff -Naur wmforkplop-0.9.3.orig/configure.ac wmforkplop-0.9.3/configure.ac +AC_OUTPUT([Makefile]) diff -Naur wmforkplop-0.9.3.orig/Makefile.am wmforkplop-0.9.3/Makefile.am --- wmforkplop-0.9.3.orig/Makefile.am 2004-07-11 20:22:33.0 +0200 -+++ wmforkplop-0.9.3/Makefile.am 2022-02-20 16:41:27.920695917 +0100 wmforkplop-0.9.3/Makefile.am 2022-02-21 09:32:25.649635912 +0100 @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 +
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmforkplop/, x11-plugins/wmforkplop/files/
commit: b44a22be92f9fc98df14be762688ef7b4d77c5b7
Author: Bernard Cafarelli gentoo org>
AuthorDate: Sun Feb 20 15:48:14 2022 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Sun Feb 20 15:48:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b44a22be
x11-plugins/wmforkplop: modernize configure.ac
Adapted from Debian patch:
https://salsa.debian.org/debian/wmforkplop/-/blob/master/debian/patches/0005-configure.ac-Modernize.patch
Also fix imlib2 support, using pkg-config
Closes: https://bugs.gentoo.org/828892
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli gentoo.org>
.../wmforkplop/files/wmforkplop-0.9.3-cflags.patch | 12 --
.../files/wmforkplop-0.9.3-configure.patch | 145 +
x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild | 11 +-
3 files changed, 153 insertions(+), 15 deletions(-)
diff --git a/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch
b/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch
deleted file mode 100644
index 8846e46e2b99..
--- a/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
a/configure2012-10-23 15:54:48.098767586 +0200
-+++ b/configure2012-10-23 15:54:56.946510053 +0200
-@@ -3483,9 +3483,6 @@
-
-
-
--if test x$GCC = xyes; then
-- CFLAGS="-O3 -fomit-frame-pointer -ffast-math -Wall -W";
--fi
-
- echo "$as_me:$LINENO: checking for X" >&5
- echo $ECHO_N "checking for X... $ECHO_C" >&6
diff --git a/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-configure.patch
b/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-configure.patch
new file mode 100644
index ..23063948e861
--- /dev/null
+++ b/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-configure.patch
@@ -0,0 +1,145 @@
+diff -Naur wmforkplop-0.9.3.orig/configure.ac wmforkplop-0.9.3/configure.ac
+--- wmforkplop-0.9.3.orig/configure.ac 2006-12-01 12:32:10.0 +0100
wmforkplop-0.9.3/configure.ac 2022-02-20 16:45:58.096842874 +0100
+@@ -1,11 +1,13 @@
+-AC_INIT(wmforkplop.c)
+-AM_INIT_AUTOMAKE(wmforkplop, 0.9.3)
+-AM_CONFIG_HEADER(config.h)
++AC_INIT([wmforkplop], [0.9.3], [http://hules.free.fr/wmforkplop/])
++AM_INIT_AUTOMAKE
++LT_INIT
++AC_CONFIG_MACRO_DIRS([m4])
++AC_CONFIG_HEADERS([config.h])
+
+ AC_SUBST(VERSION)
+
+ ISODATE=`date +%Y-%m-%d`
+-AC_SUBST(ISODATE)
++AC_SUBST([ISODATE])
+
+ AC_CANONICAL_HOST
+
+@@ -19,54 +21,48 @@
+
+ AC_DEFINE(_GNU_SOURCE,[],[uses GNU extensions])
+
+-
+-if test x$GCC = xyes; then
+- CFLAGS="-O3 -fomit-frame-pointer -ffast-math -Wall -W";
+-fi
+-
+ dnl check for X
+ AC_PATH_X
+ AC_PATH_XTRA
+-if test x$no_x = xyes; then
+- echo "You need to supply the path to the X headers and libraries with
--x-includes=dir and --x-libraries=dir";
+- exit 1;
+-fi;
++AS_IF(
++ [test "x${no_x}" = "xyes"],
++ [AC_MSG_ERROR([You need to supply the path to the X headers and libraries
with --x-includes=dir and --x-libraries=dir])]
++)
+
+ LIBS="${X_PRE_LIBS} ${X_LIBS} -lX11 -lXext ${LIBS} ${X_EXTRA_LIBS}"
+ CFLAGS="$CFLAGS $X_CFLAGS"
+
+ dnl Checks for library functions.
+-AC_CHECK_HEADERS(linux/hdreg.h)
++AC_CHECK_HEADERS([linux/hdreg.h])
+
+-AC_CHECK_PROG([IMLIB2_CONFIG_IN_PATH],[imlib2-config],[yes],[no])
+-if test "x$IMLIB2_CONFIG_IN_PATH" = "xno"; then
+- AC_ERROR([imlib2-config not found in PATH.. You need to install Imlib2 (and
its developpement package)])
+-fi
+-IMLIB2_CFLAGS=$(imlib2-config --cflags)
+-IMLIB2_LIBS=$(imlib2-config --libs)
+-AC_SUBST(IMLIB2_CFLAGS)
+-AC_SUBST(IMLIB2_LIBS)
++AC_CHECK_PROG([PKG_CONFIG_IN_PATH],[pkg-config],[yes],[no])
++AS_IF(
++ [test "x$PKG_CONFIG_IN_PATH" = "xno"],
++ [AC_ERROR([pkg-config not found in PATH.. You need to install pkgconf])]
++)
++
++IMLIB2_CFLAGS=$(pkg-config imlib2 --cflags)
++IMLIB2_LIBS=$(pkg-config imlib2 --libs)
++AC_SUBST([IMLIB2_CFLAGS])
++AC_SUBST([IMLIB2_LIBS])
+
+ YELLOW="\\033\\1331;33m"
+ RESET="\\033\\1330m"
+
+-PKG_CHECK_MODULES(PACKAGE, [libgtop-2.0 >= 2.7.90], LIBGTOPBUG="no",
LIBGTOPBUG="yes")
+-PKG_CHECK_MODULES(PACKAGE, [libgtop-2.0 >= 2.0.0])
+-LIBGTOP_CFLAGS=$PACKAGE_CFLAGS;
+-LIBGTOP_LIBS=$PACKAGE_LIBS;
+-dnl LIBGTOP_LIBS=`pkg-config --libs libgtop-2.0`
+-dnl LIBGTOP_CFLAGS=`pkg-config --cflags libgtop-2.0`
+-AC_SUBST(LIBGTOP_LIBS)
+-AC_SUBST(LIBGTOP_CFLAGS)
+-if test "x$LIBGTOPBUG" = "xyes"; then
+-AC_DEFINE(LIBGTOP_BUGGY,[],[defined if libgtop < 2.7.90 is used])
+-echo "Using a buggy version (<2.7.90) of libgtop"
+-else
+-echo "Using a good version of libgtop"
+-fi
++PKG_CHECK_MODULES([LIBGTOP], [libgtop-2.0 >= 2.7.90], [LIBGTOPBUG="no"],
[LIBGTOPBUG="yes"])
++PKG_CHECK_MODULES([LIBGTOP], [libgtop-2.0 >= 2.0.0])
++AC_SUBST([LIBGTOP_LIBS])
++AC_SUBST([LIBGTOP_CFLAGS])
++AS_IF(
++ [test "x$LIBGTOPBUG" = "xyes"],
++ [AC_DEFINE([LIBGTOP_BUGGY], [], [defined if libgtop < 2.7.90 is used])
++ AC_MSG_WARN([Using a buggy version (<2.7.90) of libgtop])],
++ [AC_MSG_NOTIC
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmforkplop/
commit: fc5338e54dc126d2ec75517ef5b2c61eaad815ef
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Fri Dec 7 14:08:52 2018 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Tue Dec 11 14:27:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc5338e5
x11-plugins/wmforkplop: drop old
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Bernard Cafarelli gentoo.org>
x11-plugins/wmforkplop/wmforkplop-0.9.3-r1.ebuild | 23 ---
x11-plugins/wmforkplop/wmforkplop-0.9.3.ebuild| 21 -
2 files changed, 44 deletions(-)
diff --git a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r1.ebuild
b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r1.ebuild
deleted file mode 100644
index 73fb872a3ed..000
--- a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="monitors the forking activity of the kernel and most active
processes"
-HOMEPAGE="http://hules.free.fr/wmforkplop";
-SRC_URI="http://hules.free.fr/wmforkplop/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-DEPEND="gnome-base/libgtop
- media-libs/imlib2[X]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Easier to patch configure directly here
- epatch "${FILESDIR}"/${P}-cflags.patch
-}
diff --git a/x11-plugins/wmforkplop/wmforkplop-0.9.3.ebuild
b/x11-plugins/wmforkplop/wmforkplop-0.9.3.ebuild
deleted file mode 100644
index c29ea07ec33..000
--- a/x11-plugins/wmforkplop/wmforkplop-0.9.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="monitors the forking activity of the kernel and most active
processes"
-HOMEPAGE="http://hules.free.fr/wmforkplop";
-SRC_URI="http://hules.free.fr/wmforkplop/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-DEPEND="gnome-base/libgtop
- media-libs/imlib2[X]"
-RDEPEND="${DEPEND}"
-
-#src_install() {
-# emake DESTDIR="${D}" install
-#}
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmforkplop/
commit: aeeed8b1a034c86d5c3d9c6375171e469543fc87
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Tue Aug 21 07:22:49 2018 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Sat Aug 25 07:09:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeeed8b1
x11-plugins/wmforkplop: restore RDEPEND
.../{wmforkplop-0.9.3-r2.ebuild => wmforkplop-0.9.3-r3.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r2.ebuild
b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
similarity index 96%
rename from x11-plugins/wmforkplop/wmforkplop-0.9.3-r2.ebuild
rename to x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
index 5d55aaf80fb..3878d594dd3 100644
--- a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r2.ebuild
+++ b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
DEPEND="gnome-base/libgtop
media-libs/imlib2[X]"
+RDEPEND="${DEPEND}"
# Easier to patch configure directly here
PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmforkplop/files/, x11-plugins/wmforkplop/
commit: 0a45a7bd5563669e1074d68d21eea738e0c9057d
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Jul 22 12:46:47 2018 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Thu Jul 26 20:30:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a45a7bd
x11-plugins/wmforkplop: EAPI7, improve ebuild
.../wmforkplop/files/wmforkplop-0.9.3-cflags.patch | 4 ++--
x11-plugins/wmforkplop/wmforkplop-0.9.3-r2.ebuild | 18 ++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch
b/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch
index 3c7c369aac4..8846e46e2b9 100644
--- a/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch
+++ b/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch
@@ -1,5 +1,5 @@
configure.orig 2012-10-23 15:54:48.098767586 +0200
-+++ configure 2012-10-23 15:54:56.946510053 +0200
+--- a/configure2012-10-23 15:54:48.098767586 +0200
b/configure2012-10-23 15:54:56.946510053 +0200
@@ -3483,9 +3483,6 @@
diff --git a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r2.ebuild
b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r2.ebuild
new file mode 100644
index 000..5d55aaf80fb
--- /dev/null
+++ b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="monitors the forking activity of the kernel and most active
processes"
+HOMEPAGE="http://hules.free.fr/wmforkplop";
+SRC_URI="http://hules.free.fr/wmforkplop/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+DEPEND="gnome-base/libgtop
+ media-libs/imlib2[X]"
+
+# Easier to patch configure directly here
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
