Browse Source

dillo: update to latest git, runs more stable on my olpc-xo-1

Waldemar Brodkorb 1 week ago
parent
commit
dc290d9652
2 changed files with 8 additions and 6 deletions
  1. 2 2
      mk/fetch.mk
  2. 6 4
      package/dillo/Makefile

+ 2 - 2
mk/fetch.mk

@@ -62,7 +62,8 @@ $(1):
 	mkdir -p "$$$${fullname%%/$$$$filename}"; \
 	cd "$$$${fullname%%/$$$$filename}"; \
 	for url in "${PKG_SITES}"; do case $$$$url in \
-	   file://*|git://*|*.git) \
+	      file://*|git://*|*.git) \
+	        if [ ! -z "$${PKG_GIT}" ]; then \
 		echo "Trying to downloading from backup site first"; \
 		if $${FETCHCMD} $$$$filename $${MASTER_SITE_BACKUP}/$$$$filename $(DL_TRACE); then \
 			touch $$$$filename.nohash; \
@@ -70,7 +71,6 @@ $(1):
 			[[ ! -e $$$$filename ]] || exit 0; \
 		fi; \
 		rm -rf $${PKG_NAME}-$${PKG_VERSION}; \
-		if [ ! -z "$${PKG_GIT}" ]; then \
 		  echo "Using git ${PKG_GIT}: $${PKG_VERSION}" $(DL_TRACE); \
 		  case "$${PKG_GIT}" in \
 		    tag|branch) \

+ 6 - 4
package/dillo/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		dillo
-PKG_VERSION:=		3.2.0
+PKG_VERSION:=		c1fb64dd43c8cc479c8bfbff6df341c97a26423c
+PKG_GIT:=		hash
 PKG_RELEASE:=		1
-PKG_HASH:=		1066ed42ea7fe0ce19e79becd029c651c15689922de8408e13e70bb5701931bf
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libfltk libxi libpng zlib libjpeg-turbo libopenssl
@@ -14,17 +14,19 @@ PKG_DEPENDS+=		libXrender libXfixes libXext fontconfig libxml2 ca-certificates
 PKG_BUILDDEP:=		fltk libXi libjpeg-turbo libpng zlib openssl
 PKG_NEEDS:=		threads cxx
 PKG_URL:=		https://dillo-browser.github.io/
-PKG_SITES:=		https://github.com/dillo-browser/dillo/releases/download/v$(PKG_VERSION)/
+#PKG_SITES:=		https://github.com/dillo-browser/dillo/releases/download/v$(PKG_VERSION)/
+PKG_SITES:=		https://git.dillo-browser.org/dillo
 
 PKG_ARCH_DEPENDS:=	aarch64 arm mips mips64 sh x86 x86_64
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TARGET_LDFLAGS+=	-latomic
+AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config
 CONFIGURE_ARGS+=	--enable-tls \
 			--disable-xembed