Merge branch 'main' of https://codeberg.org/emmett1/alicelinux

15 files changed, 107 insertions, 25 deletions

diff --git a/repos/extra/firefox/.checksum b/repos/extra/firefox/.checksum
index 66394a70..ff1464c3 100644
--- a/repos/extra/firefox/.checksum
+++ b/repos/extra/firefox/.checksum
@@ -1,3 +1,3 @@
-a8b8d9c90071b289986c070dc836f9e0404ec7757954c5461dc30d5a6adb6201  firefox-138.0.3.source.tar.xz
+f6aaa01f576b07f9c9bc112517161e5fb917b4b6dafeb27ae547ab4337fa88ae  firefox-138.0.4.source.tar.xz
 3e4e722acd2ab2e38a16ec23b29296318d77cc54f034d4b21d91bde085e26bc0  fix-target-detection.patch
 30889a96df16927cca69826f3ca94b9f751819c2fcae07001a7108847ff25cb6  visibility.patch
diff --git a/repos/extra/firefox/abuild b/repos/extra/firefox/abuild
index 874fc6e2..6c2bf0a2 100644
--- a/repos/extra/firefox/abuild
+++ b/repos/extra/firefox/abuild
@@ -1,5 +1,5 @@
 name=firefox
-version=138.0.3
+version=138.0.4
 release=1
 source="https://ftp.mozilla.org/pub/${name}/releases/${version}/source/${name}-${version}.source.tar.xz
 	visibility.patch
diff --git a/repos/extra/fzy/.checksum b/repos/extra/fzy/.checksum
new file mode 100644
index 00000000..6bd75e68
--- /dev/null
+++ b/repos/extra/fzy/.checksum
@@ -0,0 +1 @@
+01505f6d38106dfde1f2263c6c19afb2c32f3749223edf3fc39f67c5873ea807  fzy-1.0.tar.gz
diff --git a/repos/extra/fzy/.files b/repos/extra/fzy/.files
new file mode 100644
index 00000000..8a12637d
--- /dev/null
+++ b/repos/extra/fzy/.files
@@ -0,0 +1,7 @@
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/bin/
+-rwxr-xr-x root/root    usr/bin/fzy
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/man/
+drwxr-xr-x root/root    usr/share/man/man1/
+-rw-r--r-- root/root    usr/share/man/man1/fzy.1.gz
diff --git a/repos/extra/fzy/abuild b/repos/extra/fzy/abuild
new file mode 100644
index 00000000..e46031ea
--- /dev/null
+++ b/repos/extra/fzy/abuild
@@ -0,0 +1,4 @@
+name=fzy
+version=1.0
+release=1
+source="https://github.com/jhawthorn/${name}/archive/${version}/${name}-${version}.tar.gz"
diff --git a/repos/extra/glib-gi/.checksum b/repos/extra/glib-gi/.checksum
new file mode 100644
index 00000000..6d31f8f3
--- /dev/null
+++ b/repos/extra/glib-gi/.checksum
@@ -0,0 +1,2 @@
+e888056a509e73c6c02c044ab8252b0eb135a6b0b20b6026b30d8b8454e2183a  0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
+0e5a33860f0d9fae14495b7809903e5d053879ed714e360360ae4c7ba37ce408  glib-2.84.2.tar.xz
diff --git a/repos/extra/glib-gi/.files b/repos/extra/glib-gi/.files
new file mode 100644
index 00000000..e6e4e630
--- /dev/null
+++ b/repos/extra/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/extra/glib-gi/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch b/repos/extra/glib-gi/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
new file mode 100755
index 00000000..0a0b7f04
--- /dev/null
+++ b/repos/extra/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/extra/glib-gi/abuild b/repos/extra/glib-gi/abuild
new file mode 100755
index 00000000..22ebe582
--- /dev/null
+++ b/repos/extra/glib-gi/abuild
@@ -0,0 +1,24 @@
+name=glib-gi
+version=2.84.2
+release=1
+source="https://download.gnome.org/sources/glib/${version%.*}/glib-$version.tar.xz
+	0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch"
+build_opt="
+	-Dselinux=disabled
+	-Dtests=false
+	-Dintrospection=enabled
+"
+
+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/extra/glib-gi/depends b/repos/extra/glib-gi/depends
new file mode 100755
index 00000000..6b609f79
--- /dev/null
+++ b/repos/extra/glib-gi/depends
@@ -0,0 +1 @@
+gobject-introspection
diff --git a/repos/extra/glib-gi/outdated b/repos/extra/glib-gi/outdated
new file mode 100644
index 00000000..8713324b
--- /dev/null
+++ b/repos/extra/glib-gi/outdated
@@ -0,0 +1 @@
+name=glib
diff --git a/repos/extra/glib/.files b/repos/extra/glib/.files
index 7bd76bca..2e2bdea1 100644
--- a/repos/extra/glib/.files
+++ b/repos/extra/glib/.files
@@ -336,14 +336,6 @@ drwxr-xr-x root/root    usr/include/glib-2.0/gobject/
 drwxr-xr-x root/root    usr/lib/
 drwxr-xr-x root/root    usr/lib/gio/
 drwxr-xr-x root/root    usr/lib/gio/modules/
