public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/phosh] f43: Revert the partial Phosh 0.57 backport on Fedora 43
@ 2026-09-23  0:02 Sam Day
  0 siblings, 0 replies; only message in thread
From: Sam Day @ 2026-09-23  0:02 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/phosh
            Branch : f43
            Commit : f71a96719268d6f09308d92414fcc6a384d718d2
            Author : Sam Day <me@samcday.com>
            Date   : 2026-09-23T10:01:48+10:00
            Stats  : +10/-51 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/phosh/c/f71a96719268d6f09308d92414fcc6a384d718d2?branch=f43

            Log:
            Revert the partial Phosh 0.57 backport on Fedora 43

Restore the 0.54 packaging. The Phosh ecosystem must be updated together; the partial Fedora 43 update has been withdrawn.

---
diff --git a/.gitignore b/.gitignore
index 1ba5007..e53d987 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,11 +105,3 @@
 /phosh-v0.53.1.tar.gz
 /phosh-v0.54_rc1.tar.gz
 /phosh-v0.54.0.tar.gz
-/phosh-v0.55.0.tar.gz
-/phosh-v0.56_rc1.tar.gz
-/phosh-v0.56.0.tar.gz
-/phosh-v0.57_rc1.tar.gz
-x86_64/
-results_phosh/
-*.src.rpm
-/phosh-v0.57.0.tar.gz

diff --git a/0001-app-grid-disable-hide-with-older-mobile-settings.patch b/0001-app-grid-disable-hide-with-older-mobile-settings.patch
deleted file mode 100644
index aa3fc27..0000000
--- a/0001-app-grid-disable-hide-with-older-mobile-settings.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Sam Day <me@samcday.com>
-Subject: [PATCH] app-grid: Disable hiding with older Mobile Settings
-
-Fedora 43 ships Mobile Settings 0.54, which lacks the hidden-app
-management UI introduced in 0.56. Keep both hiding actions disabled so
-applications cannot be hidden without an available recovery interface.
-
---- a/src/app-grid-button.c
-+++ b/src/app-grid-button.c
-@@ -648,13 +648,9 @@
-   if (have_gnome_software) {
-     act = g_action_map_lookup_action (priv->action_map, "uninstall");
-     g_object_bind_property (metainfo_cache, "ready", act, "enabled", G_BINDING_SYNC_CREATE);
--  } else {
--    act = g_action_map_lookup_action (priv->action_map, "hide");
--    g_simple_action_set_enabled (G_SIMPLE_ACTION (act), TRUE);
--
--    act = g_action_map_lookup_action (priv->action_map, "manage-hidden-apps");
--    g_simple_action_set_enabled (G_SIMPLE_ACTION (act), TRUE);
-   }
-+  /* Keep hide actions disabled: managing hidden apps needs Mobile Settings >= 0.56,
-+   * while Fedora 43 ships 0.54. The older UI cannot restore hidden applications. */
- 
-   g_type_ensure (PHOSH_TYPE_CLAMP);
-   g_type_ensure (PHOSH_TYPE_FADING_LABEL);

diff --git a/phosh.spec b/phosh.spec
index 23441d4..7ae5d73 100644
--- a/phosh.spec
+++ b/phosh.spec
@@ -2,9 +2,8 @@
 %global libcall_ui_version v0.1.5
 
 Name:     phosh
-Version:  0.57.0
-# Keep Fedora 43-only fixes below the Fedora 44 release when upgrading.
-Release:  1%{?dist}.1
+Version:  0.54.0
+Release:  %autorelease
 Summary:  Graphical shell for mobile devices
 License:  GPL-3.0-or-later
 URL:      https://gitlab.gnome.org/World/Phosh/phosh
