[PR PATCH] hugin: update to 2023.0.0

[PR PATCH] hugin: update to 2023.0.0

[Aicaya]

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

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

https://github.com/Aicaya/void-packages hugin
https://github.com/void-linux/void-packages/pull/47572

hugin: update to 2023.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
- 
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

Switched from `glew-devel` to `libepoxy-devel` using [a flag introduced in this version][1] (`-DBUILD_WITH_EPOXY=on`) since the main program would not open anymore, both on the current package as well as this one.  I also removed a patch that does not work with the new release.

Will test building the package on other architectures later today.

[1]: https://hugin.sourceforge.io/releases/2023.0.0/en.shtml

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

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

From f9be71a599788b96586847c6921266ee0076632b Mon Sep 17 00:00:00 2001
From: Aicaya Maro <aicaya@posteo.net>
Date: Mon, 4 Dec 2023 11:13:32 -0400
Subject: [PATCH 01/11] hugin: update to 2023.0.0

---
 srcpkgs/hugin/patches/exiv2-0.28.patch | 77 --------------------------
 srcpkgs/hugin/template                 |  9 +--
 2 files changed, 5 insertions(+), 81 deletions(-)
 delete mode 100644 srcpkgs/hugin/patches/exiv2-0.28.patch

diff --git a/srcpkgs/hugin/patches/exiv2-0.28.patch b/srcpkgs/hugin/patches/exiv2-0.28.patch
deleted file mode 100644
index 49f0518117020..0000000000000
--- a/srcpkgs/hugin/patches/exiv2-0.28.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/hugin/-/blob/main/exiv2-0.28.patch
-diff -r 79cd11a7a66f src/hugin_base/panodata/Exiv2Helper.cpp
---- a/src/hugin_base/panodata/Exiv2Helper.cpp	Wed May 24 19:13:20 2023 +0200
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp	Mon Jun 05 00:31:19 2023 +0200
-@@ -40,7 +40,7 @@
-             Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName));
-             if (itr != exifData.end() && itr->count())
-             {
--                value = itr->toLong();
-+                value = itr->toUint32();
-                 return true;
-             }
-             else
-@@ -165,7 +165,7 @@
-         {
-             if(it!=exifData.end() && it->count())
-             {
--                return it->toLong();
-+                return it->toUint32();
-             }
-             return 0;
-         };
-@@ -600,4 +600,4 @@
-         };
- 
-     }; //namespace Exiv2Helper
--}; //namespace HuginBase
-\ No newline at end of file
-+}; //namespace HuginBase
-diff -r 79cd11a7a66f src/hugin_base/panodata/SrcPanoImage.cpp
---- a/src/hugin_base/panodata/SrcPanoImage.cpp	Wed May 24 19:13:20 2023 +0200
-+++ b/src/hugin_base/panodata/SrcPanoImage.cpp	Mon Jun 05 00:31:19 2023 +0200
-@@ -384,7 +384,7 @@
-                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
-                     if (pos != xmpData.end())
-                     {
--                        croppedWidth = pos->toLong();
-+                        croppedWidth = pos->toUint32();
-                     }
-                     else
-                     {
-@@ -394,7 +394,7 @@
-                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
-                     if (pos != xmpData.end())
-                     {
--                        croppedHeight = pos->toLong();
-+                        croppedHeight = pos->toUint32();
-                     }
-                     else
-                     {
-@@ -408,7 +408,7 @@
-                         double hfov = 0;
-                         if (pos != xmpData.end())
-                         {
--                            hfov = 360 * croppedWidth / (double)pos->toLong();
-+                            hfov = 360 * croppedWidth / (double)pos->toUint32();
-                         }
-                         else
-                         {
-@@ -419,7 +419,7 @@
-                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
-                         if (pos != xmpData.end())
-                         {
--                            fullHeight = pos->toLong();
-+                            fullHeight = pos->toUint32();
-                         }
-                         else
-                         {
-@@ -430,7 +430,7 @@
-                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
-                         if (pos != xmpData.end())
-                         {
--                            cropTop = pos->toLong();
-+                            cropTop = pos->toUint32();
-                         }
-                         else
-                         {
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 894876470ebde..31f5be4f0d323 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,14 +1,15 @@
 # Template file for 'hugin'
 pkgname=hugin
-version=2022.0.0
-revision=12
+version=2023.0.0
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
+configure_args="-DBUILD_WITH_EPOXY=on"
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
 hostmakedepends="pkg-config exiftool swig gettext"
 makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
  exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
- lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
+ lensfun-devel python3-devel libepoxy-devel libXmu-devel libXi-devel glu-devel
  lcms2-devel lapack-devel"
 depends="exiftool enblend-enfuse"
 short_desc="Easy to use panoramic imaging toolchain"
@@ -17,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://hugin.sourceforge.net/"
 changelog="https://hugin.sourceforge.io/releases/${version}/en.shtml"
 distfiles="${SOURCEFORGE_SITE}/hugin/hugin/hugin-${version%.*}/hugin-${version}.tar.bz2"
-checksum=97c8562a0ba9a743e0b955a43dfde048b1c60cd9e5f2ee2b69de1a81646e05a7
+checksum=04a39fccc6017e0544c639bd22309472c574d35b3455cbade1fc3870e631632b
 python_version=3
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"

From 29612fc3a13a5936d949ac7ce2a2a0f6b69f6ad6 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Mon, 4 Dec 2023 01:09:27 +0000
Subject: [PATCH 02/11] python3-psutil: update to 5.9.6.

---
 srcpkgs/python3-psutil/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-psutil/template b/srcpkgs/python3-psutil/template
index d8364b8bdd2ff..936f1b99fb972 100644
--- a/srcpkgs/python3-psutil/template
+++ b/srcpkgs/python3-psutil/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-psutil'
 pkgname=python3-psutil
-version=5.9.5
-revision=2
+version=5.9.6
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/giampaolo/psutil"
 changelog="https://raw.githubusercontent.com/giampaolo/psutil/master/HISTORY.rst"
 distfiles="${PYPI_SITE}/p/psutil/psutil-${version}.tar.gz"
-checksum=5410638e4df39c54d957fc51ce03048acd8e6d60abc0f5107af51e5fb566eb3c
+checksum=e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a
 # Tests seem to assume package is installed
 make_check=no
 

From 79fa0ddeedc8b577c8be69783947352c16fa9a67 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 3 Dec 2023 21:39:48 -0500
Subject: [PATCH 03/11] texlab: update to 5.12.0

---
 srcpkgs/texlab/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
index 61d14eeae7c9e..a1c14d42c9b46 100644
--- a/srcpkgs/texlab/template
+++ b/srcpkgs/texlab/template
@@ -1,6 +1,6 @@
 # Template file for 'texlab'
 pkgname=texlab
-version=5.11.0
+version=5.12.0
 revision=1
 build_style=cargo
 make_install_args="--path crates/texlab"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://texlab.netlify.app/"
 changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md"
 distfiles="https://github.com/latex-lsp/texlab/archive/refs/tags/v${version}.tar.gz"
-checksum=a4f845b334a5d96bc189eebe4c9d63609fe74a77cb37975511346b3cbce3bea4
+checksum=61662cab58931b0865372cb1d32efb4701237cd50d77c0888d619a8ec3765e01
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="smartstring fails to compile"

From ea9138287de4c77c0ee7bf32b75979bd9c1c4650 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 4 Dec 2023 10:51:02 +0100
Subject: [PATCH 04/11] dbeaver: update to 23.3.0.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index f1b89803c0e2a..1c893be461eb4 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=23.2.5
+version=23.3.0
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://dbeaver.io"
 changelog="https://dbeaver.io/news/"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=f2ae503a5bba9f41bd2d9a477e493da158b4d7c2c4d02ca0d9d46c62f0b7f755
+checksum=617ea555269bdc0a1d4c9a59c653713df8e3404d676ee055258e9a16903e29ec
 nopie=true
 
 do_build() {

From d995a521e6622662b4dc1ae45b70623defdb8d16 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 4 Dec 2023 13:15:12 +0100
Subject: [PATCH 05/11] platformio: update to 6.1.11

---
 srcpkgs/platformio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/platformio/template b/srcpkgs/platformio/template
index 8296b9f8571f2..bb9f8d32f2ddc 100644
--- a/srcpkgs/platformio/template
+++ b/srcpkgs/platformio/template
@@ -1,6 +1,6 @@
 # Template file for 'platformio'
 pkgname=platformio
-version=6.1.1
+version=6.1.11
 revision=1
 build_style=python3-module
 # According to https://github.com/platformio/platformio-core/blob/9c20ab81cb68f1ffb7a8cac22ce95c4c797643ec/Makefile#L13
@@ -19,8 +19,8 @@ license="Apache-2.0"
 homepage="https://github.com/platformio/platformio-core"
 changelog="https://raw.githubusercontent.com/platformio/platformio-core/develop/HISTORY.rst"
 distfiles="https://github.com/platformio/platformio-core/archive/refs/tags/v${version}.tar.gz"
-checksum=44e66d216f3925fe0ee5d830ec4d569c57e3407aeafedb277ce71f69d9027acc
+checksum=686b45c95cf7a12ba338c744bf9d530a7e9ef1bf52b34d010c065dd81bb48c3a
 
 post_install() {
-	vinstall scripts/99-platformio-udev.rules 644 usr/lib/udev/rules.d
+	vinstall platformio/assets/system/99-platformio-udev.rules 644 usr/lib/udev/rules.d
 }

From 226875fceeea35996e38627c0765382f7e98527d Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 4 Dec 2023 14:21:43 +0200
Subject: [PATCH 06/11] polychromatic: update to 0.8.3.

---
 srcpkgs/polychromatic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polychromatic/template b/srcpkgs/polychromatic/template
index 263b8689acd08..956f1d12b9bc4 100644
--- a/srcpkgs/polychromatic/template
+++ b/srcpkgs/polychromatic/template
@@ -1,6 +1,6 @@
 # Template file for 'polychromatic'
 pkgname=polychromatic
-version=0.8.2
+version=0.8.3
 revision=1
 build_style=meson
 hostmakedepends="ninja sassc which gettext"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://polychromatic.app"
 changelog="https://github.com/polychromatic/polychromatic/raw/master/CHANGELOG"
 distfiles="https://github.com/polychromatic/polychromatic/archive/v${version}.tar.gz"
-checksum=ce909a388a0f46defd366adb267979747d981966c6dc57206368900f096ff2f5
+checksum=fe5d6b5232be14684b28279b59d451d8b7944677becc95d160513607053cf098

From 1198dfb49e801cc6d09581eb950c18d286367b12 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Mon, 4 Dec 2023 13:33:57 +0100
Subject: [PATCH 07/11] python3-starlette: update to 0.33.0

---
 srcpkgs/python3-starlette/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-starlette/template b/srcpkgs/python3-starlette/template
index 0ee23e242f987..b33361bb6f77b 100644
--- a/srcpkgs/python3-starlette/template
+++ b/srcpkgs/python3-starlette/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-starlette'
 pkgname=python3-starlette
-version=0.32.0
+version=0.33.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="hatchling"
@@ -10,7 +10,7 @@ maintainer="Emil Miler <em@0x45.cz>"
 license="BSD-3-Clause"
 homepage="https://github.com/encode/starlette"
 distfiles="${PYPI_SITE}/s/starlette/starlette-${version}.tar.gz"
-checksum=87c899fe3aee6a42f711380b03e1d244a21079529cb3dbe1a5109e60915e0bbb
+checksum=8c21f9592451b2016300c5bbc54b181063367b62720a4048656c070319238897
 # Many modules needed for testing are not available
 make_check=no
 

From 489f565896036b51b8116944af8dd04e84a1e0e1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sun, 30 Jul 2023 21:49:24 +0100
Subject: [PATCH 08/11] nodejs: update to 18.19.0, adopt.

---
 srcpkgs/nodejs/template | 48 +++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 2576dbdbbbe89..e79112eb935b4 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,35 +1,41 @@
 # Template file for 'nodejs'
 pkgname=nodejs
-version=18.16.0
-revision=3
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="which pkg-config python3-setuptools zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)"
-makedepends="zlib-devel $(vopt_if icu icu-devel)
+version=18.19.0
+revision=1
+hostmakedepends="which pkg-config python3-setuptools"
+_make_depends="zlib-devel $(vopt_if icu icu-devel)
  $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)"
+ $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)
+ $(vopt_if brotli brotli-devel)"
+makedepends="${_make_depends}"
 checkdepends="procps-ng iana-etc"
 short_desc="Evented I/O for V8 javascript"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="triallax <triallax@tutanota.com>"
 license="MIT"
 homepage="https://nodejs.org/"
-distfiles="https://nodejs.org/dist/v${version}/node-v${version}.tar.gz"
-checksum=6a4f5c5d76e5c50cef673099e56f19bc3266ae363f56ca0ab77dd2f3c5088c6d
+changelog="https://raw.githubusercontent.com/nodejs/node/main/doc/changelogs/CHANGELOG_V${version%%.*}.md"
+distfiles="https://nodejs.org/dist/v${version}/node-v${version}.tar.xz"
+checksum=f52b41af20596a9abd8ed75241837ec43945468221448bbf841361e2091819b6
 python_version=3
 
-build_options="ssl libuv icu nghttp2 cares"
+build_options="ssl libuv icu nghttp2 cares brotli"
 desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_icu="Enable shared icu"
 desc_option_nghttp2="Enable shared nghttp2"
 desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv icu nghttp2 cares"
+desc_option_brotli="Enable shared brotli"
+build_options_default="ssl libuv icu nghttp2 cares brotli"
 
 replaces="iojs>=0"
 conflicts="nodejs-lts-10"
 provides="nodejs-runtime-0_1"
 
+if [ "$CROSS_BUILD" ]; then
+	# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
+	hostmakedepends+=" ${_make_depends}"
+fi
+
 # https://build.voidlinux.org/builders/i686_builder/builds/27325/steps/shell_3/logs/stdio
 if [ "$XBPS_WORDSIZE" = 32 ]; then
 	LDFLAGS="-Wl,--no-keep-memory"
@@ -71,12 +77,13 @@ do_configure() {
 		# to execute it within the build system fails
 		_args+=" --cross-compiling"
 	fi
-	./configure --prefix=/usr --shared-zlib \
+	./configure --prefix=/usr --shared-zlib  --enable-lto \
 		$(vopt_if icu --with-intl=system-icu) \
 		$(vopt_if ssl --shared-openssl) \
 		$(vopt_if libuv --shared-libuv) \
 		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
+		$(vopt_if cares --shared-cares) \
+		$(vopt_if brotli --shared-brotli) ${_args}
 }
 
 do_build() {
@@ -88,7 +95,16 @@ do_build() {
 }
 
 do_check() {
-	local CI_SKIP_TESTS="test-cluster-primary-error.js,test-cluster-primary-kill.js,test-child-process-uid-gid.js,test-process-euid-egid.js,test-process-uid-gid.js,test-socket-write-after-fin-error.js,test-dns-perf_hooks.js"
+	local CI_SKIP_TESTS="test-child-process-uid-gid.js,test-process-euid-egid.js,test-process-uid-gid.js,test-tls-session-cache.js,test-tls-getprotocol.js,test-tls-alert.js,test-tls-cli-min-version-1.1.js,test-tls-cli-max-version-1.1.js,test-tls-cli-min-version-1.2.js,test-tls-cli-max-version-1.2.js,test-tls-cli-min-version-1.3.js,test-tls-cli-max-version-1.3.js,test-tls-min-max-version.js,test-process-versions.js,test-strace-openat-openssl.js,test-crypto-dh.js,test-dgram-send-cb-quelches-error.js,test-https-agent-session-eviction.js"
+
+	# https://github.com/nodejs/node/issues/50741
+	CI_SKIP_TESTS+=",test-dns-resolveany.js,test-dns-resolveany-bad-ancount.js"
+
+	if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
+		# https://github.com/nodejs/node/issues/45906
+		CI_SKIP_TESTS+=",test-fs-utimes-y2K38.js"
+	fi
+
 	make CI_SKIP_TESTS="$CI_SKIP_TESTS" LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
 }
 

From 8910f35b6f504be5dfe34d9ce47db383815bf0ba Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Tue, 28 Nov 2023 00:17:41 +0000
Subject: [PATCH 09/11] xorg-server-xwayland: update to 23.2.2, adopt.

---
 srcpkgs/xorg-server-xwayland/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index cd94be8bdd494..b2caeb9442253 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=23.2.1
+version=23.2.2
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
@@ -12,11 +12,11 @@ makedepends="nettle-devel libepoxy-devel font-util libXfont2-devel pixman-devel
  MesaLib-devel libxcb-devel libxshmfence-devel libxcvt-devel"
 depends="xorg-server-common"
 short_desc="Nested X server that runs as a wayland client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=842cd6043f13e59390727418b238e509b8d4c37bc60702852e2c977f384bf218
+distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-${version}/xserver-xwayland-${version}.tar.gz"
+checksum=0ed038cfc55f2bc32378e675eb4b198251db824c1a85f9285b4d9ca454fe6df7
 make_check=no # needs xtest repository
 
 post_install() {

From d74a75d36c5697edd320952f8c51ee9b4570e7c7 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 2 Dec 2023 15:00:22 +0100
Subject: [PATCH 10/11] proj: update to 9.3.1.

---
 srcpkgs/proj/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index 42a0e3e86b0d2..6aad399f60966 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,6 +1,6 @@
 # Template file for 'proj'
 pkgname=proj
-version=9.3.0
+version=9.3.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://proj.org"
 distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz"
-checksum=91a3695a004ea28db0448a34460bed4cc3b130e5c7d74339ec999efdab0e547d
+checksum=b0f919cb9e1f42f803a3e616c2b63a78e4d81ecfaed80978d570d3a5e29d10bc
 
 post_install() {
 	vlicense COPYING

From 560cf75b9b4d3fed740c6d17e8c65389d6d5c1e7 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 30 Nov 2023 10:28:39 +0100
Subject: [PATCH 11/11] godot: update to 4.2.

---
 srcpkgs/godot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 1bdfcbf5f57c6..b07869975ff97 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=4.1.3
+version=4.2
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
@@ -24,7 +24,7 @@ maintainer="dataCobra <datacobra@thinkbot.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=a9357c869152497223f91bb083bf5575cc25815cc1117ca677438164b8a4fad5
+checksum=517e538ef7f3eebeb761c281fb71ac529424146f6b3b746d0861825ddcf18918
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

Re: hugin: update to 2023.0.0

[Aicaya]

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

New comment by Aicaya on void-packages repository

https://github.com/void-linux/void-packages/pull/47572#issuecomment-1838952622

Comment:
Wait hold on I messed up the commit

Re: hugin: update to 2023.0.0

[Aicaya]

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

New comment by Aicaya on void-packages repository

https://github.com/void-linux/void-packages/pull/47572#issuecomment-1838952622

Comment:
Wait hold on I messed up the commit

Re: hugin: update to 2023.0.0

[Aicaya]

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

New comment by Aicaya on void-packages repository

https://github.com/void-linux/void-packages/pull/47572#issuecomment-1838956495

Comment:
Wait sorry I fucked up the branch, closing until I have time to redo this

Re: [PR PATCH] [Closed]: hugin: update to 2023.0.0

[Aicaya]

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

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

hugin: update to 2023.0.0
https://github.com/void-linux/void-packages/pull/47572

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
- 
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

Switched from `glew-devel` to `libepoxy-devel` using [a flag introduced in this version][1] (`-DBUILD_WITH_EPOXY=on`) since the main program would not open anymore, both on the current package as well as this one.  I also removed a patch that does not work with the new release.

Will test building the package on other architectures later today.

[1]: https://hugin.sourceforge.io/releases/2023.0.0/en.shtml

Re: hugin: update to 2023.0.0

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/47572#issuecomment-1838968638

Comment:
Don't close branches just to fix git issues; `git rebase upstream/master` is all you need to do. Otherwise, you can always create a new local branch and force-push it over this remote branch.

Re: [PR PATCH] [Updated] hugin: update to 2023.0.0

[Aicaya]

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

There is an updated pull request by Aicaya against master on the void-packages repository

https://github.com/Aicaya/void-packages hugin
https://github.com/void-linux/void-packages/pull/47572

hugin: update to 2023.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
- 
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

Switched from `glew-devel` to `libepoxy-devel` using [a flag introduced in this version][1] (`-DBUILD_WITH_EPOXY=on`) since the main program would not open anymore, both on the current package as well as this one.  I also removed a patch that does not work with the new release.

Will test building the package on other architectures later today.

[1]: https://hugin.sourceforge.io/releases/2023.0.0/en.shtml

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

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

From 3036c10dfa27e6eb73d237c89876592773375d34 Mon Sep 17 00:00:00 2001
From: Aicaya Maro <aicaya@posteo.net>
Date: Mon, 4 Dec 2023 12:06:48 -0400
Subject: [PATCH] hugin: update to 2023.0.0

---
 srcpkgs/hugin/patches/exiv2-0.28.patch | 77 --------------------------
 srcpkgs/hugin/template                 |  9 +--
 2 files changed, 5 insertions(+), 81 deletions(-)
 delete mode 100644 srcpkgs/hugin/patches/exiv2-0.28.patch

diff --git a/srcpkgs/hugin/patches/exiv2-0.28.patch b/srcpkgs/hugin/patches/exiv2-0.28.patch
deleted file mode 100644
index 49f0518117020..0000000000000
--- a/srcpkgs/hugin/patches/exiv2-0.28.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/hugin/-/blob/main/exiv2-0.28.patch
-diff -r 79cd11a7a66f src/hugin_base/panodata/Exiv2Helper.cpp
---- a/src/hugin_base/panodata/Exiv2Helper.cpp	Wed May 24 19:13:20 2023 +0200
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp	Mon Jun 05 00:31:19 2023 +0200
-@@ -40,7 +40,7 @@
-             Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName));
-             if (itr != exifData.end() && itr->count())
-             {
--                value = itr->toLong();
-+                value = itr->toUint32();
-                 return true;
-             }
-             else
-@@ -165,7 +165,7 @@
-         {
-             if(it!=exifData.end() && it->count())
-             {
--                return it->toLong();
-+                return it->toUint32();
-             }
-             return 0;
-         };
-@@ -600,4 +600,4 @@
-         };
- 
-     }; //namespace Exiv2Helper
--}; //namespace HuginBase
-\ No newline at end of file
-+}; //namespace HuginBase
-diff -r 79cd11a7a66f src/hugin_base/panodata/SrcPanoImage.cpp
---- a/src/hugin_base/panodata/SrcPanoImage.cpp	Wed May 24 19:13:20 2023 +0200
-+++ b/src/hugin_base/panodata/SrcPanoImage.cpp	Mon Jun 05 00:31:19 2023 +0200
-@@ -384,7 +384,7 @@
-                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
-                     if (pos != xmpData.end())
-                     {
--                        croppedWidth = pos->toLong();
-+                        croppedWidth = pos->toUint32();
-                     }
-                     else
-                     {
-@@ -394,7 +394,7 @@
-                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
-                     if (pos != xmpData.end())
-                     {
--                        croppedHeight = pos->toLong();
-+                        croppedHeight = pos->toUint32();
-                     }
-                     else
-                     {
-@@ -408,7 +408,7 @@
-                         double hfov = 0;
-                         if (pos != xmpData.end())
-                         {
--                            hfov = 360 * croppedWidth / (double)pos->toLong();
-+                            hfov = 360 * croppedWidth / (double)pos->toUint32();
-                         }
-                         else
-                         {
-@@ -419,7 +419,7 @@
-                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
-                         if (pos != xmpData.end())
-                         {
--                            fullHeight = pos->toLong();
-+                            fullHeight = pos->toUint32();
-                         }
-                         else
-                         {
-@@ -430,7 +430,7 @@
-                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
-                         if (pos != xmpData.end())
-                         {
--                            cropTop = pos->toLong();
-+                            cropTop = pos->toUint32();
-                         }
-                         else
-                         {
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 894876470ebde..31f5be4f0d323 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,14 +1,15 @@
 # Template file for 'hugin'
 pkgname=hugin
-version=2022.0.0
-revision=12
+version=2023.0.0
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
+configure_args="-DBUILD_WITH_EPOXY=on"
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
 hostmakedepends="pkg-config exiftool swig gettext"
 makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
  exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
- lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
+ lensfun-devel python3-devel libepoxy-devel libXmu-devel libXi-devel glu-devel
  lcms2-devel lapack-devel"
 depends="exiftool enblend-enfuse"
 short_desc="Easy to use panoramic imaging toolchain"
@@ -17,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://hugin.sourceforge.net/"
 changelog="https://hugin.sourceforge.io/releases/${version}/en.shtml"
 distfiles="${SOURCEFORGE_SITE}/hugin/hugin/hugin-${version%.*}/hugin-${version}.tar.bz2"
-checksum=97c8562a0ba9a743e0b955a43dfde048b1c60cd9e5f2ee2b69de1a81646e05a7
+checksum=04a39fccc6017e0544c639bd22309472c574d35b3455cbade1fc3870e631632b
 python_version=3
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"

Re: hugin: update to 2023.0.0

[Aicaya]

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

New comment by Aicaya on void-packages repository

https://github.com/void-linux/void-packages/pull/47572#issuecomment-1838985041

Comment:
Thanks for the tip. Still getting used to working with pull requests instead of email patches, so I got confused and panicked.

Apologies!

Re: [PR PATCH] [Merged]: hugin: update to 2023.0.0

[classabbyamp]

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

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

hugin: update to 2023.0.0
https://github.com/void-linux/void-packages/pull/47572

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

Switched from `glew-devel` to `libepoxy-devel` using [a flag introduced in this version][1] (`-DBUILD_WITH_EPOXY=on`) since the main program would not open anymore, both on the current package as well as this one.  I also removed a patch that does not work with the new release.

Will test building the package on other architectures later today.

[1]: https://hugin.sourceforge.io/releases/2023.0.0/en.shtml