From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- www-client/dillo/Manifest | 6 +- www-client/dillo/dillo-3.0.5-r2.ebuild | 64 +++++++++++++ www-client/dillo/dillo-3.0.5.ebuild | 2 +- www-client/dillo/dillo-9999.ebuild | 13 +-- .../dillo/files/dillo-3.0.5-fno-common.patch | 100 +++++++++++++++++++++ 5 files changed, 171 insertions(+), 14 deletions(-) create mode 100644 www-client/dillo/dillo-3.0.5-r2.ebuild create mode 100644 www-client/dillo/files/dillo-3.0.5-fno-common.patch (limited to 'www-client/dillo') diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest index bef875dd3a5e..064e8a9e3c83 100644 --- a/www-client/dillo/Manifest +++ b/www-client/dillo/Manifest @@ -1,7 +1,9 @@ +AUX dillo-3.0.5-fno-common.patch 2234 BLAKE2B be7c3073e370c8c65fa4cda31739755db678d3dc37564d0635fd03a9fbcdc25f07082a203297c69a74f7557588f7c7149ad59a9ad9a78ab1780a9bc660754259 SHA512 854ee60ecb5b60e5c3f2e5ee22e2e8b29d1ef64052c46055e4a6aa8eafdb31fe7073fec3fda9851de3929c5f73ddc010bf4f2d18cb0036a7df3d453930563000 AUX dillo2-inbuf.patch 313 BLAKE2B f3924f38da743bc843142106853b4fc704a9ffc8efe8d74d463fdf09c02bcf7ecff46d04787e7c6fd79a4797c4f239dcd746a73cb47adc36bc6a663169611bde SHA512 d68a21d64eb81341afdccdf1e409e6d12ca88ee2f016b327365b36ff71e015aa38e325b6127f77e45a6d995f38b9a88e90fb375145342fb8d29731ce2105c9ae DIST dillo-3.0.5.tar.bz2 734472 BLAKE2B c8a7ac3a875740d2d64269b0d368e6f9395c89a56737dda9d6dcb013f5d46631e4f6f68e251f7104c0ec9bbb14bcc10b67a7f519558f857743d7cf15976f197c SHA512 d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155 DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833 EBUILD dillo-3.0.5-r1.ebuild 1366 BLAKE2B d2643e53e81ea793f48962226c23a71c91805ac1b4e51c80a3daff34817db9f085d40eeacb1e5a9cec7d7defbc7a0d685c46fd74e79dd2b21adc525bfb715fa4 SHA512 094c790948088f24dd89f32c115ff89e6d7c31bfcb196368bfbca1c15ddb3842600062d16a6d75358330496dab7be6012d7a309106d238128073b8ea68ef9400 -EBUILD dillo-3.0.5.ebuild 1297 BLAKE2B 73a84fd8a75bafaf456da571f581d498c2c6bc6f223685959e0296c090ff542ed3ce77506d571079136fc6d2c49d6b0be27a5e3d42c593cac71c8e289d2e37d5 SHA512 d8e98e6f663dc99a534206b0488494fad1fd9b6652fc9520b7f9fda0b8b9213534398dbee7341d21c8d5b4de3b0bdd96acb57a2953be670f428cc6bb20b3bb8d -EBUILD dillo-9999.ebuild 1294 BLAKE2B 48adca2680bfc4089e0b74c574273db143f7cab747431dc89d84bd492598366c15f167056eff6ab30ad57a9418c760af845fb65074a30a977e84d91d3b7ea633 SHA512 ba2948909260b69640a9abe63d115932eb20135b3c2ee4964118ab7a998ce5e73095e83131b967334a0ffebd8b5bd8f461e794f560d4a48c23ded22c7d181248 +EBUILD dillo-3.0.5-r2.ebuild 1239 BLAKE2B 3909148cfd43055167ce795e22a6aeea15207684fe4c66cfdc7d4d329005ee096b2e56d5046732b6219440a756a15c9787615c68f1e545309ac136c039df9c17 SHA512 60f3deefbd7a962eed80e3cb1f185aeb40e155d7c78929fa6ebd4587e33afdb877a64fadce58edce5de99b628245c495d0ac83700f92e082d50d9a9294e69ee8 +EBUILD dillo-3.0.5.ebuild 1298 BLAKE2B 6f73df054852d4287c5bc2706bf1e0a41780df62c754f8a518e3637fb35f9aa83e29b180778bc34e8eb57d2395fd3c87ba3c210c7a48477be43e46de30eceb5b SHA512 b4e15989f992691899a8b67ff392d04c48ee196b7817b8b2e74d0d17a236ed2432752f276c37bfd0eca4097086c23343e7a8869bdaf9547d61dd15f7fc61187f +EBUILD dillo-9999.ebuild 1156 BLAKE2B 591195d6467ff26f08df6419636b8f14ed733afc164340c85c5ce1142b0a53851de7294d5a0194623e43e1bab647966728eed015a5a26bc253961f5e7f81b13c SHA512 8b25bed5910d130cc83fe51ebbcbb4104d71672fcf0fd8556e81eac157862c7163f435dc29c0adddffd4946bdaeaf461497b4e4852a19a0f3d867d5e3f05baac MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4 diff --git a/www-client/dillo/dillo-3.0.5-r2.ebuild b/www-client/dillo/dillo-3.0.5-r2.ebuild new file mode 100644 index 000000000000..14d9e245482d --- /dev/null +++ b/www-client/dillo/dillo-3.0.5-r2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit 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 +) +DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README" + +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/dillo-3.0.5.ebuild b/www-client/dillo/dillo-3.0.5.ebuild index 8cd67bfe688d..8cda8d50161a 100644 --- a/www-client/dillo/dillo-3.0.5.ebuild +++ b/www-client/dillo/dillo-3.0.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.dillo.org/download/${P}.tar.bz2 LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 sparc x86" IUSE="doc +gif ipv6 +jpeg +png ssl" RDEPEND=" diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild index 2cf816aa62b4..7134cc059e28 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 000000000000..df80f55afaf8 --- /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 + #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 -- cgit v1.2.3