From 44d767c5880c38bd3682ee15020fa3c46de9ad75 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 13 Jun 2024 22:51:28 +0800 Subject: [PATCH] fix: elementary-photos (#1349) Remove patches Signed-off-by: madomado (cherry picked from commit d714015d91b1223d5b36d5f517adaa7d37065805) --- .../elementary-photos/elementary-photos.spec | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/anda/desktops/elementary/elementary-photos/elementary-photos.spec b/anda/desktops/elementary/elementary-photos/elementary-photos.spec index d6ced0bf94..f70987ce23 100644 --- a/anda/desktops/elementary/elementary-photos/elementary-photos.spec +++ b/anda/desktops/elementary/elementary-photos/elementary-photos.spec @@ -12,9 +12,6 @@ License: LGPL-2.0-or-later URL: https://github.com/elementary/photos Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -# RIP the publishing plugins (sorry for the "wide" patch, having issues with just the relevant commits) -Patch0: https://github.com/elementary/photos/compare/7261606a05d1f41116aba5c86b62d1f739419ed1..09e55943b266bc2861b913251cb834169d81743e.patch - BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libappstream-glib @@ -22,6 +19,7 @@ BuildRequires: meson >= 0.46.0 BuildRequires: vala BuildRequires: fdupes BuildRequires: git-core +BuildRequires: cmake BuildRequires: pkgconfig(gee-0.8) >= 0.8.5 BuildRequires: pkgconfig(geocode-glib-2.0) @@ -43,6 +41,8 @@ BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(libraw) >= 0.13.2 BuildRequires: pkgconfig(libwebp) >= 0.4.4 BuildRequires: pkgconfig(sqlite3) >= 3.5.9 +BuildRequires: pkgconfig(libportal) +BuildRequires: pkgconfig(libportal-gtk3) Requires: hicolor-icon-theme @@ -53,7 +53,6 @@ Foundation. %prep %autosetup -n %{srcname}-%{version} -N -git apply %PATCH0 # The .patch file has Git binary patches, so we need to apply it manually with Git %build @@ -75,10 +74,10 @@ desktop-file-validate \ %{buildroot}/%{_datadir}/applications/%{appname}.desktop desktop-file-validate \ - %{buildroot}/%{_datadir}/applications/%{appname}-viewer.desktop + %{buildroot}/%{_datadir}/applications/%{appname}.viewer.desktop appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %files -f %{appname}.lang @@ -92,11 +91,11 @@ appstream-util validate-relax --nonet \ %{_libexecdir}/%{appname}/ %{_datadir}/applications/%{appname}.desktop -%{_datadir}/applications/%{appname}-viewer.desktop +%{_datadir}/applications/%{appname}.viewer.desktop %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{appname}.svg -%{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/icons/hicolor/*/apps/%{appname}.viewer.svg +%{_datadir}/metainfo/%{appname}.metainfo.xml %changelog