Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (cbd0b9d8d94390fba4e3e7326a67821d22f3731f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (cbd0b9d8d94390fba4e3e7326a67821d22f3731f)
  • Date: Wed, 6 Dec 2023 12:36:50 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

gnome3-libs/gcr/HISTORY | 3
gnome3-libs/gcr/PRE_BUILD | 3
gnome3-libs/gcr/patches/0001-no-packages-for-meson.patch | 57
+++++++++++++++
3 files changed, 63 insertions(+)

New commits:
commit cbd0b9d8d94390fba4e3e7326a67821d22f3731f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fcr: fix frikkin build because of meson dropping defunct options

diff --git a/gnome3-libs/gcr/HISTORY b/gnome3-libs/gcr/HISTORY
index 129f4af..1fcd1f2 100644
--- a/gnome3-libs/gcr/HISTORY
+++ b/gnome3-libs/gcr/HISTORY
@@ -1,3 +1,6 @@
+2023-12-06 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, patches/0001-no-packages-for-meson.patch: fix build
+
2022-05-28 Florian Franzmann <bwlf AT bandrate.org>
* DEPENDS: use MESON_DEPENDS

diff --git a/gnome3-libs/gcr/PRE_BUILD b/gnome3-libs/gcr/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/gnome3-libs/gcr/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/gnome3-libs/gcr/patches/0001-no-packages-for-meson.patch
b/gnome3-libs/gcr/patches/0001-no-packages-for-meson.patch
new file mode 100644
index 0000000..10e4430
--- /dev/null
+++ b/gnome3-libs/gcr/patches/0001-no-packages-for-meson.patch
@@ -0,0 +1,57 @@
+From: Jakub Jirutka <jakub AT jirutka.cz>
+Date: Wed, 12 Jan 2022 00:24:20 +0100
+Subject: meson: Fix unknown kw argument in gnome.generate_gir
+
+This argument has been removed in Meson 0.61.0:
+
+ gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword
arguments "packages"
+
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
+
+> The packages argument to gnome.generate_gir was allowed, but never did
anything, so stop passing it.
+
+Fixes #89
+
+(cherry picked from commit b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8)
+---
+ gck/meson.build | 1 -
+ gcr/meson.build | 1 -
+ ui/meson.build | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/gck/meson.build b/gck/meson.build
+index 756b486..a21a1e9 100644
+--- a/gck/meson.build
++++ b/gck/meson.build
+@@ -131,7 +131,6 @@ if get_option('introspection')
+ sources: gck_gir_sources,
+ namespace: 'Gck',
+ nsversion: '@0@'.format(gck_major_version),
+- packages: gck_deps,
+ export_packages: 'gck-@0@'.format(gck_major_version),
+ includes: [ 'GObject-2.0', 'Gio-2.0' ],
+ header: 'gck/gck.h',
+diff --git a/gcr/meson.build b/gcr/meson.build
+index 06c3a63..f998336 100644
+--- a/gcr/meson.build
++++ b/gcr/meson.build
+@@ -189,7 +189,6 @@ if get_option('introspection')
+ sources: [ gcr_base_public_sources, gcr_base_headers ],
+ namespace: 'Gcr',
+ nsversion: '@0@'.format(gcr_major_version),
+- packages: gcr_base_deps,
+ export_packages: 'gcr-base-@0@'.format(gcr_major_version),
+ includes: [
+ 'GObject-2.0',
+diff --git a/ui/meson.build b/ui/meson.build
+index e656ea2..32ee057 100644
+--- a/ui/meson.build
++++ b/ui/meson.build
+@@ -152,7 +152,6 @@ if get_option('introspection')
+ export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+ identifier_prefix: 'Gcr',
+ symbol_prefix: 'gcr',
+- packages: gcr_ui_deps,
+ includes: [
+ 'GObject-2.0',
+ 'Gio-2.0',



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (cbd0b9d8d94390fba4e3e7326a67821d22f3731f), Thomas Orgis, 12/06/2023

Archive powered by MHonArc 2.6.24.

Top of Page