muon build fixes

8 files changed, 167 insertions, 0 deletions

diff --git a/repos/archive/glib-gi/.files b/repos/archive/glib-gi/.files
new file mode 100644
index 00000000..e6e4e630
--- /dev/null
+++ b/repos/archive/glib-gi/.files
@@ -0,0 +1,19 @@
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/lib/
+drwxr-xr-x root/root    usr/lib/girepository-1.0/
+-rw-r--r-- root/root    usr/lib/girepository-1.0/GIRepository-3.0.typelib
+-rw-r--r-- root/root    usr/lib/girepository-1.0/GLib-2.0.typelib
+-rw-r--r-- root/root    usr/lib/girepository-1.0/GLibUnix-2.0.typelib
+-rw-r--r-- root/root    usr/lib/girepository-1.0/GModule-2.0.typelib
+-rw-r--r-- root/root    usr/lib/girepository-1.0/GObject-2.0.typelib
+-rw-r--r-- root/root    usr/lib/girepository-1.0/Gio-2.0.typelib
+-rw-r--r-- root/root    usr/lib/girepository-1.0/GioUnix-2.0.typelib
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/gir-1.0/
+-rw-r--r-- root/root    usr/share/gir-1.0/GIRepository-3.0.gir
+-rw-r--r-- root/root    usr/share/gir-1.0/GLib-2.0.gir
+-rw-r--r-- root/root    usr/share/gir-1.0/GLibUnix-2.0.gir
+-rw-r--r-- root/root    usr/share/gir-1.0/GModule-2.0.gir
+-rw-r--r-- root/root    usr/share/gir-1.0/GObject-2.0.gir
+-rw-r--r-- root/root    usr/share/gir-1.0/Gio-2.0.gir
+-rw-r--r-- root/root    usr/share/gir-1.0/GioUnix-2.0.gir
diff --git a/repos/archive/glib-gi/.shasum b/repos/archive/glib-gi/.shasum
new file mode 100644
index 00000000..0dfab55b
--- /dev/null
+++ b/repos/archive/glib-gi/.shasum
@@ -0,0 +1,3 @@
+fcb45dde8329b9d1952db13fb18ff82982c6b5a07ebe253eb65c0525  0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
+b879f9e27767b32bf69f4091c7c7d1b5100095259caf0b44d9b8c21b  glib-2.88.1.tar.xz
+57329de4c7d7b4bdb51d2b7b6afaaac368f4bd127fd77ffb93aea0e4  muon-introspection-env.patch
diff --git a/repos/archive/glib-gi/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch b/repos/archive/glib-gi/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
new file mode 100755
index 00000000..0a0b7f04
--- /dev/null
+++ b/repos/archive/glib-gi/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Fri, 7 Jan 2022 18:59:10 +0000
+Subject: [PATCH] glib-compile-schemas: Remove noisy deprecation warnings
+
+While the warnings are useful for developers, Arch Linux users also see
+them when glib-compile-schemas gets run after upgrades, where they just
+add noise.
+
+The alternative to this patch would be redirecting the compiler's stderr
+to /dev/null, but that might also suppress more useful errors or
+warnings we want users to see.
+---
+ gio/glib-compile-schemas.c | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
+index 04ef40457eba..e791ce254454 100644
+--- a/gio/glib-compile-schemas.c
++++ b/gio/glib-compile-schemas.c
+@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState  *state,
+       return;
+     }
+ 
+-  if (path && (g_str_has_prefix (path, "/apps/") ||
+-               g_str_has_prefix (path, "/desktop/") ||
+-               g_str_has_prefix (path, "/system/")))
+-    {
+-      gchar *message = NULL;
+-      message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”.  "
+-                                   "Paths starting with "
+-                                   "“/apps/”, “/desktop/” or “/system/” are deprecated."),
+-                                 id, path);
+-      g_printerr ("%s\n", message);
+-      g_free (message);
+-    }
+-
+   state->schema_state = schema_state_new (path, gettext_domain,
+                                           extends, extends_name, list_of);
+ 
diff --git a/repos/archive/glib-gi/abuild b/repos/archive/glib-gi/abuild
new file mode 100755
index 00000000..2cc76b5e
--- /dev/null
+++ b/repos/archive/glib-gi/abuild
@@ -0,0 +1,26 @@
+name=glib-gi
+version=2.88.1
+release=1
+source="https://download.gnome.org/sources/glib/${version%.*}/glib-$version.tar.xz
+	muon-introspection-env.patch
+	0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch"
+build_opt="
+	-Dselinux=disabled
+	-Dtests=false
+	-Dintrospection=enabled
+	-Dnls=disabled
+"
+
+postbuild() {
+	mkdir -p $SRC/tmp
+	mv $PKG/usr/lib/girepository-1.0 $SRC/tmp
+	mv $PKG/usr/share/gir-1.0 $SRC/tmp
+	rm -rf $PKG/*
+
+	mkdir -p \
+		$PKG/usr/lib \
+		$PKG/usr/share
+
+	mv $SRC/tmp/girepository-1.0 $PKG/usr/lib
+	mv $SRC/tmp/gir-1.0 $PKG/usr/share
+}
diff --git a/repos/archive/glib-gi/depends b/repos/archive/glib-gi/depends
new file mode 100755
index 00000000..6b609f79
--- /dev/null
+++ b/repos/archive/glib-gi/depends
@@ -0,0 +1 @@
+gobject-introspection
diff --git a/repos/archive/glib-gi/info b/repos/archive/glib-gi/info
new file mode 100644
index 00000000..f6bf7a77
--- /dev/null
+++ b/repos/archive/glib-gi/info
@@ -0,0 +1,4 @@
+description: GLib with GObject introspection data
+homepage: https://gitlab.gnome.org/GNOME/glib
+license: LGPL-2.1-or-later
+maintainer: Emmett1 <me@emmett1.my>
diff --git a/repos/archive/glib-gi/muon-introspection-env.patch b/repos/archive/glib-gi/muon-introspection-env.patch
new file mode 100644
index 00000000..d5bddd58
--- /dev/null
+++ b/repos/archive/glib-gi/muon-introspection-env.patch
@@ -0,0 +1,73 @@
+--- a/girepository/introspection/meson.build
++++ b/girepository/introspection/meson.build
+@@ -77,7 +77,6 @@
+   dependencies: gi_gen_shared_dependencies + [
+     libgobject_dep,
+   ],
+-  env: gi_gen_env_variables,
+   extra_args: gir_args + [
+     '-DGLIB_COMPILATION',
+     '-DGETTEXT_PACKAGE="dummy"',
+@@ -106,7 +105,6 @@
+     dependencies: gi_gen_shared_dependencies + [
+       libgobject_dep,
+     ],
+-    env: gi_gen_env_variables,
+     extra_args: gir_args + [
+       '-DGLIB_COMPILATION',
+       '-DGETTEXT_PACKAGE="dummy"',
+@@ -136,7 +134,6 @@
+     dependencies: gi_gen_shared_dependencies + [
+       libgobject_dep,
+     ],
+-    env: gi_gen_env_variables,
+     extra_args: gir_args + [
+       '-DGLIB_COMPILATION',
+       '-DGETTEXT_PACKAGE="dummy"',
+@@ -168,7 +165,6 @@
+   install: true,
+   install_dir_gir: glib_girdir,
+   dependencies: gi_gen_shared_dependencies,
+-  env: gi_gen_env_variables,
+   extra_args: gir_args + [
+       '-DGOBJECT_COMPILATION',
+       '--symbol-prefix=gobject',
+@@ -197,7 +193,6 @@
+   dependencies: gi_gen_shared_dependencies + [
+     libglib_dep,
+   ],
+-  env: gi_gen_env_variables,
+   extra_args: gir_args + [
+       '-DGMODULE_COMPILATION',
+       '-DGETTEXT_PACKAGE="dummy"',
+@@ -241,7 +236,6 @@
+     libgobject_dep,
+     libgmodule_dep,
+   ],
+-  env: gi_gen_env_variables,
+   extra_args: gir_args + gio_gir_args,
+ )
+ 
+@@ -267,7 +261,6 @@
+       libgobject_dep,
+       libgmodule_dep,
+     ],
+-    env: gi_gen_env_variables,
+     extra_args: gir_args + gio_gir_args + gio_win32_gir_c_includes + [
+       '--pkg=gio-windows-2.0',
+       '--symbol-prefix=g_win32',
+@@ -297,7 +290,6 @@
+       libgobject_dep,
+       libgmodule_dep,
+     ],
+-    env: gi_gen_env_variables,
+     extra_args: gir_args + gio_gir_args + gio_unix_gir_c_includes + [
+       '--pkg=gio-unix-2.0',
+       '--symbol-prefix=g_unix',
+@@ -344,6 +336,5 @@
+     libgio_dep,
+   ],
+   extra_args: gir_args + libgirepository_gir_args,
+-  env: gi_libgirepository_gen_env_variables,
+ )
+ 
diff --git a/repos/archive/glib-gi/outdated b/repos/archive/glib-gi/outdated
new file mode 100644
index 00000000..4f55ab90
--- /dev/null
+++ b/repos/archive/glib-gi/outdated
@@ -0,0 +1 @@
+glib