* [PR PATCH] netsurf: update to 3.11 and update deps.
@ 2024-01-07 20:51 mtboehlke
2024-04-07 1:46 ` github-actions
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: mtboehlke @ 2024-01-07 20:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1511 bytes --]
There is a new pull request by mtboehlke against master on the void-packages repository
https://github.com/mtboehlke/void-packages netsurf
https://github.com/void-linux/void-packages/pull/48111
netsurf: update to 3.11 and update deps.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
In addition to updating netsurf and its dependencies, changes include:
- http -> https where needed
- libnsutils: fix package description
- libcss: workaround for targets being rebuilt during install phase
- netsurf: remove some unused makedepends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48111.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-netsurf-48111.patch --]
[-- Type: text/x-diff, Size: 14529 bytes --]
From 8de9cb849431d9647e4eb62e6504318a7e83641f Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 18:48:49 -0600
Subject: [PATCH 01/10] netsurf-buildsystem: update to 1.10.
---
srcpkgs/netsurf-buildsystem/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/netsurf-buildsystem/template b/srcpkgs/netsurf-buildsystem/template
index c9d9619cb3a56..18be91040b489 100644
--- a/srcpkgs/netsurf-buildsystem/template
+++ b/srcpkgs/netsurf-buildsystem/template
@@ -1,13 +1,13 @@
# Template file for 'netsurf-buildsystem'
pkgname=netsurf-buildsystem
-version=1.9
-revision=2
+version=1.10
+revision=1
short_desc="Netsurf buildsystem"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname#netsurf-}-${version}.tar.gz"
-checksum=93841e314a688209a20b8745f065393f3a90f01be68f45e96bc8d2f4a2aa9a2a
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname#netsurf-}-${version}.tar.gz"
+checksum=3d3e39d569e44677c4b179129bde614c65798e2b3e6253160239d1fd6eae4d79
do_build() {
make COMPONENT_TYPE=lib-shared PREFIX=/usr
From d7825cd88bb37d484c46d59f42582c079fbc0c5a Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 18:51:54 -0600
Subject: [PATCH 02/10] libparserutils: update to 0.2.5.
---
srcpkgs/libparserutils/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template
index 3c553bf22d655..7fbcbfc331b28 100644
--- a/srcpkgs/libparserutils/template
+++ b/srcpkgs/libparserutils/template
@@ -1,14 +1,14 @@
# Template file for 'libparserutils'
pkgname=libparserutils
-version=0.2.4
+version=0.2.5
revision=1
hostmakedepends="perl netsurf-buildsystem"
short_desc="Library for building efficient parsers, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.netsurf-browser.org"
license="MIT"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=322bae61b30ccede3e305bf6eae2414920649775bc5ff1d1b688012a3c4947d8
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=317ed5c718f17927b5721974bae5de32c3fd6d055db131ad31b4312a032ed139
CFLAGS="-Wno-error"
do_build() {
From f19de2502e9d0dff41fe7264fc3e17963f15231c Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 21:41:13 -0600
Subject: [PATCH 03/10] libhubbub: update to 0.3.8.
---
srcpkgs/libhubbub/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libhubbub/template b/srcpkgs/libhubbub/template
index a07961f957967..ffdef691ef9b5 100644
--- a/srcpkgs/libhubbub/template
+++ b/srcpkgs/libhubbub/template
@@ -1,16 +1,15 @@
# Template file for 'libhubbub'
pkgname=libhubbub
-version=0.3.7
+version=0.3.8
revision=1
-hostmakedepends="perl pkg-config netsurf-buildsystem"
+hostmakedepends="gperf perl pkg-config netsurf-buildsystem"
makedepends="libxslt-devel json-c-devel libparserutils-devel"
short_desc="HTML5 compliant parsing library, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=9e7ae253e6c9069e757eb9ad4e4846f38b4db52c0ca0151446a9fa4a977735b6
-
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=8ac1e6f5f3d48c05141d59391719534290c59cd029efc249eb4fdbac102cd5a5
CFLAGS="-Wno-error"
do_build() {
From d923e006d14681c65916e06ef5123210c8311f68 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 21:54:16 -0600
Subject: [PATCH 04/10] libdom: update to 0.4.2.
also, sed -> vsed
---
srcpkgs/libdom/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template
index 01ed2f1bbc554..9ab1828d81b8d 100644
--- a/srcpkgs/libdom/template
+++ b/srcpkgs/libdom/template
@@ -1,6 +1,6 @@
# Template file for 'libdom'
pkgname=libdom
-version=0.4.1
+version=0.4.2
revision=1
hostmakedepends="pkg-config perl netsurf-buildsystem"
makedepends="expat-devel libparserutils-devel libwapcaplet-devel libhubbub-devel"
@@ -9,10 +9,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.netsurf-browser.org"
distfiles="https://download.netsurf-browser.org/libs/releases/libdom-${version}-src.tar.gz"
-checksum=98ee072471e55e208c9878e515c410ad462ca36f87b4afcbecad023f3a2cef4a
+checksum=d05e45af16547014c2b0a3aecf3670fa13d419f505b3f5fc7ac8a1491fc30f3c
post_extract() {
- sed -i 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' Makefile
+ vsed -i Makefile -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g'
}
do_build() {
From fe1e3a3b8ad16ea4ba6c72b2f8e27b2174c0b473 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:17:25 -0600
Subject: [PATCH 05/10] libnsgif: update to 1.0.0.
---
common/shlibs | 2 +-
srcpkgs/libnsgif/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7696ecd17f832..ae123cb6e12a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1016,7 +1016,7 @@ libns-9.16.22.so bind-libs-9.16.22_1
libplist-2.0.so.3 libplist-2.2.0_1
libplist++-2.0.so.3 libplist++-2.2.0_1
libnsbmp.so.0 libnsbmp-0.0.3_1
-libnsgif.so.0 libnsgif-0.0.3_1
+libnsgif.so.1 libnsgif-1.0.0_1
libparserutils.so.0 libparserutils-0.1.1_1
libwapcaplet.so.0 libwapcaplet-0.1.0_1
libcss.so.0 libcss-0.1.1_1
diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template
index 541ffad77e0d6..a1a69bcadf584 100644
--- a/srcpkgs/libnsgif/template
+++ b/srcpkgs/libnsgif/template
@@ -1,14 +1,14 @@
# Template file for 'libnsgif'
pkgname=libnsgif
-version=0.2.1
+version=1.0.0
revision=1
hostmakedepends="netsurf-buildsystem"
short_desc="Decoding library for the GIF image file format, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.netsurf-browser.org"
license="MIT"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=9eaea534cd70b53c5aaf45317ae957701685a6b4a88dbe34ed26f4faae879a4b
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=6014c842f61454d2f5a0f8243d7a8d7bde9b7da3ccfdca2d346c7c0b2c4c061b
CFLAGS="-Wno-error"
do_build() {
From 9b1dd1d0cd52cc77410f41f67f5974b6430f7e21 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:26:27 -0600
Subject: [PATCH 06/10] libnsbmp: update to 0.1.7.
---
srcpkgs/libnsbmp/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template
index 92fef902ae391..07383ed77cd5d 100644
--- a/srcpkgs/libnsbmp/template
+++ b/srcpkgs/libnsbmp/template
@@ -1,14 +1,14 @@
# Template file for 'libnsbmp'
pkgname=libnsbmp
-version=0.1.6
+version=0.1.7
revision=1
hostmakedepends="netsurf-buildsystem"
short_desc="Decoding library for BMP and ICO images in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=79c49365f860ed451bfc4109eddec8de3e9b7ce5a3be069596bd2aa19279324f
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=5407a7682a122baaaa5a15b505290e2d37df54c13c5edef4b09d12c862d82293
CFLAGS="-Wno-error"
do_build() {
From 79294386ab9821708cb6892ba52ec407b58a9c29 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:38:26 -0600
Subject: [PATCH 07/10] libnsutils: update to 0.1.1.
also fix package description
---
srcpkgs/libnsutils/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libnsutils/template b/srcpkgs/libnsutils/template
index c4b52c828504b..bcbab3ce874e4 100644
--- a/srcpkgs/libnsutils/template
+++ b/srcpkgs/libnsutils/template
@@ -1,14 +1,14 @@
# Template file for 'libnsutils'
pkgname=libnsutils
-version=0.1.0
+version=0.1.1
revision=1
hostmakedepends="pkg-config perl netsurf-buildsystem"
-short_desc="CSS parser and selection engine, written in C"
+short_desc="NetSurf utility functions"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=790c6516344abe82f6289d656392e9ccebe475b20cc7e1e2d843011385f7aef0
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=5694b4526e458ed000413ce6027589cbe10a257a7ecf065a01421dc7299dea92
do_build() {
make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-shared PREFIX=/usr
From 2041a50414fc339d57f3dc78614fb90af2b7fc12 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:45:41 -0600
Subject: [PATCH 08/10] nsgenbind: update to 0.9.
---
srcpkgs/nsgenbind/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nsgenbind/template b/srcpkgs/nsgenbind/template
index 86fcf05958d89..440c753e9a4e9 100644
--- a/srcpkgs/nsgenbind/template
+++ b/srcpkgs/nsgenbind/template
@@ -1,14 +1,14 @@
# Template file for 'nsgenbind'
pkgname=nsgenbind
-version=0.8
+version=0.9
revision=1
hostmakedepends="pkg-config flex netsurf-buildsystem"
short_desc="Tool to generate javascript to dom bindings from w3c webid files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=4d8d53ad000ada712772365e6a73eb8fc5ce97584af9c865ac5b26a2187f1cb3
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=232ce0f66cbc2c3eed6288ae26de2c567bbfbbc01d8b0f6fc6c1c1649d4b385d
do_build() {
make ${makejobs} FLEX=flex BISON=bison PREFIX=/usr
From 6608af355a9d6e0d42f49aeb31b220749ff3deda Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 23:24:14 -0600
Subject: [PATCH 09/10] libcss: update to 0.9.2.
Workaround targets being rebuilt during install phase
---
srcpkgs/libcss/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libcss/template b/srcpkgs/libcss/template
index 1bb4aa1af8b21..007b552ea879c 100644
--- a/srcpkgs/libcss/template
+++ b/srcpkgs/libcss/template
@@ -1,25 +1,28 @@
# Template file for 'libcss'
pkgname=libcss
-version=0.9.1
+version=0.9.2
revision=1
hostmakedepends="pkg-config perl netsurf-buildsystem"
makedepends="libparserutils-devel libwapcaplet-devel"
short_desc="CSS parser and selection engine, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=d2dce16e93392e8d6a7209420d47c2d56a3811701a0e81a724fc541c63d3c6dc
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=2df215bbec34d51d60c1a04b01b2df4d5d18f510f1f3a7af4b80cddb5671154e
CFLAGS="-Wno-error"
do_build() {
+ make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-static PREFIX=/usr BUILDDIR=build-static-lib
make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-shared PREFIX=/usr
- make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-static PREFIX=/usr
}
do_install() {
make COMPONENT_TYPE=lib-shared PREFIX=/usr DESTDIR=${DESTDIR} install
- make COMPONENT_TYPE=lib-static PREFIX=/usr DESTDIR=${DESTDIR} install
+
+# workaround to avoid targets being rebuilt
+# make COMPONENT_TYPE=lib-static PREFIX=/usr DESTDIR=${DESTDIR} BUILDDIR=build-static-lib install
+ vinstall build-static-lib/libcss.a 644 /usr/lib
vlicense COPYING
}
From faa46c9886c40cedcd137743bb9448554a96dfe5 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 7 Jan 2024 14:25:03 -0600
Subject: [PATCH 10/10] netsurf: update to 3.11.
also remove some unused makedepends
---
srcpkgs/netsurf/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 8aa9b8918966d..48e0c0adcfdf7 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
# Template file for 'netsurf'
pkgname=netsurf
-version=3.10
-revision=5
+version=3.11
+revision=1
build_style=gnu-makefile
make_use_env=yes
make_build_args="TARGET=gtk3 NETSURF_USE_BMP=YES NETSURF_USE_WEBP=YES
@@ -10,16 +10,15 @@ 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+3-devel"
+ libcurl-devel libwebp-devel libcss-devel libnsbmp-devel libnsgif-devel
+ libutf8proc-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.0-only, MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/netsurf/releases/source/${pkgname}-${version}-src.tar.gz"
-checksum=36484429e193614685c2ff246f55bd0a6dddf31a018bee45e0d1f7c28851995e
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/netsurf/releases/source/${pkgname}-${version}-src.tar.gz"
+checksum=c28a626aefee428d053b13f88b5c440922245976522d12eaf137cfd32d201cb2
post_install() {
# Install app icon (from Ubuntu)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: netsurf: update to 3.11 and update deps.
2024-01-07 20:51 [PR PATCH] netsurf: update to 3.11 and update deps mtboehlke
@ 2024-04-07 1:46 ` github-actions
2024-04-07 5:16 ` [PR PATCH] [Updated] " mtboehlke
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: github-actions @ 2024-04-07 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/48111#issuecomment-2041270136
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] netsurf: update to 3.11 and update deps.
2024-01-07 20:51 [PR PATCH] netsurf: update to 3.11 and update deps mtboehlke
2024-04-07 1:46 ` github-actions
@ 2024-04-07 5:16 ` mtboehlke
2024-04-08 15:26 ` mtboehlke
2024-05-04 19:24 ` [PR PATCH] [Merged]: " cinerea0
3 siblings, 0 replies; 5+ messages in thread
From: mtboehlke @ 2024-04-07 5:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1516 bytes --]
There is an updated pull request by mtboehlke against master on the void-packages repository
https://github.com/mtboehlke/void-packages netsurf
https://github.com/void-linux/void-packages/pull/48111
netsurf: update to 3.11 and update deps.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
In addition to updating netsurf and its dependencies, changes include:
- http -> https where needed
- libnsutils: fix package description
- libcss: workaround for targets being rebuilt during install phase
- netsurf: remove some unused makedepends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48111.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-netsurf-48111.patch --]
[-- Type: text/x-diff, Size: 14551 bytes --]
From 5d14f615d0a6fd7c89904bcc8eb2eb3942f3359a Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 18:48:49 -0600
Subject: [PATCH 01/10] netsurf-buildsystem: update to 1.10.
---
srcpkgs/netsurf-buildsystem/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/netsurf-buildsystem/template b/srcpkgs/netsurf-buildsystem/template
index c9d9619cb3a560..18be91040b4898 100644
--- a/srcpkgs/netsurf-buildsystem/template
+++ b/srcpkgs/netsurf-buildsystem/template
@@ -1,13 +1,13 @@
# Template file for 'netsurf-buildsystem'
pkgname=netsurf-buildsystem
-version=1.9
-revision=2
+version=1.10
+revision=1
short_desc="Netsurf buildsystem"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname#netsurf-}-${version}.tar.gz"
-checksum=93841e314a688209a20b8745f065393f3a90f01be68f45e96bc8d2f4a2aa9a2a
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname#netsurf-}-${version}.tar.gz"
+checksum=3d3e39d569e44677c4b179129bde614c65798e2b3e6253160239d1fd6eae4d79
do_build() {
make COMPONENT_TYPE=lib-shared PREFIX=/usr
From 738b18969acba18257bb6e0f0ec3044390e9c88d Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 18:51:54 -0600
Subject: [PATCH 02/10] libparserutils: update to 0.2.5.
---
srcpkgs/libparserutils/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template
index 3c553bf22d6552..7fbcbfc331b28b 100644
--- a/srcpkgs/libparserutils/template
+++ b/srcpkgs/libparserutils/template
@@ -1,14 +1,14 @@
# Template file for 'libparserutils'
pkgname=libparserutils
-version=0.2.4
+version=0.2.5
revision=1
hostmakedepends="perl netsurf-buildsystem"
short_desc="Library for building efficient parsers, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.netsurf-browser.org"
license="MIT"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=322bae61b30ccede3e305bf6eae2414920649775bc5ff1d1b688012a3c4947d8
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=317ed5c718f17927b5721974bae5de32c3fd6d055db131ad31b4312a032ed139
CFLAGS="-Wno-error"
do_build() {
From 89ba2bd43f91936c4044e13c4d053b10fdef6124 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 21:41:13 -0600
Subject: [PATCH 03/10] libhubbub: update to 0.3.8.
---
srcpkgs/libhubbub/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libhubbub/template b/srcpkgs/libhubbub/template
index a07961f9579670..ffdef691ef9b5f 100644
--- a/srcpkgs/libhubbub/template
+++ b/srcpkgs/libhubbub/template
@@ -1,16 +1,15 @@
# Template file for 'libhubbub'
pkgname=libhubbub
-version=0.3.7
+version=0.3.8
revision=1
-hostmakedepends="perl pkg-config netsurf-buildsystem"
+hostmakedepends="gperf perl pkg-config netsurf-buildsystem"
makedepends="libxslt-devel json-c-devel libparserutils-devel"
short_desc="HTML5 compliant parsing library, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=9e7ae253e6c9069e757eb9ad4e4846f38b4db52c0ca0151446a9fa4a977735b6
-
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=8ac1e6f5f3d48c05141d59391719534290c59cd029efc249eb4fdbac102cd5a5
CFLAGS="-Wno-error"
do_build() {
From 0205e3985356d340f44e103aff573162c95da7bf Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 21:54:16 -0600
Subject: [PATCH 04/10] libdom: update to 0.4.2.
also, sed -> vsed
---
srcpkgs/libdom/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template
index 01ed2f1bbc5549..9ab1828d81b8dc 100644
--- a/srcpkgs/libdom/template
+++ b/srcpkgs/libdom/template
@@ -1,6 +1,6 @@
# Template file for 'libdom'
pkgname=libdom
-version=0.4.1
+version=0.4.2
revision=1
hostmakedepends="pkg-config perl netsurf-buildsystem"
makedepends="expat-devel libparserutils-devel libwapcaplet-devel libhubbub-devel"
@@ -9,10 +9,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.netsurf-browser.org"
distfiles="https://download.netsurf-browser.org/libs/releases/libdom-${version}-src.tar.gz"
-checksum=98ee072471e55e208c9878e515c410ad462ca36f87b4afcbecad023f3a2cef4a
+checksum=d05e45af16547014c2b0a3aecf3670fa13d419f505b3f5fc7ac8a1491fc30f3c
post_extract() {
- sed -i 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' Makefile
+ vsed -i Makefile -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g'
}
do_build() {
From 65f1203c9adbe8e3fef93b4e815b16009e8475ad Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:17:25 -0600
Subject: [PATCH 05/10] libnsgif: update to 1.0.0.
---
common/shlibs | 2 +-
srcpkgs/libnsgif/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a3ede5e9185342..e2c5eb1518f9f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1025,7 +1025,7 @@ libns-9.16.22.so bind-libs-9.16.22_1
libplist-2.0.so.3 libplist-2.2.0_1
libplist++-2.0.so.3 libplist++-2.2.0_1
libnsbmp.so.0 libnsbmp-0.0.3_1
-libnsgif.so.0 libnsgif-0.0.3_1
+libnsgif.so.1 libnsgif-1.0.0_1
libparserutils.so.0 libparserutils-0.1.1_1
libwapcaplet.so.0 libwapcaplet-0.1.0_1
libcss.so.0 libcss-0.1.1_1
diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template
index 541ffad77e0d68..a1a69bcadf5847 100644
--- a/srcpkgs/libnsgif/template
+++ b/srcpkgs/libnsgif/template
@@ -1,14 +1,14 @@
# Template file for 'libnsgif'
pkgname=libnsgif
-version=0.2.1
+version=1.0.0
revision=1
hostmakedepends="netsurf-buildsystem"
short_desc="Decoding library for the GIF image file format, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.netsurf-browser.org"
license="MIT"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=9eaea534cd70b53c5aaf45317ae957701685a6b4a88dbe34ed26f4faae879a4b
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=6014c842f61454d2f5a0f8243d7a8d7bde9b7da3ccfdca2d346c7c0b2c4c061b
CFLAGS="-Wno-error"
do_build() {
From 91c1161e9f0b004d1cfe8163834718c13245dffd Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:26:27 -0600
Subject: [PATCH 06/10] libnsbmp: update to 0.1.7.
---
srcpkgs/libnsbmp/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template
index 92fef902ae391d..07383ed77cd5d5 100644
--- a/srcpkgs/libnsbmp/template
+++ b/srcpkgs/libnsbmp/template
@@ -1,14 +1,14 @@
# Template file for 'libnsbmp'
pkgname=libnsbmp
-version=0.1.6
+version=0.1.7
revision=1
hostmakedepends="netsurf-buildsystem"
short_desc="Decoding library for BMP and ICO images in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=79c49365f860ed451bfc4109eddec8de3e9b7ce5a3be069596bd2aa19279324f
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=5407a7682a122baaaa5a15b505290e2d37df54c13c5edef4b09d12c862d82293
CFLAGS="-Wno-error"
do_build() {
From 6a33e581ee6f32f69d544a0b1fd476a49e97dc28 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:38:26 -0600
Subject: [PATCH 07/10] libnsutils: update to 0.1.1.
also fix package description
---
srcpkgs/libnsutils/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libnsutils/template b/srcpkgs/libnsutils/template
index c4b52c828504bb..bcbab3ce874e4f 100644
--- a/srcpkgs/libnsutils/template
+++ b/srcpkgs/libnsutils/template
@@ -1,14 +1,14 @@
# Template file for 'libnsutils'
pkgname=libnsutils
-version=0.1.0
+version=0.1.1
revision=1
hostmakedepends="pkg-config perl netsurf-buildsystem"
-short_desc="CSS parser and selection engine, written in C"
+short_desc="NetSurf utility functions"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=790c6516344abe82f6289d656392e9ccebe475b20cc7e1e2d843011385f7aef0
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=5694b4526e458ed000413ce6027589cbe10a257a7ecf065a01421dc7299dea92
do_build() {
make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-shared PREFIX=/usr
From 33db3b61bdd36ee9392fc2e714f695422598e4ce Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:45:41 -0600
Subject: [PATCH 08/10] nsgenbind: update to 0.9.
---
srcpkgs/nsgenbind/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nsgenbind/template b/srcpkgs/nsgenbind/template
index 86fcf05958d892..440c753e9a4e9b 100644
--- a/srcpkgs/nsgenbind/template
+++ b/srcpkgs/nsgenbind/template
@@ -1,14 +1,14 @@
# Template file for 'nsgenbind'
pkgname=nsgenbind
-version=0.8
+version=0.9
revision=1
hostmakedepends="pkg-config flex netsurf-buildsystem"
short_desc="Tool to generate javascript to dom bindings from w3c webid files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=4d8d53ad000ada712772365e6a73eb8fc5ce97584af9c865ac5b26a2187f1cb3
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=232ce0f66cbc2c3eed6288ae26de2c567bbfbbc01d8b0f6fc6c1c1649d4b385d
do_build() {
make ${makejobs} FLEX=flex BISON=bison PREFIX=/usr
From 11ce308d34e6bdc9962efda567651c72b1cb254a Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 23:24:14 -0600
Subject: [PATCH 09/10] libcss: update to 0.9.2.
Workaround targets being rebuilt during install phase
---
srcpkgs/libcss/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libcss/template b/srcpkgs/libcss/template
index 1bb4aa1af8b210..007b552ea879c3 100644
--- a/srcpkgs/libcss/template
+++ b/srcpkgs/libcss/template
@@ -1,25 +1,28 @@
# Template file for 'libcss'
pkgname=libcss
-version=0.9.1
+version=0.9.2
revision=1
hostmakedepends="pkg-config perl netsurf-buildsystem"
makedepends="libparserutils-devel libwapcaplet-devel"
short_desc="CSS parser and selection engine, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=d2dce16e93392e8d6a7209420d47c2d56a3811701a0e81a724fc541c63d3c6dc
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=2df215bbec34d51d60c1a04b01b2df4d5d18f510f1f3a7af4b80cddb5671154e
CFLAGS="-Wno-error"
do_build() {
+ make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-static PREFIX=/usr BUILDDIR=build-static-lib
make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-shared PREFIX=/usr
- make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-static PREFIX=/usr
}
do_install() {
make COMPONENT_TYPE=lib-shared PREFIX=/usr DESTDIR=${DESTDIR} install
- make COMPONENT_TYPE=lib-static PREFIX=/usr DESTDIR=${DESTDIR} install
+
+# workaround to avoid targets being rebuilt
+# make COMPONENT_TYPE=lib-static PREFIX=/usr DESTDIR=${DESTDIR} BUILDDIR=build-static-lib install
+ vinstall build-static-lib/libcss.a 644 /usr/lib
vlicense COPYING
}
From 0f1e8260c8c92c031f9fa1f7f1eedb418f7d46ef Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 7 Jan 2024 14:25:03 -0600
Subject: [PATCH 10/10] netsurf: update to 3.11.
also remove some unused makedepends
---
srcpkgs/netsurf/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 8aa9b8918966dc..48e0c0adcfdf7c 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
# Template file for 'netsurf'
pkgname=netsurf
-version=3.10
-revision=5
+version=3.11
+revision=1
build_style=gnu-makefile
make_use_env=yes
make_build_args="TARGET=gtk3 NETSURF_USE_BMP=YES NETSURF_USE_WEBP=YES
@@ -10,16 +10,15 @@ 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+3-devel"
+ libcurl-devel libwebp-devel libcss-devel libnsbmp-devel libnsgif-devel
+ libutf8proc-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.0-only, MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/netsurf/releases/source/${pkgname}-${version}-src.tar.gz"
-checksum=36484429e193614685c2ff246f55bd0a6dddf31a018bee45e0d1f7c28851995e
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/netsurf/releases/source/${pkgname}-${version}-src.tar.gz"
+checksum=c28a626aefee428d053b13f88b5c440922245976522d12eaf137cfd32d201cb2
post_install() {
# Install app icon (from Ubuntu)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] netsurf: update to 3.11 and update deps.
2024-01-07 20:51 [PR PATCH] netsurf: update to 3.11 and update deps mtboehlke
2024-04-07 1:46 ` github-actions
2024-04-07 5:16 ` [PR PATCH] [Updated] " mtboehlke
@ 2024-04-08 15:26 ` mtboehlke
2024-05-04 19:24 ` [PR PATCH] [Merged]: " cinerea0
3 siblings, 0 replies; 5+ messages in thread
From: mtboehlke @ 2024-04-08 15:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1516 bytes --]
There is an updated pull request by mtboehlke against master on the void-packages repository
https://github.com/mtboehlke/void-packages netsurf
https://github.com/void-linux/void-packages/pull/48111
netsurf: update to 3.11 and update deps.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
In addition to updating netsurf and its dependencies, changes include:
- http -> https where needed
- libnsutils: fix package description
- libcss: workaround for targets being rebuilt during install phase
- netsurf: remove some unused makedepends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48111.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-netsurf-48111.patch --]
[-- Type: text/x-diff, Size: 14551 bytes --]
From cf624e4d7f92d4614776ac22a4b6c51cb9591b38 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 18:48:49 -0600
Subject: [PATCH 01/10] netsurf-buildsystem: update to 1.10.
---
srcpkgs/netsurf-buildsystem/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/netsurf-buildsystem/template b/srcpkgs/netsurf-buildsystem/template
index c9d9619cb3a560..18be91040b4898 100644
--- a/srcpkgs/netsurf-buildsystem/template
+++ b/srcpkgs/netsurf-buildsystem/template
@@ -1,13 +1,13 @@
# Template file for 'netsurf-buildsystem'
pkgname=netsurf-buildsystem
-version=1.9
-revision=2
+version=1.10
+revision=1
short_desc="Netsurf buildsystem"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname#netsurf-}-${version}.tar.gz"
-checksum=93841e314a688209a20b8745f065393f3a90f01be68f45e96bc8d2f4a2aa9a2a
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname#netsurf-}-${version}.tar.gz"
+checksum=3d3e39d569e44677c4b179129bde614c65798e2b3e6253160239d1fd6eae4d79
do_build() {
make COMPONENT_TYPE=lib-shared PREFIX=/usr
From a44ad3fb89e6c8aea790db694aafd3cd5d000399 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 18:51:54 -0600
Subject: [PATCH 02/10] libparserutils: update to 0.2.5.
---
srcpkgs/libparserutils/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template
index 3c553bf22d6552..7fbcbfc331b28b 100644
--- a/srcpkgs/libparserutils/template
+++ b/srcpkgs/libparserutils/template
@@ -1,14 +1,14 @@
# Template file for 'libparserutils'
pkgname=libparserutils
-version=0.2.4
+version=0.2.5
revision=1
hostmakedepends="perl netsurf-buildsystem"
short_desc="Library for building efficient parsers, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.netsurf-browser.org"
license="MIT"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=322bae61b30ccede3e305bf6eae2414920649775bc5ff1d1b688012a3c4947d8
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=317ed5c718f17927b5721974bae5de32c3fd6d055db131ad31b4312a032ed139
CFLAGS="-Wno-error"
do_build() {
From 140f8c3b5d9cc70bd2c5a7b786bc697c1e1df884 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 21:41:13 -0600
Subject: [PATCH 03/10] libhubbub: update to 0.3.8.
---
srcpkgs/libhubbub/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libhubbub/template b/srcpkgs/libhubbub/template
index a07961f9579670..ffdef691ef9b5f 100644
--- a/srcpkgs/libhubbub/template
+++ b/srcpkgs/libhubbub/template
@@ -1,16 +1,15 @@
# Template file for 'libhubbub'
pkgname=libhubbub
-version=0.3.7
+version=0.3.8
revision=1
-hostmakedepends="perl pkg-config netsurf-buildsystem"
+hostmakedepends="gperf perl pkg-config netsurf-buildsystem"
makedepends="libxslt-devel json-c-devel libparserutils-devel"
short_desc="HTML5 compliant parsing library, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=9e7ae253e6c9069e757eb9ad4e4846f38b4db52c0ca0151446a9fa4a977735b6
-
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=8ac1e6f5f3d48c05141d59391719534290c59cd029efc249eb4fdbac102cd5a5
CFLAGS="-Wno-error"
do_build() {
From 9e0f604fc7233a9c9f80fbfdddebbf5dc71dac53 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 21:54:16 -0600
Subject: [PATCH 04/10] libdom: update to 0.4.2.
also, sed -> vsed
---
srcpkgs/libdom/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template
index 01ed2f1bbc5549..9ab1828d81b8dc 100644
--- a/srcpkgs/libdom/template
+++ b/srcpkgs/libdom/template
@@ -1,6 +1,6 @@
# Template file for 'libdom'
pkgname=libdom
-version=0.4.1
+version=0.4.2
revision=1
hostmakedepends="pkg-config perl netsurf-buildsystem"
makedepends="expat-devel libparserutils-devel libwapcaplet-devel libhubbub-devel"
@@ -9,10 +9,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.netsurf-browser.org"
distfiles="https://download.netsurf-browser.org/libs/releases/libdom-${version}-src.tar.gz"
-checksum=98ee072471e55e208c9878e515c410ad462ca36f87b4afcbecad023f3a2cef4a
+checksum=d05e45af16547014c2b0a3aecf3670fa13d419f505b3f5fc7ac8a1491fc30f3c
post_extract() {
- sed -i 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' Makefile
+ vsed -i Makefile -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g'
}
do_build() {
From 77479499989ae9fdbe683b7534361ea69f0ab672 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:17:25 -0600
Subject: [PATCH 05/10] libnsgif: update to 1.0.0.
---
common/shlibs | 2 +-
srcpkgs/libnsgif/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e39dec57f4ff10..8679bb4834bfe3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1025,7 +1025,7 @@ libns-9.16.22.so bind-libs-9.16.22_1
libplist-2.0.so.3 libplist-2.2.0_1
libplist++-2.0.so.3 libplist++-2.2.0_1
libnsbmp.so.0 libnsbmp-0.0.3_1
-libnsgif.so.0 libnsgif-0.0.3_1
+libnsgif.so.1 libnsgif-1.0.0_1
libparserutils.so.0 libparserutils-0.1.1_1
libwapcaplet.so.0 libwapcaplet-0.1.0_1
libcss.so.0 libcss-0.1.1_1
diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template
index 541ffad77e0d68..a1a69bcadf5847 100644
--- a/srcpkgs/libnsgif/template
+++ b/srcpkgs/libnsgif/template
@@ -1,14 +1,14 @@
# Template file for 'libnsgif'
pkgname=libnsgif
-version=0.2.1
+version=1.0.0
revision=1
hostmakedepends="netsurf-buildsystem"
short_desc="Decoding library for the GIF image file format, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.netsurf-browser.org"
license="MIT"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=9eaea534cd70b53c5aaf45317ae957701685a6b4a88dbe34ed26f4faae879a4b
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=6014c842f61454d2f5a0f8243d7a8d7bde9b7da3ccfdca2d346c7c0b2c4c061b
CFLAGS="-Wno-error"
do_build() {
From e10cc6545fc17cc5168fbf67a403a52bd7904fbc Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:26:27 -0600
Subject: [PATCH 06/10] libnsbmp: update to 0.1.7.
---
srcpkgs/libnsbmp/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template
index 92fef902ae391d..07383ed77cd5d5 100644
--- a/srcpkgs/libnsbmp/template
+++ b/srcpkgs/libnsbmp/template
@@ -1,14 +1,14 @@
# Template file for 'libnsbmp'
pkgname=libnsbmp
-version=0.1.6
+version=0.1.7
revision=1
hostmakedepends="netsurf-buildsystem"
short_desc="Decoding library for BMP and ICO images in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=79c49365f860ed451bfc4109eddec8de3e9b7ce5a3be069596bd2aa19279324f
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=5407a7682a122baaaa5a15b505290e2d37df54c13c5edef4b09d12c862d82293
CFLAGS="-Wno-error"
do_build() {
From 3974035d555578b3e5956ace68d17d59f3b5d698 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:38:26 -0600
Subject: [PATCH 07/10] libnsutils: update to 0.1.1.
also fix package description
---
srcpkgs/libnsutils/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libnsutils/template b/srcpkgs/libnsutils/template
index c4b52c828504bb..bcbab3ce874e4f 100644
--- a/srcpkgs/libnsutils/template
+++ b/srcpkgs/libnsutils/template
@@ -1,14 +1,14 @@
# Template file for 'libnsutils'
pkgname=libnsutils
-version=0.1.0
+version=0.1.1
revision=1
hostmakedepends="pkg-config perl netsurf-buildsystem"
-short_desc="CSS parser and selection engine, written in C"
+short_desc="NetSurf utility functions"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=790c6516344abe82f6289d656392e9ccebe475b20cc7e1e2d843011385f7aef0
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=5694b4526e458ed000413ce6027589cbe10a257a7ecf065a01421dc7299dea92
do_build() {
make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-shared PREFIX=/usr
From 28a526d6bd06c28aea622f50140c04774f8baa6f Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 22:45:41 -0600
Subject: [PATCH 08/10] nsgenbind: update to 0.9.
---
srcpkgs/nsgenbind/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nsgenbind/template b/srcpkgs/nsgenbind/template
index 86fcf05958d892..440c753e9a4e9b 100644
--- a/srcpkgs/nsgenbind/template
+++ b/srcpkgs/nsgenbind/template
@@ -1,14 +1,14 @@
# Template file for 'nsgenbind'
pkgname=nsgenbind
-version=0.8
+version=0.9
revision=1
hostmakedepends="pkg-config flex netsurf-buildsystem"
short_desc="Tool to generate javascript to dom bindings from w3c webid files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=4d8d53ad000ada712772365e6a73eb8fc5ce97584af9c865ac5b26a2187f1cb3
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=232ce0f66cbc2c3eed6288ae26de2c567bbfbbc01d8b0f6fc6c1c1649d4b385d
do_build() {
make ${makejobs} FLEX=flex BISON=bison PREFIX=/usr
From 411eeb7c899802545d118222458e5d0233c43399 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Mon, 1 Jan 2024 23:24:14 -0600
Subject: [PATCH 09/10] libcss: update to 0.9.2.
Workaround targets being rebuilt during install phase
---
srcpkgs/libcss/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libcss/template b/srcpkgs/libcss/template
index 1bb4aa1af8b210..007b552ea879c3 100644
--- a/srcpkgs/libcss/template
+++ b/srcpkgs/libcss/template
@@ -1,25 +1,28 @@
# Template file for 'libcss'
pkgname=libcss
-version=0.9.1
+version=0.9.2
revision=1
hostmakedepends="pkg-config perl netsurf-buildsystem"
makedepends="libparserutils-devel libwapcaplet-devel"
short_desc="CSS parser and selection engine, written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
-checksum=d2dce16e93392e8d6a7209420d47c2d56a3811701a0e81a724fc541c63d3c6dc
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/libs/releases/${pkgname}-${version}-src.tar.gz"
+checksum=2df215bbec34d51d60c1a04b01b2df4d5d18f510f1f3a7af4b80cddb5671154e
CFLAGS="-Wno-error"
do_build() {
+ make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-static PREFIX=/usr BUILDDIR=build-static-lib
make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-shared PREFIX=/usr
- make ${makejobs} HOST_CC=cc COMPONENT_TYPE=lib-static PREFIX=/usr
}
do_install() {
make COMPONENT_TYPE=lib-shared PREFIX=/usr DESTDIR=${DESTDIR} install
- make COMPONENT_TYPE=lib-static PREFIX=/usr DESTDIR=${DESTDIR} install
+
+# workaround to avoid targets being rebuilt
+# make COMPONENT_TYPE=lib-static PREFIX=/usr DESTDIR=${DESTDIR} BUILDDIR=build-static-lib install
+ vinstall build-static-lib/libcss.a 644 /usr/lib
vlicense COPYING
}
From 2736fbb4dc85a6cd32e0cfa99462348132948c1a Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Sun, 7 Jan 2024 14:25:03 -0600
Subject: [PATCH 10/10] netsurf: update to 3.11.
also remove some unused makedepends
---
srcpkgs/netsurf/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index eb58f27836c09e..48e0c0adcfdf7c 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
# Template file for 'netsurf'
pkgname=netsurf
-version=3.10
-revision=6
+version=3.11
+revision=1
build_style=gnu-makefile
make_use_env=yes
make_build_args="TARGET=gtk3 NETSURF_USE_BMP=YES NETSURF_USE_WEBP=YES
@@ -10,16 +10,15 @@ 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+3-devel"
+ libcurl-devel libwebp-devel libcss-devel libnsbmp-devel libnsgif-devel
+ libutf8proc-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.0-only, MIT"
-homepage="http://www.netsurf-browser.org"
-distfiles="http://download.netsurf-browser.org/netsurf/releases/source/${pkgname}-${version}-src.tar.gz"
-checksum=36484429e193614685c2ff246f55bd0a6dddf31a018bee45e0d1f7c28851995e
+homepage="https://www.netsurf-browser.org"
+distfiles="https://download.netsurf-browser.org/netsurf/releases/source/${pkgname}-${version}-src.tar.gz"
+checksum=c28a626aefee428d053b13f88b5c440922245976522d12eaf137cfd32d201cb2
post_install() {
# Install app icon (from Ubuntu)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: netsurf: update to 3.11 and update deps.
2024-01-07 20:51 [PR PATCH] netsurf: update to 3.11 and update deps mtboehlke
` (2 preceding siblings ...)
2024-04-08 15:26 ` mtboehlke
@ 2024-05-04 19:24 ` cinerea0
3 siblings, 0 replies; 5+ messages in thread
From: cinerea0 @ 2024-05-04 19:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]
There's a merged pull request on the void-packages repository
netsurf: update to 3.11 and update deps.
https://github.com/void-linux/void-packages/pull/48111
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
In addition to updating netsurf and its dependencies, changes include:
- http -> https where needed
- libnsutils: fix package description
- libcss: workaround for targets being rebuilt during install phase
- netsurf: remove some unused makedepends
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-05-04 19:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-07 20:51 [PR PATCH] netsurf: update to 3.11 and update deps mtboehlke
2024-04-07 1:46 ` github-actions
2024-04-07 5:16 ` [PR PATCH] [Updated] " mtboehlke
2024-04-08 15:26 ` mtboehlke
2024-05-04 19:24 ` [PR PATCH] [Merged]: " cinerea0
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).