Waldemar Brodkorb 7 месяцев назад
Родитель
Сommit
74e23d858f
1 измененных файлов с 12 добавлено и 11 удалено
  1. 12 11
      package/dillo/Makefile

+ 12 - 11
package/dillo/Makefile

@@ -4,18 +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_ARCH_DEPENDS:=	arm mips mips64 x86 x86_64
+PKG_ARCH_DEPENDS:=	arm mips mips64 sh x86 x86_64
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
@@ -23,11 +24,11 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_CFLAGS+=		-fcommon
-TARGET_CXXFLAGS+=	-fcommon
-TARGET_LDFLAGS+=	-liconv
+#TARGET_CFLAGS+=		-fcommon
+#TARGET_CXXFLAGS+=	-fcommon
+TARGET_LDFLAGS+=	-liconv -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