From 96dd7c8dabc5495fad71ece95e89be325ce95bcd Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 28 Jul 2023 00:38:44 +0800 Subject: [PATCH] chore: sync with Terra 38 (#660) --- anda/apps/armcord/armcord.spec | 30 +-- .../0001-remove-libadwaita-dependency.patch | 24 ++ anda/apps/paper-plane/anda.hcl | 5 + anda/apps/paper-plane/paper-plane.spec | 49 ++++ anda/apps/paper-plane/update.rhai | 1 + anda/audio/voicevox/update.rhai | 12 +- .../elementary-calendar.spec | 17 +- .../elementary-greeter.spec | 8 +- .../elementary-settings-daemon.spec | 17 +- .../switchboard-plug-keyboard.spec | 4 +- .../switchboard-plug-sound.spec | 8 +- .../wingpanel-indicator-nightlight.spec | 6 +- .../wingpanel-indicator-sound.spec | 6 +- .../latte-dock-nightly.spec | 2 +- anda/desktops/mate/tweak/anda.hcl | 5 + anda/desktops/mate/tweak/mate-tweak.spec | 47 ++++ anda/desktops/mate/tweak/update.rhai | 1 + anda/fonts/iosevka-fusion/iosevka-fusion.toml | 68 ++--- anda/fonts/manrope/update.rhai | 2 +- .../prismlauncher-nightly.spec | 47 ++-- anda/games/prismlauncher-nightly/update.rhai | 2 +- .../prismlauncher-qt5-nightly.spec | 47 ++-- .../prismlauncher-qt5-nightly/update.rhai | 2 +- .../prismlauncher-qt5/prismlauncher-qt5.spec | 32 +-- anda/games/prismlauncher/prismlauncher.spec | 32 +-- anda/lib/args-hxx/anda.hcl | 5 + anda/lib/args-hxx/args-hxx.spec | 53 ++++ anda/lib/args-hxx/update.rhai | 1 + .../gtk4-layer-shell/gtk4-layer-shell.spec | 3 +- .../libadwaita-nightly.spec | 6 +- anda/lib/libadwaita-nightly/update.rhai | 5 +- .../libappimageupdate/libappimageupdate.spec | 32 +-- anda/lib/pqmarble/anda.hcl | 5 + anda/lib/pqmarble/pqmarble.spec | 53 ++++ anda/lib/pqmarble/update.rhai | 4 + anda/lib/tdlib-paper-plane/anda.hcl | 8 + .../tdlib-paper-plane/tdlib-paper-plane.spec | 106 ++++++++ anda/lib/tdlib/tdlib-nightly.spec | 4 +- anda/lib/tdlib/update.rhai | 5 +- anda/lib/zsync2/anda.hcl | 5 + anda/lib/zsync2/zsync2.spec | 81 ++++++ anda/moby-extras/moby-buildx/moby-buildx.spec | 4 +- anda/nim/nim-nightly/nim-nightly.spec | 2 +- .../blackbox-terminal/blackbox-terminal.spec | 37 +-- .../anda.hcl | 5 + .../com.system76.Scheduler.dbusproxy.service | 8 + .../kwin-system76-scheduler-integration.spec | 49 ++++ .../system76-scheduler-dbus-proxy.sh | 11 + .../update.rhai | 1 + anda/python/ruff/python3-ruff.spec | 6 +- anda/rust/kondo/anda.hcl | 1 + .../appimagelauncher/appimagelauncher.spec | 7 +- anda/tools/gcm-core/gcm-core.spec | 6 +- .../handbrake/HandBrake-no-fdk_aac.patch | 14 ++ anda/tools/handbrake/HandBrake-no-libva.patch | 13 + anda/tools/handbrake/HandBrake-no-nasm.patch | 12 + anda/tools/handbrake/HandBrake-nostrip.patch | 10 + .../tools/handbrake/HandBrake-x265-link.patch | 13 + anda/tools/handbrake/anda.hcl | 5 + ...29C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg | Bin 0 -> 2226 bytes anda/tools/handbrake/terra-HandBrake.spec | 234 ++++++++++++++++++ anda/tools/subatomic/subatomic.spec | 2 +- 62 files changed, 1034 insertions(+), 256 deletions(-) create mode 100644 anda/apps/paper-plane/0001-remove-libadwaita-dependency.patch create mode 100644 anda/apps/paper-plane/anda.hcl create mode 100644 anda/apps/paper-plane/paper-plane.spec create mode 100644 anda/apps/paper-plane/update.rhai create mode 100644 anda/desktops/mate/tweak/anda.hcl create mode 100644 anda/desktops/mate/tweak/mate-tweak.spec create mode 100644 anda/desktops/mate/tweak/update.rhai create mode 100644 anda/lib/args-hxx/anda.hcl create mode 100644 anda/lib/args-hxx/args-hxx.spec create mode 100644 anda/lib/args-hxx/update.rhai create mode 100644 anda/lib/pqmarble/anda.hcl create mode 100644 anda/lib/pqmarble/pqmarble.spec create mode 100644 anda/lib/pqmarble/update.rhai create mode 100644 anda/lib/tdlib-paper-plane/anda.hcl create mode 100644 anda/lib/tdlib-paper-plane/tdlib-paper-plane.spec create mode 100644 anda/lib/zsync2/anda.hcl create mode 100644 anda/lib/zsync2/zsync2.spec create mode 100644 anda/others/kwin-system76-scheduler-integration/anda.hcl create mode 100644 anda/others/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service create mode 100644 anda/others/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec create mode 100644 anda/others/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh create mode 100644 anda/others/kwin-system76-scheduler-integration/update.rhai create mode 100644 anda/tools/handbrake/HandBrake-no-fdk_aac.patch create mode 100644 anda/tools/handbrake/HandBrake-no-libva.patch create mode 100644 anda/tools/handbrake/HandBrake-no-nasm.patch create mode 100644 anda/tools/handbrake/HandBrake-nostrip.patch create mode 100644 anda/tools/handbrake/HandBrake-x265-link.patch create mode 100644 anda/tools/handbrake/anda.hcl create mode 100644 anda/tools/handbrake/gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg create mode 100644 anda/tools/handbrake/terra-HandBrake.spec diff --git a/anda/apps/armcord/armcord.spec b/anda/apps/armcord/armcord.spec index 3a934d1b19..cc7903d6bc 100644 --- a/anda/apps/armcord/armcord.spec +++ b/anda/apps/armcord/armcord.spec @@ -1,25 +1,25 @@ %define debug_package %nil -Name: armcord -Version: 3.2.1 -Release: 1%{?dist} -License: OSL-3.0 -Summary: Custom lightweight Discord client designed to enhance your experience -URL: https://github.com/ArmCord/ArmCord -Group: Applications/Internet -Source0: %url/archive/refs/tags/v%version.tar.gz -Source1: launch.sh -Requires: electron xdg-utils -BuildRequires: nodejs-npm -Conflicts: armcord-bin -BuildArch: noarch +Name: armcord +Version: 3.2.1 +Release: 1%{?dist} +License: OSL-3.0 +Summary: Custom lightweight Discord client designed to enhance your experience +URL: https://github.com/ArmCord/ArmCord +Group: Applications/Internet +Source1: launch.sh +Requires: electron xdg-utils +BuildRequires: nodejs-npm git +Conflicts: armcord-bin +BuildArch: noarch %description ArmCord is a custom client designed to enhance your Discord experience while keeping everything lightweight. %prep -%autosetup -n ArmCord-%version +git clone %url . +git checkout v%version cat < armcord.desktop [Desktop Entry] @@ -36,7 +36,7 @@ EOF %build -npx pnpm@7 install --frozen-lockfile --ignore-scripts +npx pnpm@7 install --no-frozen-lockfile npm run packageQuick diff --git a/anda/apps/paper-plane/0001-remove-libadwaita-dependency.patch b/anda/apps/paper-plane/0001-remove-libadwaita-dependency.patch new file mode 100644 index 0000000000..57e4f6acaa --- /dev/null +++ b/anda/apps/paper-plane/0001-remove-libadwaita-dependency.patch @@ -0,0 +1,24 @@ +From f26efc2b94f630213cb78d378cd7ba5adbc58260 Mon Sep 17 00:00:00 2001 +From: windowsboy111 +Date: Tue, 13 Jun 2023 23:00:14 +0800 +Subject: [PATCH] remove libadwaita dependency + +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 5766bcf..5d769be 100644 +--- a/meson.build ++++ b/meson.build +@@ -13,7 +13,6 @@ base_id = 'app.drey.PaperPlane' + dependency('glib-2.0', version: '>= 2.72') + dependency('gio-2.0', version: '>= 2.72') + dependency('gtk4', version: '>= 4.10') +-dependency('libadwaita-1', version: '>= 1.4') + dependency('tdjson', version: '== 1.8.14') + + glib_compile_resources = find_program('glib-compile-resources', required: true) +-- +2.40.1 + diff --git a/anda/apps/paper-plane/anda.hcl b/anda/apps/paper-plane/anda.hcl new file mode 100644 index 0000000000..f51b4171fe --- /dev/null +++ b/anda/apps/paper-plane/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "paper-plane.spec" + } +} diff --git a/anda/apps/paper-plane/paper-plane.spec b/anda/apps/paper-plane/paper-plane.spec new file mode 100644 index 0000000000..ae865364eb --- /dev/null +++ b/anda/apps/paper-plane/paper-plane.spec @@ -0,0 +1,49 @@ +%define debug_package %nil +%global ver 0.1.0 +%global commit 4a9945429cdc446b323e390e8c1163944582051e + +Name: paper-plane +Version: %ver~%commit +Release: 1%?dist +Summary: Alternative Telegram client in GTK4 and Rust +License: GPL-3.0 +URL: https://github.com/paper-plane-developers/paper-plane +Source0: %url/archive/%commit.tar.gz +BuildRequires: meson cargo terra-gtk4-devel tdlib-paper-plane-devel libappstream-glib desktop-file-utils terra-blueprint-compiler sassc pkgconfig(appstream) vala libadwaita-nightly-devel rlottie-devel clang-devel desktop-file-utils libappstream-glib +Requires: terra-gtk4 >= 4.10 gstreamer1-plugin-libav gstreamer1-plugins-good libadwaita-nightly tdlib-paper-plane + +%description +Paper Plane is an alternative Telegram client. It uses libadwaita for its user +interface and strives to meet the design principles of the GNOME desktop. + +%prep +%autosetup -n %name-%commit +cp /%_libdir/pkgconfig/libadwaita-nightly.pc /%_libdir/pkgconfig/libadwaita-1.pc + +%build +# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=paper-plane +%meson -Dtg_api_id=22303002 -Dtg_api_hash=3cc0969992690f032197e6609b296599 +%meson_build + +%install +%meson_install + +%check +appstream-util validate-relax --nonet %buildroot%_datadir/metainfo/app.drey.PaperPlane.metainfo.xml +desktop-file-validate %buildroot%_datadir/applications/app.drey.PaperPlane.desktop + +%files +%doc README.md +%license COPYING +%_bindir/paper-plane +%_datadir/applications/app.drey.PaperPlane.desktop +%_datadir/glib-2.0/schemas/app.drey.PaperPlane.gschema.xml +%_datadir/icons/hicolor/scalable/apps/app.drey.PaperPlane.svg +%_datadir/icons/hicolor/symbolic/apps/app.drey.PaperPlane-symbolic.svg +%_datadir/locale/*/LC_MESSAGES/paper-plane.mo +%_datadir/metainfo/app.drey.PaperPlane.metainfo.xml +%_datadir/paper-plane/resources.gresource + +%changelog +* Tue May 23 2023 windowsboy111 - 0.1.0-beta.1 +- Initial package. diff --git a/anda/apps/paper-plane/update.rhai b/anda/apps/paper-plane/update.rhai new file mode 100644 index 0000000000..20aa983867 --- /dev/null +++ b/anda/apps/paper-plane/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("paper-plane-developers/paper-plane")); diff --git a/anda/audio/voicevox/update.rhai b/anda/audio/voicevox/update.rhai index 212b012879..7079f79d94 100644 --- a/anda/audio/voicevox/update.rhai +++ b/anda/audio/voicevox/update.rhai @@ -1,9 +1,5 @@ -// let v = gh("VOICEVOX/voicevox"); -// rpm.version(v); -// let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines; -// rpm.define("nodev", find(">=([\\d.]+)", engines.node, 1)); -// rpm.define("nodev", find(">=([\\d.]+)", engines.npm, 1)); -let v = "0.14.7"; +let v = gh("VOICEVOX/voicevox"); +rpm.version(v); let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines; -print(find(">=([\\d.]+)", engines.node, 1)); -print(find(">=([\\d.]+)", engines.npm, 1)); +rpm.define("nodev", find(">=([\\d.]+)", engines.node, 1)); +rpm.define("npmv", find(">=([\\d.]+)", engines.npm, 1)); diff --git a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec index f55b0d54e7..f19007f7d3 100644 --- a/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec +++ b/anda/desktops/elementary/elementary-calendar/elementary-calendar.spec @@ -12,8 +12,6 @@ License: GPL-3.0-or-later URL: https://github.com/elementary/calendar Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/elementary/calendar/pull/758.patch - BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libappstream-glib @@ -21,6 +19,8 @@ BuildRequires: pkgconfig(champlain-0.12) BuildRequires: pkgconfig(libecal-2.0) BuildRequires: pkgconfig(granite) BuildRequires: pkgconfig(libhandy-1) +# BuildRequires: pkgconfig(libportal) +BuildRequires: pkgconfig(libportal-gtk3) BuildRequires: folks-devel BuildRequires: libgee-devel BuildRequires: pkgconfig(geocode-glib-2.0) @@ -69,20 +69,17 @@ This package contains the development files. %check -desktop-file-validate \ - %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop -desktop-file-validate \ - %{buildroot}/%{_datadir}/applications/%{appname}.desktop +%dnl desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop +desktop-file-validate %{buildroot}/%{_datadir}/applications/%{appname}.desktop -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %files -f %{appname}.lang %doc README.md %license COPYING -%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop +%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop %{_bindir}/%{appname} @@ -92,7 +89,7 @@ appstream-util validate-relax --nonet \ %{_datadir}/applications/%{appname}.desktop %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{appname}.svg -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %files devel %{_includedir}/%{name}/ diff --git a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec index 79d9084158..f439a76a57 100644 --- a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec +++ b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec @@ -10,7 +10,6 @@ License: GPL-3.0 URL: https://github.com/elementary/greeter Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz Source1: 40-%{appname}.conf -Patch0: https://github.com/elementary/greeter/compare/93bbca3..1b3879d.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -69,7 +68,7 @@ The elementary Greeter is a styled Login Screen for LightDM. %prep -%autosetup -n %{srcname}-%{version} -p1 +%autosetup -n %{srcname}-%{version} %build @@ -90,8 +89,7 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/ %check -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %files -f %{appname}.lang @@ -105,7 +103,7 @@ appstream-util validate-relax --nonet \ %{_sbindir}/%{appname} %{_datadir}/xgreeters/%{appname}.desktop -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %{_datadir}/lightdm/lightdm.conf.d/40-%appname.conf diff --git a/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec b/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec index 2cce8467cc..6fd742962a 100644 --- a/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec +++ b/anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec @@ -25,6 +25,7 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(granite) >= 5.3.0 BuildRequires: pkgconfig(libgeoclue-2.0) BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(fwupd) Requires: xdg-desktop-portal @@ -47,25 +48,27 @@ Requires: xdg-desktop-portal %check desktop-file-validate \ - %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}.desktop + %{buildroot}/%{_datadir}/applications/%{appname}.desktop appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %post %systemd_user_post %{appname}.xdg-desktop-portal.service +%systemd_post %{appname}.check-for-firmware-updates.timer %preun %systemd_user_preun %{appname}.xdg-desktop-portal.service +%systemd_preun %{appname}.check-for-firmware-updates.timer %files %license LICENSE %doc README.md -%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}.desktop +%config(noreplace) %{_datadir}/applications/%{appname}.desktop %{_bindir}/%{appname} @@ -75,10 +78,16 @@ appstream-util validate-relax --nonet \ %{_datadir}/dbus-1/interfaces/%{iface}.xml %{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.elementary.settings-daemon.service %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %{_datadir}/xdg-desktop-portal/portals/%{appname}.portal %{_userunitdir}/%{appname}.xdg-desktop-portal.service +%{_unitdir}/%{appname}.check-for-firmware-updates.service +%{_unitdir}/%{appname}.check-for-firmware-updates.timer + +%{_sysconfdir}/xdg/autostart/%appname.desktop + +%{_datadir}/icons/hicolor/*/apps/%{appname}.svg %changelog diff --git a/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec b/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec index 7d5491a1ac..01d5fae036 100644 --- a/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec +++ b/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec @@ -59,7 +59,7 @@ same time. Keyboard shortcuts are also part of this plug. %check appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %files -f %{plug_name}-plug.lang @@ -68,7 +68,7 @@ appstream-util validate-relax --nonet \ %{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so -%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml +%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %changelog diff --git a/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec b/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec index 69a18a169a..4f3c99aaca 100644 --- a/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec +++ b/anda/desktops/elementary/switchboard-plug-sound/switchboard-plug-sound.spec @@ -27,6 +27,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(libcanberra-gtk) BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(switchboard-2.0) @@ -52,12 +53,11 @@ A sound plug for Switchboard. %find_lang %{plug_name}-plug # remove the specified stock icon from appdata (invalid in libappstream-glib) -sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml +sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %check -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %files -f %{plug_name}-plug.lang @@ -66,7 +66,7 @@ appstream-util validate-relax --nonet \ %{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so -%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml +%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %changelog diff --git a/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec b/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec index 0810592312..cc62529c0a 100644 --- a/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec +++ b/anda/desktops/elementary/wingpanel-indicator-nightlight/wingpanel-indicator-nightlight.spec @@ -48,8 +48,8 @@ A wingpanel indicator for Night Light. %check -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml +%dnl appstream-util validate-relax --nonet \ +%dnl %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %files -f nightlight-indicator.lang @@ -58,7 +58,7 @@ appstream-util validate-relax --nonet \ %{_libdir}/wingpanel/libnightlight.so -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %changelog diff --git a/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec b/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec index 3bd01e3adb..c1a1992d12 100644 --- a/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec +++ b/anda/desktops/elementary/wingpanel-indicator-sound/wingpanel-indicator-sound.spec @@ -50,12 +50,12 @@ A sound indicator for wingpanel. %find_lang sound-indicator # remove the specified stock icon from appdata (invalid in libappstream-glib) -sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml +sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %check appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %files -f sound-indicator.lang @@ -65,7 +65,7 @@ appstream-util validate-relax --nonet \ %{_libdir}/wingpanel/libsound.so %{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.sound.gschema.xml -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %changelog diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec index 72298091ae..ae2e7df052 100644 --- a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec +++ b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/KDE/latte-dock/ -%global commit a0e6eae9c801cb8696ab97928091424e23fd8ae0 +%global commit ea8c4b9714f288998d526736f40591ad37c19bbc %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} diff --git a/anda/desktops/mate/tweak/anda.hcl b/anda/desktops/mate/tweak/anda.hcl new file mode 100644 index 0000000000..202963aea4 --- /dev/null +++ b/anda/desktops/mate/tweak/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "mate-tweak.spec" + } +} diff --git a/anda/desktops/mate/tweak/mate-tweak.spec b/anda/desktops/mate/tweak/mate-tweak.spec new file mode 100644 index 0000000000..69f0099d3b --- /dev/null +++ b/anda/desktops/mate/tweak/mate-tweak.spec @@ -0,0 +1,47 @@ +%define debug_package %nil + +Name: mate-tweak +Version: 22.10.0 +Release: 1%?dist +Summary: Tweak tool for the MATE Desktop +License: GPL-2.0 +URL: https://github.com/ubuntu-mate/mate-tweak +Source0: %url/archive/refs/tags/%version.tar.gz +Requires: python3 +BuildRequires: python3dist(setuptools) rpm_macro(py3_build) intltool desktop-file-utils + +%description +This is MATE Tweak, a fork of mintDesktop. + +%prep +%autosetup +python3 -m ensurepip +python3 -m pip install distutils-extra-python + +%build +%py3_build + +%install +%py3_install + +%check +desktop-file-validate %buildroot%_datadir/applications/*.desktop + +%files +%doc README.md +%license COPYING +%_bindir/%name +%_bindir/marco-{compton,xrender,picom,glx,xr_glx_hybrid,no-composite} +%_prefix/lib/%name/ +%_datadir/locale/*/LC_MESSAGES/%name.mo +%_mandir/man1/marco-{glx,no-composite,xr_glx_hybrid,xrender}.1.gz +%_mandir/man1/%name.1.gz +%_datadir/applications/%name.desktop +%_datadir/applications/marco-{glx,no-composite,xr_glx_hybrid,xrender}.desktop +%_datadir/polkit-1/actions/org.mate.%name.policy +%ghost %_prefix/lib/python3.11/site-packages/__pycache__ +%ghost %_prefix/lib/python3.11/site-packages/setup.py +%ghost %_prefix/lib/python3.11/site-packages/mate_tweak-%version-py%python3_version.egg-info/ + +%changelog +%autochangelog diff --git a/anda/desktops/mate/tweak/update.rhai b/anda/desktops/mate/tweak/update.rhai new file mode 100644 index 0000000000..105f92ae20 --- /dev/null +++ b/anda/desktops/mate/tweak/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("ubuntu-mate/mate-tweak")); diff --git a/anda/fonts/iosevka-fusion/iosevka-fusion.toml b/anda/fonts/iosevka-fusion/iosevka-fusion.toml index 4c4fa0b971..c3586586ab 100644 --- a/anda/fonts/iosevka-fusion/iosevka-fusion.toml +++ b/anda/fonts/iosevka-fusion/iosevka-fusion.toml @@ -46,28 +46,28 @@ cv57 = 6 # ι iota serified flat tailed cv58 = 2 # λ lambda top tailed cv59 = 1 # μ me tailless cv60 = 2 # ξ xe flat top -cv76 = 13 # 0 oval dashed forward slash -cv79 = 2 # 3 arched -cv81 = 2 # 5 open contour -cv83 = 1 # 7 straight -cv84 = 3 # 8 two asymmetric circles -cv88 = 2 # ~ tilde low -cv89 = 2 # * asterisk five-pointed low -cv90 = 1 # _ underscore right below baseline -cv91 = 1 # ^ uptick high -cv92 = 1 # ( parentheses normal slope -cv93 = 2 # { braces curly -cv94 = 1 # # column straight -cv96 = 4 # @ three-fold, tall height -cv97 = 2 # $ dollar strike through -VXSE = 2 # ¢ cent strike through -cv98 = 1 # % percent dots -cv99 = 1 # | bar natural slope -VXSA = 1 # ' single quote straight -VXSB = 1 # ` grave/backtick straight -VXSC = 1 # ? smooth -cv87 = 2 # .:; square punctuation marks -cv86 = 2 # ijäöü square diacretics +cv77 = 13 # 0 oval dashed forward slash +cv80 = 2 # 3 arched +cv82 = 2 # 5 open contour +cv84 = 1 # 7 straight +cv85 = 3 # 8 two asymmetric circles +cv89 = 2 # ~ tilde low +cv90 = 3 # * asterisk five-pointed low +cv91 = 1 # _ underscore right below baseline +cv92 = 1 # ^ uptick high +cv93 = 1 # ( parentheses normal slope +cv94 = 2 # { braces curly +cv95 = 1 # # column straight +cv97 = 4 # @ three-fold, tall height +cv98 = 2 # $ dollar strike through +VXSF = 2 # ¢ cent strike through +cv99 = 1 # % percent dots +VXSA = 1 # | bar natural slope +VXSB = 1 # ' single quote straight +VXSC = 1 # ` grave/backtick straight +VXSD = 1 # ? smooth +cv88 = 2 # .:; square punctuation marks +cv87 = 2 # ijäöü square diacretics [buildPlans.iosevka-fusion.variants.upright] cv26 = 3 # a double storey rounded @@ -86,12 +86,12 @@ cv46 = 1 # v straight cv47 = 1 # w straight cv48 = 1 # x straight cv50 = 1 # z straight -cv72 = 3 # 1 serified with base -cv73 = 1 # 2 straight -cv75 = 3 # 4 semi-open contour -cv77 = 3 # 6 straight -cv80 = 3 # 9 straight -cv89 = 2 # & et open top (ampersand) +cv78 = 3 # 1 serified with base +cv79 = 1 # 2 straight +cv81 = 3 # 4 semi-open contour +cv83 = 3 # 6 straight +cv86 = 3 # 9 straight +cv96 = 2 # & et open top (ampersand) [buildPlans.iosevka-fusion.variants.italic] cv26 = 1 # a double storey straight @@ -110,12 +110,12 @@ cv46 = 2 # v curly cv47 = 2 # w curly short middle top cv48 = 2 # x curly cv50 = 4 # z curly -cv72 = 2 # 1 serified no base -cv73 = 2 # 2 curly -cv75 = 1 # 4 closed contour crossing -cv77 = 1 # 6 closed contour -cv80 = 1 # 9 closed contour -cv89 = 4 # & et open top toothed (ampersand) +cv78 = 2 # 1 serified no base +cv79 = 2 # 2 curly +cv81 = 1 # 4 closed contour crossing +cv83 = 1 # 6 closed contour +cv86 = 1 # 9 closed contour +cv96 = 4 # & et open top toothed (ampersand) [buildPlans.iosevka-fusion.weights.thin] shape = 100 diff --git a/anda/fonts/manrope/update.rhai b/anda/fonts/manrope/update.rhai index 29cb3cfb3c..aa3b5d1237 100644 --- a/anda/fonts/manrope/update.rhai +++ b/anda/fonts/manrope/update.rhai @@ -1,6 +1,6 @@ let readme = get("https://raw.githubusercontent.com/sharanda/manrope/master/README.md"); let ver = find("## Changelog\n- v (.+?) \\/", readme, 1); -if ver != find("Version:\\s*([\\d.]+)\n" rpm.f, 1) { +if ver != find("Version:\\s*([\\d.]+)\n", rpm.f, 1) { let req = new_req("https://api.github.com/repos/sharanda/manrope/commits/HEAD"); let sha = req.get().json().sha; rpm.global("commit", sha); diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index aa6719d6ce..3408eaf48d 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,10 +1,11 @@ %global real_name prismlauncher +%global nice_name PrismLauncher -%global commit 12cd8a7bea991c2a8d4b59b1cfc9f7c246819fc9 +%global commit 928e18b66dbee8ea4b245416206a9e73427ce0f1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f +%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 -%global tomlplusplus_commit 0a90913abf9390b9e08ab6d3b40ac11634553f38 +%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8 %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} @@ -24,26 +25,14 @@ %global min_qt_version 5.12 %endif -%global build_platform unknown - -%if 0%{?fedora} -%global build_platform Fedora -%endif - -%if 0%{?rhel} -%global build_platform RedHat -%endif - -%if 0%{?centos} -%global build_platform CentOS -%endif +%global build_platform terra %if %{with qt6} Name: prismlauncher-nightly %else Name: prismlauncher-qt5-nightly %endif -Version: 7.1^%{snapshot_info} +Version: 8.0^%{snapshot_info} Release: 1%{?dist} Summary: Minecraft launcher with ability to manage multiple instances License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later @@ -53,6 +42,7 @@ Source0: https://github.com/PrismLauncher/PrismLauncher/archive/%{commi Source1: https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz Source2: https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz Source3: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz +Patch0: 0001-find-cmark-with-pkgconfig.patch BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules @@ -74,6 +64,9 @@ BuildRequires: cmake(Qt6Core5Compat) %endif BuildRequires: pkgconfig(libcmark) +%if 0%{fedora} < 38 +BuildRequires: cmark +%endif BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -93,8 +86,6 @@ Recommends: flite # Prism supports enabling gamemode Suggests: gamemode -Recommends: terra-fractureiser-detector - Conflicts: %{real_name} Conflicts: %{real_name}-qt5 %if %{without qt6} @@ -145,27 +136,31 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest -appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml -desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop - %files %doc README.md %license LICENSE COPYING.md -%dir %{_datadir}/%{real_name} +%dir %{_datadir}/%{nice_name} %{_bindir}/%{real_name} -%{_datadir}/%{real_name}/NewLaunch.jar -%{_datadir}/%{real_name}/JavaCheck.jar +%{_datadir}/%{nice_name}/NewLaunch.jar +%{_datadir}/%{nice_name}/JavaCheck.jar +%{_datadir}/%{nice_name}/qtlogging.ini %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop %{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg %{_datadir}/mime/packages/modrinth-mrpack-mime.xml -%{_datadir}/PrismLauncher/qtlogging.ini %{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories %{_mandir}/man?/prismlauncher.* %changelog +* Wed Jul 26 2023 seth - 8.0^20230726.4f00012-1 +- remove terra-fractureiser-detector from recommends, use proper build platform, + and add patches for epel/older fedora versions + +* Sun Jul 23 2023 seth - 8.0^20230722.273d75f-1 +- update submodules, version, & use autorelease + * Wed Jun 07 2023 seth - 7.0^20230603.954d4d7-1 - specify jdk 17 + cleanup outdated patches/scriptlets diff --git a/anda/games/prismlauncher-nightly/update.rhai b/anda/games/prismlauncher-nightly/update.rhai index 851afe7e30..e5a93d1efe 100644 --- a/anda/games/prismlauncher-nightly/update.rhai +++ b/anda/games/prismlauncher-nightly/update.rhai @@ -4,5 +4,5 @@ if filters.contains("nightly") { let sha = req.get().json().sha; rpm.global("commit", sha); rpm.release(); - rpm.version(`${gh("PrismLauncher/PrismLauncher")}^%{snapshot_info}`); + // rpm.version(`${gh("PrismLauncher/PrismLauncher")}^%{snapshot_info}`); } diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 3fd2723b54..927e8a2e66 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,10 +1,11 @@ %global real_name prismlauncher +%global nice_name PrismLauncher -%global commit 12cd8a7bea991c2a8d4b59b1cfc9f7c246819fc9 +%global commit 928e18b66dbee8ea4b245416206a9e73427ce0f1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f +%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 -%global tomlplusplus_commit 0a90913abf9390b9e08ab6d3b40ac11634553f38 +%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8 %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} @@ -24,26 +25,14 @@ %global min_qt_version 5.12 %endif -%global build_platform unknown - -%if 0%{?fedora} -%global build_platform Fedora -%endif - -%if 0%{?rhel} -%global build_platform RedHat -%endif - -%if 0%{?centos} -%global build_platform CentOS -%endif +%global build_platform terra %if %{with qt6} Name: prismlauncher-nightly %else Name: prismlauncher-qt5-nightly %endif -Version: 7.1^%{snapshot_info} +Version: 8.0^%{snapshot_info} Release: 1%{?dist} Summary: Minecraft launcher with ability to manage multiple instances License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later @@ -53,6 +42,7 @@ Source0: https://github.com/PrismLauncher/PrismLauncher/archive/%{commi Source1: https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz Source2: https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz Source3: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz +Patch0: 0001-find-cmark-with-pkgconfig.patch BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules @@ -74,6 +64,9 @@ BuildRequires: cmake(Qt6Core5Compat) %endif BuildRequires: pkgconfig(libcmark) +%if 0%{fedora} < 38 +BuildRequires: cmark +%endif BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -90,8 +83,6 @@ Requires: java-1.8.0-openjdk Recommends: xrandr # libflite needed for using narrator in minecraft Recommends: flite - -Recommends: terra-fractureiser-detector # Prism supports enabling gamemode Suggests: gamemode @@ -145,27 +136,31 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest -appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml -desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop - %files %doc README.md %license LICENSE COPYING.md -%dir %{_datadir}/%{real_name} +%dir %{_datadir}/%{nice_name} %{_bindir}/%{real_name} -%{_datadir}/%{real_name}/NewLaunch.jar -%{_datadir}/%{real_name}/JavaCheck.jar +%{_datadir}/%{nice_name}/NewLaunch.jar +%{_datadir}/%{nice_name}/JavaCheck.jar +%{_datadir}/%{nice_name}/qtlogging.ini %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop %{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg %{_datadir}/mime/packages/modrinth-mrpack-mime.xml -%{_datadir}/PrismLauncher/qtlogging.ini %{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories %{_mandir}/man?/prismlauncher.* %changelog +* Wed Jul 26 2023 seth - 8.0^20230726.4f00012-1 +- remove terra-fractureiser-detector from recommends, use proper build platform, + and add patches for epel/older fedora versions + +* Sun Jul 23 2023 seth - 8.0^20230722.273d75f-1 +- update submodules, version, & use autorelease + * Wed Jun 07 2023 seth - 7.0^20230603.954d4d7-1 - specify jdk 17 + cleanup outdated patches/scriptlets diff --git a/anda/games/prismlauncher-qt5-nightly/update.rhai b/anda/games/prismlauncher-qt5-nightly/update.rhai index 851afe7e30..e5a93d1efe 100644 --- a/anda/games/prismlauncher-qt5-nightly/update.rhai +++ b/anda/games/prismlauncher-qt5-nightly/update.rhai @@ -4,5 +4,5 @@ if filters.contains("nightly") { let sha = req.get().json().sha; rpm.global("commit", sha); rpm.release(); - rpm.version(`${gh("PrismLauncher/PrismLauncher")}^%{snapshot_info}`); + // rpm.version(`${gh("PrismLauncher/PrismLauncher")}^%{snapshot_info}`); } diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec index 1d070c5968..c61ce707c7 100644 --- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec +++ b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec @@ -1,4 +1,5 @@ %global real_name prismlauncher +%global nice_name PrismLauncher %bcond_with qt6 # Change this variables if you want to use custom keys @@ -14,19 +15,7 @@ %global min_qt_version 5.12 %endif -%global build_platform unknown - -%if 0%{?fedora} -%global build_platform Fedora -%endif - -%if 0%{?rhel} -%global build_platform RedHat -%endif - -%if 0%{?centos} -%global build_platform CentOS -%endif +%global build_platform terra %if %{with qt6} Name: prismlauncher @@ -34,7 +23,7 @@ Name: prismlauncher Name: prismlauncher-qt5 %endif Version: 7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minecraft launcher with ability to manage multiple instances # see COPYING.md for more information # each file in the source also contains a SPDX-License-Identifier header that declares its license @@ -80,7 +69,6 @@ Recommends: xrandr # libflite needed for using narrator in minecraft Recommends: flite -Recommends: terra-fractureiser-detector # Prism supports enabling gamemode Suggests: gamemode @@ -124,27 +112,27 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest -appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml -desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop - %files %doc README.md %license LICENSE COPYING.md -%dir %{_datadir}/%{real_name} +%dir %{_datadir}/%{nice_name} %{_bindir}/prismlauncher -%{_datadir}/%{real_name}/NewLaunch.jar -%{_datadir}/%{real_name}/JavaCheck.jar +%{_datadir}/%{nice_name}/NewLaunch.jar +%{_datadir}/%{nice_name}/JavaCheck.jar +%{_datadir}/%{nice_name}/qtlogging.ini %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg %{_datadir}/mime/packages/modrinth-mrpack-mime.xml %{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories -%{_datadir}/PrismLauncher/qtlogging.ini %{_mandir}/man?/prismlauncher.* %{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %changelog +* Wed Jul 26 2023 seth - 7.2-2 +- remove terra-fractureiser-detector from recommends, use proper build platform + * Thu Jun 08 2023 seth - 6.3-3 - specify jdk 17 + cleanup outdated patches/scriptlets diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index d5ac831355..89971137f8 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -1,4 +1,5 @@ %global real_name prismlauncher +%global nice_name PrismLauncher %bcond_without qt6 # Change this variables if you want to use custom keys @@ -14,19 +15,7 @@ %global min_qt_version 5.12 %endif -%global build_platform unknown - -%if 0%{?fedora} -%global build_platform Fedora -%endif - -%if 0%{?rhel} -%global build_platform RedHat -%endif - -%if 0%{?centos} -%global build_platform CentOS -%endif +%global build_platform terra %if %{with qt6} Name: prismlauncher @@ -34,7 +23,7 @@ Name: prismlauncher Name: prismlauncher-qt5 %endif Version: 7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Minecraft launcher with ability to manage multiple instances # see COPYING.md for more information # each file in the source also contains a SPDX-License-Identifier header that declares its license @@ -80,7 +69,6 @@ Recommends: xrandr # libflite needed for using narrator in minecraft Recommends: flite -Recommends: terra-fractureiser-detector # Prism supports enabling gamemode Suggests: gamemode @@ -124,27 +112,27 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest -appstream-util validate-relax --nonet %buildroot%_metainfodir/org.prismlauncher.PrismLauncher.metainfo.xml -desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop - %files %doc README.md %license LICENSE COPYING.md -%dir %{_datadir}/%{real_name} +%dir %{_datadir}/%{nice_name} %{_bindir}/prismlauncher -%{_datadir}/%{real_name}/NewLaunch.jar -%{_datadir}/%{real_name}/JavaCheck.jar +%{_datadir}/%{nice_name}/NewLaunch.jar +%{_datadir}/%{nice_name}/JavaCheck.jar +%{_datadir}/%{nice_name}/qtlogging.ini %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg %{_datadir}/mime/packages/modrinth-mrpack-mime.xml %{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories -%{_datadir}/PrismLauncher/qtlogging.ini %{_mandir}/man?/prismlauncher.* %{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %changelog +* Wed Jul 26 2023 seth - 7.2-2 +- remove terra-fractureiser-detector from recommends, use proper build platform + * Thu Jun 08 2023 seth - 6.3-3 - specify jdk 17 + cleanup outdated patches/scriptlets diff --git a/anda/lib/args-hxx/anda.hcl b/anda/lib/args-hxx/anda.hcl new file mode 100644 index 0000000000..27a80367f9 --- /dev/null +++ b/anda/lib/args-hxx/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "args-hxx.spec" + } +} diff --git a/anda/lib/args-hxx/args-hxx.spec b/anda/lib/args-hxx/args-hxx.spec new file mode 100644 index 0000000000..e23e40dbe5 --- /dev/null +++ b/anda/lib/args-hxx/args-hxx.spec @@ -0,0 +1,53 @@ +%define debug_package %nil + +Name: args-hxx +Version: 6.4.6 +Release: 1%?dist +Summary: A simple header-only C++ argument parser library +License: MIT +URL: https://github.com/Taywee/args +Source0: %url/archive/refs/tags/%version.tar.gz +BuildRequires: make doxygen gcc-c++ cmake + +%description +A simple header-only C++ argument parser library. Supposed to be flexible and +powerful, and attempts to be compatible with the functionality of the Python +standard argparse library (though not necessarily the API). + + +%package doc +Summary: Documentations for args-hxx + +%description doc +%summary. + + +%prep +%autosetup -n args-%version + +%build +%cmake +%cmake_build +make doc/man + +%install +%cmake_install +make installman DESTDIR=%buildroot%_prefix + +%files +%_includedir/args.hxx +/usr/lib/cmake/args/args-config-version.cmake +/usr/lib/cmake/args/args-config.cmake +%_libdir/pkgconfig/args.pc + +%files doc +%_mandir/man3/args* +%_mandir/man3/DoublesReader.3.gz +%_mandir/man3/StringAssignable.3.gz +%_mandir/man3/ToLowerReader.3.gz +%_mandir/man3/conanfile_ArgsConan.3.gz +%_mandir/man3/md_CONTRIBUTING.3.gz + + +%changelog +%autochangelog diff --git a/anda/lib/args-hxx/update.rhai b/anda/lib/args-hxx/update.rhai new file mode 100644 index 0000000000..1c610f61f0 --- /dev/null +++ b/anda/lib/args-hxx/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("Taywee/args")); diff --git a/anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec b/anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec index 0dc6b75a8b..767706215e 100644 --- a/anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec +++ b/anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec @@ -63,7 +63,8 @@ Requires: gtk4-layer-shell /usr/share/gir-1.0/Gtk4LayerShell-1.0.gir %files doc -/usr/share/gtk-doc/html/gtk-layer-shell +/usr/share/gtk-doc/html/gtk4-layer-shell/ + %files vapi /usr/share/vala/vapi/gtk4-layer-shell-0.deps diff --git a/anda/lib/libadwaita-nightly/libadwaita-nightly.spec b/anda/lib/libadwaita-nightly/libadwaita-nightly.spec index f60f69c6fb..ae79b28193 100644 --- a/anda/lib/libadwaita-nightly/libadwaita-nightly.spec +++ b/anda/lib/libadwaita-nightly/libadwaita-nightly.spec @@ -1,9 +1,9 @@ %global ver 1.4 -%global commit 9c2d9426b0772787796009f03f0eab06612c4a96 +%global commit 631673f7789c789b38d48da0c8340e247fdc3c74 Name: libadwaita-nightly Version: %ver^%commit -Release: 2%?dist +Release: 1%?dist Summary: Building blocks for modern GNOME applications License: LGPL-2.1+ URL: https://gnome.pages.gitlab.gnome.org/libadwaita/ @@ -61,7 +61,7 @@ Demo files for %{name}. %install %meson_install - +mv %buildroot%_libdir/pkgconfig/libadwaita-1.pc %buildroot%_libdir/pkgconfig/libadwaita-nightly.pc %check appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml diff --git a/anda/lib/libadwaita-nightly/update.rhai b/anda/lib/libadwaita-nightly/update.rhai index 4cee9df53a..9bad68b501 100644 --- a/anda/lib/libadwaita-nightly/update.rhai +++ b/anda/lib/libadwaita-nightly/update.rhai @@ -1,8 +1,5 @@ if filters.contains("nightly") { - // let txt = get("https://gitlab.gnome.org/api/v4/projects/14079/repository/tags?per_page=1"); - // let ver = txt.json_arr()[0].name; - // rpm.global("ver", ver); - txt = get("https://gitlab.gnome.org/api/v4/projects/14079/repository/commits?per_page=1&page=1"); + let txt = get("https://gitlab.gnome.org/api/v4/projects/14079/repository/commits?per_page=1&page=1"); let commit = txt.json_arr()[0].id; rpm.global("commit", commit); } diff --git a/anda/lib/libappimageupdate/libappimageupdate.spec b/anda/lib/libappimageupdate/libappimageupdate.spec index a52dda5fe8..f2be4a8dd8 100644 --- a/anda/lib/libappimageupdate/libappimageupdate.spec +++ b/anda/lib/libappimageupdate/libappimageupdate.spec @@ -20,6 +20,7 @@ Source0: %{url}/archive/%{git_commit}.tar.gz BuildRequires: make BuildRequires: cmake3 +BuildRequires: cpr-devel BuildRequires: gcc-c++ BuildRequires: libappimage-devel curl-devel libX11-devel zlib-devel fuse-devel librsvg2-devel cairo-devel git-core BuildRequires: nlohmann-json-devel @@ -29,6 +30,7 @@ BuildRequires: pkgconfig(Qt5) BuildRequires: openssl-devel BuildRequires: inotify-tools-devel BuildRequires: argagg-devel +BuildRequires: zsync2-devel %description Implements functionality for dealing with AppImage files. It is written in C++ and is using Boost. @@ -45,18 +47,14 @@ developing applications that use %{name}. %prep %autosetup -n AppImageUpdate-%{git_commit} -git init . -git remote add origin %{url} -git fetch origin -git checkout %{git_commit} --force -git pull origin %{git_commit} --force -git submodule update --init --recursive - %build # add include path for argagg %cmake -DBUILD_QT_UI=ON \ -DBUILD_LIBAPPIMAGEUPDATE_ONLY=ON \ - -DUSE_SYSTEM_LIBAPPIMAGE=ON + -DUSE_SYSTEM_LIBAPPIMAGE=ON \ + -DUSE_SYSTEM_ZSYNC2=ON \ + -DCPR_FORCE_USE_SYSTEM_CURL=ON \ + -DUSE_SYSTEM_CPR=ON %cmake_build @@ -71,27 +69,11 @@ git submodule update --init --recursive %{_libdir}/*.a # what is this? %exclude %{_bindir}/validate -%exclude %{_bindir}/curl-config -%exclude %{_bindir}/zsync2 -%exclude %{_bindir}/zsyncmake2 + %files devel %{_includedir}/{appimage,cpr,zs*.h} -%exclude %{_includedir}/z{conf,lib}.h -%exclude %{_includedir}/curl/ %{_prefix}/lib/cmake/AppImageUpdate/ -/usr/lib/debug/usr/bin/zsync*.debug -/usr/lib64/cmake/CURL/CURLConfig.cmake -/usr/lib64/cmake/CURL/CURLConfigVersion.cmake -/usr/lib64/cmake/CURL/CURLTargets-debug.cmake -/usr/lib64/cmake/CURL/CURLTargets.cmake -/usr/lib64/cmake/zsync2/zsync2Config.cmake -/usr/lib64/cmake/zsync2/zsync2ConfigVersion.cmake -/usr/lib64/cmake/zsync2/zsync2Targets-debug.cmake -/usr/lib64/cmake/zsync2/zsync2Targets.cmake -/usr/lib64/pkgconfig/args.pc -%exclude /usr/lib64/pkgconfig/libcurl.pc -%exclude /usr/lib64/pkgconfig/zlib.pc %changelog * Tue Oct 25 2022 Cappy Ishihara diff --git a/anda/lib/pqmarble/anda.hcl b/anda/lib/pqmarble/anda.hcl new file mode 100644 index 0000000000..9c60fdd668 --- /dev/null +++ b/anda/lib/pqmarble/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "pqmarble.spec" + } +} diff --git a/anda/lib/pqmarble/pqmarble.spec b/anda/lib/pqmarble/pqmarble.spec new file mode 100644 index 0000000000..eb487fb3c0 --- /dev/null +++ b/anda/lib/pqmarble/pqmarble.spec @@ -0,0 +1,53 @@ +%global commit f240b2ec7d5cdacb8fdcc553703420dc5101ffdb +%global ver 2.0.0 + +Name: pqmarble +Version: %ver^%commit +Release: 1%{?dist} +Summary: My GTK library +License: GPL-3.0 +URL: https://gitlab.gnome.org/raggesilver/marble +BuildRequires: vala pkgconfig(gtk4) meson >= 0.50.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.24 +BuildRequires: pkgconfig(gio-2.0) >= 2.50 + +Source0: %{url}/-/archive/%{commit}/marble-%{commit}.tar.gz + +%description +%summary. +Just as Elementary has Granite I have Marble, my collection of useful functions +and reusable widgets. + +%package devel +Summary: Development files for marble-gtk + +%description devel +%summary. + + +%prep +%autosetup -n marble-%{commit} + +%build +%meson +%meson_build + +%install +%meson_install + +%files +%doc README.md +%license COPYING +%_libdir/girepository-1.0/PQMarble-*.typelib +%_libdir/libpqmarble.so.* +%_datadir/vala/vapi/pqmarble.deps +%_datadir/vala/vapi/pqmarble.vapi + +%files devel +%_prefix/include/pqmarble.h +%_libdir/libpqmarble.so +%_libdir/pkgconfig/pqmarble.pc +%_datadir/gir-1.0/PQMarble-*.gir + +%changelog +%autochangelog diff --git a/anda/lib/pqmarble/update.rhai b/anda/lib/pqmarble/update.rhai new file mode 100644 index 0000000000..49fbc60d30 --- /dev/null +++ b/anda/lib/pqmarble/update.rhai @@ -0,0 +1,4 @@ +let req = get("https://gitlab.gnome.org/api/v4/projects/1551/repository/branches/main").json(); +rpm.global("commit", req.commit.id) +let meson = get("https://gitlab.gnome.org/raggesilver/marble/-/raw/master/meson.build"); +rpm.global("ver", find("(?m)^\\s+version:\\s*'(.+)',$", meson, 1)); diff --git a/anda/lib/tdlib-paper-plane/anda.hcl b/anda/lib/tdlib-paper-plane/anda.hcl new file mode 100644 index 0000000000..512f0d744b --- /dev/null +++ b/anda/lib/tdlib-paper-plane/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "tdlib-paper-plane.spec" + } + labels { + nightly = "1" + } +} diff --git a/anda/lib/tdlib-paper-plane/tdlib-paper-plane.spec b/anda/lib/tdlib-paper-plane/tdlib-paper-plane.spec new file mode 100644 index 0000000000..dad6ba9260 --- /dev/null +++ b/anda/lib/tdlib-paper-plane/tdlib-paper-plane.spec @@ -0,0 +1,106 @@ +%global commit 8517026415e75a8eec567774072cbbbbb52376c1 +%global ver 1.8.14 +Name: tdlib-paper-plane +Version: %ver^%commit +Release: 1%{?dist} + +License: BSL-1.0 +URL: https://github.com/tdlib/td +Summary: Cross-platform library for building Telegram clients +Source0: %url/archive/%commit/tdlib-%commit.tar.gz + +BuildRequires: gperftools-devel +BuildRequires: openssl-devel +BuildRequires: ninja-build +BuildRequires: zlib-devel +BuildRequires: gcc-c++ +BuildRequires: gperf +BuildRequires: cmake +BuildRequires: gcc + +Provides: bundled(sqlite) = 3.31.0 + +%description +TDLib (Telegram Database library) is a cross-platform library for +building Telegram clients. It can be easily used from almost any +programming language. + +%name tracks the latest version of TDLib on +https://github.com/tdlib/td and determines the latest version via +the CMakeLists.txt file. + +%package devel +Summary: Development files for %name +Requires: %name%?_isa = %{?epoch:%epoch:}%version-%release +Provides: pkgconfig(tdjson) = %ver + +%package static +Summary: Static libraries for %name +Requires: %name%?_isa = %{?epoch:%epoch:}%version-%release +Requires: %name-devel%?_isa = %{?epoch:%epoch:}%version-%release + +%description devel +%summary. + +%description static +%summary. + +%prep +%autosetup -n td-%commit -p1 +sed -e 's/"DEFAULT"/"PROFILE=SYSTEM"/g' -i tdnet/td/net/SslStream.cpp + +%build +%cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBDIR=%_lib \ + -DTD_ENABLE_JNI:BOOL=OFF \ + -DTD_ENABLE_DOTNET:BOOL=OFF +%cmake_build + +%install +%cmake_install + +%files +%license LICENSE_1_0.txt +%doc README.md CHANGELOG.md +%_libdir/libtd*.so.%ver + +%files devel +%_includedir/td +%_libdir/libtd*.so +%_libdir/cmake/Td +%_libdir/pkgconfig/td*.pc + +%files static +%_libdir/libtd*.a + +%changelog +* Sun May 28 2023 windowsboy111 - 1.8.14^54b34e9180dabc017210ebe3995f01d0c2fbaef1-1 +- Repackaged for Terra + +* Sat Jan 21 2023 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Feb 15 2022 Onuralp Sezer - 1.8.0-1 +- Version 1.8.0 + +* Sat Jan 22 2022 Fedora Release Engineering - 1.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Sep 14 2021 Sahana Prasad - 1.7.0-4 +- Rebuilt with OpenSSL 3.0.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Nov 28 2020 Vitaly Zaitsev - 1.7.0-1 +- Updated to version 1.7.0. + +* Wed Jul 29 2020 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 984a3a93af..2c37778d8e 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,5 +1,5 @@ -%global commit 66234ae2537a99ec0eaf7b0857245a6e5c2d2bc9 -%global ver 1.8.14 +%global commit 8893dc808fa96399629d8d961ea1cbfbbc776480 +%global ver 1.8.15 Name: tdlib-nightly Version: %ver^%commit Release: 1%{?dist} diff --git a/anda/lib/tdlib/update.rhai b/anda/lib/tdlib/update.rhai index b240b7f343..bb69634b77 100644 --- a/anda/lib/tdlib/update.rhai +++ b/anda/lib/tdlib/update.rhai @@ -1,9 +1,8 @@ if filters.contains("nightly") { let ghreq = new_req("https://api.github.com/repos/tdlib/td/commits/HEAD"); - let req = new_req("https://raw.githubusercontent.com/tdlib/td/master/CMakeLists.txt"); ghreq.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`); - let sha = json(ghreq.get()).sha; - rpm.global("commit", sha); + rpm.global("commit", json(ghreq.get()).sha); + let req = new_req("https://raw.githubusercontent.com/tdlib/td/master/CMakeLists.txt"); let v = find("\nproject\\(TDLib\\s+VERSION\\s+([\\d.]+)\\s+", req.get(), 1); rpm.global("ver", v); rpm.release(); diff --git a/anda/lib/zsync2/anda.hcl b/anda/lib/zsync2/anda.hcl new file mode 100644 index 0000000000..c529bdd272 --- /dev/null +++ b/anda/lib/zsync2/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "zsync2.spec" + } +} diff --git a/anda/lib/zsync2/zsync2.spec b/anda/lib/zsync2/zsync2.spec new file mode 100644 index 0000000000..ea8d0c5147 --- /dev/null +++ b/anda/lib/zsync2/zsync2.spec @@ -0,0 +1,81 @@ +%global git_commit 1608115705047d6826bcd7b35a6988deaf3dbfec + +%global commit_short %(c=%{git_commit}; echo ${c:0:7}) + +%global libver 2.0.0-alpha-1-20220304.git%{commit_short} + +# replace - with ~ +%global libver_format %(v=%{libver}; sed 's/-/~/g' <<< $v) + +Name: zsync2 + +Version: %{libver_format} +Release: 1%{?dist} +Summary: A rewrite of the advanced file download/sync tool zsync. + +License: Artistic-2.0 +URL: https://github.com/AppImageCommunity/zsync2 +#Source0: %%{url}/archive/refs/%%{libver}.tar.gz +Source0: %{url}/archive/%{git_commit}.tar.gz +Patch0: https://github.com/AppImageCommunity/zsync2/commit/e57e1fce68194fa920542fd334488de5123e4832.patch + +BuildRequires: make +BuildRequires: cmake3 +BuildRequires: gcc-c++ +BuildRequires: curl-devel zlib-devel git-core +BuildRequires: openssl-devel +BuildRequires: libcurl-devel +BuildRequires: libssh-devel +BuildRequires: gtest-devel +BuildRequires: cpr-devel +BuildRequires: libgcrypt-devel + + +%description +A rewrite of the advanced file download/sync tool zsync. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%autosetup -n zsync2-%{git_commit} -p1 + +%build +%cmake -DCPR_FORCE_USE_SYSTEM_CURL=ON \ + -DUSE_SYSTEM_CURL=ON \ + -DUSE_SYSTEM_CPR=ON +%cmake_build + + +%install +%cmake_install + +%{?ldconfig_scriptlets} + + +%files +%license COPYING +%doc README.md +%{_bindir}/zsync2 +%{_bindir}/zsyncmake2 +%{_libdir}/*.so* + + +%files devel +%{_includedir}/*.h +# cmake +%{_libdir}/cmake/zsync2* +# will be packaged separately +%exclude %{_libdir}/pkgconfig/args.pc + + + +%changelog +* Sat Jul 22 2023 Cappy Ishihara +- Initial build diff --git a/anda/moby-extras/moby-buildx/moby-buildx.spec b/anda/moby-extras/moby-buildx/moby-buildx.spec index 8200a2a57d..5b1962b47e 100644 --- a/anda/moby-extras/moby-buildx/moby-buildx.spec +++ b/anda/moby-extras/moby-buildx/moby-buildx.spec @@ -27,8 +27,8 @@ go mod download %build export CGO_ENABLED=1 go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w -extldflags '--static-pie'" \ - -buildmode=pie -tags 'osusergo,netgo,static_build' -v -x \ - -o docker-buildx ./cmd/buildx + -buildmode=pie -tags 'osusergo,netgo,static_build' -v -x \ + -o docker-buildx ./cmd/buildx %install diff --git a/anda/nim/nim-nightly/nim-nightly.spec b/anda/nim/nim-nightly/nim-nightly.spec index 21fcec72cf..ce442e16d6 100644 --- a/anda/nim/nim-nightly/nim-nightly.spec +++ b/anda/nim/nim-nightly/nim-nightly.spec @@ -1,5 +1,5 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 17915d93bfb50aaff6c4bf77fe25707705e557c8 +%global commit 11c8dfc9b3199a12e5aadadd1491f63894b489ec %global ver 1.9.5 %global debug_package %nil diff --git a/anda/others/blackbox-terminal/blackbox-terminal.spec b/anda/others/blackbox-terminal/blackbox-terminal.spec index e13c4f8f8f..670e35453a 100644 --- a/anda/others/blackbox-terminal/blackbox-terminal.spec +++ b/anda/others/blackbox-terminal/blackbox-terminal.spec @@ -7,8 +7,8 @@ URL: https://gitlab.gnome.org/raggesilver/blackbox BuildRequires: vala meson gettext BuildRequires: pkgconfig(gtk4) >= 4.6.2 BuildRequires: pkgconfig(gio-2.0) >= 2.50 -BuildRequires: pkgconfig(libadwaita-1) >= 1.1 -BuildRequires: marble-gtk +BuildRequires: libadwaita-devel >= 1.1 +BuildRequires: pkgconfig(pqmarble) >= 2 BuildRequires: pkgconfig(vte-2.91-gtk4) >= 0.69.0 BuildRequires: pkgconfig(json-glib-1.0) >= 1.4.4 BuildRequires: pkgconfig(libxml-2.0) >= 2.9.12 @@ -16,13 +16,14 @@ BuildRequires: pkgconfig(librsvg-2.0) >= 2.54.0 BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(graphene-gobject-1.0) BuildRequires: pkgconfig(gee-0.8) -Source0: %{url}/-/archive/v%{version}/blackbox-v%{version}.tar.gz +BuildRequires: desktop-file-utils libappstream-glib cmake +Source0: %url/-/archive/v%version/blackbox-v%version.tar.gz %description %{summary}. %prep -%autosetup -n blackbox-v%{version} +%autosetup -p1 -n blackbox-v%version %build %meson @@ -31,21 +32,25 @@ Source0: %{url}/-/archive/v%{version}/blackbox-v%{version}.tar.gz %install %meson_install +%check +appstream-util validate-relax --nonet %buildroot/%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml + %files %doc README.md %license COPYING -/usr/bin/blackbox -/usr/lib/debug/* -/usr/share/applications/com.raggesilver.BlackBox.desktop -/usr/share/appdata/com.raggesilver.BlackBox.appdata.xml -/usr/share/blackbox/* -/usr/share/glib-2.0/schemas/com.raggesilver.BlackBox.gschema.xml -/usr/share/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-fullscreen-symbolic.svg -/usr/share/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-show-headerbar-symbolic.svg -/usr/share/icons/hicolor/scalable/actions/external-link-symbolic.svg -/usr/share/icons/hicolor/scalable/actions/settings-symbolic.svg -/usr/share/icons/hicolor/scalable/apps/com.raggesilver.BlackBox.svg -/usr/share/locale/*/LC_MESSAGES/blackbox.mo +%_bindir/blackbox +%_bindir/terminal-toolbox +%_datadir/applications/com.raggesilver.BlackBox.desktop +%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml +%_datadir/blackbox/ +%_datadir/glib-2.0/schemas/com.raggesilver.BlackBox.gschema.xml +%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-fullscreen-symbolic.svg +%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-show-headerbar-symbolic.svg +%_datadir/icons/hicolor/scalable/actions/external-link-symbolic.svg +%_datadir/icons/hicolor/scalable/actions/settings-symbolic.svg +%_datadir/icons/hicolor/scalable/apps/com.raggesilver.BlackBox.svg +%_datadir/locale/*/LC_MESSAGES/blackbox.mo + %changelog diff --git a/anda/others/kwin-system76-scheduler-integration/anda.hcl b/anda/others/kwin-system76-scheduler-integration/anda.hcl new file mode 100644 index 0000000000..6251aa26a4 --- /dev/null +++ b/anda/others/kwin-system76-scheduler-integration/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "kwin-system76-scheduler-integration.spec" + } +} diff --git a/anda/others/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service b/anda/others/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service new file mode 100644 index 0000000000..2bb6ec3048 --- /dev/null +++ b/anda/others/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service @@ -0,0 +1,8 @@ +[Unit] +Description=Forward com.system76.Scheduler session DBus messages to the system bus + +[Service] +ExecStart=/usr/local/bin/system76-scheduler-dbus-proxy.sh + +[Install] +WantedBy=default.target diff --git a/anda/others/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec b/anda/others/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec new file mode 100644 index 0000000000..769531c676 --- /dev/null +++ b/anda/others/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec @@ -0,0 +1,49 @@ +%global debug_package %nil + +Name: kwin-system76-scheduler-integration +Version: 0.1 +Release: 1%?dist +Summary: Notify the System76 Scheduler which app has focus so it can be prioritized +License: MIT +URL: https://github.com/maxiberta/kwin-system76-scheduler-integration +Source0: %url/archive/refs/tags/%version.tar.gz +Source1: system76-scheduler-dbus-proxy.sh +Source2: com.system76.Scheduler.dbusproxy.service +Requires: bash dbus-tools system76-scheduler kde-cli-tools systemd kf5-kconfig-core qt +BuildRequires: kf5-kpackage systemd-rpm-macros + +%description +System76 Scheduler is a service which optimizes Linux's CPU scheduler and +automatically assigns process priorities for improved desktop responsiveness. + +This KWin Script interactively notifies System76 Scheduler which app has focus +via D-Bus, so it is prioritized. + +%prep +%autosetup + +%build +kpackagetool5 --type=KWin/Script -i . + +%install +install -Dm755 %SOURCE1 %buildroot/usr/local/bin/system76-scheduler-dbus-proxy.sh +install -Dm644 %SOURCE2 %buildroot%_userunitdir/com.system76.Scheduler.dbusproxy.service +mkdir -p %buildroot%_datadir/kwin-system76-scheduler-integration +cp -r $HOME/.local/share/kwin-system76-scheduler-integration %buildroot%_datadir/kwin-system76-scheduler-integration + +%post +%systemd_user_post com.system76.Scheduler.dbusproxy.service + + +%preun +%systemd_user_preun com.system76.Scheduler.dbusproxy.service + + +%files +%config %_userunitdir/com.system76.Scheduler.dbusproxy.service +/usr/local/bin/system76-scheduler-dbus-proxy.sh +%_datadir/kwin-system76-scheduler-integration/ + + +%changelog +%autochangelog diff --git a/anda/others/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh b/anda/others/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh new file mode 100644 index 0000000000..e03e92726c --- /dev/null +++ b/anda/others/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh @@ -0,0 +1,11 @@ +#!/bin/bash +DBUS_SERVICE="com.system76.Scheduler" +DBUS_PATH="/com/system76/Scheduler" +DBUS_INTERFACE="com.system76.Scheduler" +DBUS_METHOD="SetForegroundProcess" +dbus-monitor "destination=$DBUS_SERVICE,path=$DBUS_PATH,interface=$DBUS_INTERFACE,member=$DBUS_METHOD" | + while true; do + read method call time sender _ dest serial path interface member + read type pid + [ "$member" = "member=$DBUS_METHOD" ] && qdbus --system $DBUS_SERVICE $DBUS_PATH $DBUS_INTERFACE.$DBUS_METHOD $pid + done diff --git a/anda/others/kwin-system76-scheduler-integration/update.rhai b/anda/others/kwin-system76-scheduler-integration/update.rhai new file mode 100644 index 0000000000..c9403e0162 --- /dev/null +++ b/anda/others/kwin-system76-scheduler-integration/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("maxiberta/kwin-system76-scheduler-integration")); diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec index cc9d613e39..23f6ba628c 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/python/ruff/python3-ruff.spec @@ -2,11 +2,11 @@ Name: python3-ruff Version: 0.0.280 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An extremely fast Python linter, written in Rust License: MIT -URL: https://github.com/charliermarsh/ruff -Source0: %{url}/archive/refs/tags/v%{version}.tar.gz +URL: https://beta.ruff.rs/ +Source0: https://github.com/astral-sh/ruff/archive/refs/tags/v%{version}.tar.gz BuildRequires: python3-installer python3.11 python3-pip maturin cargo Provides: python3.11dist(ruff) = %{version} diff --git a/anda/rust/kondo/anda.hcl b/anda/rust/kondo/anda.hcl index 45d18fe3ca..b2058e1d24 100644 --- a/anda/rust/kondo/anda.hcl +++ b/anda/rust/kondo/anda.hcl @@ -1,4 +1,5 @@ project pkg { + arches = ["x86_64"] rpm { spec = "rust-kondo.spec" } diff --git a/anda/tools/appimagelauncher/appimagelauncher.spec b/anda/tools/appimagelauncher/appimagelauncher.spec index 2c305eaf6a..10420ae589 100644 --- a/anda/tools/appimagelauncher/appimagelauncher.spec +++ b/anda/tools/appimagelauncher/appimagelauncher.spec @@ -27,6 +27,7 @@ BuildRequires: libappimage-devel BuildRequires: libappimageupdate-devel BuildRequires: systemd-rpm-macros BuildRequires: librsvg2-devel +BuildRequires: libqtxdg-devel %description @@ -43,13 +44,9 @@ BuildRequires: librsvg2-devel -DUSE_SYSTEM_SQUASHFUSE=ON \ -DUSE_SYSTEM_BOOST=ON \ -DUSE_SYSTEM_CURL=ON \ - -DUSE_SYSTEM_XDGUTILS=OFF \ + -DUSE_SYSTEM_XDGUTILS=ON \ -DUSE_SYSTEM_LIBAPPIMAGE=ON -pushd redhat-linux-build -#make libappimageupdate libappimageupdate-qt -popd - %cmake_build diff --git a/anda/tools/gcm-core/gcm-core.spec b/anda/tools/gcm-core/gcm-core.spec index c62abd2053..9cc641ddc3 100644 --- a/anda/tools/gcm-core/gcm-core.spec +++ b/anda/tools/gcm-core/gcm-core.spec @@ -1,4 +1,5 @@ %global debug_package %{nil} +%define __os_install_post %{nil} %global long_name git-credential-manager @@ -17,11 +18,11 @@ Source0: %{forgesource} Provides: %{long_name} = %{version}-%{release} Provides: %{long_name}-core = %{version}-%{release} -BuildRequires: dotnet-sdk-6.0 +BuildRequires: dotnet-sdk-7.0 # Require DPKG, so that we can use the `dpkg-architecture` command. which makes the build script happy. # TODO: Better solution: Patch out the debian-specific packaging code. BuildRequires: dpkg-dev -Requires: dotnet-runtime-6.0 +Requires: dotnet-runtime-7.0 %description @@ -35,6 +36,7 @@ Azure Repos, and other popular Git hosting services. dotnet build -c LinuxRelease %install +export DONT_STRIP=1 ls out/linux/Packaging.Linux/Release/payload -alh install -Dm755 out/linux/Packaging.Linux/Release/payload/%{long_name} %{buildroot}%{_bindir}/%{long_name} diff --git a/anda/tools/handbrake/HandBrake-no-fdk_aac.patch b/anda/tools/handbrake/HandBrake-no-fdk_aac.patch new file mode 100644 index 0000000000..b984bba61c --- /dev/null +++ b/anda/tools/handbrake/HandBrake-no-fdk_aac.patch @@ -0,0 +1,14 @@ +diff -up HandBrake-1.6.0/gtk/configure.ac.fdk HandBrake-1.6.0/gtk/configure.ac +--- HandBrake-1.6.0/gtk/configure.ac.fdk 2022-12-28 09:43:46.000000000 +0100 ++++ HandBrake-1.6.0/gtk/configure.ac 2023-01-23 20:50:40.075455676 +0100 +@@ -215,10 +215,6 @@ else + HB_LIBS="$HB_LIBS -lx264" + fi + +-if test "x$use_fdk_aac" = "xyes" ; then +- HB_LIBS="$HB_LIBS -lfdk-aac" +-fi +- + if test "x$use_x265" = "xyes" ; then + HB_LIBS="$HB_LIBS -lx265" + fi diff --git a/anda/tools/handbrake/HandBrake-no-libva.patch b/anda/tools/handbrake/HandBrake-no-libva.patch new file mode 100644 index 0000000000..d9b32f3f7b --- /dev/null +++ b/anda/tools/handbrake/HandBrake-no-libva.patch @@ -0,0 +1,13 @@ +diff -up HandBrake-1.2.0/test/module.defs.va HandBrake-1.2.0/test/module.defs +--- HandBrake-1.2.0/test/module.defs.va 2018-12-16 18:16:51.000000000 +0100 ++++ HandBrake-1.2.0/test/module.defs 2019-01-21 00:40:28.279840862 +0100 +@@ -25,9 +25,6 @@ endif + + ifeq (1,$(FEATURE.qsv)) + TEST.GCC.D += USE_QSV HAVE_THREADS=1 +-ifeq ($(BUILD.system),linux) +- TEST.GCC.l += va va-drm +-endif + endif + + ifeq (1,$(FEATURE.vce)) diff --git a/anda/tools/handbrake/HandBrake-no-nasm.patch b/anda/tools/handbrake/HandBrake-no-nasm.patch new file mode 100644 index 0000000000..8e1cac7e5b --- /dev/null +++ b/anda/tools/handbrake/HandBrake-no-nasm.patch @@ -0,0 +1,12 @@ +diff -up HandBrake-1.6.0/make/configure.py.orig HandBrake-1.6.0/make/configure.py +--- HandBrake-1.6.0/make/configure.py.orig 2022-12-28 09:43:46.000000000 +0100 ++++ HandBrake-1.6.0/make/configure.py 2023-01-06 23:39:40.041593595 +0100 +@@ -1665,7 +1665,7 @@ try: + lipo = ToolProbe( 'LIPO.exe', 'lipo', 'lipo', abort=False ) + pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkgconfig', 'pkg-config', abort=True, minversion=[0,27,0] ) + meson = ToolProbe( 'MESON.exe', 'meson', 'meson', abort=True, minversion=[0,47,0] ) +- nasm = ToolProbe( 'NASM.exe', 'asm', 'nasm', abort=True, minversion=[2,13,0] ) ++ nasm = ToolProbe( 'NASM.exe', 'asm', 'nasm', abort=False, minversion=[2,13,0] ) + ninja = ToolProbe( 'NINJA.exe', 'ninja', 'ninja-build', 'ninja', abort=True ) + + xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', 'xcodebuild', abort=(True if (not xcode_opts['disabled'] and (build_tuple.match('*-*-darwin*') and cross is None)) else False), versionopt='-version', minversion=[10,3,0] ) diff --git a/anda/tools/handbrake/HandBrake-nostrip.patch b/anda/tools/handbrake/HandBrake-nostrip.patch new file mode 100644 index 0000000000..b03dcc6159 --- /dev/null +++ b/anda/tools/handbrake/HandBrake-nostrip.patch @@ -0,0 +1,10 @@ +--- a/gtk/module.rules ++++ b/gtk/module.rules +@@ -21,6 +21,7 @@ $(GTK.CONFIGURE.stamp): $(GTK.src/)configure.ac $(GTK.src/)src/Makefile.am + CXX="$(GCC.gxx)" \ + CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D *W ?extra)" \ + LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \ ++ STRIP="$(STRIP.exe)" \ + PYTHON="$(PYTHON.exe)" \ + --prefix=$(PREFIX) \ + --with-hb=$(call fn.ABSOLUTE,$(BUILD/)) diff --git a/anda/tools/handbrake/HandBrake-x265-link.patch b/anda/tools/handbrake/HandBrake-x265-link.patch new file mode 100644 index 0000000000..6a1464571e --- /dev/null +++ b/anda/tools/handbrake/HandBrake-x265-link.patch @@ -0,0 +1,13 @@ +--- a/test/module.defs 2020-06-13 15:05:35.000000000 +0100 ++++ a/test/module.defs 2020-07-03 11:15:53.951205608 +0100 +@@ -30,6 +30,10 @@ + endif + endif + ++ifeq (1,$(FEATURE.x265)) ++ TEST.GCC.l += x265 ++endif ++ + ifeq (1,$(FEATURE.flatpak)) + TEST.GCC.l += glib-2.0 + endif diff --git a/anda/tools/handbrake/anda.hcl b/anda/tools/handbrake/anda.hcl new file mode 100644 index 0000000000..390725ce9f --- /dev/null +++ b/anda/tools/handbrake/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "terra-HandBrake.spec" + } +} diff --git a/anda/tools/handbrake/gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg b/anda/tools/handbrake/gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg new file mode 100644 index 0000000000000000000000000000000000000000..d845bd31873a115f9de42803ce1e7546f5cc913c GIT binary patch literal 2226 zcmV;j2u=5y0u2ON5T_3T5CG{tac)bCuEr#G+@!=^}bi(I4td$KZXyb=+xx*#qydhd%hV%p~?D;u->k)wWvc z`?jzHfe=0p9QdU4!N$mYg8wp9XwHkYNIDv{Vx#zx|Mi88`aBF*`FIrecY0{y#W@^cj zJa2*sSXX8ZOBXw>4!l^qJ-{FVRDi;93kU4B??ILSd6e|CsngtjF}9Z__B-s-eI5+` zY8=$4xm7(p)*rCbc6tb8j^BJgQLjSmF?>YENj+&n!3STc+w;-!M7+iW0Gg^J400sL zYc8#GUv6jwR$0OupqgB1*I(`hXP~CBhPD6tQ^`rcrgE!?-v^|cRb~JXXniMq!=o#Q zR_wzp6TlK3rd*yHM>j5aM6X^T-sS=&J1z@FKo-vZao_E&v2#jschl8aBKd^#XFKC(>{o{ zGNMwYB(U5$y-@%W0RRECC`e&$WI}RbYh@r*Wnpa~JY;2dWo&P7WpZ;sXkl(-Vsc?? zWiDoNK8XT71QP)Y04D_kSrDfW0viJb2?vHBfCUQ)2nPcN6$%Lm3k4Pe0|5X69svRu zfB*^!5CR>zv`$KfMIbW|{S!pD2T>R$>I)wzaXIVUm3V0Pm?WOAmtWBPIw3~1jJshv z(cm1)&$mMoO0`EG7cW7D|JI~b1Hz9FX=jIM<`~+mlEr_k4=7LX*o{ki4A?OoLSF~a zF&)GAq_S}}_37J=UTKIlRc{jAq5cm|Dff4&SO_G}HCPLQiWz2Cwc}UdH^~gCX}<~j?S5%kfr;a5pjf}RnK;YwtZ#-Bz35$J zZJ}XStmaL}1z7jh@R2_NPV*uwq}EJdh#HGfOpxuGX#V@lW>9tBR+~22v-1(Ov;fij z*v<72mYI||nXSvwInvNdDV7JsEOs~(-xQ_W70zZ(b=ChteL{Xo8pjgcqy=ICxD_gVF)Au5rN5&1FK2au^c-{ zChsfN==cJb>+k`;oyXVLhGyByv8SfnmUj!l!uxU%`i7SeRNpK8M22bJs$NkMw&mb@dM zomp5+)#A4e*M5Yd8qhTys1}N74jxki@D~A)12&cteUA!r@5i2~jE_ULs|3dYxYj*Z z>-ph{=Og1QXJ(>?8R2%9) z#FSN}$98y{va_+$srj8UKJgUPCr3)!AU;A{D3{vCvN+LD7}x!eMAddI)hP%F>kpWJ zJ&I-Bc^C%W>*MV%G-+9_RX21q>6(g6T1T&h^5nhbE`KYJJ=9C4iVS_i*H5s&z9ib| z!zv`$Kf zMf4010O<4>IsG+Yi+H^VVR8ohDpOZhAe>wMfB?ofS0k^ukf;Ig!9ho%94ZfLYEvg8 z+1BD?TId453+eD-zGvzNJ%9qZ+2tsRyr>nKa@NXY%ccSX%@!DvHy0ADcvGSl!IT5v zaq(m95`EJ2Dl7Sh!ya#0-;>iByjW-Kv0s&!CC=6#j#-1>G!;&eCsyy8Zd^-4qbdTcdQu%(+2euDD+2Ztc0$hKA6i~(cw zb3me%lh1SJ%Xq`W)nQpks@>0xNI}Wqk6sa^WB9 zZprl@W#}oda~~4vk_a8SWpFPC_W^r4p8zT$q()VY)ep#lPc@NxT07r;z}u2#tD?cU z+`9S>Wzy8!a2S~duMKANYcEH7u*;zdUG!1-WuWKbsVp}Z5RNrq8N~~b_6-pTGUOYU^!pGuO`0@wSmg-tHs38<&ylR)tBpqik zQQ?yZuJXozd})R5)hQkf{KcRcnHR<7vKc#g?f6P&aWbhl)O08flWOk~fQt3u?{KqN zzc(pX??1v^%W)bduzCfF#$H)*Ql|fRzcwBKn?uP>sX)3NM)h1r83cUr+3k%3inI(c A@c;k- literal 0 HcmV?d00001 diff --git a/anda/tools/handbrake/terra-HandBrake.spec b/anda/tools/handbrake/terra-HandBrake.spec new file mode 100644 index 0000000000..74cb51f40e --- /dev/null +++ b/anda/tools/handbrake/terra-HandBrake.spec @@ -0,0 +1,234 @@ +# https://pkgs.rpmfusion.org/cgit/free/HandBrake.git/tree/HandBrake.spec +%global commit0 04413a27e6d616cddd98c2c6468aca2bf91b87b5 +%global commit_date %(date '+%Y%m%d') +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global tag %{version} +%global pkg HandBrake + +# Build with "--without ffmpeg" or enable this to use bundled libAV +# instead of system FFMpeg libraries. +#global _without_ffmpeg 1 + +%ifarch i686 x86_64 +%global _with_asm 1 +%global _with_vpl 1 +%endif + +%global desktop_id fr.handbrake.ghb + +Name: terra-HandBrake +Version: 1.6.1 +Release: 1%?dist +Summary: An open-source multiplatform video transcoder +License: GPL-2.0-or-later +URL: https://handbrake.fr/ + +%if 0%{?tag:1} +%dnl Source0: https://github.com/%pkg/%pkg/releases/download/%version/%pkg-%version-source.tar.bz2 +Source1: https://github.com/%pkg/%pkg/releases/download/%version/%pkg-%version-source.tar.bz2.sig +# import from https://handbrake.fr/openpgp.php or https://github.com/HandBrake/HandBrake/wiki/OpenPGP +# gpg2 --export --export-options export-minimal 1629C061B3DDE7EB4AE34B81021DB8B44E4A8645 > gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg +Source2: gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg +%else +%dnl Source0: https://github.com/%pkg/%pkg/archive/%commit0.tar.gz#/%{name}-%{shortcommit0}.tar.gz +%endif + +%{?_without_ffmpeg:Source10: https://libav.org/releases/libav-12.tar.gz} + +# Pass strip tool override to gtk/configure +Patch0: %pkg-nostrip.patch +# Don't link with libva unnecessarily +Patch1: %pkg-no-libva.patch +# Don't link with fdk_aac unnecessarily +Patch2: %pkg-no-fdk_aac.patch +# Fix build on non-x86 (without nasm) +Patch3: %pkg-no-nasm.patch +# Patch from Gentoo +Patch4: %pkg-x265-link.patch + +BuildRequires: a52dec-devel >= 0.7.4 +BuildRequires: cmake +BuildRequires: dbus-glib-devel +BuildRequires: desktop-file-utils +%if 0%{?tag:1} +BuildRequires: gnupg2 +%endif +BuildRequires: libappstream-glib +%{!?_without_ffmpeg:BuildRequires: ffmpeg-free-devel >= 3.5} +# Should be >= 2.6: +BuildRequires: freetype-devel >= 2.4.11 +# Should be >= 0.19.7: +BuildRequires: fribidi-devel >= 0.19.4 +BuildRequires: gcc-c++ +BuildRequires: gstreamer1-plugins-base-devel +BuildRequires: intltool +BuildRequires: jansson-devel +BuildRequires: turbojpeg-devel +BuildRequires: lame-devel >= 3.98 +BuildRequires: libappindicator-gtk3-devel +# Should be >= 0.13.2: +BuildRequires: libass-devel >= 0.13.1 +BuildRequires: libbluray-devel >= 0.9.3 +BuildRequires: libdav1d-devel +BuildRequires: libdrm-devel +BuildRequires: libdvdnav-devel >= 5.0.1 +BuildRequires: libdvdread-devel >= 5.0.0 +BuildRequires: libgudev-devel +%if 0%{?_with_vpl:1} +BuildRequires: intel-mediasdk-devel +BuildRequires: oneVPL-devel +BuildRequires: libva-devel +%endif +BuildRequires: libmpeg2-devel >= 0.5.1 +BuildRequires: libnotify-devel +BuildRequires: librsvg2-devel +BuildRequires: libsamplerate-devel +BuildRequires: libtheora-devel +BuildRequires: libtool +BuildRequires: libvorbis-devel +# Should be >= 1.5: +BuildRequires: libvpx-devel >= 1.3 +BuildRequires: make +BuildRequires: meson +%if 0%{?_with_asm:1} +BuildRequires: nasm +%endif +BuildRequires: numactl-devel +BuildRequires: nv-codec-headers +BuildRequires: opus-devel +BuildRequires: python3 +BuildRequires: speex-devel +BuildRequires: svt-av1-devel +BuildRequires: x264-devel >= 0.148 +BuildRequires: x265-devel >= 1.9 +BuildRequires: xz-devel +BuildRequires: zimg-devel +BuildRequires: git +BuildRequires: vulkan-loader + +Requires: hicolor-icon-theme +# needed for reading encrypted DVDs +%{?fedora:Recommends: libdvdcss%_isa} +Obsoletes: HandBrake-cli < %version-%release +Provides: HandBrake-cli = %version-%release +Provides: handbrake = %version-%release + +%description +%pkg is a general-purpose, free, open-source, cross-platform, multithreaded +video transcoder software application. It can process most common multimedia +files and any DVD or Bluray sources that do not contain any kind of copy +protection. + +This package contains the command line version of the program. + +%package gui +Summary: An open-source multiplatform video transcoder (GUI) +Provides: handbrake-gui = %version-%release +Requires: hicolor-icon-theme +# needed for reading encrypted DVDs +%{?fedora:Recommends: libdvdcss%_isa} +# needed for live preview +%{?fedora:Recommends: gstreamer1-plugins-good%_isa} + +%description gui +%pkg is a general-purpose, free, open-source, cross-platform, multithreaded +video transcoder software application. It can process most common multimedia +files and any DVD or Bluray sources that do not contain any kind of copy +protection. + +This package contains the main program with a graphical interface. + +%prep +%if 0%{?tag:1} +%endif +git clone https://github.com/%pkg/%pkg +cd %pkg +git checkout %{!?tag:%commit0}%{?tag:%version} +%patch -P0 -p1 +%if 0%!?_with_vpl +%patch -P1 -p1 +%endif +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 + +# Use system libraries in place of bundled ones +for module in a52dec fdk-aac %{!?_without_ffmpeg:ffmpeg} libdav1d libdvdnav libdvdread libbluray %{?_with_vpl:libmfx libvpl} nvenc libvpx svt-av1 x265; do + sed -i -e "/MODULES += contrib\/$module/d" make/include/main.defs +done + +# Fix desktop file +sed -i -e 's/%desktop_id.svg/%desktop_id/g' gtk/src/%desktop_id.desktop + +%build +cd %pkg +echo "HASH=%commit0" > version.txt +echo "SHORTHASH=%shortcommit0" >> version.txt +echo "DATE=$(date "+%Y-%m-%d %T" -d %date)" >> version.txt +%if 0%{?tag:1} +echo "TAG=%version" >> version.txt +echo "TAG_HASH=%commit0" >> version.txt +%endif + +# By default the project is built with optimizations for speed and no debug. +# Override configure settings by passing RPM_OPT_FLAGS and disabling preset +# debug options. +echo "GCC.args.O.speed = %optflags -I%_includedir/vpl -I%_includedir/ffmpeg -ldl -lx265 %{?_with_vpl:-lvpl}" > custom.defs +echo "GCC.args.g.none = " >> custom.defs + +# Not an autotools configure script. +./configure \ + --build build \ + --prefix=%_prefix \ + --debug=std \ + --strip=%_bindir/echo \ + --verbose \ + --disable-df-fetch \ + --disable-df-verify \ + --disable-gtk-update-checks \ + %{?_with_asm:--enable-asm} \ + --enable-x265 \ + --disable-numa \ + --enable-fdk-aac \ + %{?_with_vpl:--enable-qsv} + +%make_build -C build V=1 + +%install +cd %pkg +%make_install -C build + +cp *.markdown COPYING .. + +# Desktop file, icons and AppStream metadata from FlatPak build (more complete) +rm -f %buildroot%_datadir/applications/ghb.desktop \ + %buildroot%_datadir/icons/hicolor/scalable/apps/hb-icon.svg + +install -Dpm644 gtk/src/%desktop_id.desktop \ + %buildroot%_datadir/applications/%desktop_id.desktop +install -Dpm644 gtk/src/%desktop_id.svg \ + %buildroot%_datadir/icons/hicolor/scalable/apps/%desktop_id.svg + +%find_lang ghb + +%check +desktop-file-validate %buildroot%_datadir/applications/%desktop_id.desktop +appstream-util validate-relax --nonet %buildroot%_metainfodir/%desktop_id.metainfo.xml + +%files gui +%license COPYING +%doc AUTHORS.markdown NEWS.markdown README.markdown THANKS.markdown +%_bindir/ghb +%_metainfodir/%desktop_id.metainfo.xml +%_datadir/applications/%desktop_id.desktop +%_datadir/icons/hicolor/scalable/apps/%desktop_id.svg +%_datadir/locale/*/LC_MESSAGES/ghb.mo + + +%files +%license COPYING +%doc AUTHORS.markdown NEWS.markdown README.markdown THANKS.markdown +%_bindir/HandBrakeCLI + +%changelog +%autochangelog diff --git a/anda/tools/subatomic/subatomic.spec b/anda/tools/subatomic/subatomic.spec index dccaaf1b54..f91f1b2430 100644 --- a/anda/tools/subatomic/subatomic.spec +++ b/anda/tools/subatomic/subatomic.spec @@ -38,7 +38,7 @@ go mod download %build mkdir -p build/bin go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w" -buildmode=pie -o build/bin/subatomic-cli ./subatomic-cli -go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w" -buildmode=pie -o build/bin/subatomic ./server +go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w" -buildmode=pie -o build/bin/subatomic ./server %install