commit: 2515f70f247f167335fe8776b72cb9647fa37126 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Thu May 23 21:58:06 2024 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Thu May 23 22:04:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2515f70f
x11-plugins/wmhdplop: drop 0.9.11-r1 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> x11-plugins/wmhdplop/Manifest | 1 - .../wmhdplop/files/wmhdplop-0.9.11-configure.patch | 108 --------------------- .../wmhdplop/files/wmhdplop-0.9.11-indent.patch | 38 -------- x11-plugins/wmhdplop/wmhdplop-0.9.11-r1.ebuild | 37 ------- 4 files changed, 184 deletions(-) diff --git a/x11-plugins/wmhdplop/Manifest b/x11-plugins/wmhdplop/Manifest index 78fb53a7de16..b12ff757a2c1 100644 --- a/x11-plugins/wmhdplop/Manifest +++ b/x11-plugins/wmhdplop/Manifest @@ -1,2 +1 @@ -DIST wmhdplop-0.9.11.tar.gz 163931 BLAKE2B 9a30f0ea11fd9abd5419612a413187299945b415ed9231e878aeea5a395627b21d77b99bbac3bd8d2b0673069c2011974355c9056d2dbe46688ed7606e8f9b8c SHA512 e77802945b0c4213212922307416e8f99f1fe99de4ade6200bdd9cd8687926ddc7e67b437109174fb8544eebd8a6aea22ba685624842b54134bff48ea8aaa540 DIST wmhdplop-0.9.12.tar.gz 168047 BLAKE2B b0c675f3a32e94407e0fb7d4cd724907e57b04057705819f3892f8c35ca0651e98303b51203bc663814894533a1ac84295b8763a5ee16eada130eab62d8939d3 SHA512 d86ebfcc96669cd743c25c4513c00bff8208442e088b141ac3a5313948d928c5fb29644ef7cd4880a438e7b713382c5a009769b7bddfcabf28fd6799c14c298c diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch deleted file mode 100644 index 1bbe3ad2f388..000000000000 --- a/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -Naur wmhdplop-0.9.11.orig/configure.ac wmhdplop-0.9.11/configure.ac ---- wmhdplop-0.9.11.orig/configure.ac 2018-12-11 02:45:33.000000000 +0100 -+++ wmhdplop-0.9.11/configure.ac 2022-07-15 19:42:42.504309025 +0200 -@@ -1,12 +1,14 @@ --AC_INIT(wmhdplop, 0.9.11) -+AC_INIT([wmhdplop], [0.9.11], [https://www.dockapps.net/wmhdplop]) - AC_CONFIG_SRCDIR(wmhdplop.c) - AM_INIT_AUTOMAKE -+LT_INIT -+AC_CONFIG_MACRO_DIRS([m4]) - AM_CONFIG_HEADER(config.h) - - AC_SUBST(VERSION) - - ISODATE=`date +%Y-%m-%d` --AC_SUBST(ISODATE) -+AC_SUBST([ISODATE]) - - AC_CANONICAL_HOST - -@@ -19,39 +21,37 @@ - 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" - - dnl Checks for the gkrellm plugin - build_gkhdplop="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 -@@ -69,8 +69,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]) -@@ -82,7 +82,7 @@ - fi - CPPFLAGS="$SAVECPPFLAGS" - fi --AC_SUBST(GKHDPLOP) -+AC_SUBST([GKHDPLOP]) - - - AC_OUTPUT(Makefile) -diff -Naur wmhdplop-0.9.11.orig/Makefile.am wmhdplop-0.9.11/Makefile.am ---- wmhdplop-0.9.11.orig/Makefile.am 2018-12-08 22:48:27.000000000 +0100 -+++ wmhdplop-0.9.11/Makefile.am 2022-07-15 19:42:17.107279593 +0200 -@@ -8,6 +8,8 @@ - - EXTRA_DIST=autogen.sh gkrellm_hdplop.c - -+ACLOCAL_AMFLAGS = -I m4 -+ - IMLIB2_LIBS=@IMLIB2_LIBS@ - IMLIB2_CFLAGS=@IMLIB2_CFLAGS@ - diff --git a/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-indent.patch b/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-indent.patch deleted file mode 100644 index 30e44715ea2a..000000000000 --- a/x11-plugins/wmhdplop/files/wmhdplop-0.9.11-indent.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f597fc7288f57d1dfddd5bb559cc7b0f598d15e5 Mon Sep 17 00:00:00 2001 -From: "Torrance, Douglas" <[email protected]> -Date: Sun, 10 Oct 2021 10:01:04 +0000 -Subject: [PATCH] wmhdplop: Fix "misleadingly indented" compiler warnings. - ---- - wmhdplop/wmhdplop.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/wmhdplop.c b/wmhdplop.c -index 16b9a4f..bbbe971 100644 ---- a/wmhdplop.c -+++ b/wmhdplop.c -@@ -421,7 +421,9 @@ static void draw_hdlist(App *app) { - //printf("update : first displayed(%d) = %p\n", cnt, dl); - - for (dl = first_dev_in_list(), dev_cnt=hd_cnt=-1; dl; dl = dl->next) { -- if (dl->part_id == 0) ++hd_cnt; if (!is_displayed(dl->hd_id, dl->part_id)) continue; ++dev_cnt; -+ if (dl->part_id == 0) ++hd_cnt; -+ if (!is_displayed(dl->hd_id, dl->part_id)) continue; -+ ++dev_cnt; - imlib_get_text_size(shorten_name(dl),&w,&h); - lw = MAX(w,lw); - lh += h; -@@ -440,7 +442,9 @@ static void draw_hdlist(App *app) { - imlib_image_draw_rectangle(lx-1,ly-1,lw+2,lh+2); - - for (dl = first_dev_in_list(), dev_cnt=hd_cnt=-1; dl; dl = dl->next) { -- if (dl->part_id==0) ++hd_cnt; if (!is_displayed(dl->hd_id, dl->part_id)) continue; ++dev_cnt; -+ if (dl->part_id==0) ++hd_cnt; -+ if (!is_displayed(dl->hd_id, dl->part_id)) continue; -+ ++dev_cnt; - int x = lx, y = ly + lh - dev_cnt * h; - if (!Prefs.disable_hd_leds) { - if (dl->touched_r) { --- -2.11.4.GIT - diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.11-r1.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.11-r1.ebuild deleted file mode 100644 index 2f766c788980..000000000000 --- a/x11-plugins/wmhdplop/wmhdplop-0.9.11-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit autotools - -DESCRIPTION="a dockapp for monitoring disk activities with fancy visuals" -HOMEPAGE="https://www.dockapps.net/wmhdplop"; -SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="media-libs/imlib2[X] - x11-libs/libX11 - x11-libs/libXext - media-fonts/corefonts - >=media-libs/freetype-2" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-configure.patch - "${FILESDIR}"/${P}-indent.patch -) - -DOCS=( AUTHORS ChangeLog NEWS README ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --disable-gkrellm -}
