diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /x11-plugins/wmforkplop | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'x11-plugins/wmforkplop')
-rw-r--r-- | x11-plugins/wmforkplop/Manifest | 4 | ||||
-rw-r--r-- | x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch | 12 | ||||
-rw-r--r-- | x11-plugins/wmforkplop/files/wmforkplop-0.9.3-configure.patch | 154 | ||||
-rw-r--r-- | x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild | 11 |
4 files changed, 164 insertions, 17 deletions
diff --git a/x11-plugins/wmforkplop/Manifest b/x11-plugins/wmforkplop/Manifest index a4ad3025b94e..f873b45c2377 100644 --- a/x11-plugins/wmforkplop/Manifest +++ b/x11-plugins/wmforkplop/Manifest @@ -1,4 +1,4 @@ -AUX wmforkplop-0.9.3-cflags.patch 314 BLAKE2B 506f7f4bebce7187a5631cb134fe254c6eb18827694ea1b493f8877dfbeac7515fc30b8826f5aef2a355806422ca775af0a0faabb0f5acfadea2fa0a4ecc1d8f SHA512 01d9a9358a38c4cd5d1e59d55f1c583a139efd42bda682a8b2cd516f833e996795f5fc083020dca1870ced521a622427c9351b9bbdc651ce1bc29867ba3352ea +AUX wmforkplop-0.9.3-configure.patch 4919 BLAKE2B bc8d25e298a0ede9ce2af54963d8325c54651fcffd18e4b47f26101ae5d9fa461d215457a2b05d5e85065c1d7d70973c4dbaa158a950af5ba88405b3c92060fa SHA512 06a2a49feb03d00b091183cef316f37cbdd5a3b0464f730f5c5935e0a8f5bdb0ad9e60faa3b0a36901797ef103e0dc481c52f58de85e982d3ea67bb3a02794e9 DIST wmforkplop-0.9.3.tar.gz 228451 BLAKE2B c246839aa410f6c58bca6bbfeebd86c4e870fb3fbeed798c6eff6eff0ea7d553dc49655734c05c06847ce6b4cc7766154844a2cd51a3f33ae7843b0337105673 SHA512 169a83afc60978856fa93ec83fa7ebd3efdff377b0bf6a957e5ae75fd1512b5a33cf08b47ab20126aa6e10eb05f5d6364212f853798b722d415e898a5edac0e9 -EBUILD wmforkplop-0.9.3-r3.ebuild 541 BLAKE2B 0ffa35a715a8cc16aa8fe81a8d4bef788f770121545aec9f70ab801dd48d2f2276bed54cc6ea8d13fa4e29a4755da5918aae82c3036622b93ee91548cd35b66c SHA512 6d740e999f5274da1d918ef29b9f131ba52be9bba30cfec110405281add521cbd61cf9351390ca17ff5acd257f6150a9c47eae935924ddcba4d884831e5ad4fd +EBUILD wmforkplop-0.9.3-r3.ebuild 558 BLAKE2B d650b2a8df9006c1984bcc276795be90f83cc73c63e0305aff0801d7c975088560f83e44252d2994076a0e33dfb3a71b52da15f4c232d0549d85195f0d286a5c SHA512 ab9dabfe71516f9878d618ebb62806721423a3e3f811a84a5abb481dccb81458b935de94b4020009e903c100bc166b64b70f85fa928e878651e62db75d53186e MISC metadata.xml 642 BLAKE2B 8239b01b1be99d3431df2a42f4f63fec5122794f7f6246b7bc0652b3b2ce22e9d32b495a5fa84fa8be4ac46d370e8ffaecdb209206f2e6af319d1bdc26bd7144 SHA512 c58618c6f9b560184a9970e5a778a77f925693520ce3e9b3a9ae158bff72b6b902c0e291510bb7d0e19358ca29a7c90d3dc4ee4cb9a21d0d79781b2d6ef212c1 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..000000000000 --- a/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/configure 2012-10-23 15:54:48.098767586 +0200 -+++ b/configure 2012-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 000000000000..a0a8e78a85d8 --- /dev/null +++ b/x11-plugins/wmforkplop/files/wmforkplop-0.9.3-configure.patch @@ -0,0 +1,154 @@ +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.000000000 +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) +-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_NOTICE([Using a good version of libgtop])] ++) ++ + dnl Checks for the gkrellm plugin + build_gkforkplop="yes" +-AC_ARG_ENABLE(gkrellm, ++AC_ARG_ENABLE([gkrellm], + [ --enable-gkrellm build 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; + GTK2_LIBS=$PACKAGE_LIBS; +- AC_SUBST(GTK2_CFLAGS) +- AC_SUBST(GTK2_LIBS) ++ AC_SUBST([GTK2_CFLAGS]) ++ AC_SUBST([GTK2_LIBS]) + SAVECPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CFLAGS $GTK2_CFLAGS" + AC_CHECK_HEADERS([gkrellm2/gkrellm.h], [ok=1], [ok=0]) +@@ -103,19 +99,7 @@ + fi + CPPFLAGS="$SAVECPPFLAGS" + fi +-AC_SUBST(GKFORKPLOP) +- ++AC_SUBST([GKFORKPLOP]) + +-AC_OUTPUT(Makefile) + +-dnl echo "- - - - - - - - - - - - - - - -" +-dnl echo -e "${YELLOW}wmforkplop will be built${RESET}" +-dnl if test "x$build_gkforkplop" = "xno"; then +-dnl echo -e "${YELLOW}gkforkplop.so will NOT be built${RESET}" +-dnl else +-dnl echo -e "${YELLOW}gkforkplop.so will be built${RESET}" +-dnl echo "Check that the plugin is working properly before installing it with:" +-dnl echo " gkrellm -p ./gkforkplop.so" +-dnl echo "and then install the gkrellm plugin with:" +-dnl echo " mv ./gkforkplop.so ~/.gkrellm2/plugins" +-dnl fi ++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.000000000 +0200 ++++ wmforkplop-0.9.3/Makefile.am 2022-02-21 09:32:25.649635912 +0100 +@@ -1,3 +1,5 @@ ++ACLOCAL_AMFLAGS = -I m4 ++ + bin_PROGRAMS=wmforkplop + noinst_PROGRAMS=@GKFORKPLOP@ + EXTRA_PROGRAMS=gkforkplop.so diff --git a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild index 3878d594dd31..2ecbefa3c127 100644 --- a/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild +++ b/x11-plugins/wmforkplop/wmforkplop-0.9.3-r3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools DESCRIPTION="monitors the forking activity of the kernel and most active processes" HOMEPAGE="http://hules.free.fr/wmforkplop" @@ -15,5 +16,9 @@ DEPEND="gnome-base/libgtop media-libs/imlib2[X]" RDEPEND="${DEPEND}" -# Easier to patch configure directly here -PATCHES=( "${FILESDIR}"/${P}-cflags.patch ) +PATCHES=( "${FILESDIR}"/${P}-configure.patch ) + +src_prepare() { + default + eautoreconf +} |