-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/lib/glib-2.0/
 drwxr-xr-x root/root    usr/lib/glib-2.0/include/
 -rw-r--r-- root/root    usr/lib/glib-2.0/include/glibconfig.h
@@ -392,14 +384,6 @@ drwxr-xr-x root/root    usr/share/gettext/
 drwxr-xr-x root/root    usr/share/gettext/its/
 -rw-r--r-- root/root    usr/share/gettext/its/gschema.its
 -rw-r--r-- root/root    usr/share/gettext/its/gschema.loc
-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
 drwxr-xr-x root/root    usr/share/glib-2.0/
 drwxr-xr-x root/root    usr/share/glib-2.0/codegen/
 -rw-r--r-- root/root    usr/share/glib-2.0/codegen/__init__.py
diff --git a/repos/extra/glib/abuild b/repos/extra/glib/abuild
index 279ea5ab..deeef51c 100644
--- a/repos/extra/glib/abuild
+++ b/repos/extra/glib/abuild
@@ -1,15 +1,14 @@
 name=glib
 version=2.84.2
-release=1
+release=2
 source="https://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz
 	0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch"
-[ -f $SPM_PKGDB/gobject-introspection ] || _opt="-Dintrospection=disabled"
 build_opt="
-	-Dman=false
-	-Dgtk_doc=false
+	-Dman-pages=disabled
+	-Ddocumentation=false
 	-Dselinux=disabled
 	-Dtests=false
-	$_opt
+	-Dintrospection=disabled
 "
 
 postbuild() {
diff --git a/repos/extra/librewolf/.checksum b/repos/extra/librewolf/.checksum
index a4fe19b6..c489d629 100644
--- a/repos/extra/librewolf/.checksum
+++ b/repos/extra/librewolf/.checksum
@@ -1,3 +1,3 @@
 504da8aa33992b09a74d8ec262ec6c99752e64fb1d03441f86a49a21a874f95e  fix-rust-target.patch
-6bc9d0efb4ba21b14de1dcf30fbacc67eabdad99adae1397b65cf1a770e8ae13  librewolf-138.0.1-2.source.tar.gz
+6286ed068f8dc876b79bcb7e6f292397a9441ba4c774c0e3195c5d3c7c8202fb  librewolf-138.0.4-1.source.tar.gz
 30889a96df16927cca69826f3ca94b9f751819c2fcae07001a7108847ff25cb6  visibility.patch
diff --git a/repos/extra/librewolf/abuild b/repos/extra/librewolf/abuild
index e8b6fd43..14c3a3e4 100644
--- a/repos/extra/librewolf/abuild
+++ b/repos/extra/librewolf/abuild
@@ -1,5 +1,5 @@
 name=librewolf
-version=138.0.1.2
+version=138.0.4.1
 _ver=${version%.*}
 _sion=${version##*.}
 _version=${_ver}-${_sion}