[PR PATCH] netsurf: use gtk+3

[PR PATCH] netsurf: use gtk+3

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages netsurf
https://github.com/void-linux/void-packages/pull/22254

netsurf: use gtk+3
I cleaned up the `netsurf` template in the process of moving it to `gtk+3`.

A patch file from https://github.com/void-linux/void-packages/pull/22254.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-netsurf-22254.patch --]
[-- Type: text/x-diff, Size: 2561 bytes --]

From 037fa020becd4c24a0fd82aede059e79160d1adc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 24 May 2020 06:40:09 -0400
Subject: [PATCH] netsurf: use gtk+3

---
 srcpkgs/netsurf/files/netsurf.sh |  4 ++--
 srcpkgs/netsurf/template         | 34 +++++++++++++-------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/netsurf/files/netsurf.sh b/srcpkgs/netsurf/files/netsurf.sh
index a586b2b0c31..c33eab44de0 100644
--- a/srcpkgs/netsurf/files/netsurf.sh
+++ b/srcpkgs/netsurf/files/netsurf.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 shortname=$(echo $LANG | cut -b1-2)
 if [ -d /usr/share/netsurf/$shortname ]; then
-	/usr/bin/netsurf-gtk "$@"
+	/usr/bin/netsurf-gtk3 "$@"
 else
-	LANG=en_US /usr/bin/netsurf-gtk "$@"
+	LANG=en_US /usr/bin/netsurf-gtk3 "$@"
 fi
 exit $?
diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 63a95bcab08..ff27e3c1f78 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,38 +1,32 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.9
-revision=1
+revision=2
+build_style=gnu-makefile
+make_use_env=yes
+make_build_args="
+ TARGET=gtk3
+ NETSURF_USE_BMP=YES \
+ NETSURF_USE_WEBP=YES \
+ NETSURF_USE_VIDEO=NO \
+ NETSURF_USE_HARU_PDF=NO
+"
+make_install_args="$make_build_args"
 hostmakedepends="pkg-config gperf flex nsgenbind gdk-pixbuf-devel
  tar perl-HTML-Parser glib-devel xxd"
 makedepends="
  libidn-devel libmng-devel libxml2-devel libcurl-devel lcms-devel libwebp-devel
  libcss-devel libnsbmp-devel libnsgif-devel libutf8proc-devel
- libnsutils-devel libdom-devel gtk+-devel"
+ libnsutils-devel libdom-devel gtk+3-devel"
 depends="desktop-file-utils shared-mime-info"
 short_desc="Free, open source web browser written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, MIT"
+license="GPL-2.0-only, MIT"
 homepage="http://www.netsurf-browser.org"
 distfiles="http://download.netsurf-browser.org/netsurf/releases/source/${pkgname}-${version}-src.tar.gz"
 checksum=d72f1c6f6113a01e541f8476a93c347235068779140090df55ba402eb4a8ecc3
 
-do_build() {
-	make ${makejobs} \
-		PREFIX=/usr \
-		NETSURF_USE_BMP=YES \
-		NETSURF_USE_WEBP=YES \
-		NETSURF_USE_VIDEO=NO \
-		NETSURF_USE_HARU_PDF=NO
-}
-do_install() {
-	make ${makejobs} \
-		PREFIX=/usr \
-		NETSURF_USE_BMP=YES \
-		NETSURF_USE_WEBP=YES \
-		NETSURF_USE_VIDEO=NO \
-		NETSURF_USE_HARU_PDF=NO \
-		DESTDIR=${DESTDIR} install
-
+post_install() {
 	# Install app icon (from Ubuntu)
 	vinstall ${FILESDIR}/${pkgname}.png 0644 usr/share/pixmaps
 

Re: [PR PATCH] [Merged]: netsurf: use gtk+3

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

There's a merged pull request on the void-packages repository

netsurf: use gtk+3
https://github.com/void-linux/void-packages/pull/22254

Description:
I cleaned up the `netsurf` template in the process of moving it to `gtk+3`.