From bd6971f0223568c06d9bbb9320405712d0186046 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Thu, 12 Sep 2024 17:12:04 -0700
Subject: [PATCH] (not for master) remove temp/* pkgs that conflict with
systemd repo
Until bpo moves to pmb v3.
See: https://gitlab.com/postmarketOS/build.postmarketos.org/-/issues/143
---
temp/gnome-settings-daemon-mobile/APKBUILD | 89 -------------
temp/gnome-shell-mobile/APKBUILD | 145 ---------------------
temp/gnome-shell-mobile/gsh.patch | 26 ----
temp/mutter-mobile/APKBUILD | 120 -----------------
temp/mutter-mobile/pcversion.patch | 14 --
5 files changed, 394 deletions(-)
delete mode 100644 temp/gnome-settings-daemon-mobile/APKBUILD
delete mode 100644 temp/gnome-shell-mobile/APKBUILD
delete mode 100644 temp/gnome-shell-mobile/gsh.patch
delete mode 100644 temp/mutter-mobile/APKBUILD
delete mode 100644 temp/mutter-mobile/pcversion.patch
diff --git a/temp/gnome-settings-daemon-mobile/APKBUILD b/temp/gnome-settings-daemon-mobile/APKBUILD
deleted file mode 100644
index fff0a72670b..00000000000
--- a/temp/gnome-settings-daemon-mobile/APKBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-pkgname=gnome-settings-daemon-mobile
-pkgver=46.0
-pkgrel=0
-pkgdesc="GNOME settings daemon"
-url="https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile"
-arch="all"
-options="!check" # tests fail on builders
-license="GPL-2.0-only AND LGPL-2.1-only"
-depends="pulseaudio"
-depends_dev="
- alsa-lib-dev
- colord-dev
- cups-dev
- elogind-dev
- geoclue-dev
- geocode-glib-dev>=3.26.4-r1
- lcms2-dev
- libcanberra-dev
- libgweather4-dev
- libnotify-dev
- libwacom-dev
- modemmanager-dev
- networkmanager-dev
- nss-dev
- pango-dev
- polkit-dev
- pulseaudio-dev
- upower-dev
- "
-makedepends="
- $depends_dev
- coreutils
- gcr4-dev
- glib-dev
- gnome-desktop-dev
- gsettings-desktop-schemas-dev
- gtk+3.0-dev
- libxml2-utils
- meson
- "
-checkdepends="
- gnome-session
- gnome-shell
- py3-dbusmock
- py3-gobject3
- umockdev-dev
- "
-subpackages="$pkgname-dev $pkgname-lang"
-_commit=46-mobile-0
-_gvc_commit="8e7a5a4c3e51007ce6579292642517e3d3eb9c50"
-source="gnome-settings-daemon-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile/-/archive/$_commit/gnome-settings-daemon-mobile-$_commit.tar.gz
- libgnome-volume-control-$_gvc_commit.tar.gz::https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/gnome-shell-$_gvc_commit.tar.gz"
-builddir="$srcdir/gnome-settings-daemon-mobile-$_commit"
-
-build() {
- cd "$builddir"
- rm -rf "$builddir/subprojects/gvc"
- mv "$srcdir/libgnome-volume-control-$_gvc_commit" $builddir/subprojects/gvc
- abuild-meson \
- -Db_lto=true \
- -Delogind=true \
- -Dsystemd=false \
- . output
- meson compile -C output
-}
-
-check() {
- meson test --no-rebuild --print-errorlogs -C output
-}
-
-package() {
- provides="gnome-settings-daemon=$pkgver-r$pkgrel"
- DESTDIR="$pkgdir" meson install --no-rebuild -C output
-}
-
-dev() {
- provides="gnome-settings-daemon-dev=$pkgver-r$pkgrel"
- default_dev
-}
-
-lang() {
- provides="gnome-settings-daemon-lang=$pkgver-r$pkgrel"
- default_lang
-}
-
-sha512sums="
-1d8f0cc22416a76787495fbef70d57496c7970783c3b4356284c7c68e1fe3599b75df7efb8bd6747ef19ee9a2d68dd0bb8fe7b1f53b5baa2cedef6705962f59a gnome-settings-daemon-mobile-46-mobile-0.tar.gz
-ebc6985afbda5ddebcda44d8b6732a9abc2d7249aff3adf7a76a90aa681590f830dcf2e5f3534a624adc32d1f0445e261ee149d65c221f733e0c33e0690a004d libgnome-volume-control-8e7a5a4c3e51007ce6579292642517e3d3eb9c50.tar.gz
-"
diff --git a/temp/gnome-shell-mobile/APKBUILD b/temp/gnome-shell-mobile/APKBUILD
deleted file mode 100644
index a3e46320060..00000000000
--- a/temp/gnome-shell-mobile/APKBUILD
+++ /dev/null
@@ -1,145 +0,0 @@
-# Forked from Alpine to add phone adaptivity patches
-
-pkgname=gnome-shell-mobile
-pkgver=46.1
-pkgrel=0
-pkgdesc="GNOME shell"
-url="https://wiki.gnome.org/Projects/GnomeShell"
-# gjs / riscv64: mutter-mobile
-arch="all !armhf !s390x !riscv64"
-license="GPL-2.0-or-later"
-depends="
- accountsservice
- adwaita-icon-theme
- desktop-file-utils
- elogind
- font-adobe-source-code-pro
- font-cantarell
- gnome-bluetooth
- gnome-control-center
- gnome-shell-mobile-schemas
- gsettings-desktop-schemas
- gst-plugin-pipewire
- gst-plugins-good
- gstreamer
- ibus
- librsvg
- mutter-mobile>=46
- networkmanager-common
- tecla
- unzip
- upower
- "
-makedepends="
- asciidoc
- elogind-dev
- evolution-data-server-dev evolution-dev
- gcr4-dev
- gjs-dev>=1.64.0
- gnome-autoar-dev
- gnome-bluetooth-dev
- gnome-control-center-dev
- gnome-desktop-dev>=3.35.91
- gobject-introspection-dev
- gstreamer-dev
- ibus-dev
- libcanberra-dev
- libnma-dev
- libxml2-dev
- libxml2-utils
- meson
- mutter-mobile-dev>=46
- networkmanager-dev
- pipewire-dev
- polkit-dev
- pulseaudio-dev
- py3-setuptools
- python3
- sassc
- startup-notification-dev
- tecla-dev
- "
-checkdepends="
- xvfb-run
- mesa-dri-gallium
- "
- # gdm is also needed but introduces circular dep
-provides="gnome-shell=$pkgver-r$pkgrel"
-subpackages="
- $pkgname-dbg
- $pkgname-doc
- $pkgname-lang
- $pkgname-schemas::noarch
- gnome-mobile-extensions-app:extensions_app:noarch
- "
-_commit="46-mobile.1"
-_gvc_commit="91f3f41490666a526ed78af744507d7ee1134323"
-source="gnome-shell-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-shell-mobile/-/archive/$_commit/gnome-shell-mobile-$_commit.tar.gz
- libgnome-volume-control-$_gvc_commit.tar.gz::https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/libgnome-volume-control-$_gvc_commit.tar.gz
- gsh.patch"
-builddir="$srcdir/gnome-shell-mobile-$_commit"
-options="!check" # Tests have circular dependency 'gnome-shell <-> gdm'
-# To make sure pmb_recommends installs the correct one
-_pmb_recommends="gnome-mobile-extensions-app"
-
-prepare() {
- default_prepare
- rm -rf "$builddir/subprojects/gvc"
- mv "$srcdir/libgnome-volume-control-$_gvc_commit" $builddir/subprojects/gvc
-
- sed -i "s/mutter_api_version = '.*'/mutter_api_version = '99'/g" meson.build
- # versions in the format "46-mobile.1" are considered invalid by pkg-config
- sed -i 's/\([0-9]\+\)-mobile\.\([0-9]\+\)/\1.\2/' meson.build
-}
-
-build() {
- abuild-meson \
- -Dsystemd=false \
- -Dtests=false \
- . output
- meson compile ${JOBS:+-j ${JOBS}} -C output
-}
-
-check() {
- xvfb-run meson test --no-rebuild -v -C output
-}
-
-extensions_app() {
- provides="gnome-extensions-app=$pkgver-r$pkgrel"
- pkgdesc="Manage GNOME Shell extensions"
- depends="gnome-shell-mobile libadwaita"
- replaces="gnome-shell-mobile"
-
- amove usr/bin/gnome-extensions-app
- amove usr/share/applications/org.gnome.Shell.Extensions.desktop
- amove usr/share/gnome-shell/org.gnome.Extensions
- amove usr/share/gnome-shell/org.gnome.Extensions.data.gresource
- amove usr/share/gnome-shell/org.gnome.Extensions.src.gresource
-}
-
-schemas() {
- pkgdesc="GNOME Shell gsetting schemas"
- depends=""
- provides="gnome-shell-schemas=$pkgver-r$pkgrel"
-
- amove usr/share/glib-2.0/schemas
- amove usr/share/gnome-control-center/keybindings
-}
-
-lang() {
- default_lang
- provides="gnome-shell-lang=$pkgver-r$pkgrel"
-}
-
-package() {
- DESTDIR="$pkgdir" meson install --no-rebuild -C output
-
- # owned by postmarketos-hidden-desktop-entries
- rm $pkgdir/usr/share/applications/org.gnome.Extensions.desktop
-}
-
-sha512sums="
-aeca65c373979eacf73aff169b69f3cefa8f457a04e641481f79a3a6e398a51d3ccfc6c7a94ae4a81486dd08fb7b600b2a949efc9272ab17ae9719fc7fe35740 gnome-shell-mobile-46-mobile.1.tar.gz
-c832e99bc56ae586734d468e4e1a17f107acc76076d07ba45c46359ba751d1e6abe6108e43730fdf1dd18153cfa9f374e3e81118ae4902f0974d5b5f54f8276b libgnome-volume-control-91f3f41490666a526ed78af744507d7ee1134323.tar.gz
-ae4ac679bacd35948b44068e5a70407f473bd96986ee126abb1bdf066db5cbc2087a3ffae0b390286689cacbe8325870fd43663ba39f4f7543216e02bf083934 gsh.patch
-"
diff --git a/temp/gnome-shell-mobile/gsh.patch b/temp/gnome-shell-mobile/gsh.patch
deleted file mode 100644
index 4b631055c19..00000000000
--- a/temp/gnome-shell-mobile/gsh.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Patch-Source: https://github.com/chimera-linux/cports/blob/793dbd2807070fd0fd4f7ba37fd73d4c5ff47584/main/gnome-shell/patches/no-exe-introspection.patch
-commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Mar 19 19:11:00 2023 +0100
-
- Disable 9bc89b821cf09195418f20225bbec39c0567d263
-
- Even if we manually define _DYNAMIC, it does not work (segfaults
- somewhere in musl, coming from g_strsplit) and is pretty useless
- for our case anyway.
-
-diff --git a/src/main.c b/src/main.c
-index 8cccc0a..ef6408f 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -19,6 +19,10 @@
- #include <atk-bridge.h>
- #include <link.h>
-
-+#ifdef HAVE_EXE_INTROSPECTION
-+#undef HAVE_EXE_INTROSPECTION
-+#endif
-+
- #ifdef HAVE_EXE_INTROSPECTION
- #include <elf.h>
- #endif
diff --git a/temp/mutter-mobile/APKBUILD b/temp/mutter-mobile/APKBUILD
deleted file mode 100644
index df1f925f2c3..00000000000
--- a/temp/mutter-mobile/APKBUILD
+++ /dev/null
@@ -1,120 +0,0 @@
-# Forked from Alpine to apply mobile adaptivity patches
-
-pkgname=mutter-mobile
-pkgver=46.1
-pkgrel=0
-pkgdesc="clutter-based window manager and compositor"
-url="https://wiki.gnome.org/Projects/Mutter/"
-# ricsv64: doesn't build currently:
-# https://builds.sr.ht/~postmarketos/job/869829#task-pmbootstrap_build-1224
-arch="all !riscv64"
-license="GPL-2.0-or-later"
-depends="
- gnome-settings-daemon-mobile
- gsettings-desktop-schemas
- mutter-mobile-schemas
- xkeyboard-config
- xwayland
- "
-makedepends="
- at-spi2-core-dev
- cairo-dev
- dbus-dev
- elogind-dev
- eudev-dev
- fribidi-dev
- gdk-pixbuf-dev
- glib-dev
- gnome-desktop-dev
- gnome-settings-daemon-mobile-dev
- gobject-introspection-dev
- graphene-dev
- gtk+3.0-dev
- json-glib-dev
- lcms2-dev
- libcanberra-dev
- libdrm-dev
- libgudev-dev
- libice-dev
- libinput-dev
- libsm-dev
- libwacom-dev
- libx11-dev
- libxau-dev
- libxcb-dev
- libxcomposite-dev
- libxcursor-dev
- libxdamage-dev
- libxext-dev
- libxfixes-dev
- libxi-dev
- libxinerama-dev
- libxkbcommon-dev
- libxkbfile-dev
- libxrandr-dev
- libxrender-dev
- libxtst-dev
- libei-dev
- mesa-dev
- meson
- pango-dev
- pipewire-dev
- startup-notification-dev
- wayland-dev
- wayland-protocols
- xorg-server
- "
-options="!check" # Can't be run with release builds
-provides="mutter=$pkgver-r$pkgrel"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-schemas::noarch"
-_commit="46-mobile.1"
-source="mutter-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/mutter-mobile/-/archive/$_commit/mutter-mobile-$_commit.tar.gz
- pcversion.patch
- "
-builddir="$srcdir/mutter-mobile-$_commit"
-
-prepare() {
- default_prepare
-
- sed -i "s/libmutter_api_version = '.*'/libmutter_api_version = '99'/g" meson.build
- # versions in the format "46-mobile.1" are considered invalid by pkg-config
- sed -i 's/\([0-9]\+\)-mobile\.\([0-9]\+\)/\1.\2/' meson.build
-}
-
-build() {
- abuild-meson \
- -Dudev=true \
- -Dnative_backend=true \
- -Dintrospection=true \
- -Dxwayland_path=/usr/bin/Xwayland \
- -Dremote_desktop=true \
- -Dprofiler=false \
- -Dtests=false \
- -Dinstalled_tests=false \
- . output
- meson compile ${JOBS:+-j ${JOBS}} -C output
-}
-
-schemas() {
- pkgdesc="Mutter schemas related files"
- provides="mutter-schemas=$pkgver-r$pkgrel"
- depends=""
-
- amove usr/share/glib-2.0/schemas
- amove usr/share/GConf/gsettings
- amove usr/share/gnome-control-center/keybindings
-}
-
-lang() {
- default_lang
- provides="mutter-lang=$pkgver-r$pkgrel"
-}
-
-package() {
- DESTDIR="$pkgdir" meson install --no-rebuild -C output
-}
-
-sha512sums="
-210266238a9cf56b77e195559a2f99574de4a52b973bad7143a88f112730dd61ebf807e6644519998f39fe5ddbcb1bfd589d0d5167c92718953d5ad22eba2ae7 mutter-mobile-46-mobile.1.tar.gz
-670927a5528f9fec4801b7dab8a377b7280c239acb1f7a9077647deef71119738deb958a94d4ce0a99d39b29eeab3b2505698f7d19b880bbcec9f5260202d3a6 pcversion.patch
-"
diff --git a/temp/mutter-mobile/pcversion.patch b/temp/mutter-mobile/pcversion.patch
deleted file mode 100644
index f948f80e966..00000000000
--- a/temp/mutter-mobile/pcversion.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-apk-tools 2.12.10 fails with this in a .pc depends file
-diff --git a/meson.build b/meson.build
-index 3550496..15b9e7d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -26,7 +26,7 @@
- cairo_req = '>= 1.10.0'
- pangocairo_req = '>= 1.20'
- pixman_req = '>= 0.42'
--gsettings_desktop_schemas_req = '>= 40.alpha'
-+gsettings_desktop_schemas_req = '>= 40'
- x11_req = '>= 1.7.0'
- xcomposite_req = '>= 0.4'
- xkbcommon_req = '>= 0.4.3'
--
GitLab