@@ -16,19 +15,11 @@ Source1:  https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/%{gvc
 Source2:  https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/%{libcall_ui_version}/libcall-ui-%{libcall_ui_version}.tar.gz
 Source3:  phosh
 
-# Fedora 43 Mobile Settings lacks the hidden-app management UI added in 0.56.
-Patch:    0001-app-grid-disable-hide-with-older-mobile-settings.patch
-
 ExcludeArch:  %{ix86}
-# https://bugzilla.redhat.com/show_bug.cgi?id=2426735
-ExcludeArch:  ppc64le
-# We don't anticipate anybody running phosh on their legacy mainframe servers.
-ExcludeArch:  s390x
 
 BuildRequires:  gcc
 BuildRequires:  meson
 BuildRequires:  pam-devel
-BuildRequires:  pkgconfig(appstream) >= 1.0.0
 BuildRequires:  pkgconfig(libecal-2.0) >= 3.33.1
 BuildRequires:  pkgconfig(libedataserver-1.2) >= 3.33.1
 BuildRequires:  pkgconfig(fribidi)
@@ -121,7 +112,6 @@ Development headers for libphosh.
 
 %prep
 %setup -a1 -a2 -q -n %{name}-v%{version_no_tilde _}
-%autopatch -p1
 
 mv libgnome-volume-control-%{gvc_commit} subprojects/gvc
 mv libcall-ui-%{libcall_ui_version} subprojects/libcall-ui
@@ -140,10 +130,16 @@ cp %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/
 %{__install} -Dpm 0644 data/phosh.service %{buildroot}%{_unitdir}/phosh.service
 rm %{buildroot}%{_libdir}/libphosh-0.45.a
 
+# FIXME: test_phosh_util_data_uri_to_pixbuf seems to fail on ppc64le so
+# disable until reason is figured out
+%ifnarch ppc64le
 %check
 desktop-file-validate \
 %{buildroot}%{_datadir}/applications/mobi.phosh.Shell.desktop
-%{shrink:LC_ALL=C.UTF-8 xvfb-run %meson_test}
+LC_ALL=C.UTF-8 xvfb-run sh <<'SH'
+%meson_test
+SH
+%endif
 
 %files -f %{name}.lang
 %{_bindir}/phosh-session
@@ -177,7 +173,6 @@ desktop-file-validate \
 %{_libdir}/phosh/plugins/dark-mode-quick-setting.plugin
 %{_libdir}/phosh/plugins/emergency-info.plugin
 %{_libdir}/phosh/plugins/launcher-box.plugin
-%{_libdir}/phosh/plugins/load-meter-status-icon.plugin
 %{_libdir}/phosh/plugins/location-quick-setting.plugin
 %{_libdir}/phosh/plugins/mobile-data-quick-setting.plugin
 %{_libdir}/phosh/plugins/night-light-quick-setting.plugin
@@ -189,13 +184,11 @@ desktop-file-validate \
 %{_libdir}/phosh/plugins/scaling-quick-setting.plugin
 %{_libdir}/phosh/plugins/media-players.plugin
 %{_libdir}/phosh/plugins/simple-custom-status-icon.plugin
-%{_libdir}/phosh/plugins/syncthing-quick-setting.plugin
 %{_libdir}/phosh/plugins/libphosh-plugin-caffeine-quick-setting.so
 %{_libdir}/phosh/plugins/libphosh-plugin-calendar.so
 %{_libdir}/phosh/plugins/libphosh-plugin-dark-mode-quick-setting.so
 %{_libdir}/phosh/plugins/libphosh-plugin-emergency-info.so
 %{_libdir}/phosh/plugins/libphosh-plugin-launcher-box.so
-%{_libdir}/phosh/plugins/libphosh-plugin-load-meter-status-icon.so
 %{_libdir}/phosh/plugins/libphosh-plugin-location-quick-setting.so
 %{_libdir}/phosh/plugins/libphosh-plugin-mobile-data-quick-setting.so
 %{_libdir}/phosh/plugins/libphosh-plugin-night-light-quick-setting.so
@@ -207,7 +200,6 @@ desktop-file-validate \
 %{_libdir}/phosh/plugins/libphosh-plugin-scaling-quick-setting.so
 %{_libdir}/phosh/plugins/libphosh-plugin-media-players.so
 %{_libdir}/phosh/plugins/libphosh-plugin-simple-custom-status-icon.so
-%{_libdir}/phosh/plugins/libphosh-plugin-syncthing-quick-setting.so
 %{_libdir}/phosh/plugins/prefs/libphosh-plugin-prefs-emergency-info.so
 %{_libdir}/phosh/plugins/prefs/libphosh-plugin-prefs-ticket-box.so
 %{_libdir}/phosh/plugins/prefs/libphosh-plugin-prefs-upcoming-events.so

diff --git a/sources b/sources
index 0f1d015..34495a3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (phosh-v0.57.0.tar.gz) = 29c177cbc6ba25880160aafec2abc00fe0d02fee63466dd429dc7e0b70f8f2cbdb84e048004c4811932b53a63c56c49d3b597e8f55a77a9751483b51d5774bfc
+SHA512 (phosh-v0.54.0.tar.gz) = 67200ccd58d119bc6b2a7bf60a19bb381a4a2d39a8ab8c0bb4fc9611e058532576bc94a0edbfbad4aa159ad435a7983242ec2e7ad440ba5baf8725a1f3cb0ee8
 SHA512 (libgnome-volume-control-d2442f455844e5292cb4a74ffc66ecc8d7595a9f.tar.gz) = 6214f4c17f85b76b04f9f60c8fc4fd993bca8d7c61df40e4aa96cb921831b666719d6666474a8f2eda9fcd483dbd4d53cfc55773981fa1e6b1c214bdb698d1e0
 SHA512 (libcall-ui-v0.1.5.tar.gz) = e6cbcfd93396cee438262716f29dfe898fa9c061af977d92ff67014388cec71883dbd46500bfc6817647a3a86859daec5594444e3898b825caeac51fe9dac1b1

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-23  0:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-23  0:02 [rpms/phosh] f43: Revert the partial Phosh 0.57 backport on Fedora 43 Sam Day

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox