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
