From 930a21a2453376dbb92dbef91f3c27a17c9278c06eb2bf3b93da4250178ae2c5 Mon Sep 17 00:00:00 2001 From: Richard Rahl Date: Wed, 7 Aug 2024 06:40:07 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/X11:COSMIC:Factory/xdg-desktop-portal-cosmic?expand=0&rev=5 --- _service | 2 +- leap-fix-libexec.patch | 11 +++++++++++ vendor.tar.zst | 4 ++-- ...tal-cosmic-0.1.0+git20240717.813352e.tar.zst | 3 --- xdg-desktop-portal-cosmic-1.0.0.a1.tar.zst | 3 +++ xdg-desktop-portal-cosmic.changes | 17 +++++++++++++++++ xdg-desktop-portal-cosmic.spec | 10 +++++++--- 7 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 leap-fix-libexec.patch delete mode 100644 xdg-desktop-portal-cosmic-0.1.0+git20240717.813352e.tar.zst create mode 100644 xdg-desktop-portal-cosmic-1.0.0.a1.tar.zst diff --git a/_service b/_service index 7ba9ebc..ba5e806 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ https://github.com/pop-os/xdg-desktop-portal-cosmic.git git master - 0.1.0+git%cd.%h + 1.0.0.a1 yes diff --git a/leap-fix-libexec.patch b/leap-fix-libexec.patch new file mode 100644 index 0000000..ce21400 --- /dev/null +++ b/leap-fix-libexec.patch @@ -0,0 +1,11 @@ +--- Makefile.orig 2024-07-29 19:11:10.189698162 +0300 ++++ Makefile 2024-07-29 19:12:48.420183313 +0300 +@@ -1,7 +1,7 @@ + prefix ?= /usr/local + bindir = $(prefix)/bin + libdir = $(prefix)/lib +-libexecdir = $(prefix)/libexec ++libexecdir = $(prefix)/lib + includedir = $(prefix)/include + datarootdir = $(prefix)/share + datadir = $(datarootdir) diff --git a/vendor.tar.zst b/vendor.tar.zst index e34e522..1679e7d 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7694dbe3c9fc0795741c65da0cacb5e2549fa77e5c79de185eed2052418152e -size 93051170 +oid sha256:605fe19af864abd5f75a18e938af95fea28c0884d27d42e308829444f5eee116 +size 99876144 diff --git a/xdg-desktop-portal-cosmic-0.1.0+git20240717.813352e.tar.zst b/xdg-desktop-portal-cosmic-0.1.0+git20240717.813352e.tar.zst deleted file mode 100644 index c53b0fa..0000000 --- a/xdg-desktop-portal-cosmic-0.1.0+git20240717.813352e.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12abe745a0dabf23b78313cce6bc30ef41d34a9c354fcf685e69b8262c4cce3b -size 279031 diff --git a/xdg-desktop-portal-cosmic-1.0.0.a1.tar.zst b/xdg-desktop-portal-cosmic-1.0.0.a1.tar.zst new file mode 100644 index 0000000..047fe2f --- /dev/null +++ b/xdg-desktop-portal-cosmic-1.0.0.a1.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be5db1b6b781bdce77ad2b193b4a1216f77fd21e80726a8e677016a0086abfd4 +size 296229 diff --git a/xdg-desktop-portal-cosmic.changes b/xdg-desktop-portal-cosmic.changes index a0a567b..a338eac 100644 --- a/xdg-desktop-portal-cosmic.changes +++ b/xdg-desktop-portal-cosmic.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Aug 7 02:12:58 UTC 2024 - Richard Rahl + +- update to 1.0.0-alpha1: + * Fix compile warnings + * Add scrolling for list of toplevels + * Hover and selected styles for outputs in screencast dialog + * Use custom widget instead of global subscription for keybindings + * screencopy: Respect source_type option + * Allow multiple select for screencast only when requested + * Arrange screen capture outputs horiozontally + * Display name of application requiring screen capture + * Show preview of outputs in screencast dialog + * Show toplevel icons in screencast dialog + * Fix button text color +- enable leap (thanks to vyvir) + ------------------------------------------------------------------- Sat Jul 06 17:07:55 UTC 2024 - Joshua Smith diff --git a/xdg-desktop-portal-cosmic.spec b/xdg-desktop-portal-cosmic.spec index 2529e15..26496ba 100644 --- a/xdg-desktop-portal-cosmic.spec +++ b/xdg-desktop-portal-cosmic.spec @@ -17,13 +17,14 @@ Name: xdg-desktop-portal-cosmic -Version: 0.1.0+git20240717.813352e +Version: 1.0.0.a1 Release: 0 Summary: COSMIC xdg portal License: GPL-3.0-only URL: https://github.com/pop-os/xdg-desktop-portal-cosmic Source0: %{name}-%{version}.tar.zst Source1: vendor.tar.zst +Patch0: leap-fix-libexec.patch BuildRequires: cargo-packaging BuildRequires: clang-devel BuildRequires: git-core @@ -43,7 +44,10 @@ BuildRequires: pkgconfig(xkbcommon) This package contains the xdg portal implementation for COSMIC DE. %prep -%autosetup -a1 +%autosetup -N -a1 +%if 0%{?suse_version} < 1600 +%autopatch -p0 +%endif %build %make_build @@ -57,7 +61,7 @@ This package contains the xdg portal implementation for COSMIC DE. %files %license LICENSE %{_libexecdir}/%{name} -%{_iconsdir}/hicolor/scalable/actions/*.svg +%{_datadir}/icons/hicolor/scalable/actions/*.svg %{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.cosmic.service %{_datadir}/xdg-desktop-portal/cosmic-portals.conf %{_datadir}/xdg-desktop-portal/portals/cosmic.portal From 369b5e1c1198889db9c786b62f60a5ba2c4a2995cab9cfd406639c5eaa04d119 Mon Sep 17 00:00:00 2001 From: Richard Rahl Date: Wed, 7 Aug 2024 06:58:48 +0000 Subject: [PATCH 2/4] - enable leap with patch leap-fix-libexec.patch (thanks to vyvir) OBS-URL: https://build.opensuse.org/package/show/X11:COSMIC:Factory/xdg-desktop-portal-cosmic?expand=0&rev=6 --- xdg-desktop-portal-cosmic.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdg-desktop-portal-cosmic.changes b/xdg-desktop-portal-cosmic.changes index a338eac..9f836ce 100644 --- a/xdg-desktop-portal-cosmic.changes +++ b/xdg-desktop-portal-cosmic.changes @@ -13,7 +13,7 @@ Wed Aug 7 02:12:58 UTC 2024 - Richard Rahl * Show preview of outputs in screencast dialog * Show toplevel icons in screencast dialog * Fix button text color -- enable leap (thanks to vyvir) +- enable leap with patch leap-fix-libexec.patch (thanks to vyvir) ------------------------------------------------------------------- Sat Jul 06 17:07:55 UTC 2024 - Joshua Smith From 632461841ac42b4df8ae7c39cc5032c1d0847981fe0eee4c7408ed16bf16c50e Mon Sep 17 00:00:00 2001 From: Richard Rahl Date: Wed, 7 Aug 2024 12:21:25 +0000 Subject: [PATCH 3/4] . OBS-URL: https://build.opensuse.org/package/show/X11:COSMIC:Factory/xdg-desktop-portal-cosmic?expand=0&rev=7 --- _service | 2 +- xdg-desktop-portal-cosmic-1.0.0.a1.tar.zst | 3 --- xdg-desktop-portal-cosmic-1.0.0~alpha1.tar.zst | 3 +++ xdg-desktop-portal-cosmic.spec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 xdg-desktop-portal-cosmic-1.0.0.a1.tar.zst create mode 100644 xdg-desktop-portal-cosmic-1.0.0~alpha1.tar.zst diff --git a/_service b/_service index ba5e806..24de7ee 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ https://github.com/pop-os/xdg-desktop-portal-cosmic.git git master - 1.0.0.a1 + 1.0.0~alpha1 yes diff --git a/xdg-desktop-portal-cosmic-1.0.0.a1.tar.zst b/xdg-desktop-portal-cosmic-1.0.0.a1.tar.zst deleted file mode 100644 index 047fe2f..0000000 --- a/xdg-desktop-portal-cosmic-1.0.0.a1.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be5db1b6b781bdce77ad2b193b4a1216f77fd21e80726a8e677016a0086abfd4 -size 296229 diff --git a/xdg-desktop-portal-cosmic-1.0.0~alpha1.tar.zst b/xdg-desktop-portal-cosmic-1.0.0~alpha1.tar.zst new file mode 100644 index 0000000..badc3c7 --- /dev/null +++ b/xdg-desktop-portal-cosmic-1.0.0~alpha1.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e87cac8642f302d9716bda415be88766a03985539ffd0738ca32ea946bb960f +size 297540 diff --git a/xdg-desktop-portal-cosmic.spec b/xdg-desktop-portal-cosmic.spec index 26496ba..4413036 100644 --- a/xdg-desktop-portal-cosmic.spec +++ b/xdg-desktop-portal-cosmic.spec @@ -17,7 +17,7 @@ Name: xdg-desktop-portal-cosmic -Version: 1.0.0.a1 +Version: 1.0.0~alpha1 Release: 0 Summary: COSMIC xdg portal License: GPL-3.0-only From 4288dd228070edc741d47bd4715379cf367e35dc5e1f2c9a56ca38f763880158 Mon Sep 17 00:00:00 2001 From: Richard Rahl Date: Thu, 8 Aug 2024 02:46:45 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/X11:COSMIC:Factory/xdg-desktop-portal-cosmic?expand=0&rev=8 --- _service | 4 +++- xdg-desktop-portal-cosmic-1.0.0~alpha1.tar.zst | 4 ++-- xdg-desktop-portal-cosmic.changes | 10 +++++++++- xdg-desktop-portal-cosmic.spec | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/_service b/_service index 24de7ee..12a0c8a 100644 --- a/_service +++ b/_service @@ -3,9 +3,11 @@ https://github.com/pop-os/xdg-desktop-portal-cosmic.git git - master + refs/tags/epoch-1.0.0-alpha.1 + epoch-(.*) 1.0.0~alpha1 yes + xdg-desktop-portal-cosmic *.tar diff --git a/xdg-desktop-portal-cosmic-1.0.0~alpha1.tar.zst b/xdg-desktop-portal-cosmic-1.0.0~alpha1.tar.zst index badc3c7..cb0449e 100644 --- a/xdg-desktop-portal-cosmic-1.0.0~alpha1.tar.zst +++ b/xdg-desktop-portal-cosmic-1.0.0~alpha1.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e87cac8642f302d9716bda415be88766a03985539ffd0738ca32ea946bb960f -size 297540 +oid sha256:bf049122aa1ebed539de093b8ec8891b2a4cf9805df199ac973a3f470bad1278 +size 297603 diff --git a/xdg-desktop-portal-cosmic.changes b/xdg-desktop-portal-cosmic.changes index 9f836ce..59d08e5 100644 --- a/xdg-desktop-portal-cosmic.changes +++ b/xdg-desktop-portal-cosmic.changes @@ -1,7 +1,15 @@ +------------------------------------------------------------------- +Thu Aug 8 01:01:29 UTC 2024 - Richard Rahl + +- standardize packaging with also fixes for miscellaneous hardcoding + filenames, using @PARENT_TAG where applicable, and be more specific + with files in the %files section (so no non-wanted files are getting + added + ------------------------------------------------------------------- Wed Aug 7 02:12:58 UTC 2024 - Richard Rahl -- update to 1.0.0-alpha1: +- update to 1.0.0~alpha1: * Fix compile warnings * Add scrolling for list of toplevels * Hover and selected styles for outputs in screencast dialog diff --git a/xdg-desktop-portal-cosmic.spec b/xdg-desktop-portal-cosmic.spec index 4413036..8f98945 100644 --- a/xdg-desktop-portal-cosmic.spec +++ b/xdg-desktop-portal-cosmic.spec @@ -53,7 +53,7 @@ This package contains the xdg portal implementation for COSMIC DE. %make_build %install -%make_install prefix=%{_prefix} +%make_install DESTDIR=%{buildroot} prefix=%{_prefix} %check %{cargo_test} @@ -61,7 +61,7 @@ This package contains the xdg portal implementation for COSMIC DE. %files %license LICENSE %{_libexecdir}/%{name} -%{_datadir}/icons/hicolor/scalable/actions/*.svg +%{_datadir}/icons/hicolor/scalable/actions/{screenshot-screen-symbolic,screenshot-selection-symbolic,screenshot-window-symbolic}.svg %{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.cosmic.service %{_datadir}/xdg-desktop-portal/cosmic-portals.conf %{_datadir}/xdg-desktop-portal/portals/cosmic.portal