community/glibd: upgrade to 2.4.3

This commit is contained in:
Celeste 2024-05-04 02:58:15 +00:00
parent 5917bafe4f
commit 0c1dd9d3dc
3 changed files with 38 additions and 27 deletions

View File

@ -1,8 +1,8 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=glibd
pkgver=2.4.2
pkgrel=4
pkgver=2.4.3
pkgrel=0
pkgdesc="D bindings for the GLib C Utility Library"
url="https://github.com/gtkd-developers/GlibD"
arch="x86_64 aarch64" # ldc
@ -10,7 +10,8 @@ license="GPL-3.0-or-later"
makedepends="meson gobject-introspection-dev glib-dev ldc gir-to-d"
subpackages="$pkgname-dev $pkgname-dbg"
source="https://github.com/gtkd-developers/GlibD/archive/v$pkgver/glibd-$pkgver.tar.gz
Trivial-fix-for-Glib-2.78.patch"
link-gthread.patch
"
builddir="$srcdir/GlibD-$pkgver"
build() {
@ -27,6 +28,6 @@ package() {
}
sha512sums="
6db52b29cf90a5d8f6ddb43c1ddcd5bcc6ed5b2b6cd575711beffff74b8592c07aa3c6a1047954305cbcd515ef6ea814c162a91c12e9580d5938228ecc7a6d49 glibd-2.4.2.tar.gz
7bcbf68b9a069860e81232da4ece4ea3e8f766afcefbb6dcff060e897bdd6dc00c8f045eb5b1547a981b08990b678eb54f22d620e375f1ee469caeb09331e2f7 Trivial-fix-for-Glib-2.78.patch
7ceb415cad9aa3ea325d561932586b730af7ce123d4f1e69339eb2f007774abfa126d783af898ef7f8c17bde0f337383ba1630fd039f9a22a3c34a98ac8dd539 glibd-2.4.3.tar.gz
3fb514e6a7afcf596a09e80defbf51d43995624fcaac38b75e555462740ee1d9688e02680c1194cd03e77f5b1c2aae6aad97527d66f6971188f3074ae6826f22 link-gthread.patch
"

View File

@ -1,22 +0,0 @@
From ef3b70be9de8e1c798db47b627b465b0a257e693 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 21 Sep 2023 20:56:50 +0200
Subject: [PATCH] Trivial fix for GLib 2.78
generated/glib/StringG.d(137): Error: constructor `glib.StringG.StringG.this(string init)` conflicts with previous declaration at generated/glib/StringG.d(78)
---
src/APILookupGLib.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/APILookupGLib.txt b/src/APILookupGLib.txt
index d037f7a..f66969d 100644
--- a/src/APILookupGLib.txt
+++ b/src/APILookupGLib.txt
@@ -1313,6 +1313,7 @@ code: end
struct: String
class: StringG
+version 2.78: noCode: new_take
struct: Thread
noCode: new

View File

@ -0,0 +1,32 @@
Fix errors found while running tests:
Error relocating libglibd-2.0.so.0: g_thread_init: symbol not found
Error relocating libglibd-2.0.so.0: g_thread_init_with_errorcheck_mutexes: symbol not found
--- a/meson.build
+++ b/meson.build
@@ -20,6 +20,7 @@
gmodule_dep = dependency('gmodule-2.0')
gobject_dep = dependency('gobject-2.0')
gio_dep = dependency('gio-2.0')
+gthread_dep = dependency('gthread-2.0')
# The Glib gir files are part of the gobject introspection package.
introspection_dep = dependency('gobject-introspection-1.0')
@@ -47,7 +48,7 @@
glibd = library('glibd-2.0',
[gir_binding_sources],
include_directories: [gir_bind_dir],
- dependencies: [glib_dep, gmodule_dep, gobject_dep, gio_dep],
+ dependencies: [glib_dep, gmodule_dep, gobject_dep, gio_dep, gthread_dep],
install: true,
soversion: project_soversion,
version: meson.project_version())
@@ -61,7 +62,7 @@
name: 'glibd-2.0',
subdirs: 'd/glibd-2',
version: meson.project_version(),
- requires: [glib_dep, gmodule_dep, gio_dep, gobject_dep],
+ requires: [glib_dep, gmodule_dep, gio_dep, gobject_dep, gthread_dep],
description: 'D bindings for the GLib C Utility Library.')
# for use by others which embed this as subproject