diff --git a/testing/netsurf/APKBUILD b/testing/netsurf/APKBUILD index 157702df854..71d5046c7a9 100644 --- a/testing/netsurf/APKBUILD +++ b/testing/netsurf/APKBUILD @@ -3,12 +3,12 @@ # Contributor: Miles Alan # Maintainer: ScrumpyJack pkgname=netsurf -pkgver=3.10 -pkgrel=8 +pkgver=3.11 +pkgrel=0 pkgdesc="free, open source web browser" url="http://www.netsurf-browser.org" arch="all" -license="GPL-2.0" +license="GPL-2.0-or-later" makedepends="curl-dev openssl-dev doxygen flex bison libwebp-dev lcms2-dev libmng-dev gperf gtk+3.0-dev libcurl libpng-dev libidn-dev check-dev libharu-dev librsvg-dev libjpeg-turbo-dev vim @@ -89,7 +89,7 @@ framebuffer() { } sha512sums=" -fc4c300eef07c540a7e07f8034db25b7e5fb731b5956029af2220f8638802aa38c055ad54b5683c14501aef9c22fb781b96613c16ae9a6996c3833ceede6f9bf netsurf-all-3.10.tar.gz +f931687e08976ca336762587cc1ac75e45518be62b19d1d31aac3063b92b9666f8a022ff3a183e80c89404ba8ff33458b26521130e96943043085a42291ee283 netsurf-all-3.11.tar.gz 4f6868f377abb1fbade92088bee9a319952c4cee82821ca5b3f892484e0d111f33045c8583f3d069e48af6f3f2fcad43c364daa0f5457b3b013542793ac10fcf netsurf -fcdf69dac7d951448f44360105b56fdd3b097b38ffeaae4dd702c0ff4176044add4260688612e07d04bcf63aa43673234f484a2210a3cf4a9b71c80596ac5751 non-coreutils-install-compatibility.patch +528a0d085afcf089789fc2e2aafa27e48c71f9eba1eeed65ba293ccb9c60187193d8e36337ff56b9de8221821d6cb2a4146e175edb383f7a6ef660771c8a1e28 non-coreutils-install-compatibility.patch " diff --git a/testing/netsurf/non-coreutils-install-compatibility.patch b/testing/netsurf/non-coreutils-install-compatibility.patch index dd3efac7f5f..de5374db041 100644 --- a/testing/netsurf/non-coreutils-install-compatibility.patch +++ b/testing/netsurf/non-coreutils-install-compatibility.patch @@ -2,7 +2,7 @@ Alpine / busybox's install doesn't have coreutils' -T option. --- a/netsurf/frontends/framebuffer/Makefile +++ b/netsurf/frontends/framebuffer/Makefile -@@ -222,7 +222,7 @@ +@@ -200,10 +200,10 @@ NETSURF_FRAMEBUFFER_RESOURCE_LIST := adblock.css credits.html \ install-framebuffer: $(VQ)echo " INSTALL: $(DESTDIR)/$(PREFIX)" $(Q)$(INSTALL) -d $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN) @@ -10,4 +10,18 @@ Alpine / busybox's install doesn't have coreutils' -T option. + $(Q)$(INSTALL) $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)/netsurf-fb $(Q)$(INSTALL) -d $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES) $(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do $(INSTALL) -m 644 $(FRONTEND_RESOURCES_DIR)/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done - $(Q)$(RM) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES)/Messages +- $(Q)$(INSTALL) -m 644 -T $(MESSAGES_TARGET)/en/Messages $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES)/Messages ++ $(Q)$(INSTALL) -m 644 $(MESSAGES_TARGET)/en/Messages $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES)/Messages + + # ---------------------------------------------------------------------------- + # Package target +--- a/buildsystem/makefiles/Makefile.tools ++++ b/buildsystem/makefiles/Makefile.tools +@@ -285,7 +285,7 @@ GENHTML ?= genhtml + + BUILD_CXX ?= c++ + +-INSTALL ?= install -C ++INSTALL ?= install + + LCOV ?= lcov