mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 21:16:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gobject-introspection.wrap: Backport patch from upstream

Browse source 
This allows it to build with the newer glib subproject.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8363>
This commit is contained in:
Nirbheek Chauhan 2025-01-27 15:01:28 +05:30 committed by GStreamer Marge Bot
parent e2bd8809bf
commit 5b201e42d2
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gobject-introspection.wrap
View file

@ -5,7 +5,7 @@ source_fallback_url = https://ftp.acc.umu.se/pub/gnome/sources/gobject-introspec
source_filename = gobject-introspection-1.74.0.tar.xz source_filename = gobject-introspection-1.74.0.tar.xz
source_hash = 347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653 source_hash = 347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653
wrapdb_version = 1.74.0-0 wrapdb_version = 1.74.0-0
diff_files = gobject-introspection-1.74.0/0001-Fix-gir-build-when-using-subprojects-dependencies.patch, gobject-introspection-1.74.0/0001-gir-stop-assuming-glib-source-and-build-dirs-using-v.patch diff_files = gobject-introspection-1.74.0/0001-Fix-gir-build-when-using-subprojects-dependencies.patch, gobject-introspection-1.74.0/0001-gir-stop-assuming-glib-source-and-build-dirs-using-v.patch, gobject-introspection-1.74.0/0001-build-Work-around-an-undocumented-GLib-variable-rena.patch
[provide] [provide]
dependency_names = gobject-introspection-1.0 dependency_names = gobject-introspection-1.0

28
subprojects/packagefiles/gobject-introspection-1.74.0/0001-build-Work-around-an-undocumented-GLib-variable-rena.patch Normal file
View file

@ -0,0 +1,28 @@
From 3163d96f47a62a20a343eb7af9d3c2931563a63d Mon Sep 17 00:00:00 2001
From: "L. E. Segovia" <amy@centricular.com>
Date: Sat, 24 Feb 2024 14:14:19 -0300
Subject: [PATCH] build: Work around an undocumented GLib variable renaming
See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3892
---
gir/meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gir/meson.build b/gir/meson.build
index b732d24d..3a016831 100644
--- a/gir/meson.build
+++ b/gir/meson.build
@@ -155,7 +155,9 @@ elif dep_type == 'internal'
if giounix_dep.found()
glib_files += [
- glib_subproject.get_variable('glib_unix_h')
+ # Variable was renamed in 2.79.2
+ # https://gitlab.gnome.org/GNOME/glib/-/commit/1f9e44d6232c3e96caa8a96d9b1cc2c65cf5848c
+ glib_subproject.get_variable('glib_unix_headers')
]
endif
--
2.47.1