[packages/libgda6] upstream fix for meson >= 0.61
atler
atler at pld-linux.org
Thu Jul 31 14:33:25 CEST 2025
commit 27451bbe253df63e377c57836154b17636823048
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Jul 31 14:20:39 2025 +0200
upstream fix for meson >= 0.61
libgda6.spec | 2 ++
meson0.61.patch | 33 +++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
---
diff --git a/libgda6.spec b/libgda6.spec
index e2e77ce..109eea4 100644
--- a/libgda6.spec
+++ b/libgda6.spec
@@ -31,6 +31,7 @@ Source0: https://download.gnome.org/sources/libgda/6.0/libgda-%{version}.tar.xz
# Source0-md5: 2e059e57b0620fb23fc74f3d2bd0fd1f
Patch0: %{name}-web.patch
Patch1: %{name}-soname.patch
+Patch2: meson0.61.patch
URL: https://www.gnome-db.org/
%{?with_firebird:BuildRequires: Firebird-devel}
BuildRequires: autoconf >= 2.68
@@ -389,6 +390,7 @@ Plik katalogu oraz ikony libgda dla Glade.
%setup -q -n libgda-%{version}
%patch -P0 -p1
%patch -P1 -p1
+%patch -P2 -p1
%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
libgda-report/RML/trml2html/trml2html.py \
diff --git a/meson0.61.patch b/meson0.61.patch
new file mode 100644
index 0000000..ec34112
--- /dev/null
+++ b/meson0.61.patch
@@ -0,0 +1,33 @@
+From b9833107e9ee25632955e45b17cd6c96ac205ab4 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal at vasilek.cz>
+Date: Wed, 9 Mar 2022 23:07:22 +0100
+Subject: [PATCH] meson: remove positional args from i18n.merge_file
+
+This causes the build to fail with meson 0.61+
+---
+ tools/browser/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/browser/meson.build b/tools/browser/meson.build
+index 39459c39c..4321d8c39 100644
+--- a/tools/browser/meson.build
++++ b/tools/browser/meson.build
+@@ -84,7 +84,7 @@ gda_browser_sources += gda_browser_sourcesf
+
+ subdir('data')
+
+-i18n.merge_file('browser_desktop',
++i18n.merge_file(
+ po_dir: join_paths(meson.source_root(),'po'),
+ type: 'desktop',
+ input: 'org.gnome.gda.Browser.desktop.in',
+@@ -105,4 +105,4 @@ custom_target('org.gnome.gda.Browser.appdata',
+ install_dir: join_paths(get_option('datadir'),'metainfo')
+ )
+
+-browser_deps += inc_browserdirh_dep
+\ No newline at end of file
++browser_deps += inc_browserdirh_dep
+--
+GitLab
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgda6.git/commitdiff/da92e8aaf34177a62c7be505fda86c41b5a6552e
More information about the pld-cvs-commit
mailing list