From aa4954f71a3ba2293395a8cce2321a70c39c7554 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 24 May 2024 00:07:11 +0100 Subject: gentoo auto-resync : 24:05:2024 - 00:07:11 --- x11-plugins/wmhdplop/Manifest | 6 +- .../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 ------- x11-plugins/wmhdplop/wmhdplop-0.9.12.ebuild | 5 +- 5 files changed, 3 insertions(+), 191 deletions(-) delete mode 100644 x11-plugins/wmhdplop/files/wmhdplop-0.9.11-configure.patch delete mode 100644 x11-plugins/wmhdplop/files/wmhdplop-0.9.11-indent.patch delete mode 100644 x11-plugins/wmhdplop/wmhdplop-0.9.11-r1.ebuild (limited to 'x11-plugins/wmhdplop') diff --git a/x11-plugins/wmhdplop/Manifest b/x11-plugins/wmhdplop/Manifest index d632a3150936..c10253acc1d1 100644 --- a/x11-plugins/wmhdplop/Manifest +++ b/x11-plugins/wmhdplop/Manifest @@ -1,8 +1,4 @@ -AUX wmhdplop-0.9.11-configure.patch 3188 BLAKE2B 2d5e5e2b22485d0004fd7fec7ee47dd247c8cf5e4f34f2350d7f7e14d36f413662877ba56de42db0976ce749024ba08152e85daab2722e2b30e4fa36324255f7 SHA512 1110d4517b4b43bb39a8cca57bd11e8511637e4a7586fa18b5a8363e4bc1702836e0ed9cd46b50e489ba488297eb8c02073a3ba6295d6f32283cb6f5a8debfeb -AUX wmhdplop-0.9.11-indent.patch 1447 BLAKE2B 4d1359ad2f8408bdf6823d06139f3a89a5c5cc70e2aa237d02274d308979e505ed492fb55097e6090a82a659742d93285a2974dbd2ecd8c54a7864fb4c542919 SHA512 ca393cd833e7760223fa8e92ca3511c4e3631480402cca5addc67304368116da22bfde228066a648897530f47fbb7bed543b83ffab7c9db9efe59bd118a92636 AUX wmhdplop-0.9.12-configure.patch 424 BLAKE2B 328051be56faf3f80f4ddd4ab22da6d251f41b917aa61593314e6ad76158a55934c8f840f3db32a1a33ebbb9066384520c14e08d18c3cf0c892b2c189b023967 SHA512 e69531d680f2be8b4f5794c7adde478f5bbeaf809d6c654855007dd8948123c6876ba899242ce200f760dd5e8324ecf09a3e444ff4ce71aa61c9ed1a1568a49d -DIST wmhdplop-0.9.11.tar.gz 163931 BLAKE2B 9a30f0ea11fd9abd5419612a413187299945b415ed9231e878aeea5a395627b21d77b99bbac3bd8d2b0673069c2011974355c9056d2dbe46688ed7606e8f9b8c SHA512 e77802945b0c4213212922307416e8f99f1fe99de4ade6200bdd9cd8687926ddc7e67b437109174fb8544eebd8a6aea22ba685624842b54134bff48ea8aaa540 DIST wmhdplop-0.9.12.tar.gz 168047 BLAKE2B b0c675f3a32e94407e0fb7d4cd724907e57b04057705819f3892f8c35ca0651e98303b51203bc663814894533a1ac84295b8763a5ee16eada130eab62d8939d3 SHA512 d86ebfcc96669cd743c25c4513c00bff8208442e088b141ac3a5313948d928c5fb29644ef7cd4880a438e7b713382c5a009769b7bddfcabf28fd6799c14c298c -EBUILD wmhdplop-0.9.11-r1.ebuild 712 BLAKE2B 3f65491374be554c081bd269f7c8ef75ede01420b6d343f3a16e85c39c7846ea6af36b02d71208c44186f285067c9415f9d904ceeb9d15ec6ef49f5bf3658b28 SHA512 cb7b3b69327a03e39404325ee6ebb9311da9907d433176c5b385ff18b312c9a37a14b384b0fe70fe1369baafaea06d5dab350b4260c5022646ed976f9e8e7324 -EBUILD wmhdplop-0.9.12.ebuild 679 BLAKE2B 0db32534b7bafb029ee20eb2ab9201896ec879cb713d85c2927ec828f8399c7be696d21ccbe4fd8b2f825718dc57ce72c668d4d1c51b0dbb066879949c21168a SHA512 b74f976fd7fbeaab5dda57fbe201f38217bedd890797d10e0f16941a719ef6d50d5f91cdcfa22b9c3cfb57dc1d0bb2e6fac00f7856b206061b8bd4afa37ffe15 +EBUILD wmhdplop-0.9.12.ebuild 679 BLAKE2B debe640f397223e016e3284b15c4d3bca9d6bf35e9c183ec7c4b2d6c4ab2e06839e829f73dba95d133d0cbed3e109275e75fe5018aac0aaadfd4471d08c3bcad SHA512 f33b99fcdc2a35bfab2c6010c775c5f0d6a0e7fd94b2f5170ce62653fbc47a06715062cd99c7b990250a712ca47434adf3fdd8c99d9c5651448d86b5ae19c057 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f 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" -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 -} diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.12.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.12.ebuild index 2bb210461885..1d72db117b1b 100644 --- a/x11-plugins/wmhdplop/wmhdplop-0.9.12.ebuild +++ b/x11-plugins/wmhdplop/wmhdplop-0.9.12.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=8 @@ -11,9 +11,8 @@ 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] +RDEPEND="media-libs/imlib2[X,text(+)] x11-libs/libX11 x11-libs/libXext media-fonts/corefonts -- cgit v1.2.3