* [gentoo-commits] repo/gentoo:master commit in: www-client/dillo/, www-client/dillo/files/
@ 2020-01-31 11:39 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2020-01-31 11:39 UTC (permalink / raw
To: gentoo-commits
commit: cebb9304294041396e5a8295266864a30bcdb78e
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 11:31:57 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 11:39:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cebb9304
www-client/dillo: Fix CFLAGS=-fno-common
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=707398
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../{dillo-9999.ebuild => dillo-3.0.5-r2.ebuild} | 38 ++++----
www-client/dillo/dillo-9999.ebuild | 13 +--
.../dillo/files/dillo-3.0.5-fno-common.patch | 100 +++++++++++++++++++++
3 files changed, 117 insertions(+), 34 deletions(-)
diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-3.0.5-r2.ebuild
similarity index 64%
copy from www-client/dillo/dillo-9999.ebuild
copy to www-client/dillo/dillo-3.0.5-r2.ebuild
index 2cf816aa62b..14d9e245482 100644
--- a/www-client/dillo/dillo-9999.ebuild
+++ b/www-client/dillo/dillo-3.0.5-r2.ebuild
@@ -2,41 +2,40 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-
-inherit autotools desktop mercurial toolchain-funcs
+inherit desktop multilib toolchain-funcs
DESCRIPTION="Lean FLTK based web browser"
HOMEPAGE="https://www.dillo.org/"
-SRC_URI="mirror://gentoo/${PN}.png"
-EHG_REPO_URI="https://hg.dillo.org/dillo"
+SRC_URI="
+ https://www.dillo.org/download/${P}.tar.bz2
+ mirror://gentoo/${PN}.png
+"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
-IUSE="doc +gif ipv6 +jpeg +png ssl"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gif ipv6 +jpeg libressl +png ssl"
RDEPEND="
>=x11-libs/fltk-1.3
sys-libs/zlib
jpeg? ( virtual/jpeg:0 )
png? ( >=media-libs/libpng-1.2:0 )
- ssl? ( net-libs/mbedtls:= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl )
+ )
"
-DEPEND="
+BDEPEND="
${RDEPEND}
doc? ( app-doc/doxygen )
"
PATCHES=(
"${FILESDIR}"/${PN}2-inbuf.patch
+ "${FILESDIR}"/${PN}-3.0.5-fno-common.patch
)
-
DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
-src_prepare() {
- default
- eautoreconf
-}
-
src_configure() {
econf \
$(use_enable gif) \
@@ -55,18 +54,11 @@ src_compile() {
}
src_install() {
+ dodir /etc
default
- if use doc; then
- docinto html
- dodoc -r html/
- fi
+ use doc && dodoc -r html
doicon "${DISTDIR}"/${PN}.png
make_desktop_entry ${PN} Dillo
}
-
-pkg_postinst() {
- elog "Dillo has installed a default configuration into /etc/dillo/dillorc"
- elog "You can copy this to ~/.dillo/ and customize it"
-}
diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild
index 2cf816aa62b..7134cc059e2 100644
--- a/www-client/dillo/dillo-9999.ebuild
+++ b/www-client/dillo/dillo-9999.ebuild
@@ -2,7 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-
inherit autotools desktop mercurial toolchain-funcs
DESCRIPTION="Lean FLTK based web browser"
@@ -28,8 +27,8 @@ DEPEND="
"
PATCHES=(
"${FILESDIR}"/${PN}2-inbuf.patch
+ "${FILESDIR}"/${PN}-3.0.5-fno-common.patch
)
-
DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
src_prepare() {
@@ -57,16 +56,8 @@ src_compile() {
src_install() {
default
- if use doc; then
- docinto html
- dodoc -r html/
- fi
+ use doc && dodoc -r html
doicon "${DISTDIR}"/${PN}.png
make_desktop_entry ${PN} Dillo
}
-
-pkg_postinst() {
- elog "Dillo has installed a default configuration into /etc/dillo/dillorc"
- elog "You can copy this to ~/.dillo/ and customize it"
-}
diff --git a/www-client/dillo/files/dillo-3.0.5-fno-common.patch b/www-client/dillo/files/dillo-3.0.5-fno-common.patch
new file mode 100644
index 00000000000..df80f55afaf
--- /dev/null
+++ b/www-client/dillo/files/dillo-3.0.5-fno-common.patch
@@ -0,0 +1,100 @@
+--- a/dpid/dpid.c
++++ b/dpid/dpid.c
+@@ -41,6 +41,26 @@
+ volatile sig_atomic_t caught_sigchld = 0;
+ char *SharedKey = NULL;
+
++char *srs_name;
++
++/*! dpid's service request socket file descriptor */
++int srs_fd;
++
++/*! Number of available plugins */
++int numdpis;
++
++/*! Number of sockets being watched */
++int numsocks;
++
++/*! State information for each plugin. */
++struct dp *dpi_attr_list;
++
++/*! service served for each plugin */
++Dlist *services_list;
++
++/*! Set of sockets watched for connections */
++fd_set sock_set;
++
+ /*! Remove dpid_comm_keys file.
+ * This avoids that dillo instances connect to a stale port after dpid
+ * has exited (e.g. after a reboot).
+--- a/dpid/dpid.h
++++ b/dpid/dpid.h
+@@ -25,10 +25,10 @@
+
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+
+ /*! plugin state information
+ */
+@@ -49,19 +49,19 @@
+ };
+
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+
+ /*! service served for each plugin */
+-Dlist *services_list;
++extern Dlist *services_list;
+
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- a/dpid/dpid_common.c
++++ b/dpid/dpid_common.c
+@@ -14,6 +14,9 @@
+ #include <unistd.h>
+ #include "dpid_common.h"
+
++/*! Error codes for dpid */
++dpi_errno_t dpi_errno;
++
+ /*
+ * Send a verbose error message.
+ */
+--- a/dpid/dpid_common.h
++++ b/dpid/dpid_common.h
+@@ -35,12 +35,13 @@
+ #define CKD_WRITE(fd, msg) ckd_write(fd, msg, __FILE__, __LINE__)
+ #define CKD_CLOSE(fd) ckd_close(fd, __FILE__, __LINE__)
+
+-
+ /*! Error codes for dpid */
+-enum {
++typedef enum {
+ no_errors,
+ dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++} dpi_errno_t;
++
++extern dpi_errno_t dpi_errno;
+
+ /*! Intended for identifying dillo plugins
+ * and related files
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/dillo/, www-client/dillo/files/
@ 2020-02-09 11:45 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2020-02-09 11:45 UTC (permalink / raw
To: gentoo-commits
commit: 9489ea43e91dbe22e609e7029759defc6b7ffe8b
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 11:43:47 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 11:45:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9489ea43
www-client/dillo: Fix compiling against >dev-libs/openssl-1.1
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Closes: https://bugs.gentoo.org/708732
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
www-client/dillo/dillo-3.0.5-r3.ebuild | 70 ++++++++++++++++++++++
.../dillo/files/dillo-3.0.5-openssl-1.1.patch | 26 ++++++++
2 files changed, 96 insertions(+)
diff --git a/www-client/dillo/dillo-3.0.5-r3.ebuild b/www-client/dillo/dillo-3.0.5-r3.ebuild
new file mode 100644
index 00000000000..f2cd65be706
--- /dev/null
+++ b/www-client/dillo/dillo-3.0.5-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop multilib toolchain-funcs
+
+DESCRIPTION="Lean FLTK based web browser"
+HOMEPAGE="https://www.dillo.org/"
+SRC_URI="
+ https://www.dillo.org/download/${P}.tar.bz2
+ mirror://gentoo/${PN}.png
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gif ipv6 +jpeg libressl +png ssl"
+
+RDEPEND="
+ >=x11-libs/fltk-1.3
+ sys-libs/zlib
+ jpeg? ( virtual/jpeg:0 )
+ png? ( >=media-libs/libpng-1.2:0 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl )
+ )
+"
+BDEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}2-inbuf.patch
+ "${FILESDIR}"/${PN}-3.0.5-fno-common.patch
+ "${FILESDIR}"/${PN}-3.0.5-openssl-1.1.patch
+)
+DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable gif) \
+ $(use_enable ipv6) \
+ $(use_enable jpeg) \
+ $(use_enable png) \
+ $(use_enable ssl) \
+ --docdir="/usr/share/doc/${PF}"
+}
+
+src_compile() {
+ emake AR=$(tc-getAR)
+ if use doc; then
+ doxygen Doxyfile || die
+ fi
+}
+
+src_install() {
+ dodir /etc
+ default
+
+ use doc && dodoc -r html
+
+ doicon "${DISTDIR}"/${PN}.png
+ make_desktop_entry ${PN} Dillo
+}
diff --git a/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch b/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch
new file mode 100644
index 00000000000..f21694113c2
--- /dev/null
+++ b/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch
@@ -0,0 +1,26 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -286,7 +286,7 @@
+
+ if test "x$ssl_ok" = "xyes"; then
+ old_libs="$LIBS"
+- AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto)
++ AC_CHECK_LIB(ssl, OPENSSL_config, ssl_ok=yes, ssl_ok=no, -lcrypto)
+ LIBS="$old_libs"
+ fi
+
+--- a/dpi/https.c
++++ b/dpi/https.c
+@@ -476,7 +476,11 @@
+ case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+ /*Either self signed and untrusted*/
+ /*Extract CN from certificate name information*/
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++#else
++ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
++#endif
+ strcpy(buf, "(no CN given)");
+ } else {
+ char *cn_end;
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/dillo/, www-client/dillo/files/
@ 2022-01-08 9:53 Stephan Hartmann
0 siblings, 0 replies; 4+ messages in thread
From: Stephan Hartmann @ 2022-01-08 9:53 UTC (permalink / raw
To: gentoo-commits
commit: 5559adec4b13500fe445e1a591bd159177db3f2a
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 8 09:52:00 2022 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 8 09:52:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5559adec
www-client/dillo: fix build with --disable-ssl
Closes: https://bugs.gentoo.org/830755
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
www-client/dillo/dillo-3.1_pre20181005.ebuild | 3 ++-
.../dillo/files/dillo-3.0.5-disable-ssl.patch | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/www-client/dillo/dillo-3.1_pre20181005.ebuild b/www-client/dillo/dillo-3.1_pre20181005.ebuild
index 90df028cb417..5419571beac8 100644
--- a/www-client/dillo/dillo-3.1_pre20181005.ebuild
+++ b/www-client/dillo/dillo-3.1_pre20181005.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,6 +30,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}2-inbuf.patch
"${FILESDIR}"/${PN}-3.0.5-fno-common.patch
+ "${FILESDIR}"/${PN}-3.0.5-disable-ssl.patch
)
DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
diff --git a/www-client/dillo/files/dillo-3.0.5-disable-ssl.patch b/www-client/dillo/files/dillo-3.0.5-disable-ssl.patch
new file mode 100644
index 000000000000..de96ea6c1586
--- /dev/null
+++ b/www-client/dillo/files/dillo-3.0.5-disable-ssl.patch
@@ -0,0 +1,22 @@
+
+# HG changeset patch
+# User Johannes Hofmann <Johannes.Hofmann@gmx.de>
+# Date 1612905342 -3600
+# Node ID 67b70f024568b505633524be61fcfbde5337849f
+# Parent f60d55c0256759b578b54c577da94670a7737c8a
+fix build with --disable-ssl
+
+submitted-by: John DiMarco <jdd@cs.toronto.edu>
+
+diff -r f60d55c02567 -r 67b70f024568 src/IO/tls.h
+--- a/src/IO/tls.h Fri Oct 05 22:05:08 2018 +0200
++++ b/src/IO/tls.h Tue Feb 09 22:15:42 2021 +0100
+@@ -35,6 +35,7 @@
+ #define a_Tls_connect_ready(url) TLS_CONNECT_NEVER
+ #define a_Tls_reset_server_state(url) ;
+ #define a_Tls_handshake(fd, url) ;
++#define a_Tls_connect(fd, url) ;
+ #define a_Tls_connection(fd) NULL
+ #define a_Tls_freeall() ;
+ #define a_Tls_close_by_fd(fd) ;
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/dillo/, www-client/dillo/files/
@ 2024-10-24 4:44 Matt Jolly
0 siblings, 0 replies; 4+ messages in thread
From: Matt Jolly @ 2024-10-24 4:44 UTC (permalink / raw
To: gentoo-commits
commit: 13141c5b605867b553c5033a26f1408e541f7ea7
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 24 04:41:38 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Thu Oct 24 04:43:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13141c5b
www-client/dillo: fix GCC-15 warning
Noticed that this had been patched upstream when I went to log an issue.
Also actually apply the `remove-which` patch.
Closes: https://bugs.gentoo.org/939137
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
www-client/dillo/dillo-3.1.1.ebuild | 5 ++
.../dillo/files/dillo-3.1.1-remove-which.patch | 11 -----
.../files/dillo-3.1.1-unused-constructor.patch | 57 ++++++++++++++++++++++
3 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/www-client/dillo/dillo-3.1.1.ebuild b/www-client/dillo/dillo-3.1.1.ebuild
index 9ad9d9bdc955..3b763bb84d26 100644
--- a/www-client/dillo/dillo-3.1.1.ebuild
+++ b/www-client/dillo/dillo-3.1.1.ebuild
@@ -54,6 +54,11 @@ BDEPEND="
DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
+PATCHES=(
+ "${FILESDIR}"/${P}-unused-constructor.patch
+ "${FILESDIR}"/${P}-remove-which.patch
+)
+
src_prepare() {
default
eautoreconf
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
index c79f522cbb2a..ea645bc0e4e6 100644
--- a/www-client/dillo/files/dillo-3.1.1-remove-which.patch
+++ b/www-client/dillo/files/dillo-3.1.1-remove-which.patch
@@ -3,17 +3,6 @@ From: meat <meat@device.domain>
Date: Thu, 3 Oct 2024 12:48:31 +0200
Subject: [PATCH] Use command -v instead of which
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -15,7 +15,7 @@
- # Required binaries check
- #
- check_bin_file(){
-- which $1 > /dev/null 2>&1
-+ command -v $1 > /dev/null 2>&1
- if [ $? = 0 ]; then
- return 0
- else
--- a/configure.ac
+++ b/configure.ac
@@ -297,18 +297,18 @@ if test "x$enable_png" = "xyes"; then
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
new file mode 100644
index 000000000000..60c984e18c8e
--- /dev/null
+++ b/www-client/dillo/files/dillo-3.1.1-unused-constructor.patch
@@ -0,0 +1,57 @@
+https://github.com/dillo-browser/dillo/commit/f3d7483ab4b1751944907fa24a260f0afbb60633.patch
+From: Rodrigo Arias Mallo <rodarima@gmail.com>
+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 <sgeerken@dillo.org>
++ * Copyright 2024 Rodrigo Arias Mallo <rodarima@gmail.com>
++ *
++ * 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)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-24 4:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-24 4:44 [gentoo-commits] repo/gentoo:master commit in: www-client/dillo/, www-client/dillo/files/ Matt Jolly
-- strict thread matches above, loose matches on Subject: below --
2022-01-08 9:53 Stephan Hartmann
2020-02-09 11:45 Jeroen Roovers
2020-01-31 11:39 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox