From ebf88b93667fb785b0ebfb62081af5458aa2c953 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 25 Mar 2026 22:23:11 -0700 Subject: [PATCH] backport: fix (proton-vpn): .desktop file (#10836) (#10837) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * backport: fix (proton-vpn): .desktop file * bump(proton-vpn-gtk-app): release 2 → 3 --------- (cherry picked from commit 6d9da6f2db4755305b811a80b9d0e94cc3c7da8f) Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Co-authored-by: hamachitan[bot] <252235638+hamachitan[bot]@users.noreply.github.com> --- anda/apps/proton-vpn/proton-vpn.spec | 23 +++++++++++++++++------ anda/apps/proton-vpn/update.rhai | 2 ++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/anda/apps/proton-vpn/proton-vpn.spec b/anda/apps/proton-vpn/proton-vpn.spec index 276c836e63..fe0bf32be5 100644 --- a/anda/apps/proton-vpn/proton-vpn.spec +++ b/anda/apps/proton-vpn/proton-vpn.spec @@ -1,11 +1,14 @@ +%global metainfo_commit eddfed5f7e2cd6f097cd11ad1bc8773c22a418a1 + Name: proton-vpn-gtk-app -Version: 4.15.0 -Release: 1%{?dist} +Version: 4.15.1 +Release: 3%{?dist} Summary: Official ProtonVPN Linux app License: GPL-3.0-only URL: https://protonvpn.com/download-linux Source0: https://github.com/ProtonVPN/proton-vpn-gtk-app/archive/refs/tags/v%version.tar.gz -Source1: https://github.com/flathub/com.protonvpn.www/blob/master/com.protonvpn.www.metainfo.xml +# So cursed but makes our lives easier +Source1: https://github.com/flathub/com.protonvpn.www/archive/%{metainfo_commit}/com.protonvpn.www-%{metainfo_commit}.tar.gz BuildArch: noarch BuildRequires: python3-devel @@ -42,6 +45,7 @@ with the user signup process handled on the website. %prep %autosetup -n %{name}-%{version} +tar -xvf %{SOURCE1} %build %pyproject_wheel @@ -50,18 +54,25 @@ with the user signup process handled on the website. %pyproject_install %pyproject_save_files proton install -Dm644 rpmbuild/SOURCES/proton-vpn-logo.svg %{buildroot}%{_scalableiconsdir}/proton-vpn-logo.svg -install -Dm644 %{SOURCE1} %{buildroot}%{_metainfodir}/com.protonvpn.www.metainfo.xml -# Match metainfo -install -Dm644 rpmbuild/SOURCES/proton.vpn.app.gtk.desktop %{buildroot}%{_appsdir}/com.protonvpn.www.desktop +install -Dm644 com.protonvpn.www-%{metainfo_commit}/com.protonvpn.www.metainfo.xml %{buildroot}%{_metainfodir}/com.protonvpn.www.metainfo.xml +install -Dm644 rpmbuild/SOURCES/proton.vpn.app.gtk.desktop %{buildroot}%{_appsdir}/proton.vpn.app.gtk.desktop + +# We pull in a metainfo file that often changes upstream, that calls the .desktop file what we are symlinking it to. +# If we install the .desktop file with the new name, the icon does not show properly on KDE Plasma. +%{__ln_s} -f %{_appsdir}/proton.vpn.app.gtk.desktop %{buildroot}%{_appsdir}/com.protonvpn.www.desktop %files -f %{pyproject_files} %doc README.md CONTRIBUTING.md CODEOWNERS %license LICENSE COPYING.md %{_bindir}/protonvpn-app +%{_appsdir}/proton.vpn.app.gtk.desktop %{_appsdir}/com.protonvpn.www.desktop %{_scalableiconsdir}/proton-vpn-logo.svg %{_metainfodir}/com.protonvpn.www.metainfo.xml %changelog +* Wed Mar 25 2026 Owen Zimmerman +- Fix metainfo and .desktop file + * Sat Jan 17 2026 Owen Zimmerman - Initial commit diff --git a/anda/apps/proton-vpn/update.rhai b/anda/apps/proton-vpn/update.rhai index d6fe8c6a5d..84f830d233 100644 --- a/anda/apps/proton-vpn/update.rhai +++ b/anda/apps/proton-vpn/update.rhai @@ -1 +1,3 @@ rpm.version(gh_tag("ProtonVPN/proton-vpn-gtk-app")); + +rpm.global("metainfo_commit", gh_commit("flathub/com.protonvpn.www"));