Sven-Hendrik Haase pushed to branch main at Arch Linux / Packaging / Packages /
collada-dom
Commits:
18b5d155 by Sven-Hendrik Haase at 2026-08-14T05:06:55+02:00
upgpkg: 2.5.0-5: boost 1.92.0 rebuild
- - - - -
4 changed files:
- .SRCINFO
- PKGBUILD
- REUSE.toml
- + collada-dom-fix-gcc16-ambiguous-overload.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,10 +1,10 @@
pkgbase = collada-dom
pkgdesc = COLLADA Document Object Model (DOM) C++ Library
pkgver = 2.5.0
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/rdiankov/collada-dom/
arch = x86_64
- license = custom
+ license = LicenseRef-collada
makedepends = cmake
makedepends = boost
depends = boost-libs
@@ -16,8 +16,10 @@ pkgbase = collada-dom
source =
collada-dom-2.5.0.tar.gz::https://github.com/rdiankov/collada-dom/archive/refs/tags/v2.5.0.tar.gz
source =
collada-dom-fix-boost1.85.patch::https://github.com/rdiankov/collada-dom/pull/43.patch
source = boost-1.89.patch
+ source = collada-dom-fix-gcc16-ambiguous-overload.patch
sha512sums =
f189d09e2396faa266734981bb7b5e91ec34b6faa9ad340206e769dae316496bf4271c129980668dc2756874dbb8c1157162197d0d3a74075e35200821875156
sha512sums =
b1f742316cecf4a932df7ba86f2d3bc7dda8a0cae0b0300c0638e8858e654ce5de8bc351c094f99bb6a9fba693f272de6969411679ac2c4bfe99bb9b95d1ed79
sha512sums =
24bddd4c9663cf763114d5371f89f569ff320a9bee757e2d701913dbdaad1327f980e0c877900beb47fdfeca08b96fae2015699810cac269bcd73b2a879b9632
+ sha512sums =
8f81440ec43b029aac66ffdb2a0462cc41dbe9e099bae16319d1ab0944d6be8aa51730b91515f557c951fa4c73a8de447f83c9dc4329cae0b0f6fa60f65e6b6e
pkgname = collada-dom
=====================================
PKGBUILD
=====================================
@@ -1,11 +1,11 @@
# Maintainer: Sven-Hendrik Haase <[email protected]>
pkgname=collada-dom
pkgver=2.5.0
-pkgrel=4
+pkgrel=5
pkgdesc="COLLADA Document Object Model (DOM) C++ Library"
arch=('x86_64')
url="https://github.com/rdiankov/collada-dom/";
-license=('custom')
+license=('LicenseRef-collada')
depends=(
'boost-libs'
'minizip'
@@ -17,16 +17,19 @@ depends=(
makedepends=('cmake' 'boost')
source=("$pkgname-$pkgver.tar.gz::https://github.com/rdiankov/collada-dom/archive/refs/tags/v${pkgver}.tar.gz";
"$pkgname-fix-boost1.85.patch::https://github.com/rdiankov/collada-dom/pull/43.patch";
- boost-1.89.patch)
+ boost-1.89.patch
+ "$pkgname-fix-gcc16-ambiguous-overload.patch")
sha512sums=('f189d09e2396faa266734981bb7b5e91ec34b6faa9ad340206e769dae316496bf4271c129980668dc2756874dbb8c1157162197d0d3a74075e35200821875156'
-
'b1f742316cecf4a932df7ba86f2d3bc7dda8a0cae0b0300c0638e8858e654ce5de8bc351c094f99bb6a9fba693f272de6969411679ac2c4bfe99bb9b95d1ed79'
-
'24bddd4c9663cf763114d5371f89f569ff320a9bee757e2d701913dbdaad1327f980e0c877900beb47fdfeca08b96fae2015699810cac269bcd73b2a879b9632')
+
'b1f742316cecf4a932df7ba86f2d3bc7dda8a0cae0b0300c0638e8858e654ce5de8bc351c094f99bb6a9fba693f272de6969411679ac2c4bfe99bb9b95d1ed79'
+
'24bddd4c9663cf763114d5371f89f569ff320a9bee757e2d701913dbdaad1327f980e0c877900beb47fdfeca08b96fae2015699810cac269bcd73b2a879b9632'
+
'8f81440ec43b029aac66ffdb2a0462cc41dbe9e099bae16319d1ab0944d6be8aa51730b91515f557c951fa4c73a8de447f83c9dc4329cae0b0f6fa60f65e6b6e')
prepare() {
cd "$pkgname-$pkgver"
patch -Np1 -i "$srcdir/$pkgname-fix-boost1.85.patch"
patch -p1 -i ../boost-1.89.patch
+ patch -p1 -i ../"$pkgname-fix-gcc16-ambiguous-overload.patch"
sed -i 's|<unzip.h>|<minizip/unzip.h>|'
dom/include/dae/daeZAEUncompressHandler.h
sed -i 's|<zip.h>|<minizip/zip.h>|'
dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
}
=====================================
REUSE.toml
=====================================
@@ -6,10 +6,13 @@ path = [
"README.md",
"keys/**",
".SRCINFO",
+ ".gitignore",
".nvchecker.toml",
"*.install",
"*.sysusers",
+ "*sysusers.conf",
"*.tmpfiles",
+ "*tmpfiles.conf",
"*.logrotate",
"*.pam",
"*.service",
@@ -18,6 +21,7 @@ path = [
"*.desktop",
"*.hook",
"boost-1.89.patch",
+ "collada-dom-fix-gcc16-ambiguous-overload.patch",
]
SPDX-FileCopyrightText = "Arch Linux contributors"
SPDX-License-Identifier = "0BSD"
=====================================
collada-dom-fix-gcc16-ambiguous-overload.patch
=====================================
@@ -0,0 +1,11 @@
+--- collada-dom-2.5.0.orig/dom/src/dae/daeMetaElement.cpp 2026-08-14
02:53:20.449450825 +0000
++++ collada-dom-2.5.0/dom/src/dae/daeMetaElement.cpp 2026-08-14
02:53:22.802340188 +0000
+@@ -175,7 +175,7 @@
+ else
+ _metaAttributes.append(attr);
+
+- if ((attr->getName() != NULL) &&
++ if ((const char*)(attr->getName()) &&
+ (strcmp(attr->getName(),"id") == 0)) {
+ _metaID = attr;
+ _isTrackableForQueries = true;
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/collada-dom/-/commit/18b5d155000880c36f6e25a270af7af6fc4233df
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/collada-dom/-/commit/18b5d155000880c36f6e25a270af7af6fc4233df
You're receiving this email because of your account on gitlab.archlinux.org.
Manage all notifications: https://gitlab.archlinux.org/-/profile/notifications
| Help: https://gitlab.archlinux.org/help
