diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 788cfe4b22..b9390d429b 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -52,27 +52,25 @@ jobs: with: fetch-depth: 0 - - name: Checkout latest Mock configs - uses: actions/checkout@v4 - with: - fetch-depth: 0 - repository: terrapkg/mock-configs - path: mock-configs - - name: Set up git repository run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - name: Include custom build template instead of package default + - name: CI Setup Script + if: ${{ matrix.pkg.labels.mock != '1' }} run: | - cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl + dir=$(dirname ${{ matrix.pkg.pkg }}) + if [ -f $dir/ci_setup.rhai ]; then + anda run $dir/ci_setup.rhai --labels script_path=$dir/ci_setup.rhai + fi + + - name: Install Build Dependencies + if: ${{ matrix.pkg.labels.mock != '1' }} + run: | + dir=$(dirname ${{ matrix.pkg.pkg }}) + dnf5 builddep -y ${dir}/*.spec - name: Build with Andaman - run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg - - - name: Build with Andaman (alternate arch) - if: | - matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib'] - run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-i386.cfg + run: anda build ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }} - name: Generating artifact name id: art diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index 4992cea8ab..51649ec08c 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -23,21 +23,25 @@ jobs: with: fetch-depth: 0 - - name: Checkout latest Mock configs - uses: actions/checkout@v4 - with: - repository: terrapkg/mock-configs - path: mock-configs - - name: Set up git repository run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - name: Include custom build template instead of package default + - name: CI Setup Script + if: ${{ matrix.pkg.labels.mock != '1' }} run: | - cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl + dir=$(dirname ${{ matrix.pkg.pkg }}) + if [ -f $dir/ci_setup.rhai ]; then + anda run $dir/ci_setup.rhai --labels script_path=$dir/ci_setup.rhai + fi + + - name: Install Build Dependencies + if: ${{ matrix.pkg.labels.mock != '1' }} + run: | + dir=$(dirname ${{ matrix.pkg.pkg }}) + dnf5 builddep -y ${dir}/*.spec - name: Build with Andaman - run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg + run: anda build ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }} - name: Generating artifact name id: art diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index b967a86d9f..0bae6eb5ee 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -1,115 +1,114 @@ -Name: budgie-extras -Version: 1.8.0 -Release: 1%{?dist} +Name: budgie-extras +Version: 1.8.0 +Release: 2%{?dist} -License: GPL-3.0 -Summary: Additional Budgie Desktop enhancements for user experience -URL: https://ubuntubudgie.org/ +License: GPL-3.0 +Summary: Additional Budgie Desktop enhancements for user experience +URL: https://ubuntubudgie.org/ -Source0: https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz -Patch0: 0001-fix-weathershow-desktop-widget-icon-path.patch +Source0: https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz +Patch0: 0001-fix-weathershow-desktop-widget-icon-path.patch -BuildRequires: rpm_macro(fdupes) -BuildRequires: cmake -BuildRequires: meson -BuildRequires: vala -BuildRequires: intltool +BuildRequires: rpm_macro(fdupes) +BuildRequires: cmake +BuildRequires: meson +BuildRequires: vala +BuildRequires: intltool -BuildRequires: pkgconfig(budgie-1.0) -BuildRequires: pkgconfig(gee-0.8) -BuildRequires: pkgconfig(gnome-settings-daemon) -BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(keybinder-3.0) -BuildRequires: pkgconfig(libgnome-menu-3.0) -BuildRequires: pkgconfig(libnm) -BuildRequires: pkgconfig(libnma) -BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(libsoup-2.4) -BuildRequires: pkgconfig(libwnck-3.0) +BuildRequires: pkgconfig(budgie-1.0) +BuildRequires: pkgconfig(gee-0.8) +BuildRequires: pkgconfig(gnome-settings-daemon) +BuildRequires: pkgconfig(json-glib-1.0) +BuildRequires: pkgconfig(keybinder-3.0) +BuildRequires: pkgconfig(libgnome-menu-3.0) +BuildRequires: pkgconfig(libnm) +BuildRequires: pkgconfig(libnma) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libwnck-3.0) -BuildRequires: pkgconfig(appstream) -BuildRequires: pkgconfig(granite) -BuildRequires: pkgconfig(libhandy-1) -BuildRequires: pkgconfig(zeitgeist-2.0) +BuildRequires: pkgconfig(appstream) +BuildRequires: pkgconfig(granite) +BuildRequires: pkgconfig(libhandy-1) +BuildRequires: pkgconfig(zeitgeist-2.0) -Requires: budgie-applet-applications-menu -Requires: budgie-applet-weathershow - -Requires: budgie-applet-app-launcher -Requires: budgie-applet-brightness-controller -Requires: budgie-applet-clockworks -Requires: budgie-applet-countdown -Requires: budgie-applet-dropby -Requires: budgie-applet-fuzzyclock -Requires: budgie-applet-hotcorners -Requires: budgie-applet-kangaroo -Requires: budgie-applet-keyboard-autoswitch -Requires: budgie-applet-network-manager -Requires: budgie-applet-quickchar -Requires: budgie-applet-quicknote -Requires: budgie-applet-recentlyused -Requires: budgie-applet-rotation-lock -Requires: budgie-applet-showtime -Requires: budgie-applet-takeabreak -Requires: budgie-applet-visualspace -Requires: budgie-applet-wallstreet -Requires: budgie-applet-window-shuffler -Requires: budgie-applet-workspace-stopwatch -Requires: budgie-applet-wpreviews -Requires: budgie-applet-wswitcher +Requires: budgie-applet-app-launcher +Requires: budgie-applet-applications-menu +Requires: budgie-applet-brightness-controller +Requires: budgie-applet-clockworks +Requires: budgie-applet-countdown +Requires: budgie-applet-dropby +Requires: budgie-applet-fuzzyclock +Requires: budgie-applet-hotcorners +Requires: budgie-applet-kangaroo +Requires: budgie-applet-keyboard-autoswitch +Requires: budgie-applet-network-manager +Requires: budgie-applet-quickchar +Requires: budgie-applet-quicknote +Requires: budgie-applet-recentlyused +Requires: budgie-applet-rotation-lock +Requires: budgie-applet-showtime +Requires: budgie-applet-takeabreak +Requires: budgie-applet-visualspace +Requires: budgie-applet-wallstreet +Requires: budgie-applet-weathershow +Requires: budgie-applet-window-shuffler +Requires: budgie-applet-workspace-stopwatch +Requires: budgie-applet-wpreviews +Requires: budgie-applet-wswitcher # Fix for https://github.com/UbuntuBudgie/budgie-extras/issues/233, don't know how stenstorp did not notice this -Requires: xinput +Requires: xinput %description This is part of a suite of python3 and Vala based applets for the Budgie Desktop that provide additional user orientated capabilities. The applets can be used individually or as a set. -%package common -Requires: budgie-desktop -Summary: Shared component of budgie-extras applets -BuildArch: noarch -%description common +%package common +Requires: budgie-desktop +Summary: Shared component of budgie-extras applets +BuildArch: noarch +%description common The shared component provides for capabilities that are utilised between budgie-extra applets. -%package daemon -Summary: Manages keyboard shortcuts -Requires: budgie-extras-common -%description daemon +%package daemon +Summary: Manages keyboard shortcuts +Requires: budgie-extras-common +%description daemon This on logon process manages keyboard shortcuts delivered via .bde files for various extras-plugins. %package -n budgie-applet-app-launcher -Requires: budgie-extras-common -Summary: Applet to provide an alternative means to launch applications +Requires: budgie-extras-common +Summary: Applet to provide an alternative means to launch applications %description -n budgie-applet-app-launcher The app-launcher applet allows the ability to add favorite apps to the panel as well as finding and launching applications. The list of applications listed can be easily configured to be visible or hidden. %package -n budgie-applet-applications-menu -Requires: budgie-extras-common -Summary: Lightweight and stylish app launcher +Requires: budgie-extras-common +Summary: Lightweight and stylish app launcher %description -n budgie-applet-applications-menu %{summary} %package -n budgie-applet-brightness-controller -Requires: budgie-extras-common -Summary: A Budgie Desktop applet for productivity +Requires: budgie-extras-common +Summary: A Budgie Desktop applet for productivity %description -n budgie-applet-brightness-controller %{summary} %package -n budgie-applet-clockworks -Requires: budgie-extras-common -Summary: Applet to display clock across multiple time zones +Requires: budgie-extras-common +Summary: Applet to display clock across multiple time zones %description -n budgie-applet-clockworks The Clockworks applet displays the current time across multiple time zones. %package -n budgie-applet-countdown -Requires: budgie-extras-common -Summary: Applet providing a countdown capability on the Budgie Desktop +Requires: budgie-extras-common +Summary: Applet providing a countdown capability on the Budgie Desktop %description -n budgie-applet-countdown The Countdown applet provides the user the ability to start an action when the countdown reaches 0 seconds. Actions include flashing @@ -117,8 +116,8 @@ an icon in the panel, opening a notification window, sounding a bell or running a custom command. %package -n budgie-applet-dropby -Requires: budgie-extras-common -Summary: Applet to popup when a USB device is connected +Requires: budgie-extras-common +Summary: Applet to popup when a USB device is connected %description -n budgie-applet-dropby The DropBy applet pops up in the panel when connecting a usb device. The applet subsequently offers the option(s) to mount, unmount/eject @@ -126,29 +125,29 @@ and in case of a flash drive, to make a local copy of the drive's content. The info shows the free space on the volume. %package -n budgie-applet-fuzzyclock -Requires: budgie-extras-common -Summary: Shows the time in a Fuzzy Way +Requires: budgie-extras-common +Summary: Shows the time in a Fuzzy Way %description -n budgie-applet-fuzzyclock %{summary} %package -n budgie-applet-hotcorners -Requires: budgie-extras-common -Summary: Applet providing hotcorners capabilities for the Budgie Desktop +Requires: budgie-extras-common +Summary: Applet providing hotcorners capabilities for the Budgie Desktop %description -n budgie-applet-hotcorners The hotcorners applet allow user defined commands to be executed when the mouse cursor is pushed into a corner of the main desktop. %package -n budgie-applet-kangaroo -Requires: budgie-extras-common -Summary: Applet to allow quick file-browsing +Requires: budgie-extras-common +Summary: Applet to allow quick file-browsing %description -n budgie-applet-kangaroo The kangaroo applet allows for quick & easy browsing, across (possibly) many directory layers, without having to do a single mouse click. %package -n budgie-applet-keyboard-autoswitch -Requires: budgie-extras-common -Summary: Applet adding the ability to set a different keyboard layout per application +Requires: budgie-extras-common +Summary: Applet adding the ability to set a different keyboard layout per application %description -n budgie-applet-keyboard-autoswitch The Keyboard Auto Switcher applet provides the user the ability to set a different keyboard layout per application. Exceptions to the default @@ -156,50 +155,51 @@ layout can be set by simply choosing a different layout using the Keyboard Layout applet. %package -n budgie-applet-network-manager -Requires: budgie-extras-common -Summary: A fork of Wingpanel Network Indicator, ported to budgie desktop +Requires: budgie-extras-common +Summary: A fork of Wingpanel Network Indicator, ported to budgie desktop %description -n budgie-applet-network-manager %{summary} %package -n budgie-applet-quickchar -Requires: budgie-extras-common -Summary: A mini-app to quickly choose and insert equivalents of ascii characters +Requires: budgie-extras-common +Requires: budgie-extras-daemon +Summary: A mini-app to quickly choose and insert equivalents of ascii characters %description -n budgie-applet-quickchar QuickChar is a mini-app to quickly choose and insert equivalents of ascii characters. QuickChar is activated via the Budgie Menu. %package -n budgie-applet-quicknote -Requires: budgie-extras-common -Summary: Applet providing simple notes capability for the Budgie Desktop +Requires: budgie-extras-common +Summary: Applet providing simple notes capability for the Budgie Desktop %description -n budgie-applet-quicknote The quicknote applet allows a user to record a text based note. The applet supports multiple undo and redo capabilities. %package -n budgie-applet-recentlyused -Requires: budgie-extras-common -Summary: Applet displays files recently accessed for the Budgie Desktop +Requires: budgie-extras-common +Summary: Applet displays files recently accessed for the Budgie Desktop %description -n budgie-applet-recentlyused The recentlyused applet displays the users files that have been opened or created within a configurable period of time. %package -n budgie-applet-rotation-lock -Requires: budgie-extras-common -Summary: Applet to lock or unlock the screen rotation +Requires: budgie-extras-common +Summary: Applet to lock or unlock the screen rotation %description -n budgie-applet-rotation-lock The Rotation Lock applet provides the user an easy way to lock or unlock the screen rotation. %package -n budgie-applet-showtime -Requires: budgie-extras-common -Summary: Applet displaying date and time on the Budgie Desktop +Requires: budgie-extras-common +Summary: Applet displaying date and time on the Budgie Desktop %description -n budgie-applet-showtime The ShowTime applet is a digital desktop clock, showing time and/or date. Text color of both the displayed time and date can be set separately from the applet's menu %package -n budgie-applet-takeabreak -Requires: budgie-extras-common -Summary: A pomodoro-like applet, to make sure to take regular breaks from working +Requires: budgie-extras-common +Summary: A pomodoro-like applet, to make sure to take regular breaks from working %description -n budgie-applet-takeabreak Budgie TakeaBreak is a pomodoro- like applet, to make sure to take regular breaks from working. Options from Budgie Settings include turning the screen @@ -208,35 +208,36 @@ time. The applet can be accessed quickly from the panel to temporarily switch it off. %package -n budgie-applet-visualspace -Requires: budgie-extras-common -Summary: Shows the current workspace(s), as bullet(s) +Requires: budgie-extras-common +Summary: Shows the current workspace(s), as bullet(s) %description -n budgie-applet-visualspace Budgie VisualSpace shows the current workspace(s), as bullet(s). The applet includes a menu to navigate to either one of the windows or their corresponding workspace. %package -n budgie-applet-wallstreet -Requires: budgie-extras-common -Summary: A mini-app to switch wallpapers on regular intervalls +Requires: budgie-extras-common +Summary: A mini-app to switch wallpapers on regular intervalls %description -n budgie-applet-wallstreet Budgie WallStreet is a mini-app to switch wallpapers on regular intervalls. %package -n budgie-applet-weathershow -Requires: budgie-extras-common -Summary: Applet to display the weather and forecast +Requires: budgie-extras-common +Summary: Applet to display the weather and forecast %description -n budgie-applet-weathershow The weathershow applet displays daily and three hourly weather forecasts on both the desktop and a Popover. %package -n budgie-applet-window-shuffler -Requires: budgie-extras-common -Summary: Budgie Window Shuffler +Requires: budgie-extras-common +Requires: budgie-extras-daemon +Summary: Budgie Window Shuffler %description -n budgie-applet-window-shuffler %{summary} %package -n budgie-applet-workspace-stopwatch -Requires: budgie-extras-common -Summary: An applet to keep track of usage per workspace +Requires: budgie-extras-common +Summary: An applet to keep track of usage per workspace %description -n budgie-applet-workspace-stopwatch Workspace Timer Applet is an applet to keep track of usage per workspace, e.g. to find out how much minutes/hours were actually spent on a job. Workspaces can @@ -246,14 +247,16 @@ onworkspace switch/clicking the icon for popup or else every 30 seconds. Time during suspend is automatically retracted from a workspace' time. %package -n budgie-applet-wpreviews -Requires: budgie-extras-common +Requires: budgie-extras-common +Requires: budgie-extras-daemon Summary: Applet providing window previews capabilities for the Budgie Desktop %description -n budgie-applet-wpreviews The Previews applet shows an overview of windows in an expose like way. %package -n budgie-applet-wswitcher -Requires: budgie-extras-common -Summary: An applet to show a different wallpaper on each of the workspaces +Requires: budgie-extras-common +Requires: budgie-extras-daemon +Summary: An applet to show a different wallpaper on each of the workspaces %description -n budgie-applet-wswitcher Budgie Wallpaper Workspace Switcher is an application (applet) to show a different wallpaper on each of the workspaces. Usage is simple: add the applet diff --git a/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec b/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec index 16fa825ea8..7c10a07483 100644 --- a/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec +++ b/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec @@ -3,7 +3,7 @@ Name: gnome-shell-extension-%{extension} Version: 2 -Release: 2%{?dist} +Release: 1%{?dist} Summary: GNOME Shell extension to bring back the app menu License: GPL-3.0-only URL: https://github.com/fthx/appmenu-is-back @@ -11,16 +11,16 @@ URL: https://github.com/fthx/appmenu-is-back BuildArch: noarch Source0: https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz -Patch0: https://github.com/fthx/appmenu-is-back/commit/c251ff36d226dac679eb745638e3df236d3e1a20.patch +Patch0: https://github.com/fthx/appmenu-is-back/compare/v2..703a31acf900eb7bcab3462baeefa815ec7f13ab.patch -Requires: (gnome-shell >= 46~ with gnome-shell < 47~) +Requires: (gnome-shell >= 46~ with gnome-shell < 48~) Recommends: gnome-extensions-app %description This extension brings back the app menu in the top panel, for GNOME 45 and later. %prep -%autosetup -n appmenu-is-back-%{version} +%autosetup -n appmenu-is-back-%{version} -p1 %install install -Dm644 metadata.json %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/metadata.json @@ -31,8 +31,5 @@ install -Dm644 extension.js %{buildroot}%{_datadir}/gnome-shell/extensions/%{uui %{_datadir}/gnome-shell/extensions/%{uuid} %changelog -* Mon Apr 1 2024 Lleyton Gray - 2-2 -- Patch for GNOME 46 compatibility - * Thu Nov 16 2023 Lleyton Gray - 2-1 - Initial Release diff --git a/anda/desktops/kde/lightdm-kde-greeter/anda.hcl b/anda/desktops/kde/lightdm-kde-greeter/anda.hcl new file mode 100644 index 0000000000..d53e8ec38f --- /dev/null +++ b/anda/desktops/kde/lightdm-kde-greeter/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "lightdm-kde-greeter.spec" + } +} diff --git a/anda/desktops/kde/lightdm-kde-greeter/lightdm-kde-greeter.spec b/anda/desktops/kde/lightdm-kde-greeter/lightdm-kde-greeter.spec new file mode 100644 index 0000000000..abfe7a2159 --- /dev/null +++ b/anda/desktops/kde/lightdm-kde-greeter/lightdm-kde-greeter.spec @@ -0,0 +1,92 @@ +%global commit c3f01539e3b036ae940e678f5739b37ca0300ce2 + +Name: lightdm-kde-greeter +Version: 6.0.2 +Release: 1%?dist +Summary: Login screen using the LightDM framework +License: GPL-3.0-or-later +URL: https://invent.kde.org/plasma/%name +Source0: %url/-/archive/v%version.tar.gz +Packager: madonuko +BuildRequires: gcc gcc-c++ mold +BuildRequires: cmake extra-cmake-modules +BuildRequires: cmake(Qt6Core5Compat) +BuildRequires: cmake(Qt6ShaderTools) +BuildRequires: cmake(Qt6Qml) +BuildRequires: cmake(KF6IconThemes) +BuildRequires: cmake(KF6KCMUtils) +BuildRequires: cmake(KF6Package) +BuildRequires: cmake(KF6ConfigWidgets) +BuildRequires: cmake(KF6I18n) +BuildRequires: cmake(KF6Auth) +BuildRequires: cmake(KF6NetworkManagerQt) +BuildRequires: cmake(Plasma) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(liblightdm-gobject-1) +BuildRequires: systemd-rpm-macros +Requires: lightdm +Requires: plasma-workspace-qml +Requires: polkit +Provides: lightdm-greeter + +%description +%summary. + + +%prep +# why the heck do you torture me for godsake. +%autosetup -n %name-v%version-%commit +sed 's/sbin/bin/' -i greeter/CMakeLists.txt + + +%build +export LDFLAGS="$LDFLAGS -fuse-ld=mold" +%cmake_kf6 \ + -DGREETER_WAYLAND_SESSIONS_FIRST=ON \ + -DGREETER_IMAGES_DIR=%_sharedstatedir/%name/images \ + -DBUILD_TESTING=OFF +%cmake_build + + +%install +%cmake_install + +%find_lang kcm_lightdm --with-kde +%find_lang lightdm_kde_greeter --with-kde +%find_lang lightdm_theme_userbar --with-kde + +# FIXME: why does it installs to the wrong dir +mv %buildroot/%name %buildroot%_datadir/ +mkdir -p %buildroot%_sharedstatedir/%name + +%post +%systemd_user_post %name-wifikeeper.service + +%preun +%systemd_user_preun %name-wifikeeper.service + +%postun +%systemd_user_postun_with_restart %name-wifikeeper.service + + +%files -f kcm_lightdm.lang -f lightdm_kde_greeter.lang -f lightdm_theme_userbar.lang +%doc README.md +%license COPYING.GPL3 +%config(noreplace) %_sysconfdir/lightdm/%name.conf +%dir %_sharedstatedir/%name +%_bindir/%name +%_bindir/lightdm-kde-greeter-rootimage +%_bindir/lightdm-kde-greeter-wifikeeper +%_datadir/applications/kcm_lightdm.desktop +%_datadir/dbus-1/system-services/org.kde.kcontrol.kcmlightdm.service +%_datadir/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf +%_datadir/polkit-1/actions/org.kde.kcontrol.kcmlightdm.policy +%_datadir/xgreeters/lightdm-kde-greeter.desktop +%_datadir/%name/ +%_kf6_libexecdir/kauth/kcmlightdmhelper +%_qt6_plugindir/plasma/kcms/systemsettings/kcm_lightdm.so +%_userunitdir/lightdm-kde-greeter-wifikeeper.service + +%changelog +* Tue Dec 24 2024 madonuko - 6.0.1-1 +- Initial package diff --git a/anda/desktops/kde/lightdm-kde-greeter/update.rhai b/anda/desktops/kde/lightdm-kde-greeter/update.rhai new file mode 100644 index 0000000000..a5bd437a39 --- /dev/null +++ b/anda/desktops/kde/lightdm-kde-greeter/update.rhai @@ -0,0 +1,5 @@ +let v = gitlab_tag("invent.kde.org", "2512"); +rpm.version(v); +if rpm.changed() { + rpm.global("commit", get(`https://invent.kde.org/api/v4/projects/2512/repository/tags/${v}`).json().commit.id); +} diff --git a/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec b/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec index abaad53f49..ba57eccb1c 100644 --- a/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec +++ b/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec @@ -4,7 +4,7 @@ Name: lomiri-download-manager Version: 0.1.3 -Release: 1%{?dist} +Release: 1%?dist Summary: Upload Download Manager for Lomiri License: LGPLv3 URL: https://gitlab.com/ubports/development/core/lomiri-download-manager diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 61419284a8..8b16257f0f 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -10,6 +10,7 @@ License: GPLv3 URL: https://gitlab.com/ubports/development/core/lomiri-system-settings Source0: %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz Patch0: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch +Patch1: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch BuildRequires: cmake BuildRequires: gcc-c++ diff --git a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec index 936b90daaf..7fac90dc39 100644 --- a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec +++ b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit -%global commit a72422f66dc1e40afcb9feefbc672c00c6f70671 +%global commit 8f490672f9853278b0aec6435a68d56b9eaf8207 %forgemeta Name: lomiri-ui-toolkit diff --git a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec index c00f02ffb9..83bebd6887 100644 --- a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec +++ b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec @@ -21,7 +21,7 @@ Multi-Purpose Launcher with a lot of features. Highly Customizable and fast.} %global godocs README.md cmd/version.txt Name: walker -Release: 2%?dist +Release: 1%?dist Summary: Multi-Purpose Launcher with a lot of features. Highly Customizable and fast License: MIT diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index cf39d0bc19..9d56b4fd09 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,12 +1,14 @@ -%global commit 3f7c3afaf947280bd2852626ff4599c02d9fb07e +%global commit 94599102e9fb8247af08cbbbcb7ee25e3d31e1bd %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20241230 +%global commit_date 20250102 + +%global cache_dir %{builddir}/zig-cache Name: ghostty-nightly Version: %{commit_date}.%{shortcommit} -Release: 2%{?dist} +Release: 1%{?dist} Summary: A fast, native terminal emulator written in Zig; this is the Tip (nightly) build. -License: MIT +License: MIT AND MPL-2.0 AND OFL-1.1 URL: https://ghostty.org/ Source0: https://github.com/ghostty-org/ghostty/archive/%{commit}/ghostty-%{commit}.tar.gz Patch0: no-strip.diff @@ -18,16 +20,17 @@ BuildRequires: pandoc-cli BuildRequires: zig Requires: %{name}-terminfo = %{version}-%{release} Requires: %{name}-shell-integration = %{version}-%{release} -Requires: fontconfig -Requires: freetype -Requires: glib2 -Requires: gtk4 -Requires: harfbuzz -Requires: libpng -Requires: oniguruma -Requires: pixman -Requires: zlib-ng -Suggests: libadwaita +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(oniguruma) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(libadwaita-1) +BuildRequires: libX11-devel Conflicts: ghostty Provides: ghostty-tip = %{version}-%{release} Packager: ShinyGil @@ -76,13 +79,20 @@ Supplements: %{name} %prep %autosetup -n ghostty-%{commit} -p1 +# Download everything ahead of time so we can enable system integration mode +ZIG_GLOBAL_CACHE_DIR="%{cache_dir}" ./nix/build-support/fetch-zig-cache.sh + %build %install +DESTDIR="%{buildroot}" \ zig build \ --summary all \ - -Doptimize=ReleaseFast --release=fast \ - --prefix %{buildroot}%{_prefix} --verbose \ + --release=fast \ + --system "%{cache_dir}/p" \ + --prefix "%{_prefix}" --prefix-lib-dir "%{_libdir}" \ + --prefix-exe-dir "%{_bindir}" --prefix-include-dir "%{_includedir}" \ + --verbose \ -Dcpu=baseline \ -Dpie=true \ -Demit-docs @@ -138,9 +148,10 @@ zig build \ %_datadir/terminfo/x/xterm-ghostty %changelog -* Thu Dec 26 2024 ShinyGil -- Initial package * Tue Dec 31 2024 ShinyGil - Update to 20241231.3f7c3af * High CVE-2003-0063: Allows execution of arbitrary commands * Medium CVE-2003-0070: Allows execution of arbitrary commands + +* Thu Dec 26 2024 ShinyGil +- Initial package diff --git a/anda/devs/ghostty/stable/ghostty.spec b/anda/devs/ghostty/stable/ghostty.spec index b0f8152485..5520262900 100644 --- a/anda/devs/ghostty/stable/ghostty.spec +++ b/anda/devs/ghostty/stable/ghostty.spec @@ -1,10 +1,16 @@ +# Signing key from https://github.com/ghostty-org/ghostty/blob/main/PACKAGING.md +%global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV + +%global cache_dir %{builddir}/zig-cache + Name: ghostty Version: 1.0.1 -Release: 2%{?dist} +Release: 4%{?dist} Summary: A fast, native terminal emulator written in Zig. -License: MIT +License: MIT AND MPL-2.0 AND OFL-1.1 URL: https://ghostty.org/ -Source0: https://release.files.ghostty.org/%{version}/ghostty-source.tar.gz +Source0: https://release.files.ghostty.org/%{version}/ghostty-%{version}.tar.gz +Source1: https://release.files.ghostty.org/%{version}/ghostty-%{version}.tar.gz.minisig Patch0: no-strip.diff BuildRequires: gtk4-devel BuildRequires: libadwaita-devel @@ -12,18 +18,20 @@ BuildRequires: ncurses BuildRequires: ncurses-devel BuildRequires: pandoc-cli BuildRequires: zig +BuildRequires: minisign Requires: %{name}-terminfo = %{version}-%{release} Requires: %{name}-shell-integration = %{version}-%{release} -Requires: fontconfig -Requires: freetype -Requires: glib2 -Requires: gtk4 -Requires: harfbuzz -Requires: libpng -Requires: oniguruma -Requires: pixman -Requires: zlib-ng -Suggests: libadwaita +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(oniguruma) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(libadwaita-1) +BuildRequires: libX11-devel Conflicts: ghostty-nightly Packager: ShinyGil @@ -69,15 +77,24 @@ Supplements: %{name} %summary. %prep -%autosetup -n ghostty-source -p1 +/usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key} +%autosetup -p1 + +# Download everything ahead of time so we can enable system integration mode +ZIG_GLOBAL_CACHE_DIR="%{cache_dir}" ./nix/build-support/fetch-zig-cache.sh %build %install +DESTDIR="%{buildroot}" \ zig build \ --summary all \ - -Doptimize=ReleaseFast --release=fast \ - --prefix %{buildroot}%{_prefix} --verbose \ + --release=fast \ + --system "%{cache_dir}/p" \ + --prefix "%{_prefix}" --prefix-lib-dir "%{_libdir}" \ + --prefix-exe-dir "%{_bindir}" --prefix-include-dir "%{_includedir}" \ + --verbose \ + -Dversion-string=%{version} \ -Dcpu=baseline \ -Dpie=true \ -Demit-docs @@ -133,9 +150,10 @@ zig build \ %_datadir/terminfo/x/xterm-ghostty %changelog -* Thu Dec 26 2024 ShinyGil -- Initial package * Tue Dec 31 2024 ShinyGil - Update to 1.0.1 * High CVE-2003-0063: Allows execution of arbitrary commands * Medium CVE-2003-0070: Allows execution of arbitrary commands + +* Thu Dec 26 2024 ShinyGil +- Initial package diff --git a/anda/devs/tmon/anda.hcl b/anda/devs/tmon/anda.hcl new file mode 100644 index 0000000000..e72e5561c8 --- /dev/null +++ b/anda/devs/tmon/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "tmon.spec" + } +} diff --git a/anda/devs/tmon/tmon.spec b/anda/devs/tmon/tmon.spec new file mode 100644 index 0000000000..525ef254cd --- /dev/null +++ b/anda/devs/tmon/tmon.spec @@ -0,0 +1,48 @@ +%global commit e8cae0d88dc8d51cb0e34e3fd3553bcbdaf04ca5 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20241215 +%global debug_package %{nil} + +Name: tmon +Version: %{commit_date}.git~%{shortcommit} +Release: 1%{?dist} +Summary: A tiny system monitor for Linux + +License: GPL-3.0-only +URL: https://github.com/pondda/%{name} +Source0: %{url}/archive/%{commit}.tar.gz + +Requires: lm_sensors +Conflicts: kernel-tools + +Recommends: google-noto-color-emoji-fonts + +BuildRequires: make gcc-c++ ncurses-devel + +Packager: sadlerm + +%description +%{summary}. + +%prep +%autosetup -n %{name}-%{commit} + +%build +%make_build + +%install +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp %{name} %{buildroot}%{_bindir}/%{name} +install -m 0755 -vd %{buildroot}%{_sysconfdir}/%{name} +install -m 0644 -vp default.conf %{buildroot}%{_sysconfdir}/%{name}/ + +%files +%license LICENSE +%doc README.md +%{_bindir}/%{name} +%{_sysconfdir}/%{name}/default.conf + +%changelog +* Tue Dec 17 2024 sadlerm +- Initial package + diff --git a/anda/devs/tmon/update.rhai b/anda/devs/tmon/update.rhai new file mode 100644 index 0000000000..9e475ef20f --- /dev/null +++ b/anda/devs/tmon/update.rhai @@ -0,0 +1,6 @@ +rpm.global("commit", gh_commit("pondda/tmon")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); +} + diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 8f0d13ae7c..fbf95ca640 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit 344284e01331667c018e6ade5d791a20598a3a5c +%global commit c11bde7bf4e428be7639aaf9ffc7ea3dc5becf16 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20241230 -%global ver 0.168.0 +%global commit_date 20250102 +%global ver 0.169.0 %bcond_with check diff --git a/anda/docker/containerd/containerd.spec b/anda/docker/containerd/containerd.spec index f89a3f600e..04ebde9e9f 100644 --- a/anda/docker/containerd/containerd.spec +++ b/anda/docker/containerd/containerd.spec @@ -7,7 +7,7 @@ # https://github.com/containerd/containerd %global goipath github.com/containerd/containerd -Version: 2.0.0 +Version: 2.0.1 %gometa diff --git a/anda/games/gamescope-legacy/anda.hcl b/anda/games/gamescope-legacy/anda.hcl index 272907ad53..db9bd0608a 100644 --- a/anda/games/gamescope-legacy/anda.hcl +++ b/anda/games/gamescope-legacy/anda.hcl @@ -1,8 +1,6 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "gamescope-legacy.spec" } - labels { - multilib = 1 - } } diff --git a/anda/games/gamescope-session-steam/gamescope-session-steam.spec b/anda/games/gamescope-session-steam/gamescope-session-steam.spec index 8cf4b0533c..fa0143f930 100644 --- a/anda/games/gamescope-session-steam/gamescope-session-steam.spec +++ b/anda/games/gamescope-session-steam/gamescope-session-steam.spec @@ -1,8 +1,8 @@ %define debug_package %nil -%global commit 015e09825d4f9a2dfdbc20fc2711e2dcee2af68a +%global commit 1a3fdb7fa15a4bba7204bef69702b7a10a297828 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240719 +%global commit_date 20241206 Name: gamescope-session-steam Version: %commit_date.%shortcommit diff --git a/anda/games/gamescope-session/gamescope-session.spec b/anda/games/gamescope-session/gamescope-session.spec index fbeed266ef..de8ba528a4 100644 --- a/anda/games/gamescope-session/gamescope-session.spec +++ b/anda/games/gamescope-session/gamescope-session.spec @@ -1,8 +1,8 @@ %define debug_package %nil -%global commit 0b469397e97d1c7edc48d78002ac6159b88d8d03 +%global commit 4ad912c4a3c09c91551f21617981b878f7084058 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240926 +%global commit_date 20241206 Name: gamescope-session Version: %commit_date.%shortcommit diff --git a/anda/games/gamescope/anda.hcl b/anda/games/gamescope/anda.hcl index 9aee67abdf..f3bf32281b 100755 --- a/anda/games/gamescope/anda.hcl +++ b/anda/games/gamescope/anda.hcl @@ -1,9 +1,9 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "gamescope.spec" } labels { - multilib = 1 extra = 1 } } diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 99170340b9..b2f0005701 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -42,6 +42,7 @@ keyboards) and translate their input to a variety of virtual device formats. %license LICENSE %_bindir/inputplumber %_unitdir/inputplumber.service +%_unitdir/inputplumber-suspend.service %_udevhwdbdir/59-inputplumber.hwdb %_datadir/dbus-1/system.d/org.shadowblip.InputPlumber.conf %_datadir/inputplumber/ diff --git a/anda/games/opengamepadui/opengamepadui.spec b/anda/games/opengamepadui/opengamepadui.spec index 02a04bbfb4..d65b2181ca 100644 --- a/anda/games/opengamepadui/opengamepadui.spec +++ b/anda/games/opengamepadui/opengamepadui.spec @@ -10,6 +10,7 @@ Packager: Cappy Ishihara BuildRequires: godot BuildRequires: scons BuildRequires: make +BuildRequires: cargo BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: gcc @@ -67,9 +68,7 @@ cd %{build_dir} %license %{build_dir}/LICENSE %doc %{build_dir}/docs/ %{_bindir}/opengamepadui -%{_datadir}/opengamepadui/*.so -%{_datadir}/opengamepadui/scripts/* -%{_datadir}/opengamepadui/opengamepad-ui.* +%{_datadir}/opengamepadui/ %{_datadir}/applications/opengamepadui.desktop %{_datadir}/icons/hicolor/scalable/apps/opengamepadui.svg %{_datadir}/polkit-1/actions/* diff --git a/anda/games/prismlauncher-nightly/ci_setup.rhai b/anda/games/prismlauncher-nightly/ci_setup.rhai new file mode 100644 index 0000000000..92de03460a --- /dev/null +++ b/anda/games/prismlauncher-nightly/ci_setup.rhai @@ -0,0 +1,2 @@ +import "andax/ci/extra_repos.rhai" as extra_repos; +extra_repos::install(labels); diff --git a/anda/games/prismlauncher/ci_setup.rhai b/anda/games/prismlauncher/ci_setup.rhai new file mode 100644 index 0000000000..92de03460a --- /dev/null +++ b/anda/games/prismlauncher/ci_setup.rhai @@ -0,0 +1,2 @@ +import "andax/ci/extra_repos.rhai" as extra_repos; +extra_repos::install(labels); diff --git a/anda/games/steam/.gitignore b/anda/games/steam/.gitignore new file mode 100644 index 0000000000..400d7da77c --- /dev/null +++ b/anda/games/steam/.gitignore @@ -0,0 +1,8 @@ +# We're gonna do a whitelist approach here because +# inline sources are not allowed + +* +!.gitignore +!anda.hcl +!steam.spec +!update.rhai \ No newline at end of file diff --git a/anda/games/steam/anda.hcl b/anda/games/steam/anda.hcl new file mode 100644 index 0000000000..9aa4d9d4f6 --- /dev/null +++ b/anda/games/steam/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "steam.spec" + } + // todo: force-arches macro? + // labels { + // multilib = 1 + // } +} diff --git a/anda/games/steam/steam.spec b/anda/games/steam/steam.spec new file mode 100644 index 0000000000..335f84b7d9 --- /dev/null +++ b/anda/games/steam/steam.spec @@ -0,0 +1,334 @@ +# Binary package, no debuginfo should be generated +%global debug_package %{nil} + +%global appstream_id com.valvesoftware.Steam + +# If current arch is x86_64, then add the same dependency for i686 + +%define arch_dep() \ +%ifarch x86_64 \ +Requires: %1 \ +Requires: %1(x86-32) \ +%else \ +Requires: %1 \ +%endif + + + + +%define arch_recommends() \ +%ifarch x86_64 \ +Recommends: %1 \ +Recommends: %1(x86-32) \ +%else \ +Recommends: %1 \ +%endif + + + +Name: steam +Version: 1.0.0.81 +Release: 1%{?dist} +Summary: Installer for the Steam software distribution service +# Redistribution and repackaging for Linux is allowed, see license file. udev rules are MIT. +License: Steam License Agreement and MIT +URL: http://www.steampowered.com/ +ExclusiveArch: x86_64 +Packager: Cappy Ishihara + +Source0: https://repo.steampowered.com/%{name}/archive/beta/%{name}_%{version}.tar.gz +Source1: https://github.com/terrapkg/pkg-steam/raw/refs/heads/main/steam.sh +Source2: https://github.com/terrapkg/pkg-steam/raw/refs/heads/main/steam.csh +Source5: https://github.com/terrapkg/pkg-steam/raw/refs/heads/main/README.Fedora + +# Ghost touches in Big Picture mode: +# https://github.com/ValveSoftware/steam-for-linux/issues/3384 +# https://bugzilla.kernel.org/show_bug.cgi?id=28912 +# https://github.com/denilsonsa/udev-joystick-blacklist +# https://github.com/systemd/systemd/issues/32773 + +# Input devices seen as joysticks: +Source6: https://github.com/terrapkg/pkg-steam/raw/refs/heads/main/61-these-are-not-joystick.hwdb + +# Configure limits in systemd +Source7: https://github.com/terrapkg/pkg-steam/raw/refs/heads/main/01-steam.conf + +# Newer udev rules than what is bundled in the tarball +Source8: https://raw.githubusercontent.com/ValveSoftware/steam-devices/master/60-steam-input.rules +Source9: https://raw.githubusercontent.com/ValveSoftware/steam-devices/master/60-steam-vr.rules + +# Do not install desktop file in lib/steam, do not install apt sources +Patch0: https://github.com/terrapkg/pkg-steam/raw/refs/heads/main/steam-makefile.patch +# Do not try to copy steam.desktop to the user's desktop from lib/steam +Patch1: https://github.com/terrapkg/pkg-steam/raw/refs/heads/main/steam-no-icon-on-desktop.patch + +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib +BuildRequires: make +BuildRequires: systemd + +# Required to run the initial setup +Requires: tar +Requires: zenity + +# Most games use OpenGL, some games already use Vulkan. Vulkan is also required +# for Steam Play to run Windows games through emulation. i686 version of these +# packages are necessary even on x86_64 systems for running 32bit games. Pull in +# native arch drivers as well, by not specifying _isa macro, native arch +# packages are preferred. This will make sure people have all necessary drivers +# for both i686 and x86_64 games. +%arch_dep mesa-dri-drivers +%arch_dep mesa-vulkan-drivers +%arch_dep vulkan-loader + +# Minimum requirements for starting the steam client using system libraries +Requires: alsa-lib%{?_isa} +Requires: fontconfig%{?_isa} +Requires: gtk2%{?_isa} +Requires: libICE%{?_isa} +Requires: libnsl%{?_isa} +Requires: libpng%{?_isa} +Requires: libXext%{?_isa} +Requires: libXinerama%{?_isa} +Requires: libXtst%{?_isa} +Requires: libXScrnSaver%{?_isa} +Requires: mesa-libGL%{?_isa} +Requires: mesa-libEGL%{?_isa} +Requires: NetworkManager-libnm%{?_isa} +Requires: nss%{?_isa} +Requires: pulseaudio-libs%{?_isa} + +# Required for sending out crash reports to Valve +Requires: libcurl + +# Workaround for mesa-libGL dependency bug: +# https://bugzilla.redhat.com/show_bug.cgi?id=1168475 +Requires: systemd-libs + +# Required for the firewall rules +# http://fedoraproject.org/wiki/PackagingDrafts/ScriptletSnippets/Firewalld +Requires: firewalld-filesystem +Requires(post): firewalld-filesystem + +# Required for hardware encoding/decoding during Remote Play (intel/radeon/amdgpu/nouveau) +Requires: libva +Requires: libvdpau + +# Required by Feral interactive games +Requires: libatomic + +# Required by Shank +Requires: (alsa-plugins-pulseaudio%{?_isa} if pulseaudio) +Requires: (pipewire-alsa%{?_isa} if pipewire) + +# Patched for Wayland +# https://github.com/ValveSoftware/steam-for-linux/issues/8853 +# https://github.com/negativo17/steam/issues/9 +%if 0%{?fedora} >= 40 +Requires: SDL2%{?_isa} +%endif + +# Game performance is increased with gamemode (for games that support it) +%arch_recommends gamemode + +Recommends: (gnome-shell-extension-appindicator if gnome-shell) + +# Proton uses xdg-desktop-portal to open URLs from inside a container +Requires: xdg-desktop-portal +Recommends: (xdg-desktop-portal-gtk if gnome-shell) +Recommends: (xdg-desktop-portal-kde if kwin) + +# Prevent log spam when thse are not pulled in as dependencies of full desktops +Recommends: dbus-x11 +Recommends: xdg-user-dirs + +# Allow using Steam Runtime Launch Options +Recommends: gobject-introspection + +Requires: steam-devices = %{?epoch:%{epoch}:}%{version}-%{release} + +%description +Steam is a software distribution service with an online store, automated +installation, automatic updates, achievements, SteamCloud synchronized savegame +and screenshot functionality, and many social features. + +This package contains the installer for the Steam software distribution service. + +%package devices +Summary: Permissions required by Steam for gaming devices +# Until the infra can deal with noarch sub-packages from excludearch/exclusivearch +# keep the sub-package arched +#BuildArch: noarch +Provides: steam-devices = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: steam-devices < %{?epoch:%{epoch}:}%{version}-%{release} + +%description devices +Steam is a software distribution service with an online store, automated +installation, automatic updates, achievements, SteamCloud synchronized savegame +and screenshot functionality, and many social features. + +This package contains the necessary permissions for gaming devices. + +%prep +%autosetup -p1 -n %{name}-launcher + +cp %{SOURCE5} . + +%build +# Nothing to build + +%install +%make_install + +rm -fr %{buildroot}%{_docdir}/%{name}/ \ + %{buildroot}%{_bindir}/%{name}deps + +mkdir -p %{buildroot}%{_udevhwdbdir}/ +install -m 644 -p %{SOURCE6} %{buildroot}%{_udevhwdbdir}/ + +mkdir -p %{buildroot}%{_udevrulesdir}/ +install -m 644 -p %{SOURCE8} %{SOURCE9} %{buildroot}%{_udevrulesdir}/ + +# Environment files +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +install -pm 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d + +# Raise file descriptor limit +mkdir -p %{buildroot}%{_prefix}/lib/systemd/system.conf.d/ +mkdir -p %{buildroot}%{_prefix}/lib/systemd/user.conf.d/ +install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system.conf.d/ +install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/user.conf.d/ + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{appstream_id}.metainfo.xml + +%files +%license COPYING steam_subscriber_agreement.txt +%doc debian/changelog README.Fedora +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/pixmaps/%{name}_tray_mono.png +%ifarch x86_64 +%{_prefix}/lib/%{name}/ +%else +%{_libdir}/%{name}/ +%endif +%{_mandir}/man6/%{name}.* +%{_metainfodir}/%{appstream_id}.metainfo.xml +%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh +%dir %{_prefix}/lib/systemd/system.conf.d/ +%{_prefix}/lib/systemd/system.conf.d/01-steam.conf +%dir %{_prefix}/lib/systemd/user.conf.d/ +%{_prefix}/lib/systemd/user.conf.d/01-steam.conf + +%files devices +%{_udevhwdbdir}/* +%{_udevrulesdir}/* + +%changelog +* Sun Sep 01 2024 Simone Caronni - 1.0.0.81-1 +- Update to 1.0.0.81. + +* Mon Aug 05 2024 Simone Caronni - 1.0.0.79-7 +- Fix for Wayland on Fedora 40. + +* Sat Aug 03 2024 RPM Fusion Release Engineering - 1.0.0.79-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 24 2024 Simone Caronni - 1.0.0.79-5 +- Update udev rules. +- Convert udev rule for blocking wrong joystick devices to a systemd hwdb file: + https://github.com/denilsonsa/udev-joystick-blacklist/issues/58 + +* Tue May 28 2024 Simone Caronni - 1.0.0.79-4 +- Add dependencies when full desktop is not installed. +- Add dependencies for using steam-runtime-launch-options. + +* Tue Mar 19 2024 Simone Caronni - 1.0.0.79-3 +- Adjust dependencies. + +* Sun Feb 18 2024 Simone Caronni - 1.0.0.79-2 +- Re-add gnome-shell-extension-appindicator recommendation. + +* Sun Feb 18 2024 Simone Caronni - 1.0.0.79-1 +- Update to 1.0.0.79. +- Drop gnome-shell-extension-gamemode recommendation (#6853). +- Update udev rules. + +* Sun Feb 04 2024 RPM Fusion Release Engineering - 1.0.0.78-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Aug 03 2023 RPM Fusion Release Engineering - 1.0.0.78-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri May 12 2023 Simone Caronni - 1.0.0.78-1 +- Update to 1.0.0.78. + +* Tue Mar 07 2023 Simone Caronni - 1.0.0.76-1 +- Update to 1.0.0.76. +- Separate SPEC file per distribution. +- Trim changelog. + +* Mon Aug 08 2022 RPM Fusion Release Engineering - 1.0.0.75-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg + 5.1 + +* Fri Jul 22 2022 Simone Caronni - 1.0.0.75-1 +- Update to 1.0.0.75. + +* Fri Feb 04 2022 Simone Caronni - 1.0.0.74-2 +- Add gnome-shell-extension-appindicator if running on Gnome (#6194). +- Require libICE to avoid spamming the console. It's installed by default on a + Gnome installation but not explicitly required (#6195). + +* Fri Dec 10 2021 Simone Caronni - 1.0.0.74-1 +- Update to 1.0.0.74. + +* Sat Nov 20 2021 Simone Caronni - 1.0.0.73-1 +- Update to 1.0.0.73. + +* Sat Oct 09 2021 Simone Caronni - 1.0.0.72-1 +- Update to 1.0.0.72. + +* Fri Aug 27 2021 Simone Caronni - 1.0.0.71-4 +- Remove old noruntime provide/obsolete. +- Remove VA-API driver dependencies for RHEL/CentOS 7 and update relevant + information. +- Remove not really relevant information about controllers from the readme. +- Update steam-devices. + +* Wed Aug 25 2021 Nicolas Chauvet - 1.0.0.71-3 +- Keep the stream-devices sub-package arched + +* Sun Aug 15 2021 Simone Caronni - 1.0.0.71-2 +- Steam UDEV subpackage should be noarch. + +* Sun Aug 15 2021 Simone Caronni - 1.0.0.71-1 +- Update to 1.0.0.71. +- Update README.Fedora with supported controllers. +- Use bundled AppData. + +* Wed Aug 04 2021 RPM Fusion Release Engineering - 1.0.0.70-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 30 2021 Simone Caronni - 1.0.0.70-4 +- Separate udev rules in separate subpackage to be used also by Valve's Flatpak + Steam client. +- Use upstream's udev rules as those are newer than what is bundled in the + installer tarball. + +* Tue May 04 2021 Leigh Scott - 1.0.0.70-3 +- Fix appdata screenshots (rfbz#5984) + +* Mon Apr 12 2021 Simone Caronni - 1.0.0.70-2 +- Remove new desktop entry specification for Fedora 32 and RHEL/CentOS 7/8. + +* Mon Apr 12 2021 Simone Caronni - 1.0.0.70-1 +- Update to 1.0.0.70. +- Switch to tarball provided steam-devices udev rules. + +* Thu Feb 04 2021 RPM Fusion Release Engineering - 1.0.0.68-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/anda/games/steam/update.rhai b/anda/games/steam/update.rhai new file mode 100644 index 0000000000..3114c49fcd --- /dev/null +++ b/anda/games/steam/update.rhai @@ -0,0 +1 @@ +rpm.version(find(`\nVersion:\s+1:(.+?)\s`, get("https://repo.steampowered.com/steam/archive/stable/steam_latest.dsc"), 1)); diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 484a9ab786..1d73803d22 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 0df351bf508fed789e75310330bce60fccbdd999 +%global commit 3dda60a8ce32cb7d5e3e99111399a1550c145176 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20241229 +%global commit_date 20250101 %global debug_package %nil Name: nim-nightly diff --git a/anda/langs/python/ruff/python3-ruff.spec b/anda/langs/python/ruff/python3-ruff.spec index 1c7dc9bfa7..9e3163fcc3 100644 --- a/anda/langs/python/ruff/python3-ruff.spec +++ b/anda/langs/python/ruff/python3-ruff.spec @@ -33,10 +33,9 @@ rm -rf %{python3_sitelib}/ruff/__pycache__ /usr/lib64/python*/site-packages/ruff-%{version}.dist-info/INSTALLER /usr/lib64/python*/site-packages/ruff-%{version}.dist-info/REQUESTED /usr/lib64/python*/site-packages/ruff-%{version}.dist-info/direct_url.json -/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/license_files/LICENSE +/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/licenses/LICENSE /usr/lib64/python*/site-packages/ruff/__init__.py /usr/lib64/python*/site-packages/ruff/__main__.py -/usr/lib64/python*/site-packages/ruff/__pycache__/*.cpython-*.opt-1.pyc /usr/lib64/python*/site-packages/ruff/__pycache__/*.cpython-*.pyc /usr/bin/ruff diff --git a/anda/langs/rust/jellyfin-rpc/anda.hcl b/anda/langs/rust/jellyfin-rpc/anda.hcl new file mode 100644 index 0000000000..9a335cfcef --- /dev/null +++ b/anda/langs/rust/jellyfin-rpc/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "rust-jellyfin-rpc-cli.spec" + } +} diff --git a/anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec b/anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec new file mode 100644 index 0000000000..cda74d4895 --- /dev/null +++ b/anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec @@ -0,0 +1,58 @@ +# Generated by rust2rpm 26 +%bcond_without check +%bcond_without mold + +%global crate jellyfin-rpc-cli + +Name: rust-jellyfin-rpc-cli +Version: 1.3.0 +Release: %autorelease +Summary: Displays the content you're currently watching on Discord! + +License: GPL-3.0-or-later +URL: https://crates.io/crates/jellyfin-rpc-cli +Source0: %{crates_source} +Source1: https://raw.githubusercontent.com/Radiicall/jellyfin-rpc/%version/LICENSE +Packager: madonuko + +BuildRequires: mold anda-srpm-macros cargo-rpm-macros >= 24 + +%global _description %{expand: +Displays the content you're currently watching on Discord!.} + +%description %{_description} + +%package -n %{crate} +Summary: %{summary} +License: GPL-3.0-or-later +Provides: jellyfin-rpc + +%description -n %{crate} %{_description} + +%files -n %{crate} +%license %_datadir/licenses/%name/LICENSE +%license LICENSE.dependencies +%doc README.md +%{_bindir}/jellyfin-rpc + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep_online + +%build +#{cargo_license_summary_online} +%{cargo_license_online} > LICENSE.dependencies + +%install +%cargo_install + +install -Dpm644 %SOURCE1 %buildroot%_datadir/licenses/%name/LICENSE + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +* Thu Aug 15 2024 madonuko - 1.2.2-1 +- Initial package diff --git a/anda/langs/rust/jellyfin-rpc/update.rhai b/anda/langs/rust/jellyfin-rpc/update.rhai new file mode 100644 index 0000000000..1f28f314e5 --- /dev/null +++ b/anda/langs/rust/jellyfin-rpc/update.rhai @@ -0,0 +1 @@ +rpm.version(crates("jellyfin-rpc-cli")); diff --git a/anda/langs/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec index 95a4be0274..134d4782c3 100644 --- a/anda/langs/vala/vala-nightly/vala-nightly.spec +++ b/anda/langs/vala/vala-nightly/vala-nightly.spec @@ -3,11 +3,11 @@ %global priority 90 %global real_name vala -%global commit 196d3ad6839ee158ef6d3fe485764d1e1d996a05 +%global commit 0732bb119d968a8bab154c308d1498a31aa7d6af %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git -%global commit_date 20240913 +%global commit_date 20241101 %global snapshot_info %{commit_date}.%{shortcommit} Name: vala-nightly diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 4571e176f4..58cffcd3aa 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,5 +1,5 @@ -%global commit 53acb2b5343511432db5aa2091937c3d294c7faa -%global ver 1.8.41 +%global commit 2be9e799a2bc523550d4f83f4d2d66d41c9573b9 +%global ver 1.8.42 %global commit_date 20240219 %global shortcommit %(c=%{commit}; echo ${c:0:7}) diff --git a/anda/misc/extest/anda.hcl b/anda/misc/extest/anda.hcl index 9546109527..8c444ab5c5 100644 --- a/anda/misc/extest/anda.hcl +++ b/anda/misc/extest/anda.hcl @@ -1,8 +1,6 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "rust-extest.spec" } - labels { - multilib = 1 - } } diff --git a/anda/misc/sass/sass.spec b/anda/misc/sass/sass.spec index d1794ccd76..49e6129bb2 100644 --- a/anda/misc/sass/sass.spec +++ b/anda/misc/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.81.0 +Version: 1.83.0 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT diff --git a/anda/stardust/gravity/stardust-gravity.spec b/anda/stardust/gravity/stardust-gravity.spec index 4bc0ba7067..8489ee0f33 100644 --- a/anda/stardust/gravity/stardust-gravity.spec +++ b/anda/stardust/gravity/stardust-gravity.spec @@ -6,7 +6,7 @@ Name: stardust-xr-gravity Version: %commit_date.%shortcommit -Release: 2%?dist +Release: 1%?dist Summary: Utility to launch apps and Stardust XR clients spatially. URL: https://github.com/StardustXR/gravity Source0: %url/archive/%commit/gravity-%commit.tar.gz diff --git a/anda/stardust/server/stardust-server.spec b/anda/stardust/server/stardust-server.spec index edccb8b0eb..195de310b9 100644 --- a/anda/stardust/server/stardust-server.spec +++ b/anda/stardust/server/stardust-server.spec @@ -1,3 +1,7 @@ +%global commit c830becbff8907809c87dc0949f9a0abd4d77ed6 +%global commit_date 20241102 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +# Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ Name: stardust-xr-server diff --git a/anda/stardust/server/update.rhai b/anda/stardust/server/update.rhai index 89a05318d8..16db710969 100644 --- a/anda/stardust/server/update.rhai +++ b/anda/stardust/server/update.rhai @@ -1 +1,5 @@ -rpm.version(gh("StardustXR/server")); +rpm.global("commit", gh_commit("StardustXR/server")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); +} diff --git a/anda/stardust/telescope/stardust-telescope.spec b/anda/stardust/telescope/stardust-telescope.spec index aab4b13552..eec7f90ba6 100644 --- a/anda/stardust/telescope/stardust-telescope.spec +++ b/anda/stardust/telescope/stardust-telescope.spec @@ -1,12 +1,12 @@ %define debug_package %nil -%global commit ec4218fb938b0a098285c4a97af45493d22673fa -%global commit_date 20241023 +%global commit de2165841feef1ced79ebee4ce4ad83bdebf92c9 +%global commit_date 20241231 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: stardust-xr-telescope Version: %commit_date.git~%shortcommit -Release: 2%?dist +Release: 1%?dist Summary: See the stars! Easy stardust setups to run on your computer. License: MIT URL: https://github.com/StardustXR/telescope diff --git a/anda/system/chromebook-usbc-fix/anda.hcl b/anda/system/chromebook-usbc-fix/anda.hcl new file mode 100644 index 0000000000..c1c46b66d7 --- /dev/null +++ b/anda/system/chromebook-usbc-fix/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "chromebook-usbc-fix.spec" + } + labels { + nightly = "1" + } +} \ No newline at end of file diff --git a/anda/system/chromebook-usbc-fix/chromebook-usbc-fix.spec b/anda/system/chromebook-usbc-fix/chromebook-usbc-fix.spec new file mode 100644 index 0000000000..a293cecdc7 --- /dev/null +++ b/anda/system/chromebook-usbc-fix/chromebook-usbc-fix.spec @@ -0,0 +1,50 @@ +%global commit_date 20241005 + +%global commit cef28b120a39fd459c5864d51c4ad52ecaaf25a0 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +%global debug_package %{nil} +%define __os_install_post %{nil} + +Name: chromebook-usbc-fix +Version: %commit_date.%shortcommit +Release: 2%?dist + +License: CCO +Summary: Fixes usbc on TigerLake and AlderLake Chromebooks +URL: https://github.com/Ultramarine-Linux/chromebook-usbc-fix +Source: %url/archive/%{commit}/chromebook-usbc-fix-%{commit}.tar.gz +Packager: Owen Zimmerman + +%{?systemd_requires} +BuildRequires: systemd-rpm-macros + +%description +%summary + +%prep +%autosetup -n chromebook-usbc-fix-%commit + +%install +install -Dm755 chromebook-usbc.service %buildroot%{_unitdir}/chromebook-usbc.service + +# These systemd services should be included in the preset file for Ultramarine Linux Chromebook images +%post +%systemd_post chromebook-usbc.service + +%preun +%systemd_preun chromebook-usbc.service + +%postun +%systemd_postun_with_restart chromebook-usbc.service + +%files +%doc README.md +%license LICENSE +%{_unitdir}/chromebook-usbc.service + +%changelog +* Sat Oct 12 2024 Owen-sz +- Fix the systemd preset application +* Sat Oct 5 2024 Owen-sz +- Initial package. diff --git a/anda/system/chromebook-usbc-fix/update.rhai b/anda/system/chromebook-usbc-fix/update.rhai new file mode 100644 index 0000000000..f8cb3cac66 --- /dev/null +++ b/anda/system/chromebook-usbc-fix/update.rhai @@ -0,0 +1,8 @@ +if filters.contains("nightly") { + rpm.global("commit", gh_commit("Ultramarine-Linux/chromebook-usbc-fix")); + if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); + } + } + \ No newline at end of file diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec index 19e5daab60..0cc7b520d5 100644 --- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec +++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec @@ -11,7 +11,7 @@ Name: cros-keyboard-map Version: %commit_date.%tree_shortcommit.%um_shortcommit -Release: 1%?dist +Release: 2%?dist License: BSD-3-Clause and GPLv3 Summary: Utility to generate keyd configurations for use on Chromebooks @@ -41,14 +41,15 @@ mkdir -p %buildroot%{_unitdir} install -Dm644 cros-keyboard-map.service %{buildroot}%{_unitdir}/cros-keyboard-map.service chmod +x %buildroot%{_bindir}/um-generate-cros-keymap +# These systemd services should be included in the preset file for Ultramarine Linux Chromebook images %post -%systemd_post 88-ultramarine-chromebook-default.preset +%systemd_post cros-keyboard-map.service %preun -%systemd_preun 88-ultramarine-chromebook-default.preset +%systemd_preun cros-keyboard-map.service %postun -%systemd_postun_with_restart 88-ultramarine-chromebook-default.preset +%systemd_postun_with_restart cros-keyboard-map.service %files %doc README.md diff --git a/anda/system/mesa-freeworld/anda.hcl b/anda/system/mesa-freeworld/anda.hcl index d30486b421..b10d43824d 100644 --- a/anda/system/mesa-freeworld/anda.hcl +++ b/anda/system/mesa-freeworld/anda.hcl @@ -1,9 +1,9 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "mesa-freeworld.spec" } labels { updbranch = 1 - multilib = 1 } } diff --git a/anda/system/mesa-freeworld/mesa-freeworld.spec b/anda/system/mesa-freeworld/mesa-freeworld.spec index f22bc9c83c..71678bb6a2 100644 --- a/anda/system/mesa-freeworld/mesa-freeworld.spec +++ b/anda/system/mesa-freeworld/mesa-freeworld.spec @@ -71,9 +71,9 @@ algorithms and decoding only VC1 algorithm. Name: %{srcname}-freeworld Summary: Mesa graphics libraries -%global ver 24.1.7 +%global ver 24.3.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -226,7 +226,6 @@ export RUSTFLAGS="%build_rustflags" -Ddri-drivers-path=%{_libdir}/dri-freeworld \ -Dva-libs-path=%{_libdir}/dri-freeworld \ -Dplatforms=x11,wayland \ - -Ddri3=enabled \ -Dosmesa=false \ %if 0%{?with_hardware} -Dgallium-drivers=swrast,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \ @@ -234,7 +233,6 @@ export RUSTFLAGS="%build_rustflags" -Dgallium-drivers=swrast,virgl \ %endif -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \ - -Dgallium-omx=%{!?with_omx:bellagio}%{?with_omx:disabled} \ -Dgallium-va=%{?with_va:enabled}%{!?with_va:disabled} \ -Dgallium-xa=%{!?with_xa:enabled}%{?with_xa:disabled} \ -Dgallium-nine=%{!?with_nine:true}%{?with_nine:false} \ @@ -325,7 +323,7 @@ rm -fr %{buildroot}%{_libdir}{,/dri-freeworld}/libVkLayer_MESA_device_select.so %if 0%{?with_va} %files -n %{srcname}-va-drivers-freeworld -%{_libdir}/dri-freeworld/libgallium-%{version}.so +%{_libdir}/dri-freeworld/libgallium-%{ver}.so %{_libdir}/dri-freeworld/nouveau_drv_video.so %if 0%{?with_r600} %{_libdir}/dri-freeworld/r600_drv_video.so @@ -601,4 +599,4 @@ rm -fr %{buildroot}%{_libdir}{,/dri-freeworld}/libVkLayer_MESA_device_select.so - Re-enable vdpau and omx (OpenMax) support * Sat Oct 1 2022 Luya Tshimbalanga - 22.2.0-1 -- Initial release \ No newline at end of file +- Initial release diff --git a/anda/system/mesa-freeworld/update.rhai b/anda/system/mesa-freeworld/update.rhai index 8d6c3e10f3..55ef4263cb 100644 --- a/anda/system/mesa-freeworld/update.rhai +++ b/anda/system/mesa-freeworld/update.rhai @@ -1,7 +1,3 @@ -if !labels.branch.starts_with("f") { - print(`mesa-freeworld: unsupported branch: ${labels.branch}`); - terminate(); -} -let release = labels.branch.to_upper(); -let ver = get(`https://bodhi.fedoraproject.org/updates/?search=mesa&status=stable&releases=${release}&rows_per_page=1&page=1`).json().updates[0].title; -rpm.global("ver", find(`^mesa-([\d.]+)`, ver, 1)); +import "andax/bump_extras.rhai" as bump; + +rpm.global("ver", bump::bodhi("mesa", labels.branch.as_bodhi_ver())); diff --git a/anda/system/msm-cros-efs-loader/msm-cros-efs-loader.spec b/anda/system/msm-cros-efs-loader/msm-cros-efs-loader.spec index f2e3f6a81f..d7192995b4 100644 --- a/anda/system/msm-cros-efs-loader/msm-cros-efs-loader.spec +++ b/anda/system/msm-cros-efs-loader/msm-cros-efs-loader.spec @@ -1,6 +1,6 @@ Name: terra-msm-cros-efs-loader Version: 1.0.2 -Release: 1%?dist +Release: 2%?dist Summary: EFS loader for Qualcomm-based Chrome OS devices License: GPL-3.0-or-later URL: https://gitlab.postmarketos.org/postmarketOS/msm-cros-efs-loader @@ -24,15 +24,16 @@ EFS loader for Qualcomm-based Chrome OS devices %install install -Dm755 msm-cros-efs-loader.sh %{buildroot}/usr/bin/msm-cros-efs-loader install -Dm644 %SOURCE1 %{buildroot}/%{_unitdir}/msm-cros-efs-loader.service - + +# These systemd services should be included in the preset file for Ultramarine Linux sc7180 (ARM) Chromebook images %post -%systemd_post 88-ultramarine-chromebook-default.preset +%systemd_post msm-cros-efs-loader.service %preun -%systemd_preun 88-ultramarine-chromebook-default.preset +%systemd_preun msm-cros-efs-loader.service %postun -%systemd_postun_with_restart 88-ultramarine-chromebook-default.preset +%systemd_postun_with_restart msm-cros-efs-loader.service %files %_bindir/msm-cros-efs-loader diff --git a/anda/system/polycrystal/anda.hcl b/anda/system/polycrystal/anda.hcl new file mode 100644 index 0000000000..fbac774bba --- /dev/null +++ b/anda/system/polycrystal/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "polycrystal.spec" + } +} \ No newline at end of file diff --git a/anda/system/polycrystal/polycrystal.spec b/anda/system/polycrystal/polycrystal.spec new file mode 100644 index 0000000000..536002f422 --- /dev/null +++ b/anda/system/polycrystal/polycrystal.spec @@ -0,0 +1,49 @@ +Name: polycrystal +Version: 0.2.0 +Release: 1%?dist +Summary: Barebones "automatic" Flatpak installer for distribution-default Flatpak packages. +URL: https://github.com/Ultramarine-Linux/polycrystal +Source0: %url/archive/refs/tags/v%version.tar.gz +License: GPL +BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros systemd-rpm-macros mold glib2-devel flatpak-devel +Packager: Owen Zimmerman + +%description +%summary + +%prep +%autosetup -n polycrystal-%version +%cargo_prep_online + +%build +%cargo_build + +%install +mkdir -p %{buildroot}%{_datadir}/polycrystal %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/polycrystal/entries %{buildroot}%{_sharedstatedir}/polycrystal +%cargo_install +install -Dm644 polycrystal.service %{buildroot}%{_unitdir}/polycrystal.service + +%post +%systemd_post polycrystal.service + +%preun +%systemd_preun polycrystal.service + +%postun +%systemd_postun_with_restart polycrystal.service + +%files +%{_bindir}/polycrystal +%{_datadir}/polycrystal/ +%{_unitdir}/polycrystal.service +%dir %{_sysconfdir}/polycrystal +%dir %{_sysconfdir}/polycrystal/entries +%dir %{_sharedstatedir}/polycrystal +%license LICENSE +%doc README.md + +%changelog +* Tue Nov 19 2024 Owen-sz +- Switch from commit based to release based, and add systemd services +* Fri Nov 15 2024 Owen-sz +- Package Polycrystal \ No newline at end of file diff --git a/anda/system/polycrystal/update.rhai b/anda/system/polycrystal/update.rhai new file mode 100644 index 0000000000..e9ccc09743 --- /dev/null +++ b/anda/system/polycrystal/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("Ultramarine-Linux/polycrystal")); \ No newline at end of file diff --git a/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec b/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec index 4381810371..6a55070b2d 100644 --- a/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec +++ b/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec @@ -1,13 +1,14 @@ %global debug_package %{nil} -%global ver 0.3.8-1 +%global ver v0.3.8-1 +%global ver2 %(echo %{ver} | sed 's/^v//') Name: surface-dtx-daemon Version: %(echo %ver | sed 's/-/~/g') -Release: 1%{?dist} +Release: 2%{?dist} Summary: Surface Detachment System (DTX) Daemon License: MIT URL: https://github.com/linux-surface/surface-dtx-daemon -Source: %url/archive/refs/tags/v%ver.tar.gz +Source: %url/archive/refs/tags/%ver.tar.gz BuildRequires: rust cargo dbus-devel anda-srpm-macros cargo-rpm-macros mold Packager: Owen Zimmerman @@ -17,7 +18,7 @@ Linux User-Space Detachment System (DTX) Daemon for the Surface ACPI Driver lack of driver-support on the Surface Book 1. This may change in the future. %prep -%autosetup -n %{name}-%{ver} +%autosetup -n %{name}-%{ver2} %cargo_prep_online %build @@ -48,6 +49,19 @@ install -D -m644 "target/_surface-dtx-userd" "%{buildroot}/usr/share/zsh/site-fu install -D -m644 "target/surface-dtx-daemon.fish" "%{buildroot}/usr/share/fish/vendor_completions.d/surface-dtx-daemon.fish" install -D -m644 "target/surface-dtx-userd.fish" "%{buildroot}/usr/share/fish/vendor_completions.d/surface-dtx-userd.fish" +# These systemd services should be included in the preset file for Ultramarine Linux Surface images +%post +%systemd_post surface-dtx-daemon.service +%systemd_user_post surface-dtx-userd.service + +%preun +%systemd_preun surface-dtx-daemon.service +%systemd_user_preun surface-dtx-userd.service + +%postun +%systemd_postun_with_restart surface-dtx-daemon.service +%systemd_user_postun_with_restart surface-dtx-userd.service + %files %config /etc/dbus-1/system.d/org.surface.dtx.conf %config /etc/udev/rules.d/40-surface_dtx.rules diff --git a/anda/system/xpadneo/anda.hcl b/anda/system/xpadneo/anda.hcl index a05aac8e28..522f0b2ff8 100644 --- a/anda/system/xpadneo/anda.hcl +++ b/anda/system/xpadneo/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "xpadneo.spec" } + labels { + mock = 1 + } } diff --git a/anda/system/zenpower3/anda.hcl b/anda/system/zenpower3/anda.hcl index 288539e071..64d15acce8 100644 --- a/anda/system/zenpower3/anda.hcl +++ b/anda/system/zenpower3/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "zenpower3.spec" } + labels { + mock = 1 + } } diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index cfd76491ac..94e25d0a60 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -4,8 +4,8 @@ %global crate mise Name: rust-mise -Version: 2024.12.14 -Release: %autorelease +Version: 2025.1.0 +Release: 1%?dist Summary: Front-end to your dev env Provides: mise License: MIT diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index bc97c65c2d..0be681ae5d 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit 0c02957911da1c661be201236c4f2a2be1778b3e -%global commit_date 20241220 +%global commit e709cd6bc7b80646a99e8834eb872bd5189a3af9 +%global commit_date 20250102 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0