community/phosh: include some bug fixes

https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1455

community/phosh/APKBUILD

@@ -5,7 +5,7 @@
 # Maintainer: team/phosh <newbyte@postmarketos.org>
 pkgname=phosh
 pkgver=0.39.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Wayland shell for GNOME on mobile devices"
 # armhf: blocked by gnome-shell-schemas
 # Blocked on s390x by gnome-session, gnome-settings-daemon, squeekboard and libhandy
@@ -62,6 +62,9 @@ subpackages="$pkgname-dbg $pkgname-lang $pkgname-dev $pkgname-doc $pkgname-porta
 source="https://download.gnome.org/sources/phosh/${pkgver%.*}/phosh-$pkgver.tar.xz
 	remove-gnome-session-fallback-support.patch
 	phosh.desktop
+	app-grid-folder-button-force-16px-as-icon-size.patch
+	background-avoid-update-when-the-layer-surface-isnt-configured-yet.patch
+	background-manager-dont-try-to-get-background-for-zero-size.patch
 	"
 
 build() {
@@ -97,4 +100,7 @@ sha512sums="
 ea7499a18b2abde731fcc9e739e137a1fb1edc2bff18c7b437df06ac55a285b81c1ecab8feb55892c35ecc4ef990acc80b25768a2160d3a459501429f5f30416  phosh-0.39.0.tar.xz
 8e3144b82516af14a61aa5d760e7abdd5fc03457aea51ef6daeb1780ae9903b2d01e3e9386d48d7d4a1fa2ee950cb58ee7618a8f0e817da2cf64c579b576bc2d  remove-gnome-session-fallback-support.patch
 8ca4893a751311de326e198314669f5a276092ade99c6353c4c9ce070713fb1a5b1615e7fecb93b428dc79fd4001a9af43d24eafaf2545d7db464963fda25330  phosh.desktop
+62f15085393d2c0e6b51e2686ebbbae781f90efc53b96664491b6106563a38e01d34b7e5343a8e0139cecb064e51adc9008591bcb9c9117c9d3a34f8d2b335cb  app-grid-folder-button-force-16px-as-icon-size.patch
+c062d90d8933d68a2d6a9dfce6da81433602f1c1e6f5718aa680320a47c66b335e6698c7dd4acbb0ba105c46cfdc0d0b1bf4c89389a140d65ae576ad531d9d32  background-avoid-update-when-the-layer-surface-isnt-configured-yet.patch
+1413af1b0856572da42d6286504bbd06c58172a5d67f0bc112142aa3c14b6dd42ec4a306248a3ffb4d442abcf7fa308b0cd9e3e0be3b3f0d6ed4fb01d51a24f6  background-manager-dont-try-to-get-background-for-zero-size.patch
 "

community/phosh/app-grid-folder-button-force-16px-as-icon-size.patch

+From ad108952d2d97b1b73c1f5372cb369a3121f11fe Mon Sep 17 00:00:00 2001
+From: Arun Mani J <j.arunmani@proton.me>
+Date: Sat, 8 Jun 2024 20:59:00 +0530
+Subject: [PATCH] app-grid-folder-button: Force 16px as icon size
+
+Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1072
+(cherry picked from commit 5796afc5d82d3c10dc8822245a1dcc5a0e495018)
+
+Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1455>
+---
+ src/app-grid-folder-button.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/app-grid-folder-button.c b/src/app-grid-folder-button.c
+index 05e4b2879..bed953a4b 100644
+--- a/src/app-grid-folder-button.c
++++ b/src/app-grid-folder-button.c
+@@ -116,6 +116,7 @@ build_2x2_grid_icon (PhoshAppGridFolderButton *self)
+       image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_BUTTON);
+     }
+ 
++    gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
+     gtk_widget_set_visible (image, TRUE);
+     gtk_grid_attach (self->grid, image, i % 2, i >= 2, 1, 1);
+   }
+-- 
+GitLab
+

community/phosh/background-avoid-update-when-the-layer-surface-isnt-configured-yet.patch

+From 917df7360801183a8d1b8d57870ccd2ef1f7f453 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Thu, 30 May 2024 20:03:37 +0200
+Subject: [PATCH] background: Avoid update when the layer surface isn't
+ configured yet
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise we might feed bogus values to GnomeBg.
+
+Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1069
+Signed-off-by: Guido Günther <agx@sigxcpu.org>
+Tested-by: Boud Roukema
+(cherry picked from commit 8c9a022a84cb83a8b8af88e01cbe9198d48707cf)
+
+Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1455>
+---
+ src/background.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/background.c b/src/background.c
+index 178ce225b..5333aa47a 100644
+--- a/src/background.c
++++ b/src/background.c
+@@ -455,5 +455,12 @@ phosh_background_needs_update (PhoshBackground *self)
+ {
+   g_return_if_fail (PHOSH_IS_BACKGROUND (self));
+ 
++  /* Skip update if layer surface isn't yet configured, it will
++   * trigger on layer_surface.configured anyway */
++  if (phosh_layer_surface_get_configured_width (PHOSH_LAYER_SURFACE (self)) <= 0 ||
++      phosh_layer_surface_get_configured_height (PHOSH_LAYER_SURFACE (self)) <= 0) {
++    return;
++  }
++
+   trigger_update (self);
+ }
+-- 
+GitLab
+

community/phosh/background-manager-dont-try-to-get-background-for-zero-size.patch

+From 228e9a487c46b17a2d35cfcce9310baa0155238c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Thu, 30 May 2024 19:44:59 +0200
+Subject: [PATCH] background-manager: Don't try to get background for zero size
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise we crash on gnome_bg_slide_show_get_slide on e.g. 0 width or
+height.
+
+Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1069
+Signed-off-by: Guido Günther <agx@sigxcpu.org>
+(cherry picked from commit 5df9eaca62d3586efe70d3007f69488679497805)
+
+Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1455>
+---
+ src/background-manager.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/background-manager.c b/src/background-manager.c
+index 47b99397c..7250d02ef 100644
+--- a/src/background-manager.c
++++ b/src/background-manager.c
+@@ -449,6 +449,11 @@ phosh_background_manager_get_data (PhoshBackgroundManager *self, PhoshBackground
+     width = phosh_layer_surface_get_configured_width (PHOSH_LAYER_SURFACE (background));
+     height = phosh_layer_surface_get_configured_height (PHOSH_LAYER_SURFACE (background));
+ 
++    if (width <= 0 || height <= 0) {
++      g_critical ("Layer surface not yet configured");
++      return g_steal_pointer (&bg_data);
++    }
++
+     g_assert (GNOME_BG_IS_SLIDE_SHOW (self->slideshow));
+ 
+     /* TODO: handle actual slideshows (fixed == false) */
+-- 
+GitLab
+