commit: c6e2e5111e8e18febdc92d0f3d309c1cf78ce2af Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Sat Jun 28 17:52:46 2025 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Mon Sep 15 07:33:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e2e511
www-client/dillo: drop 3.1.1-r3 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42791 Closes: https://github.com/gentoo/gentoo/pull/42791 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> www-client/dillo/Manifest | 1 - www-client/dillo/dillo-3.1.1-r3.ebuild | 112 --------------------- www-client/dillo/files/dillo-3.1.1-c23.patch | 33 ------ .../dillo/files/dillo-3.1.1-remove-which.patch | 31 ------ .../files/dillo-3.1.1-unused-constructor.patch | 57 ----------- 5 files changed, 234 deletions(-) diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest index e52344fea18e..c3adb2109958 100644 --- a/www-client/dillo/Manifest +++ b/www-client/dillo/Manifest @@ -1,2 +1 @@ -DIST dillo-3.1.1.tar.bz2 1026711 BLAKE2B 81fbaf527f89160bfddf4bc51048dab8f1487b735e6d9cb9679deb46cda666158bb6b0d469ec28691167cd9d9657a12f5d5f5ed5b6c1cb0102963d611b4e2ece SHA512 2f6ad315c246638e91af13fbeb8a846b756c222aaf2275efb1bff6bae08130bb4b8fda9c09cd33925911c424fe536cf7a587e6657de9a13d63733714c86533c1 DIST dillo-3.2.0.tar.bz2 1093734 BLAKE2B 739eb5e3ea3d1fd47b4a7a94c3bef381593707ffbada7f6e18d587981510ea321720e70c1cf2265880611617d92770499879ea1131b314b70f1d23f0dcd0534c SHA512 d797dd24c7312ad607c1d8e7fe2153860eaf1bb2146108a183ad788ea59319ec11d2160b9a7cca673f3d04474121b57d8dfa73bf3921daebe601794b8cbdea09 diff --git a/www-client/dillo/dillo-3.1.1-r3.ebuild b/www-client/dillo/dillo-3.1.1-r3.ebuild deleted file mode 100644 index 8712870a6709..000000000000 --- a/www-client/dillo/dillo-3.1.1-r3.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs virtualx xdg-utils - -DESCRIPTION="Lean FLTK based web browser" -HOMEPAGE="https://dillo-browser.github.io/"; - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dillo-browser/dillo.git"; -else - SRC_URI="https://github.com/dillo-browser/dillo/releases/download/v${PV}/${P}.tar.bz2"; - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug doc +gif +jpeg mbedtls +png +ssl +openssl +xembed" -REQUIRED_USE=" - ssl? ( || ( openssl mbedtls ) ) -" - -RDEPEND=" - =x11-libs/fltk-1.3*:1= - sys-libs/zlib - x11-libs/libX11 - jpeg? ( media-libs/libjpeg-turbo:= ) - png? ( >=media-libs/libpng-1.2:= ) - ssl? ( - mbedtls? ( net-libs/mbedtls:0= ) - openssl? ( dev-libs/openssl:= ) - ) - test? ( - media-fonts/dejavu - media-gfx/imagemagick[X] - x11-apps/xwd - x11-apps/xwininfo - x11-base/xorg-server[xvfb] - ) -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - doc? ( - app-text/doxygen[dot] - app-text/texlive - ) -" - -DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README" - -PATCHES=( - "${FILESDIR}"/${P}-unused-constructor.patch - "${FILESDIR}"/${P}-remove-which.patch - "${FILESDIR}"/${P}-c23.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable debug rtfl) - $(use_enable gif) - $(use_enable jpeg) - $(use_enable mbedtls) - $(use_enable openssl) - $(use_enable png) - $(use_enable ssl tls) - $(use_enable xembed) - --enable-ipv6 - ) - - use test && myeconfargs+=( --enable-html-tests=yes ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - emake AR="$(tc-getAR)" - - if use doc; then - doxygen Doxyfile || die - fi -} - -src_test() { - # The test suite consistently fails with -jN in portage - virtx emake -j1 check -} - -src_install() { - default - - use doc && dodoc -r html -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/www-client/dillo/files/dillo-3.1.1-c23.patch b/www-client/dillo/files/dillo-3.1.1-c23.patch deleted file mode 100644 index fe3355a98d76..000000000000 --- a/www-client/dillo/files/dillo-3.1.1-c23.patch +++ /dev/null @@ -1,33 +0,0 @@ -Convert function declarations to C23 standard -https://bugs.gentoo.org/944457 ---- a/src/cache.c -+++ b/src/cache.c -@@ -1359,7 +1359,7 @@ - /** - * Callback function for Cache_delayed_process_queue. - */ --static void Cache_delayed_process_queue_callback() -+static void Cache_delayed_process_queue_callback(void *data) - { - CacheEntry_t *entry; - ---- a/src/jpeg.c -+++ b/src/jpeg.c -@@ -124,7 +124,7 @@ - * static void init_source(j_decompress_ptr cinfo) - * (declaring it with no parameter avoids a compiler warning) - */ --static void init_source() -+static void init_source(struct jpeg_decompress_struct *cinfo) - { - } - -@@ -181,7 +181,7 @@ - * static void term_source(j_decompress_ptr cinfo) - * (declaring it with no parameter avoids a compiler warning) - */ --static void term_source() -+static void term_source(struct jpeg_decompress_struct *cinfo) - { - } - diff --git a/www-client/dillo/files/dillo-3.1.1-remove-which.patch b/www-client/dillo/files/dillo-3.1.1-remove-which.patch deleted file mode 100644 index ea645bc0e4e6..000000000000 --- a/www-client/dillo/files/dillo-3.1.1-remove-which.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/dillo-browser/dillo/commit/9880c1ba603a6080b2493c7c399ae36d656a9834.patch -From: meat <[email protected]> -Date: Thu, 3 Oct 2024 12:48:31 +0200 -Subject: [PATCH] Use command -v instead of which - ---- a/configure.ac -+++ b/configure.ac -@@ -297,18 +297,18 @@ if test "x$enable_png" = "xyes"; then - - dnl Check if the user hasn't set the variable $PNG_CONFIG - if test -z "$PNG_CONFIG"; then -- PNG_CONFIG=`which libpng16-config` -+ PNG_CONFIG=`command -v libpng16-config` - if test -z "$PNG_CONFIG"; then -- PNG_CONFIG=`which libpng14-config` -+ PNG_CONFIG=`command -v libpng14-config` - fi - if test -z "$PNG_CONFIG"; then -- PNG_CONFIG=`which libpng12-config` -+ PNG_CONFIG=`command -v libpng12-config` - fi - if test -z "$PNG_CONFIG"; then -- PNG_CONFIG=`which libpng-config` -+ PNG_CONFIG=`command -v libpng-config` - fi - if test -z "$PNG_CONFIG"; then -- PNG_CONFIG=`which libpng10-config` -+ PNG_CONFIG=`command -v libpng10-config` - fi - fi - diff --git a/www-client/dillo/files/dillo-3.1.1-unused-constructor.patch b/www-client/dillo/files/dillo-3.1.1-unused-constructor.patch deleted file mode 100644 index 60c984e18c8e..000000000000 --- a/www-client/dillo/files/dillo-3.1.1-unused-constructor.patch +++ /dev/null @@ -1,57 +0,0 @@ -https://github.com/dillo-browser/dillo/commit/f3d7483ab4b1751944907fa24a260f0afbb60633.patch -From: Rodrigo Arias Mallo <[email protected]> -Date: Thu, 17 Oct 2024 10:32:49 +0200 -Subject: [PATCH] Remove unused NotSoSimpleVector constructor - -Fixes: https://github.com/dillo-browser/dillo/issues/281 -See: https://bugs.gentoo.org/939137 ---- a/lout/misc.hh -+++ b/lout/misc.hh -@@ -1,3 +1,23 @@ -+/* -+ * Dillo Widget -+ * -+ * Copyright 2005-2007 Sebastian Geerken <[email protected]> -+ * Copyright 2024 Rodrigo Arias Mallo <[email protected]> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program. If not, see <http://www.gnu.org/licenses/>. -+ */ -+ - #ifndef __LOUT_MISC_HH__ - #define __LOUT_MISC_HH__ - -@@ -374,23 +394,6 @@ public: - this->startExtra = -1; - } - -- inline NotSoSimpleVector (const NotSoSimpleVector &o) -- { -- this->arrayMain = NULL; -- this->numMain = o.numMain; -- this->numAllocMain = o.numAllocMain; -- resizeMain (); -- memcpy (this->arrayMain, o.arrayMain, sizeof (T) * numMain); -- -- this->arrayExtra = NULL; -- this->numExtra = o.numExtra; -- this->numAllocExtra = o.numAllocExtra; -- resizeExtra (); -- memcpy (this->arrayExtra, o.arrayExtra, sizeof (T) * numExtra); -- -- this->startExtra = o.startExtra; -- } -- - inline ~NotSoSimpleVector () - { - if (this->arrayMain)
