diff options
Diffstat (limited to 'package/dillo')
| -rw-r--r-- | package/dillo/Makefile | 20 | ||||
| -rw-r--r-- | package/dillo/patches/patch-dpi_https_c | 14 | ||||
| -rw-r--r-- | package/dillo/patches/patch-src_decode_c | 11 |
3 files changed, 35 insertions, 10 deletions
diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 31316f69c..b46c53746 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -4,19 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= dillo -PKG_VERSION:= 3.0.5 +PKG_VERSION:= 3.2.0 PKG_RELEASE:= 1 -PKG_HASH:= db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b +PKG_HASH:= 1066ed42ea7fe0ce19e79becd029c651c15689922de8408e13e70bb5701931bf PKG_DESCR:= small graphical web browser PKG_SECTION:= x11/apps -PKG_DEPENDS:= libfltk libxi libpng zlib libjpeg-turbo libressl -PKG_BUILDDEP:= fltk libXi libjpeg-turbo libpng zlib libressl +PKG_DEPENDS:= libfltk libxi libpng zlib libjpeg-turbo libopenssl +PKG_DEPENDS:= libXrender libXfixes libXext fontconfig libxml2 +PKG_BUILDDEP:= fltk libXi libjpeg-turbo libpng zlib openssl PKG_NEEDS:= threads cxx -PKG_URL:= http://www.dillo.org/ -PKG_SITES:= http://www.dillo.org/download/ +PKG_URL:= https://dillo-browser.github.io/ +PKG_SITES:= https://github.com/dillo-browser/dillo/releases/download/v$(PKG_VERSION)/ -PKG_HOST_DEPENDS:= !cygwin -PKG_ARCH_DEPENDS:= arm mips mips64 x86 x86_64 +PKG_ARCH_DEPENDS:= aarch64 arm mips mips64 sh x86 x86_64 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -24,9 +24,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_LDFLAGS+= -liconv +TARGET_LDFLAGS+= -latomic CONFIGURE_ENV+= PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config -CONFIGURE_ARGS+= --enable-ssl +CONFIGURE_ARGS+= --enable-tls dillo-install: $(INSTALL_DIR) $(IDIR_DILLO)/etc/dillo diff --git a/package/dillo/patches/patch-dpi_https_c b/package/dillo/patches/patch-dpi_https_c new file mode 100644 index 000000000..90c91198d --- /dev/null +++ b/package/dillo/patches/patch-dpi_https_c @@ -0,0 +1,14 @@ +--- dillo-3.0.5.orig/dpi/https.c 2015-06-30 16:06:08.000000000 +0200 ++++ dillo-3.0.5/dpi/https.c 2024-03-04 08:18:34.867259406 +0100 +@@ -476,7 +476,11 @@ static int handle_certificate_problem(SS + 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; diff --git a/package/dillo/patches/patch-src_decode_c b/package/dillo/patches/patch-src_decode_c new file mode 100644 index 000000000..012903a25 --- /dev/null +++ b/package/dillo/patches/patch-src_decode_c @@ -0,0 +1,11 @@ +--- dillo-3.2.0.orig/src/decode.c 2024-10-23 22:26:03.000000000 +0200 ++++ dillo-3.2.0/src/decode.c 2025-08-17 08:44:05.687194623 +0200 +@@ -373,7 +373,7 @@ Decode *a_Decode_charset_init(const char + iconv_t ic = iconv_open("UTF-8", format); + if (ic != (iconv_t) -1) { + dc = dNew(Decode, 1); +- dc->state = ic; ++ dc->state = (void *)ic; + dc->buffer = dNew(char, bufsize); + dc->leftover = dStr_new(""); + |