mirror of
https://github.com/terrapkg/packages.git
synced 2026-05-31 09:01:55 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 madomado
|
01395cbaed |
+1
-1
@@ -2,7 +2,7 @@
|
||||
"repoOwner": "terrapkg",
|
||||
"repoName": "packages",
|
||||
"resetAuthor": true,
|
||||
"targetBranchChoices": ["f39", "f40", "frawhide"],
|
||||
"targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
|
||||
"branchLabelMapping": {
|
||||
"^sync-(.+)$": "$1"
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
ARG VARIANT="rawhide"
|
||||
ARG VARIANT="38"
|
||||
FROM fedora:${VARIANT}
|
||||
|
||||
RUN useradd -m vscode
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "Fedora",
|
||||
"build": {
|
||||
"dockerfile": "Dockerfile",
|
||||
"args": { "VARIANT": "rawhide" }
|
||||
"args": { "VARIANT": "38" }
|
||||
},
|
||||
"remoteUser": "vscode",
|
||||
"runArgs": [
|
||||
|
||||
@@ -42,7 +42,7 @@ jobs:
|
||||
pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
|
||||
version: ["rawhide"]
|
||||
fail-fast: false
|
||||
runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
|
||||
runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
|
||||
container:
|
||||
image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
|
||||
options: --cap-add=SYS_ADMIN --privileged
|
||||
|
||||
@@ -4,8 +4,9 @@ on:
|
||||
push:
|
||||
branches:
|
||||
- frawhide
|
||||
- f40
|
||||
- f39
|
||||
- f38
|
||||
- f37
|
||||
paths:
|
||||
- comps.xml
|
||||
workflow_dispatch:
|
||||
|
||||
@@ -46,6 +46,7 @@ jobs:
|
||||
git add *
|
||||
git commit -S -a -m "$msg"
|
||||
}
|
||||
copy_over f38 || true
|
||||
copy_over f39 || true
|
||||
copy_over f40 || true
|
||||
git push -u origin --all
|
||||
|
||||
@@ -47,6 +47,7 @@ jobs:
|
||||
git add *
|
||||
git commit -S -a -m "$msg"
|
||||
}
|
||||
copy_over f38 || true
|
||||
copy_over f39 || true
|
||||
copy_over f40 || true
|
||||
git push -u origin --all
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
# Terra Sources
|
||||
|
||||
[](https://repology.org/repository/terra_38)
|
||||
[](https://repology.org/repository/terra_39)
|
||||
[](https://repology.org/repository/terra_40)
|
||||
[](https://repology.org/repository/terra_rawhide)
|
||||
@@ -11,7 +12,7 @@ This monorepo contains the package manifests for all packages in Terra.
|
||||
|
||||
## Installation
|
||||
```bash
|
||||
sudo dnf install --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' --setopt='terra.gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc' terra-release
|
||||
sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
|
||||
```
|
||||
You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is.
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: anki-bin
|
||||
Version: 24.06.3
|
||||
Version: 24.04.1
|
||||
Release: 1%?dist
|
||||
Summary: Flashcard program for using space repetition learning (Installed with wheel)
|
||||
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: anki-qt5
|
||||
Version: 24.06.3
|
||||
Version: 24.04.1
|
||||
Release: 1%?dist
|
||||
Summary: Flashcard program for using space repetition learning
|
||||
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
|
||||
@@ -22,7 +22,7 @@ Anki is based on a theory called spaced repetition.
|
||||
%prep
|
||||
git clone https://github.com/ankitects/anki .
|
||||
git checkout %version
|
||||
%patch 1 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: anki
|
||||
Version: 24.06.3
|
||||
Version: 24.04.1
|
||||
Release: 1%?dist
|
||||
Summary: Flashcard program for using space repetition learning
|
||||
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
|
||||
@@ -20,10 +20,8 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
|
||||
Anki is based on a theory called spaced repetition.
|
||||
|
||||
%prep
|
||||
rm -rf *
|
||||
git clone https://github.com/ankitects/anki .
|
||||
git checkout %{version}
|
||||
%patch 0 -p1
|
||||
|
||||
# See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
%global __provides_exclude_from %{_datadir}/armcord/.*\\.so
|
||||
|
||||
Name: armcord-bin
|
||||
Version: 3.2.7
|
||||
Release: 1%?dist
|
||||
Version: 3.2.6
|
||||
Release: 1%{?dist}
|
||||
License: OSL-3.0
|
||||
Summary: Custom lightweight Discord client designed to enhance your experience
|
||||
URL: https://github.com/ArmCord/ArmCord
|
||||
@@ -26,7 +26,6 @@ Source2: https://raw.githubusercontent.com/ArmCord/ArmCord/v%version/README.md
|
||||
Requires: electron xdg-utils
|
||||
ExclusiveArch: x86_64 aarch64 armv7l
|
||||
Conflicts: armcord
|
||||
BuildRequires: add-determinism
|
||||
|
||||
%description
|
||||
ArmCord is a custom client designed to enhance your Discord experience
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
%define debug_package %nil
|
||||
|
||||
Name: armcord
|
||||
Version: 3.2.7
|
||||
Release: 1%?dist
|
||||
Version: 3.2.6
|
||||
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 add-determinism
|
||||
BuildRequires: nodejs-npm git
|
||||
Conflicts: armcord-bin
|
||||
BuildArch: noarch
|
||||
|
||||
@@ -18,7 +18,6 @@ ArmCord is a custom client designed to enhance your Discord experience
|
||||
while keeping everything lightweight.
|
||||
|
||||
%prep
|
||||
rm -rf *
|
||||
git clone %url .
|
||||
git checkout v%version
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
|
||||
|
||||
Name: discord-canary-openasar
|
||||
Version: 0.0.444
|
||||
Version: 0.0.376
|
||||
Release: 1%?dist
|
||||
Summary: A snappier Discord rewrite with features like further customization and theming
|
||||
License: MIT AND https://discord.com/terms
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
|
||||
|
||||
Name: discord-canary
|
||||
Version: 0.0.444
|
||||
Version: 0.0.376
|
||||
Release: 1%?dist
|
||||
Summary: Free Voice and Text Chat for Gamers
|
||||
URL: discord.com
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
|
||||
|
||||
Name: discord-openasar
|
||||
Version: 0.0.58
|
||||
Version: 0.0.52
|
||||
Release: 1%?dist
|
||||
Summary: A snappier Discord rewrite with features like further customization and theming
|
||||
License: MIT AND https://discord.com/terms
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
|
||||
|
||||
Name: discord-ptb-openasar
|
||||
Version: 0.0.93
|
||||
Version: 0.0.81
|
||||
Release: 1%?dist
|
||||
Summary: A snappier Discord rewrite with features like further customization and theming
|
||||
License: MIT AND https://discord.com/terms
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
|
||||
|
||||
Name: discord-ptb
|
||||
Version: 0.0.93
|
||||
Version: 0.0.81
|
||||
Release: 1%?dist
|
||||
Summary: Free Voice and Text Chat for Gamers.
|
||||
URL: https://discord.com
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
|
||||
|
||||
Name: discord
|
||||
Version: 0.0.58
|
||||
Version: 0.0.52
|
||||
Release: 1%?dist
|
||||
Summary: Free Voice and Text Chat for Gamers
|
||||
URL: https://discord.com
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "envision.spec"
|
||||
}
|
||||
}
|
||||
@@ -1,46 +0,0 @@
|
||||
%global commit 6cf5e40b96d1cbd99a3cfcef1f03899356e79448
|
||||
%global commit_date 20240703
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
|
||||
Name: envision
|
||||
Version: %commit_date.%commit
|
||||
Release: 1%?dist
|
||||
Summary: UI for building, configuring and running Monado, the open source OpenXR runtime
|
||||
License: AGPL-3.0-or-later
|
||||
URL: https://gitlab.com/gabmus/envision/
|
||||
Source0: %url/-/archive/%commit/envision-%commit.tar.gz
|
||||
BuildRequires: meson ninja-build cargo
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.66
|
||||
BuildRequires: pkgconfig(gio-2.0) >= 2.66
|
||||
BuildRequires: pkgconfig(gtk4) >= 4.10.0
|
||||
BuildRequires: pkgconfig(vte-2.91-gtk4) >= 0.72.0
|
||||
BuildRequires: pkgconfig(libadwaita-1)
|
||||
BuildRequires: pkgconfig(libusb-1.0)
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: glib2-devel
|
||||
Recommends: android-tools
|
||||
|
||||
%description
|
||||
%summary.
|
||||
|
||||
%prep
|
||||
%autosetup -n envision-%commit
|
||||
|
||||
%build
|
||||
%meson
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%_bindir/envision
|
||||
%_datadir/applications/org.gabmus.envision.desktop
|
||||
%_datadir/envision/
|
||||
%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.svg
|
||||
%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg
|
||||
%_metainfodir/org.gabmus.envision.appdata.xml
|
||||
@@ -1,5 +0,0 @@
|
||||
rpm.global("commit", gitlab_commit("gitlab.com", "46446166", "main"));
|
||||
if rpm.changed() {
|
||||
rpm.global("commit_date", date());
|
||||
rpm.release();
|
||||
}
|
||||
@@ -6,7 +6,7 @@
|
||||
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
|
||||
|
||||
Name: feishin
|
||||
Version: 0.7.1
|
||||
Version: 0.6.1
|
||||
Release: 1%?dist
|
||||
Summary: A modern self-hosted music player
|
||||
License: GPL-3.0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
%global commit bcc72f97ef1106b8ed028ebcdd1897351f10caa7
|
||||
%global commit ec447fd4a266e8158519f5e89589c368211bfa14
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global commit_date 20240706
|
||||
%global commit_date 20240502
|
||||
%global ver v0.38.0
|
||||
|
||||
Name: mpv-nightly
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
%global crate sccache
|
||||
|
||||
Name: rust-sccache
|
||||
Version: 0.8.1
|
||||
Version: 0.8.0
|
||||
Release: 1%?dist
|
||||
Summary: Ccache-like tool
|
||||
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "tuxclocker.spec"
|
||||
}
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
Name: tuxclocker
|
||||
Version: 1.5.1
|
||||
Release: 1%?dist
|
||||
Summary: Qt overclocking tool for GNU/Linux
|
||||
License: GPL-3.0
|
||||
URL: https://github.com/Lurkki14/tuxclocker
|
||||
# boost qt5-qtbase qt5-qtcharts
|
||||
Requires: hicolor-icon-theme
|
||||
BuildRequires: git-core meson hwdata qt5-qttools gettext anda-srpm-macros
|
||||
BuildRequires: boost-devel qt5-qtbase-devel qt5-qtcharts-devel libdrm-devel libXNVCtrl-devel openssl-devel
|
||||
Recommends: xorg-x11-drv-nvidia libdrm libXNVCtrl hwdata
|
||||
|
||||
%description
|
||||
TuxClocker is a hardware controlling and monitoring program.
|
||||
TuxClocker consists of a DBus daemon and a Qt GUI that uses the daemon.
|
||||
|
||||
%prep
|
||||
git clone --recursive %url .
|
||||
git checkout %version
|
||||
|
||||
%build
|
||||
%meson
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%_bindir/tuxclocker-qt
|
||||
%_bindir/tuxclockerd
|
||||
%_libdir/libtuxclocker.so
|
||||
%_libdir/tuxclocker/
|
||||
%_datadir/applications/tuxclocker.desktop
|
||||
%_datadir/dbus-1/system-services/org.tuxclocker.service
|
||||
%_datadir/dbus-1/system.d/org.tuxclocker.conf
|
||||
%_datadir/locale/*/LC_MESSAGES/tuxclocker.mo
|
||||
%_iconsdir/hicolor/scalable/apps/tuxclocker-logo.svg
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
@@ -1 +0,0 @@
|
||||
rpm.version(gh("Lurkki14/tuxclocker"));
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
Name: vencord-desktop
|
||||
Provides: VencordDesktop = %{version}-%{release}
|
||||
Version: 1.5.3
|
||||
Version: 1.5.2
|
||||
Release: 1%?dist
|
||||
License: GPL-3.0
|
||||
Summary: Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
%global nodev 20.12.2
|
||||
%global npmv 10.5.0
|
||||
%global ver 0.19.2
|
||||
%global ver 0.19.1
|
||||
%define debug_package %nil
|
||||
%global _build_id_links none
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
Name: elementary-calculator
|
||||
Summary: Calculator app designed for elementary
|
||||
Version: 8.0.0
|
||||
Release: 1%?dist
|
||||
Version: 2.0.3
|
||||
Release: 1%{?dist}
|
||||
License: GPL-3.0-or-later
|
||||
|
||||
URL: https://github.com/elementary/%{srcname}
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
Name: elementary-capnet-assist
|
||||
Summary: Captive Portal Assistant for elementary
|
||||
Version: 8.0.0
|
||||
Release: 1%?dist
|
||||
Version: 2.4.4
|
||||
Release: 2%{?dist}
|
||||
License: GPL-3.0-or-later
|
||||
|
||||
URL: https://github.com/elementary/capnet-assist
|
||||
@@ -21,13 +21,10 @@ BuildRequires: pkgconfig(gcr-ui-3)
|
||||
BuildRequires: pkgconfig(gio-2.0)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gobject-2.0)
|
||||
BuildRequires: pkgconfig(granite-7)
|
||||
BuildRequires: pkgconfig(granite)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libhandy-1) >= 1.0.0
|
||||
BuildRequires: pkgconfig(webkit2gtk-4.1)
|
||||
BuildRequires: pkgconfig(gcr-4)
|
||||
BuildRequires: pkgconfig(libadwaita-1)
|
||||
BuildRequires: pkgconfig(webkitgtk-6.0)
|
||||
BuildRequires: fdupes
|
||||
|
||||
Requires: NetworkManager
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
Name: elementary-icon-theme
|
||||
Summary: Icons from the Elementary Project
|
||||
Version: 8.0.0
|
||||
Release: 1%?dist
|
||||
Version: 7.3.1
|
||||
Release: 2%{?dist}
|
||||
License: GPL-3.0-or-later
|
||||
|
||||
URL: https://github.com/elementary/icons
|
||||
|
||||
@@ -5,13 +5,16 @@
|
||||
|
||||
Name: elementary-photos
|
||||
Summary: Photo manager and viewer from elementary
|
||||
Version: 8.0.0
|
||||
Release: 1%?dist
|
||||
Version: 2.8.0
|
||||
Release: 2%?dist
|
||||
License: LGPL-2.0-or-later
|
||||
|
||||
URL: https://github.com/elementary/photos
|
||||
Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
|
||||
|
||||
# RIP the publishing plugins (sorry for the "wide" patch, having issues with just the relevant commits)
|
||||
Patch0: https://github.com/elementary/photos/compare/7261606a05d1f41116aba5c86b62d1f739419ed1..09e55943b266bc2861b913251cb834169d81743e.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libappstream-glib
|
||||
@@ -19,7 +22,6 @@ BuildRequires: meson >= 0.46.0
|
||||
BuildRequires: vala
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: git-core
|
||||
BuildRequires: cmake
|
||||
|
||||
BuildRequires: pkgconfig(gee-0.8) >= 0.8.5
|
||||
BuildRequires: pkgconfig(geocode-glib-2.0)
|
||||
@@ -41,8 +43,6 @@ BuildRequires: pkgconfig(libhandy-1)
|
||||
BuildRequires: pkgconfig(libraw) >= 0.13.2
|
||||
BuildRequires: pkgconfig(libwebp) >= 0.4.4
|
||||
BuildRequires: pkgconfig(sqlite3) >= 3.5.9
|
||||
BuildRequires: pkgconfig(libportal)
|
||||
BuildRequires: pkgconfig(libportal-gtk3)
|
||||
|
||||
Requires: hicolor-icon-theme
|
||||
|
||||
@@ -53,6 +53,7 @@ Foundation.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{srcname}-%{version} -N
|
||||
git apply %PATCH0 # The .patch file has Git binary patches, so we need to apply it manually with Git
|
||||
|
||||
|
||||
%build
|
||||
@@ -74,10 +75,10 @@ desktop-file-validate \
|
||||
%{buildroot}/%{_datadir}/applications/%{appname}.desktop
|
||||
|
||||
desktop-file-validate \
|
||||
%{buildroot}/%{_datadir}/applications/%{appname}.viewer.desktop
|
||||
%{buildroot}/%{_datadir}/applications/%{appname}-viewer.desktop
|
||||
|
||||
appstream-util validate-relax --nonet \
|
||||
%{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
|
||||
%{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
|
||||
|
||||
|
||||
%files -f %{appname}.lang
|
||||
@@ -91,11 +92,11 @@ appstream-util validate-relax --nonet \
|
||||
%{_libexecdir}/%{appname}/
|
||||
|
||||
%{_datadir}/applications/%{appname}.desktop
|
||||
%{_datadir}/applications/%{appname}.viewer.desktop
|
||||
%{_datadir}/applications/%{appname}-viewer.desktop
|
||||
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
|
||||
%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
|
||||
%{_datadir}/icons/hicolor/*/apps/%{appname}.viewer.svg
|
||||
%{_datadir}/metainfo/%{appname}.metainfo.xml
|
||||
%{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg
|
||||
%{_datadir}/metainfo/%{appname}.appdata.xml
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
+4
-4
@@ -3,8 +3,8 @@
|
||||
|
||||
Name: elementary-shortcut-overlay
|
||||
Summary: Native, OS-wide shortcut overlay
|
||||
Version: 8.0.0
|
||||
Release: 1%?dist
|
||||
Version: 2.0.1
|
||||
Release: %autorelease
|
||||
License: GPL-3.0
|
||||
|
||||
URL: https://github.com/elementary/shortcut-overlay
|
||||
@@ -49,7 +49,7 @@ desktop-file-validate \
|
||||
%{buildroot}/%{_datadir}/applications/%{appname}.desktop
|
||||
|
||||
appstream-util validate-relax --nonet \
|
||||
%{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
|
||||
%{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
|
||||
|
||||
|
||||
%files -f %{appname}.lang
|
||||
@@ -59,7 +59,7 @@ appstream-util validate-relax --nonet \
|
||||
%{_bindir}/%{appname}
|
||||
|
||||
%{_datadir}/applications/%{appname}.desktop
|
||||
%{_datadir}/metainfo/%{appname}.metainfo.xml
|
||||
%{_datadir}/metainfo/%{appname}.appdata.xml
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
Name: elementary-theme
|
||||
Summary: Elementary GTK+ Stylesheet
|
||||
Version: 8.0.0
|
||||
Release: 1%?dist
|
||||
Version: 7.3.0
|
||||
Release: 1%{?dist}
|
||||
License: GPL-3.0
|
||||
|
||||
URL: https://github.com/elementary/stylesheet
|
||||
|
||||
@@ -5,8 +5,8 @@ apps built for elementary.}
|
||||
|
||||
Name: granite-7
|
||||
Summary: Elementary companion library for GTK+ and GLib
|
||||
Version: 7.5.0
|
||||
Release: 1%?dist
|
||||
Version: 7.4.0
|
||||
Release: 1%{?dist}
|
||||
License: LGPL-3.0-or-later
|
||||
|
||||
URL: https://github.com/elementary/granite
|
||||
@@ -82,7 +82,6 @@ desktop-file-validate \
|
||||
|
||||
%{_datadir}/metainfo/granite-7.metainfo.xml
|
||||
%{_datadir}/icons/hicolor/*/apps/io.elementary.granite-7.svg
|
||||
%{_datadir}/themes/Granite/
|
||||
|
||||
|
||||
%files devel
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
Name: pantheon-agent-polkit
|
||||
Summary: Pantheon Polkit Agent
|
||||
Version: 8.0.0
|
||||
Release: 1%?dist
|
||||
Version: 1.0.5
|
||||
Release: 1%{?dist}
|
||||
License: LGPL-2.0-or-later
|
||||
|
||||
URL: https://github.com/elementary/%{name}
|
||||
@@ -18,12 +18,10 @@ BuildRequires: vala >= 0.34.1
|
||||
BuildRequires: fdupes
|
||||
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
|
||||
BuildRequires: pkgconfig(granite) >= 6.0.0
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(polkit-agent-1)
|
||||
BuildRequires: pkgconfig(polkit-gobject-1)
|
||||
BuildRequires: pkgconfig(libadwaita-1)
|
||||
BuildRequires: pkgconfig(gobject-2.0)
|
||||
BuildRequires: pkgconfig(granite-7)
|
||||
BuildRequires: pkgconfig(gtk4)
|
||||
|
||||
%description
|
||||
An agent for Polkit authorization designed for Pantheon.
|
||||
@@ -52,7 +50,7 @@ desktop-file-validate \
|
||||
%{buildroot}/%{_datadir}/applications/%{appname}.desktop
|
||||
|
||||
appstream-util validate-relax --nonet \
|
||||
%{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
|
||||
%{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
|
||||
|
||||
|
||||
%files -f %{appname}.lang
|
||||
@@ -64,7 +62,7 @@ appstream-util validate-relax --nonet \
|
||||
%{_libexecdir}/policykit-1-pantheon/
|
||||
|
||||
%{_datadir}/applications/%{appname}.desktop
|
||||
%{_datadir}/metainfo/%{appname}.metainfo.xml
|
||||
%{_datadir}/metainfo/%{appname}.appdata.xml
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Name: pantheon-tweaks
|
||||
Version: 2.0.2
|
||||
Release: 1%?dist
|
||||
Version: 1.1.2
|
||||
Release: 1%{?dist}
|
||||
Summary: A system settings panel for the Pantheon desktop environment
|
||||
License: GPL-3.0
|
||||
URL: https://github.com/pantheon-tweaks/pantheon-tweaks
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
Name: switchboard-plug-tweaks
|
||||
Summary: Switchboard Tweaks Plug
|
||||
Version: 2.0.2
|
||||
Release: 1%?dist
|
||||
Version: 1.1.2
|
||||
Release: 1%{?dist}
|
||||
License: GPL-3.0-or-later
|
||||
|
||||
URL: https://github.com/pantheon-tweaks/pantheon-tweaks
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
Name: switchboard-plug-wacom
|
||||
Summary: Switchboard Wacom Plug
|
||||
Version: 8.0.0
|
||||
Version: 1.0.1
|
||||
Release: 1%?dist
|
||||
License: GPL-3.0-or-later
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
%global srcname switchboard
|
||||
%global appname io.elementary.settings
|
||||
%global appname io.elementary.switchboard
|
||||
|
||||
Name: switchboard
|
||||
Summary: Modular Desktop Settings Hub
|
||||
Version: 8.0.0
|
||||
Release: 1%?dist
|
||||
Version: 6.0.2
|
||||
Release: 1%{?dist}
|
||||
License: LGPL-2.0-or-later
|
||||
|
||||
URL: https://github.com/elementary/%{name}
|
||||
@@ -16,10 +16,12 @@ BuildRequires: libappstream-glib
|
||||
BuildRequires: meson
|
||||
BuildRequires: vala
|
||||
|
||||
BuildRequires: pkgconfig(granite-7)
|
||||
BuildRequires: pkgconfig(gtk4)
|
||||
BuildRequires: pkgconfig(libadwaita-1)
|
||||
BuildRequires: fdupes sassc
|
||||
BuildRequires: pkgconfig(gee-0.8)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(granite) >= 5.4.0
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libhandy-1) >= 0.83.0
|
||||
BuildRequires: fdupes
|
||||
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
@@ -90,7 +92,7 @@ appstream-util validate-relax --nonet \
|
||||
|
||||
%{_datadir}/applications/%{appname}.desktop
|
||||
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
|
||||
%{_iconsdir}/hicolor/*/apps/%{appname}.svg
|
||||
%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
|
||||
%{_datadir}/metainfo/%{appname}.appdata.xml
|
||||
|
||||
%files libs
|
||||
@@ -100,14 +102,19 @@ appstream-util validate-relax --nonet \
|
||||
%dir %{_libdir}/%{name}
|
||||
%dir %{_libdir}/%{name}/*
|
||||
|
||||
%{_libdir}/lib%{name}-3.so.0
|
||||
%{_libdir}/lib%{name}-3.so.2.0
|
||||
%{_libdir}/lib%{name}-2.0.so.0
|
||||
%{_libdir}/lib%{name}-2.0.so.2.0
|
||||
|
||||
%files devel
|
||||
%{_includedir}/%{name}-3/
|
||||
%{_includedir}/%{name}-2.0/
|
||||
|
||||
%{_libdir}/lib%{name}-3.so
|
||||
%{_libdir}/pkgconfig/%{name}-3.pc
|
||||
%{_libdir}/lib%{name}-2.0.so
|
||||
%{_libdir}/pkgconfig/%{name}-2.0.pc
|
||||
|
||||
%{_datadir}/vala/vapi/%{name}-3.deps
|
||||
%{_datadir}/vala/vapi/%{name}-3.vapi
|
||||
%{_datadir}/vala/vapi/%{name}-2.0.deps
|
||||
%{_datadir}/vala/vapi/%{name}-2.0.vapi
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.0.2-1
|
||||
- Repackaged for Terra
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
%global forgeurl https://github.com/KDE/latte-dock/
|
||||
|
||||
%global commit 4f1c08054b1f975176375f615cf9d2470f7ec7ed
|
||||
%global commit 23b9e9ea3694235e19868846bab5292b2518fd34
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global commit_date %(date '+%Y%m%d')
|
||||
%global snapshot_info %{commit_date}.%{shortcommit}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager
|
||||
%global commit 682c4928a91da598767e0be2496d9c35af7db035
|
||||
%global commit 6e4342ae0ef3710343e2dbf0b8da586853625e2e
|
||||
%forgemeta
|
||||
|
||||
Name: lomiri-download-manager
|
||||
Version: 0.1.3
|
||||
Version: 0.5.2
|
||||
Release: 1%?dist
|
||||
Summary: Upload Download Manager for Lomiri
|
||||
License: LGPLv3
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
let o = get("https://gitlab.com/api/v4/projects/17088252/repository/tags").json_arr()[0];
|
||||
let o = get("https://gitlab.com/api/v4/projects/25034025/repository/tags").json_arr()[0];
|
||||
let f = rpm.f;
|
||||
rpm.version(o.name);
|
||||
// check if changed
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
|
||||
%global commit 1a80200cd84b1b71715f91bf9e278ef46a8cbb6b
|
||||
%global commit 10d7151a3e4ea08b92e85be7e6e631c48219feaf
|
||||
%forgemeta
|
||||
|
||||
Name: lomiri-system-settings
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
Name: lomiri-url-dispatcher
|
||||
Version: 0.1.3
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: A small library for handling URLs over dbus
|
||||
|
||||
License: LGPL-3.0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Name: unity-settings-daemon
|
||||
Version: 15.04.1+21.10.20220802
|
||||
Release: %autorelease
|
||||
Release: 2%?dist
|
||||
Summary: Daemon handling for Unity session settings
|
||||
|
||||
License: GPL-2.0 AND LGPL-2.0-or-later
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Name: ayatana-indicator-datetime
|
||||
Summary: A GTK implementation of the StatusNotifierItem Specification
|
||||
Version: 24.5.0
|
||||
Release: 1%?dist
|
||||
Version: 24.2.0
|
||||
Release: 1%{?dist}
|
||||
License: GPL-3.0
|
||||
URL: https://github.com/AyatanaIndicators/ayatana-indicator-datetime
|
||||
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Name: ayatana-indicator-messages
|
||||
Summary: Ayatana Indicator Messages Applet
|
||||
Version: 24.5.0
|
||||
Release: 1%?dist
|
||||
Version: 23.10.0
|
||||
Release: %autorelease
|
||||
License: GPLv3
|
||||
URL: https://github.com/AyatanaIndicators/ayatana-indicator-messages
|
||||
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Name: ayatana-indicator-session
|
||||
Summary: Ayatana Indicator Session Applet
|
||||
Version: 24.5.0
|
||||
Version: 24.2.0
|
||||
Release: 1%?dist
|
||||
License: GPL-3.0
|
||||
URL: https://github.com/AyatanaIndicators/ayatana-indicator-session
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Name: ayatana-indicator-sound
|
||||
Summary: Ayatana Indicator Sound Applet
|
||||
Version: 24.5.0
|
||||
Version: 24.4.0
|
||||
Release: 1%?dist
|
||||
License: GPLv3
|
||||
URL: https://github.com/AyatanaIndicators/ayatana-indicator-sound
|
||||
|
||||
@@ -1,142 +0,0 @@
|
||||
From 4d44531c8f624f5b479c3ff23e8fecc67eb848ab Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Linton <jeremy.linton@arm.com>
|
||||
Date: Fri, 22 Oct 2021 14:51:54 -0500
|
||||
Subject: [PATCH] Delay for logind, and fallback to seat0
|
||||
|
||||
There is systemd/logind race with when restarting
|
||||
sddm that causes logind1 not to be available. Previously
|
||||
this meant the seat0 was immediately created regardless
|
||||
of the state of CanGraphical.
|
||||
|
||||
Fixing this, though we still want seat0 to be started
|
||||
if none of the seats appear to be graphical. Presumably
|
||||
there are some graphics on the machine, otherwise
|
||||
why run sddm? Wait a bit, and create seat0 anyway. If
|
||||
this fails the output from Xorg should tell us why. This
|
||||
is generally a better strategy than what happens a good
|
||||
amount of time now, where sddm is started and silent about
|
||||
why the screen is blank.
|
||||
|
||||
References:
|
||||
* https://bugzilla.redhat.com/2011991
|
||||
* https://bugzilla.redhat.com/2016310
|
||||
|
||||
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
|
||||
---
|
||||
src/daemon/LogindDBusTypes.cpp | 31 +++++++++++++++++++++----------
|
||||
src/daemon/SeatManager.cpp | 22 ++++++++++++++++++++++
|
||||
src/daemon/SeatManager.h | 1 +
|
||||
3 files changed, 44 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
|
||||
index 011bb7f..6255c69 100644
|
||||
--- a/src/daemon/LogindDBusTypes.cpp
|
||||
+++ b/src/daemon/LogindDBusTypes.cpp
|
||||
@@ -8,6 +8,8 @@
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
+#include <unistd.h>
|
||||
+
|
||||
class LogindPathInternal {
|
||||
public:
|
||||
LogindPathInternal();
|
||||
@@ -46,17 +48,26 @@ LogindPathInternal::LogindPathInternal()
|
||||
qRegisterMetaType<UserInfoList>("UserInfoList");
|
||||
qDBusRegisterMetaType<UserInfoList>();
|
||||
|
||||
- if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
|
||||
- qDebug() << "Logind interface found";
|
||||
- available = true;
|
||||
- serviceName = QStringLiteral("org.freedesktop.login1");
|
||||
- managerPath = QStringLiteral("/org/freedesktop/login1");
|
||||
- managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
|
||||
- seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
|
||||
- sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
|
||||
- userIfaceName = QStringLiteral("org.freedesktop.login1.User");
|
||||
- return;
|
||||
+#ifdef HAVE_SYSTEMD
|
||||
+ // systemd-logind should be running, although because it takes a few moments to restart after
|
||||
+ // systemctl isolate calls, it may not yet be running. Wait a few seconds for it, while blocking everything else.
|
||||
+ int logind_wait_seconds = 50;
|
||||
+ while (logind_wait_seconds--) {
|
||||
+ if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
|
||||
+ qDebug() << "Logind interface found";
|
||||
+ available = true;
|
||||
+ serviceName = QStringLiteral("org.freedesktop.login1");
|
||||
+ managerPath = QStringLiteral("/org/freedesktop/login1");
|
||||
+ managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
|
||||
+ seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
|
||||
+ sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
|
||||
+ userIfaceName = QStringLiteral("org.freedesktop.login1.User");
|
||||
+ return;
|
||||
+ }
|
||||
+ qDebug() << "Sleeping for systemd-logind";
|
||||
+ usleep(100000);
|
||||
}
|
||||
+#endif
|
||||
|
||||
if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
|
||||
qDebug() << "Console kit interface found";
|
||||
diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp
|
||||
index bd207e6..39d8b85 100644
|
||||
--- a/src/daemon/SeatManager.cpp
|
||||
+++ b/src/daemon/SeatManager.cpp
|
||||
@@ -26,6 +26,9 @@
|
||||
#include <QDBusMessage>
|
||||
#include <QDBusPendingReply>
|
||||
#include <QDBusContext>
|
||||
+#include <QDebug>
|
||||
+#include <QFileInfo>
|
||||
+#include <QTimer>
|
||||
|
||||
#include "LogindDBusTypes.h"
|
||||
|
||||
@@ -115,6 +118,8 @@ namespace SDDM {
|
||||
|
||||
QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatNew"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath)));
|
||||
QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath)));
|
||||
+
|
||||
+ QTimer::singleShot(5000, this, &SeatManager::checkSeat);
|
||||
}
|
||||
|
||||
void SeatManager::createSeat(const QString &name) {
|
||||
@@ -152,6 +157,23 @@ namespace SDDM {
|
||||
m_seats.value(name)->createDisplay(Display::defaultDisplayServerType());
|
||||
}
|
||||
|
||||
+ // this is a bit hacky, but linux DRM drivers
|
||||
+ // won't initially be available so there is a race
|
||||
+ // between determing if a efifb/etc graphical object
|
||||
+ // is the only graphics on the machine, or a DRM driver
|
||||
+ // will take over the display. So we will hang out for a few
|
||||
+ // seconds and if none of the seats are declared cangraphical
|
||||
+ // its possible the only graphics on the machine don't have
|
||||
+ // a drm driver.
|
||||
+ void SeatManager::checkSeat(void) {
|
||||
+ if (m_seats.isEmpty()) {
|
||||
+ //if (QFileInfo::exists(QStringLiteral("/dev/fb0"))) {
|
||||
+ qWarning() << "No graphical seats found, attempt to start one on the main console anyway...";
|
||||
+ createSeat(QStringLiteral("seat0"));
|
||||
+ //}
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath)
|
||||
{
|
||||
auto logindSeat = new LogindSeat(name, objectPath);
|
||||
diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h
|
||||
index b2f9796..aa43047 100644
|
||||
--- a/src/daemon/SeatManager.h
|
||||
+++ b/src/daemon/SeatManager.h
|
||||
@@ -49,6 +49,7 @@ namespace SDDM {
|
||||
private:
|
||||
QHash<QString, Seat *> m_seats; //these will exist only for graphical seats
|
||||
QHash<QString, LogindSeat*> m_systemSeats; //these will exist for all seats
|
||||
+ void checkSeat(void);
|
||||
};
|
||||
}
|
||||
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
This scripts dir contains only samples, but are generally not used directly.
|
||||
In practice, sddm runtime uses items under /etc/sddm by default
|
||||
@@ -1,5 +0,0 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "terra-sddm.spec"
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
diff -up sddm-0.18.0/services/sddm.service.in.env sddm-0.18.0/services/sddm.service.in
|
||||
--- sddm-0.18.0/services/sddm.service.in.env 2018-07-18 05:31:40.000000000 -0500
|
||||
+++ sddm-0.18.0/services/sddm.service.in 2019-03-14 08:23:22.095498405 -0500
|
||||
@@ -7,6 +7,7 @@ After=systemd-user-sessions.service gett
|
||||
[Service]
|
||||
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
|
||||
Restart=always
|
||||
+EnvironmentFile=-/etc/sysconfig/sddm
|
||||
|
||||
[Install]
|
||||
Alias=display-manager.service
|
||||
@@ -1,53 +0,0 @@
|
||||
diff --git a/src/common/Configuration.h b/src/common/Configuration.h
|
||||
index 54bcace..9b8fa22 100644
|
||||
--- a/src/common/Configuration.h
|
||||
+++ b/src/common/Configuration.h
|
||||
@@ -37,9 +37,8 @@ namespace SDDM {
|
||||
enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
|
||||
|
||||
// Name Type Default value Description
|
||||
- // TODO: Change default to x11-user in a future release
|
||||
- Entry(DisplayServer, QString, _S("x11"), _S("Which display server should be used.\n"
|
||||
- "Valid values are: x11, x11-user, wayland. Wayland support is experimental"));
|
||||
+ Entry(DisplayServer, QString, _S("wayland"), _S("Which display server should be used.\n"
|
||||
+ "Valid values are: x11, x11-user, wayland."));
|
||||
Entry(HaltCommand, QString, _S(HALT_COMMAND), _S("Halt command"));
|
||||
Entry(RebootCommand, QString, _S(REBOOT_COMMAND), _S("Reboot command"));
|
||||
Entry(Numlock, NumState, NUM_NONE, _S("Initial NumLock state. Can be on, off or none.\n"
|
||||
@@ -51,7 +50,7 @@ namespace SDDM {
|
||||
// Name Entries (but it's a regular class again)
|
||||
Section(Theme,
|
||||
Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path"));
|
||||
- Entry(Current, QString, _S(""), _S("Current theme name"));
|
||||
+ Entry(Current, QString, _S("01-breeze-fedora"), _S("Current theme name"));
|
||||
Entry(FacesDir, QString, _S(DATA_INSTALL_DIR "/faces"), _S("Global directory for user avatars\n"
|
||||
"The files should be named <username>.face.icon"));
|
||||
Entry(CursorTheme, QString, QString(), _S("Cursor theme used in the greeter"));
|
||||
@@ -71,9 +70,9 @@ namespace SDDM {
|
||||
Entry(SessionDir, QStringList, {_S("/usr/local/share/xsessions"),
|
||||
_S("/usr/share/xsessions")}, _S("Comma-separated list of directories containing available X sessions"));
|
||||
Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session"));
|
||||
- Entry(SessionLogFile, QString, _S(".local/share/sddm/xorg-session.log"), _S("Path to the user session log file"));
|
||||
- Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Path to a script to execute when starting the display server"));
|
||||
- Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Path to a script to execute when stopping the display server"));
|
||||
+ Entry(SessionLogFile, QString, _S(".cache/xsession-errors"), _S("Path to the user session log file"));
|
||||
+ Entry(DisplayCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xsetup"), _S("Path to a script to execute when starting the display server"));
|
||||
+ Entry(DisplayStopCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xstop"), _S("Path to a script to execute when stopping the display server"));
|
||||
Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling"));
|
||||
);
|
||||
|
||||
@@ -82,12 +81,12 @@ namespace SDDM {
|
||||
Entry(SessionDir, QStringList, {_S("/usr/local/share/wayland-sessions"),
|
||||
_S("/usr/share/wayland-sessions")}, _S("Comma-separated list of directories containing available Wayland sessions"));
|
||||
Entry(SessionCommand, QString, _S(WAYLAND_SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session"));
|
||||
- Entry(SessionLogFile, QString, _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
|
||||
+ Entry(SessionLogFile, QString, _S(".cache/wayland-errors"), _S("Path to the user session log file"));
|
||||
Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling"));
|
||||
);
|
||||
|
||||
Section(Users,
|
||||
- Entry(DefaultPath, QString, _S("/usr/local/bin:/usr/bin:/bin"), _S("Default $PATH for logged in users"));
|
||||
+ Entry(DefaultPath, QString, _S("/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"), _S("Default $PATH for logged in users"));
|
||||
Entry(MinimumUid, int, UID_MIN, _S("Minimum user id for displayed users"));
|
||||
Entry(MaximumUid, int, UID_MAX, _S("Maximum user id for displayed users"));
|
||||
Entry(HideUsers, QStringList, QStringList(), _S("Comma-separated list of users that should not be listed"));
|
||||
@@ -1,67 +0,0 @@
|
||||
From 52175648f4e1b415f93b24a3ef970983024659f2 Mon Sep 17 00:00:00 2001
|
||||
From: Neal Gompa <neal@gompa.dev>
|
||||
Date: Wed, 28 Feb 2024 16:47:16 -0500
|
||||
Subject: [PATCH] Default to Qt6 and always use versioned greeters
|
||||
|
||||
Distributors can handle creating an unversioned name if necessary.
|
||||
---
|
||||
src/common/ThemeMetadata.cpp | 4 ++--
|
||||
src/daemon/Greeter.cpp | 3 +--
|
||||
src/greeter/CMakeLists.txt | 9 +--------
|
||||
3 files changed, 4 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/src/common/ThemeMetadata.cpp b/src/common/ThemeMetadata.cpp
|
||||
index 2cb3762..003056a 100644
|
||||
--- a/src/common/ThemeMetadata.cpp
|
||||
+++ b/src/common/ThemeMetadata.cpp
|
||||
@@ -28,7 +28,7 @@ namespace SDDM {
|
||||
QString mainScript { QStringLiteral("Main.qml") };
|
||||
QString configFile;
|
||||
QString translationsDirectory { QStringLiteral(".") };
|
||||
- int qtVersion = 5;
|
||||
+ int qtVersion = 6;
|
||||
};
|
||||
|
||||
ThemeMetadata::ThemeMetadata(const QString &path, QObject *parent) : QObject(parent), d(new ThemeMetadataPrivate()) {
|
||||
@@ -61,6 +61,6 @@ namespace SDDM {
|
||||
d->mainScript = settings.value(QStringLiteral("SddmGreeterTheme/MainScript"), QStringLiteral("Main.qml")).toString();
|
||||
d->configFile = settings.value(QStringLiteral("SddmGreeterTheme/ConfigFile"), QStringLiteral("theme.conf")).toString();
|
||||
d->translationsDirectory = settings.value(QStringLiteral("SddmGreeterTheme/TranslationsDirectory"), QStringLiteral(".")).toString();
|
||||
- d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 5).toInt();
|
||||
+ d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 6).toInt();
|
||||
}
|
||||
}
|
||||
diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
|
||||
index 07fccde..5a956b6 100644
|
||||
--- a/src/daemon/Greeter.cpp
|
||||
+++ b/src/daemon/Greeter.cpp
|
||||
@@ -82,8 +82,7 @@ namespace SDDM {
|
||||
|
||||
QString Greeter::greeterPathForQt(int qtVersion)
|
||||
{
|
||||
- const QString suffix = qtVersion == 5 ? QString() : QStringLiteral("-qt%1").arg(qtVersion);
|
||||
- return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter%1").arg(suffix);
|
||||
+ return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter-qt%1").arg(qtVersion);
|
||||
}
|
||||
|
||||
bool Greeter::start() {
|
||||
diff --git a/src/greeter/CMakeLists.txt b/src/greeter/CMakeLists.txt
|
||||
index 72769e4..524368d 100644
|
||||
--- a/src/greeter/CMakeLists.txt
|
||||
+++ b/src/greeter/CMakeLists.txt
|
||||
@@ -1,11 +1,4 @@
|
||||
-if(QT_MAJOR_VERSION EQUAL "5")
|
||||
- # Keep the unversioned name for Qt5. When upgrading SDDM, the old daemon
|
||||
- # might still be running and only know about "sddm-greeter". Keeping the
|
||||
- # previous name around also helps users calling it directly.
|
||||
- set(GREETER_TARGET sddm-greeter)
|
||||
-else()
|
||||
- set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
|
||||
-endif()
|
||||
+set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
|
||||
|
||||
message(STATUS "Building greeter for Qt ${QT_MAJOR_VERSION} as ${GREETER_TARGET}")
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,20 +0,0 @@
|
||||
#%PAM-1.0
|
||||
auth required pam_env.so
|
||||
auth required pam_permit.so
|
||||
auth include postlogin
|
||||
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
|
||||
password include system-auth
|
||||
|
||||
session required pam_selinux.so close
|
||||
session required pam_loginuid.so
|
||||
session required pam_selinux.so open
|
||||
session optional pam_keyinit.so force revoke
|
||||
session required pam_namespace.so
|
||||
session include system-auth
|
||||
-session optional pam_gnome_keyring.so auto_start
|
||||
-session optional pam_kwallet5.so auto_start
|
||||
-session optional pam_kwallet.so auto_start
|
||||
session include postlogin
|
||||
@@ -1,17 +0,0 @@
|
||||
#%PAM-1.0
|
||||
|
||||
# Load environment from /etc/environment and ~/.pam_environment
|
||||
auth required pam_env.so
|
||||
|
||||
# Always let the greeter start without authentication
|
||||
auth required pam_permit.so
|
||||
|
||||
# No action required for account management
|
||||
account required pam_permit.so
|
||||
|
||||
# Can't change password
|
||||
password required pam_deny.so
|
||||
|
||||
# Setup session
|
||||
session required pam_unix.so
|
||||
session optional pam_systemd.so
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/services/sddm-tmpfiles.conf.in b/services/sddm-tmpfiles.conf.in
|
||||
index fb45553..6acfb6c 100644
|
||||
--- a/services/sddm-tmpfiles.conf.in
|
||||
+++ b/services/sddm-tmpfiles.conf.in
|
||||
@@ -1,5 +1,7 @@
|
||||
# Home dir of the sddm user, also contains state.conf
|
||||
d ${STATE_DIR} 0750 sddm sddm
|
||||
+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
|
||||
+Z ${STATE_DIR} - sddm sddm
|
||||
# This contains X11 auth files passed to Xorg and the greeter
|
||||
d ${RUNTIME_DIR} 0711 root root
|
||||
# Sockets for IPC
|
||||
@@ -1,2 +0,0 @@
|
||||
#Type Name ID GECOS Home directory Shell
|
||||
u sddm - "SDDM Greeter Account" /var/lib/sddm -
|
||||
@@ -1,2 +0,0 @@
|
||||
[General]
|
||||
DisplayServer=x11
|
||||
@@ -1,122 +0,0 @@
|
||||
[Autologin]
|
||||
# Whether sddm should automatically log back into sessions when they exit
|
||||
#Relogin=false
|
||||
|
||||
# Name of session file for autologin session
|
||||
#Session=
|
||||
|
||||
# Username for autologin session
|
||||
#User=
|
||||
|
||||
|
||||
[General]
|
||||
# Enable Qt's automatic high-DPI scaling
|
||||
#EnableHiDPI=false
|
||||
|
||||
# Halt command
|
||||
#HaltCommand=/usr/bin/systemctl poweroff
|
||||
|
||||
# Initial NumLock state. Can be on, off or none.
|
||||
# If property is set to none, numlock won't be changed
|
||||
# NOTE: Currently ignored if autologin is enabled.
|
||||
#Numlock=none
|
||||
|
||||
# Reboot command
|
||||
#RebootCommand=/usr/bin/systemctl reboot
|
||||
|
||||
# Control x11/wayland startup
|
||||
# DisplayServer=wayland
|
||||
|
||||
[Theme]
|
||||
# Current theme name
|
||||
#Current=01-breeze-fedora
|
||||
|
||||
# Cursor theme used in the greeter
|
||||
#CursorTheme=
|
||||
|
||||
# Number of users to use as threshold
|
||||
# above which avatars are disabled
|
||||
# unless explicitly enabled with EnableAvatars
|
||||
#DisableAvatarsThreshold=7
|
||||
|
||||
# Enable display of custom user avatars
|
||||
#EnableAvatars=true
|
||||
|
||||
# Global directory for user avatars
|
||||
# The files should be named <username>.face.icon
|
||||
#FacesDir=/usr/share/sddm/faces
|
||||
|
||||
# Theme directory path
|
||||
#ThemeDir=/usr/share/sddm/themes
|
||||
|
||||
|
||||
[Users]
|
||||
# Default $PATH for logged in users
|
||||
#DefaultPath=/usr/local/bin:/usr/bin:/bin
|
||||
|
||||
# Comma-separated list of shells.
|
||||
# Users with these shells as their default won't be listed
|
||||
#HideShells=
|
||||
|
||||
# Comma-separated list of users that should not be listed
|
||||
#HideUsers=
|
||||
|
||||
# Maximum user id for displayed users
|
||||
#MaximumUid=60000
|
||||
|
||||
# Minimum user id for displayed users
|
||||
#MinimumUid=1000
|
||||
|
||||
# Remember the session of the last successfully logged in user
|
||||
#RememberLastSession=true
|
||||
|
||||
# Remember the last successfully logged in user
|
||||
#RememberLastUser=true
|
||||
|
||||
|
||||
[Wayland]
|
||||
# Path to a script to execute when starting the desktop session
|
||||
#SessionCommand=/etc/sddm/wayland-session
|
||||
|
||||
# Directory containing available Wayland sessions
|
||||
#SessionDir=/usr/share/wayland-sessions
|
||||
|
||||
# Path to the user session log file
|
||||
#SessionLogFile=.cache/wayland-errors
|
||||
|
||||
|
||||
[X11]
|
||||
# Path to a script to execute when starting the display server
|
||||
#DisplayCommand=/etc/sddm/Xsetup
|
||||
|
||||
# Path to a script to execute when stopping the display server
|
||||
#DisplayStopCommand=/etc/sddm/Xstop
|
||||
|
||||
# The lowest virtual terminal number that will be used.
|
||||
#MinimumVT=1
|
||||
|
||||
# Arguments passed to the X server invocation
|
||||
#ServerArguments=-nolisten tcp
|
||||
|
||||
# Path to X server binary
|
||||
#ServerPath=/usr/bin/X
|
||||
|
||||
# Path to a script to execute when starting the desktop session
|
||||
#SessionCommand=/etc/X11/xinit/Xsession
|
||||
|
||||
# Directory containing available X sessions
|
||||
#SessionDir=/usr/share/xsessions
|
||||
|
||||
# Path to the user session log file
|
||||
#SessionLogFile=.cache/xsession-errors
|
||||
|
||||
# Path to the Xauthority file
|
||||
#UserAuthFile=.Xauthority
|
||||
|
||||
# Path to xauth binary
|
||||
#XauthPath=/usr/bin/xauth
|
||||
|
||||
# Path to Xephyr binary
|
||||
#XephyrPath=/usr/bin/Xephyr
|
||||
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
|
||||
auth substack password-auth
|
||||
-auth optional pam_gnome_keyring.so
|
||||
-auth optional pam_kwallet5.so
|
||||
-auth optional pam_kwallet.so
|
||||
auth include postlogin
|
||||
|
||||
account required pam_nologin.so
|
||||
account include password-auth
|
||||
|
||||
password include password-auth
|
||||
|
||||
session required pam_selinux.so close
|
||||
session required pam_loginuid.so
|
||||
-session optional pam_ck_connector.so
|
||||
session required pam_selinux.so open
|
||||
session optional pam_keyinit.so force revoke
|
||||
session required pam_namespace.so
|
||||
session include password-auth
|
||||
-session optional pam_gnome_keyring.so auto_start
|
||||
-session optional pam_kwallet5.so auto_start
|
||||
-session optional pam_kwallet.so auto_start
|
||||
session include postlogin
|
||||
@@ -1,5 +0,0 @@
|
||||
# workaround https://bugzilla.redhat.com/1686675
|
||||
# see also https://bugreports.qt.io/browse/QTBUG-58508
|
||||
QML_DISABLE_DISK_CACHE=1
|
||||
# enable qDebug messages for debug build
|
||||
# QT_LOGGING_RULES="*.debug=true"
|
||||
@@ -1,293 +0,0 @@
|
||||
# Disable X11 for RHEL 10+
|
||||
%bcond x11 %[%{undefined rhel} || 0%{?rhel} < 10]
|
||||
|
||||
Name: terra-sddm
|
||||
Version: 0.21.0
|
||||
Release: 5%{?dist}
|
||||
License: GPL-2.0-or-later
|
||||
Summary: QML based desktop and login manager
|
||||
Provides: sddm = %version-%release
|
||||
|
||||
URL: https://github.com/sddm/sddm
|
||||
Source0: %{url}/archive/v%{version}/sddm-%{version}.tar.gz
|
||||
|
||||
## upstream patches
|
||||
# Port all themes to Qt 6
|
||||
# Submitted: https://github.com/sddm/sddm/pull/1876
|
||||
Patch1: sddm-PR1876.patch
|
||||
|
||||
## upstreamable patches
|
||||
# Fix race with logind restart, and start seat0 if !CanGraphical on timer
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2011991
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2016310
|
||||
# Submmited: https://github.com/sddm/sddm/pull/1494
|
||||
Patch11: 0001-Delay-for-logind-and-fallback-to-seat0.patch
|
||||
|
||||
## downstream patches
|
||||
Patch101: sddm-0.20.0-fedora_config.patch
|
||||
|
||||
# sddm.service: +EnvironmentFile=-/etc/sysconfig/sddm
|
||||
Patch103: sddm-0.18.0-environment_file.patch
|
||||
|
||||
# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
|
||||
Patch104: sddm-rpmostree-tmpfiles-hack.patch
|
||||
|
||||
# Workaround lack of Qt 5 greeter build
|
||||
Patch105: sddm-0.21.0-qt6greeter.patch
|
||||
|
||||
# https://github.com/sddm/sddm/pull/1779
|
||||
Patch106: https://github.com/sddm/sddm/pull/1779.patch
|
||||
|
||||
# Shamelessly stolen from gdm
|
||||
Source10: sddm.pam
|
||||
# Shamelessly stolen from gdm
|
||||
Source11: sddm-autologin.pam
|
||||
# Previously included in sddm sources
|
||||
Source12: sddm-greeter.pam
|
||||
# sample sddm.conf generated with sddm --example-config, and entries commented-out
|
||||
Source13: sddm.conf
|
||||
# README.scripts
|
||||
Source14: README.scripts
|
||||
# sysconfig snippet
|
||||
Source15: sddm.sysconfig
|
||||
# sddm x11 override config
|
||||
Source16: sddm-x11.conf
|
||||
# sysusers config file. note these are shipped in the upstream tarball
|
||||
# but we cannot use the files from the tarball for %pre scriptlet
|
||||
# generation, so we duplicate them as source files for that purpose;
|
||||
# this is an ugly hack that should be removed if it becomes possible.
|
||||
# see https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/TFDMAU7KLMSQTKPJELHSM6PFVXIZ56GK/
|
||||
Source17: sddm-systemd-sysusers.conf
|
||||
|
||||
|
||||
Provides: service(graphical-login) = sddm
|
||||
|
||||
BuildRequires: cmake >= 2.8.8
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: pkgconfig(xcb)
|
||||
BuildRequires: pkgconfig(xcb-xkb)
|
||||
# sometimes python-docutils, sometimes python2-docutils, sometimes python3-docutils.
|
||||
# use path then for sanity
|
||||
BuildRequires: /usr/bin/rst2man
|
||||
BuildRequires: cmake(Qt6Core)
|
||||
BuildRequires: cmake(Qt6DBus)
|
||||
BuildRequires: cmake(Qt6Gui)
|
||||
BuildRequires: cmake(Qt6Qml)
|
||||
BuildRequires: cmake(Qt6Quick)
|
||||
BuildRequires: cmake(Qt6LinguistTools)
|
||||
BuildRequires: cmake(Qt6Test)
|
||||
BuildRequires: cmake(Qt6QuickTest)
|
||||
# verify presence to pull defaults from /etc/login.defs
|
||||
BuildRequires: shadow-utils
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-rpm-macros
|
||||
|
||||
Obsoletes: kde-settings-sddm < 20-5
|
||||
|
||||
%if 0%{?fedora}
|
||||
# for /usr/share/backgrounds/default.png
|
||||
BuildRequires: desktop-backgrounds-compat
|
||||
BuildRequires: GraphicsMagick
|
||||
Requires: desktop-backgrounds-compat
|
||||
# for /usr/share/pixmaps/system-logo-white.png
|
||||
Requires: system-logos
|
||||
%endif
|
||||
Requires: systemd
|
||||
%if %{with x11}
|
||||
Requires: xorg-x11-xinit
|
||||
%endif
|
||||
%{?systemd_requires}
|
||||
|
||||
Requires(pre): shadow-utils
|
||||
|
||||
# Virtual dependency for sddm greeter setup
|
||||
Requires: sddm-greeter-displayserver
|
||||
Suggests: sddm-wayland-generic
|
||||
|
||||
%description
|
||||
SDDM is a modern graphical display manager aiming to be fast, simple and
|
||||
beautiful. It uses modern technologies like QtQuick, which in turn gives the
|
||||
designer the ability to create smooth, animated user interfaces.
|
||||
|
||||
%package wayland-generic
|
||||
Summary: Generic Wayland SDDM greeter configuration
|
||||
Provides: sddm-greeter-displayserver
|
||||
Conflicts: sddm-greeter-displayserver
|
||||
Requires: weston
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description wayland-generic
|
||||
This package contains configuration and dependencies for SDDM
|
||||
to use Weston for the greeter display server.
|
||||
|
||||
This is the generic default Wayland configuration provided
|
||||
by SDDM.
|
||||
|
||||
%if %{with x11}
|
||||
%package x11
|
||||
Summary: X11 SDDM greeter configuration
|
||||
Provides: sddm-greeter-displayserver
|
||||
Conflicts: sddm-greeter-displayserver
|
||||
# This will eventually go away...
|
||||
Provides: deprecated()
|
||||
Requires: xorg-x11-server-Xorg
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Recommends: qt6-qtvirtualkeyboard
|
||||
BuildArch: noarch
|
||||
|
||||
%description x11
|
||||
This package contains configuration and dependencies for SDDM
|
||||
to use X11 for the greeter display server.
|
||||
%endif
|
||||
|
||||
%package themes
|
||||
Summary: SDDM Themes
|
||||
# for upgrade path
|
||||
Obsoletes: sddm < 0.2.0-0.12
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
%description themes
|
||||
A collection of sddm themes, including: elarun, maldives, maya
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 %{?commitdate:-n sddm-%{commit}} -n sddm-%version
|
||||
|
||||
%if 0%{?fedora}
|
||||
#FIXME/TODO: use version on filesystem instead of using a bundled copy
|
||||
cp -v /usr/share/backgrounds/default.png \
|
||||
src/greeter/theme/background.png
|
||||
ls -sh src/greeter/theme/background.png
|
||||
gm mogrify -resize 1920x1200 src/greeter/theme/background.png
|
||||
ls -sh src/greeter/theme/background.png
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
-DBUILD_WITH_QT6:BOOL=ON \
|
||||
-DBUILD_MAN_PAGES:BOOL=ON \
|
||||
-DCMAKE_BUILD_TYPE:STRING="Release" \
|
||||
-DENABLE_JOURNALD:BOOL=ON \
|
||||
-DSESSION_COMMAND:PATH=/etc/X11/xinit/Xsession \
|
||||
-DWAYLAND_SESSION_COMMAND:PATH=/etc/sddm/wayland-session
|
||||
|
||||
%cmake_build
|
||||
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/sddm.conf.d
|
||||
mkdir -p %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d
|
||||
install -Dpm 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/sddm
|
||||
install -Dpm 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/sddm-autologin
|
||||
install -Dpm 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pam.d/sddm-greeter
|
||||
install -Dpm 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/sddm.conf
|
||||
install -Dpm 644 %{SOURCE14} %{buildroot}%{_datadir}/sddm/scripts/README.scripts
|
||||
install -Dpm 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/sddm
|
||||
%if %{with x11}
|
||||
install -Dpm 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
|
||||
%endif
|
||||
mkdir -p %{buildroot}/run/sddm
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/sddm
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/sddm/
|
||||
cp -a %{buildroot}%{_datadir}/sddm/scripts/* \
|
||||
%{buildroot}%{_sysconfdir}/sddm/
|
||||
# we're using /etc/X11/xinit/Xsession (by default) instead
|
||||
rm -fv %{buildroot}%{_sysconfdir}/sddm/Xsession
|
||||
|
||||
# De-conflict the dbus file
|
||||
mv %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf \
|
||||
%{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
|
||||
|
||||
%if 0%{?fedora} && 0%{?fedora} < 43
|
||||
# Provide unversioned greeter until F40 is EOL
|
||||
ln -sr %{buildroot}%{_bindir}/sddm-greeter-qt6 %{buildroot}%{_bindir}/sddm-greeter
|
||||
%endif
|
||||
|
||||
|
||||
%pre
|
||||
%sysusers_create_compat %{SOURCE17}
|
||||
|
||||
%post
|
||||
%systemd_post sddm.service
|
||||
# handle incompatible configuration changes
|
||||
(grep \
|
||||
-e '^Current=fedora$' \
|
||||
-e '^\[XDisplay\]$' \
|
||||
-e '^\[WaylandDisplay\]$' \
|
||||
%{_sysconfdir}/sddm.conf > /dev/null && \
|
||||
sed -i.rpmsave \
|
||||
-e 's|^Current=fedora$|#Current=01-breeze-fedora|' \
|
||||
-e 's|^\[XDisplay\]$|\[X11\]|' \
|
||||
-e 's|^\[WaylandDisplay\]$|\[Wayland\]|' \
|
||||
%{_sysconfdir}/sddm.conf
|
||||
) ||:
|
||||
|
||||
|
||||
%preun
|
||||
%systemd_preun sddm.service
|
||||
|
||||
|
||||
%postun
|
||||
%systemd_postun sddm.service
|
||||
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md CONTRIBUTORS
|
||||
%dir %{_sysconfdir}/sddm/
|
||||
%dir %{_sysconfdir}/sddm.conf.d
|
||||
%dir %{_prefix}/lib/sddm/sddm.conf.d
|
||||
%config(noreplace) %{_sysconfdir}/sddm/*
|
||||
%config(noreplace) %{_sysconfdir}/sddm.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/sddm
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/sddm*
|
||||
%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
|
||||
%{_bindir}/sddm
|
||||
%{_bindir}/sddm-greeter*
|
||||
%{_libexecdir}/sddm-helper
|
||||
%{_libexecdir}/sddm-helper-start-wayland
|
||||
%{_libexecdir}/sddm-helper-start-x11user
|
||||
%{_tmpfilesdir}/sddm.conf
|
||||
%{_sysusersdir}/sddm.conf
|
||||
%attr(0711, root, sddm) %dir /run/sddm
|
||||
%attr(1770, sddm, sddm) %dir %{_localstatedir}/lib/sddm
|
||||
%{_unitdir}/sddm.service
|
||||
%{_qt6_archdatadir}/qml/SddmComponents/
|
||||
%dir %{_datadir}/sddm
|
||||
%{_datadir}/sddm/faces/
|
||||
%{_datadir}/sddm/flags/
|
||||
%{_datadir}/sddm/scripts/
|
||||
%dir %{_datadir}/sddm/themes/
|
||||
# %%lang'ify? they're small, probably not worth it -- rex
|
||||
%{_datadir}/sddm/translations*/
|
||||
%{_mandir}/man1/sddm.1*
|
||||
%{_mandir}/man1/sddm-greeter.1*
|
||||
%{_mandir}/man5/sddm.conf.5*
|
||||
%{_mandir}/man5/sddm-state.conf.5*
|
||||
|
||||
|
||||
%files wayland-generic
|
||||
# No files since default configuration
|
||||
|
||||
|
||||
%if %{with x11}
|
||||
%files x11
|
||||
%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
|
||||
%endif
|
||||
|
||||
|
||||
%files themes
|
||||
%{_datadir}/sddm/themes/elarun/
|
||||
%{_datadir}/sddm/themes/maldives/
|
||||
%{_datadir}/sddm/themes/maya/
|
||||
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
@@ -1 +0,0 @@
|
||||
rpm.version(gh("sddm/sddm"));
|
||||
@@ -1,6 +0,0 @@
|
||||
project pkg {
|
||||
arches = ["x86_64"]
|
||||
rpm {
|
||||
spec = "asar.spec"
|
||||
}
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
%define debug_package %nil
|
||||
%define __strip /bin/true
|
||||
%global _build_id_links none
|
||||
|
||||
# Exclude private libraries
|
||||
%global __requires_exclude libffmpeg.so
|
||||
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
|
||||
|
||||
Name: asar
|
||||
Version: 3.2.10
|
||||
Release: 1%?dist
|
||||
Summary: Simple extensive tar-like archive format with indexing
|
||||
License: MIT
|
||||
URL: https://github.com/electron/asar
|
||||
Source0: %url/archive/refs/tags/v%version.tar.gz
|
||||
Requires: nodejs
|
||||
BuildRequires: nodejs-npm
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
Asar is a simple extensive archive format, it works like `tar` that concatenates all files
|
||||
together without compression, while having random access support.
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
|
||||
%install
|
||||
mkdir -p %buildroot%_bindir
|
||||
PATH="$PATH:%buildroot%_bindir"
|
||||
npm install -g --prefix %buildroot%_prefix %SOURCE0
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%license LICENSE.md
|
||||
%_bindir/asar
|
||||
%_prefix/lib/node_modules/@electron/asar/
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
@@ -1 +0,0 @@
|
||||
rpm.version(gh("electron/asar"));
|
||||
@@ -1,6 +0,0 @@
|
||||
project pkg {
|
||||
arches = ["x86_64"]
|
||||
rpm {
|
||||
spec = "codium-marketplace.spec"
|
||||
}
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
# ref: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vscodium-marketplace
|
||||
|
||||
Name: codium-marketplace
|
||||
Version: 1.65.0
|
||||
Release: 1%?dist
|
||||
Summary: Enable vscode marketplace in vscodium
|
||||
License: MIT
|
||||
BuildArch: noarch
|
||||
URL: https://marketplace.visualstudio.com/vscode
|
||||
Requires: codium sed
|
||||
|
||||
%description
|
||||
This package replaces the default marketplace (https://open-vsx.org/)
|
||||
to the official one used by vscode.
|
||||
|
||||
%install
|
||||
touch dummy
|
||||
install -Dm644 dummy %buildroot/tmp/terra-codium-marketplace-dummy-file
|
||||
|
||||
%posttrans
|
||||
if [ $1 -gt 1 ]; then # update/install
|
||||
sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
|
||||
-e '/^[[:blank:]]*"cacheUrl/d' \
|
||||
-e '/^[[:blank:]]*"serviceUrl/a\ "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
|
||||
-e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
|
||||
-e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
|
||||
/usr/share/codium/resources/app/product.json || true
|
||||
fi
|
||||
|
||||
%preun
|
||||
sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/open-vsx.org\/vscode\/gallery",/' \
|
||||
-e '/^[[:blank:]]*"cacheUrl/d' \
|
||||
-e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/open-vsx.org\/vscode\/item"/' \
|
||||
-e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
|
||||
-e '/^[[:blank:]]*"documentationUrl/i\ "linkProtectionTrustedDomains": ["https://open-vsx.org"],' \
|
||||
/usr/share/codium/resources/app/product.json || true
|
||||
|
||||
%triggerin -- codium
|
||||
sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
|
||||
-e '/^[[:blank:]]*"cacheUrl/d' \
|
||||
-e '/^[[:blank:]]*"serviceUrl/a\ "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
|
||||
-e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
|
||||
-e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
|
||||
/usr/share/codium/resources/app/product.json || true
|
||||
|
||||
%files
|
||||
/tmp/terra-codium-marketplace-dummy-file
|
||||
@@ -12,7 +12,7 @@
|
||||
%endif
|
||||
|
||||
Name: codium
|
||||
Version: 1.90.2.24171
|
||||
Version: 1.88.1.24104
|
||||
Release: 1%?dist
|
||||
Summary: Code editing. Redefined.
|
||||
License: MIT
|
||||
@@ -28,8 +28,6 @@ VSCodium is a new choice of tool that combines the simplicity of a code editor
|
||||
with what developers need for the core edit-build-debug cycle.
|
||||
|
||||
%prep
|
||||
mkdir stuff
|
||||
cd stuff
|
||||
tar xf %SOURCE0
|
||||
|
||||
cat <<EOF > vscodium-bin-uri-handler.desktop
|
||||
@@ -72,7 +70,6 @@ EOF
|
||||
%build
|
||||
|
||||
%install
|
||||
cd stuff
|
||||
mkdir -p %buildroot%_datadir/doc/%name/ %buildroot%_datadir/licenses/%name
|
||||
install -Dm644 %SOURCE1 %buildroot%_docdir/%name/
|
||||
install -Dm644 %SOURCE2 %buildroot%_datadir/licenses/%name/
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: flutter
|
||||
Version: 3.22.2
|
||||
Version: 3.19.6
|
||||
Release: 1%?dist
|
||||
Summary: SDK for crafting beautiful, fast user experiences from a single codebase
|
||||
License: BSD-3-Clause
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
%define debug_package %nil
|
||||
|
||||
Name: neovide
|
||||
Version: 0.13.1
|
||||
Release: 1%?dist
|
||||
Version: 0.12.2
|
||||
Release: 1%{?dist}
|
||||
Summary: No Nonsense Neovim Client in Rust
|
||||
License: MIT
|
||||
URL: https://neovide.dev/
|
||||
Source0: https://github.com/neovide/neovide/archive/refs/tags/%version.tar.gz
|
||||
Requires: fontconfig freetype libglvnd
|
||||
Requires: neovim > 0.9.5
|
||||
Requires: neovim fontconfig freetype libglvnd
|
||||
BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24 cmake gtk3 python3 SDL2
|
||||
BuildRequires: fontconfig-devel freetype-devel libX11-xcb libX11-devel libstdc++-static libstdc++-devel
|
||||
ExclusiveArch: x86_64
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Name: terra-rgbds
|
||||
Version: 0.8.0
|
||||
Release: 1%?dist
|
||||
Version: 0.7.0
|
||||
Release: 1%{?dist}
|
||||
Summary: A development package for the Game Boy, including an assembler
|
||||
|
||||
# See LICENSE for details
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "zed-nightly.spec"
|
||||
}
|
||||
labels {
|
||||
nightly = 1
|
||||
large = 1
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
if filters.contains("nightly") {
|
||||
rpm.global("commit", gh_commit("zed-industries/zed"));
|
||||
rpm.global("commit_date", date());
|
||||
if rpm.changed() {
|
||||
let v = find("(\\d+\\.\\d+\\d+\\.\\d+)", find("\nversion = \"(\\d+\\.\\d+\\d+\\.\\d+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1), 1);
|
||||
rpm.global("ver", v);
|
||||
rpm.global("commit_date", date());
|
||||
rpm.release();
|
||||
}
|
||||
}
|
||||
@@ -1,97 +0,0 @@
|
||||
%global commit 0129d4e2506d5ec5e50ef0968382770b9abec390
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global commit_date 20240619
|
||||
%global ver 0.142.0
|
||||
|
||||
%bcond_without check
|
||||
|
||||
# Exclude input files from mangling
|
||||
%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
|
||||
|
||||
%global crate zed
|
||||
%global app_id dev.zed.Zed-Nightly
|
||||
|
||||
Name: zed-nightly
|
||||
Version: %ver^%commit_date.%shortcommit
|
||||
Release: 1%?dist
|
||||
Summary: Zed is a high-performance, multiplayer code editor
|
||||
|
||||
License: MIT
|
||||
URL: https://zed.dev/
|
||||
Source0: https://github.com/zed-industries/zed/archive/%{commit}.zip
|
||||
|
||||
Conflicts: zed
|
||||
Provides: zed
|
||||
|
||||
BuildRequires: cargo-rpm-macros >= 24
|
||||
BuildRequires: anda-srpm-macros
|
||||
BuildRequires: gcc
|
||||
BuildRequires: g++
|
||||
BuildRequires: clang
|
||||
BuildRequires: mold
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: wayland-devel
|
||||
BuildRequires: libxkbcommon-x11-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: libzstd-devel
|
||||
BuildRequires: perl-FindBin
|
||||
BuildRequires: perl-IPC-Cmd
|
||||
BuildRequires: perl-File-Compare
|
||||
BuildRequires: perl-File-Copy
|
||||
BuildRequires: perl-lib
|
||||
BuildRequires: vulkan-loader
|
||||
|
||||
%description
|
||||
Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{crate}-%{commit} -p1
|
||||
%cargo_prep_online
|
||||
|
||||
export DO_STARTUP_NOTIFY="true"
|
||||
export APP_ID="%app_id"
|
||||
export APP_ICON="%app_id"
|
||||
export APP_NAME="Zed Nightly"
|
||||
export APP_CLI="zed"
|
||||
export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
|
||||
export ZED_RELEASE_CHANNEL=nightly
|
||||
export BRANDING_LIGHT="#e9aa6a"
|
||||
export BRANDING_DARK="#1a5fb4"
|
||||
|
||||
echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
|
||||
envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
|
||||
|
||||
envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
|
||||
|
||||
%build
|
||||
export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
|
||||
echo "nightly" > crates/zed/RELEASE_CHANNEL
|
||||
|
||||
%cargo_build -- --package zed --package cli
|
||||
script/generate-licenses
|
||||
|
||||
%install
|
||||
install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
|
||||
install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
|
||||
|
||||
install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
|
||||
install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
|
||||
|
||||
install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
%cargo_test
|
||||
%endif
|
||||
|
||||
%files
|
||||
%{_libexecdir}/zed-editor
|
||||
%{_bindir}/zed
|
||||
%{_datadir}/applications/%app_id.desktop
|
||||
%{_datadir}/pixmaps/%app_id.png
|
||||
%{_metainfodir}/%app_id.metainfo.xml
|
||||
%license assets/licenses.md
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
@@ -1,8 +0,0 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "zed-preview.spec"
|
||||
}
|
||||
labels {
|
||||
large = 1
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
let releases = "https://api.github.com/repos/zed-industries/zed/releases".get().json_arr();
|
||||
for release in releases {
|
||||
if !release.prerelease {
|
||||
continue;
|
||||
}
|
||||
let tag = release.tag_name;
|
||||
tag.pop(4); // remove the "-pre" suffix
|
||||
rpm.global("ver", tag);
|
||||
terminate();
|
||||
}
|
||||
@@ -1,91 +0,0 @@
|
||||
%bcond_without check
|
||||
%global debug_package %{nil}
|
||||
%global ver 0.142.1
|
||||
|
||||
%global crate zed
|
||||
%global app_id dev.zed.Zed-Preview
|
||||
|
||||
Name: zed-preview
|
||||
Version: %ver
|
||||
Release: pre1%?dist
|
||||
Summary: Zed is a high-performance, multiplayer code editor
|
||||
|
||||
License: MIT
|
||||
URL: https://zed.dev/
|
||||
Source0: https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}-pre.tar.gz
|
||||
|
||||
Conflicts: zed
|
||||
Provides: zed
|
||||
|
||||
BuildRequires: cargo-rpm-macros >= 24
|
||||
BuildRequires: anda-srpm-macros
|
||||
BuildRequires: gcc
|
||||
BuildRequires: g++
|
||||
BuildRequires: clang
|
||||
BuildRequires: mold
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: wayland-devel
|
||||
BuildRequires: libxkbcommon-x11-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: libzstd-devel
|
||||
BuildRequires: perl-FindBin
|
||||
BuildRequires: perl-IPC-Cmd
|
||||
BuildRequires: perl-File-Compare
|
||||
BuildRequires: perl-File-Copy
|
||||
BuildRequires: perl-lib
|
||||
BuildRequires: vulkan-loader
|
||||
|
||||
%description
|
||||
Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{crate}-%{ver}-pre -p1
|
||||
%cargo_prep_online
|
||||
|
||||
export DO_STARTUP_NOTIFY="true"
|
||||
export APP_ID="%app_id"
|
||||
export APP_ICON="%app_id"
|
||||
export APP_NAME="Zed Preview"
|
||||
export APP_CLI="zed"
|
||||
export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra."
|
||||
export ZED_RELEASE_CHANNEL=preview
|
||||
export BRANDING_LIGHT="#99c1f1"
|
||||
export BRANDING_DARK="#1a5fb4"
|
||||
|
||||
echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
|
||||
envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
|
||||
|
||||
envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
|
||||
|
||||
%build
|
||||
export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra."
|
||||
echo "preview" > crates/zed/RELEASE_CHANNEL
|
||||
|
||||
%cargo_build -- --package zed --package cli
|
||||
script/generate-licenses
|
||||
|
||||
%install
|
||||
install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
|
||||
install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
|
||||
|
||||
install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
|
||||
install -Dm644 crates/zed/resources/app-icon-preview.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
|
||||
|
||||
install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
%cargo_test
|
||||
%endif
|
||||
|
||||
%files
|
||||
%{_libexecdir}/zed-editor
|
||||
%{_bindir}/zed
|
||||
%{_datadir}/applications/%app_id.desktop
|
||||
%{_datadir}/pixmaps/%app_id.png
|
||||
%{_metainfodir}/%app_id.metainfo.xml
|
||||
%license assets/licenses.md
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
# https://github.com/containerd/containerd
|
||||
%global goipath github.com/containerd/containerd
|
||||
Version: 1.7.19
|
||||
Version: 1.7.16
|
||||
|
||||
%gometa
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define debug_package %nil
|
||||
|
||||
Name: moby-buildx
|
||||
Version: 0.15.1
|
||||
Version: 0.14.0
|
||||
Release: 1%?dist
|
||||
Summary: Docker CLI plugin for extended build capabilities with BuildKit
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: moby-compose
|
||||
Version: 2.28.1
|
||||
Version: 2.27.0
|
||||
Release: 1%?dist
|
||||
Summary: Define and run multi-container applications with Docker
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: sarasa-gothic-fonts
|
||||
Version: 1.0.15
|
||||
Version: 1.0.10
|
||||
Release: 1%?dist
|
||||
URL: https://github.com/be5invis/Sarasa-Gothic
|
||||
Source0: %url/releases/download/v%version/Sarasa-TTC-%version.7z
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
%define osuresver 2024.705.0
|
||||
%define osuresver 2024.410.0
|
||||
%global debug_package %{nil}
|
||||
%define __strip /bin/true
|
||||
|
||||
Name: osu-lazer
|
||||
Version: 2024.625.2
|
||||
Version: 2024.412.1
|
||||
Release: 1%?dist
|
||||
Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
|
||||
ExclusiveArch: x86_64
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
%global real_name prismlauncher
|
||||
%global nice_name PrismLauncher
|
||||
|
||||
%global commit 5973c1c45e8afef8ca19da80ef216b3cac89df4d
|
||||
%global commit bfac12604e9cd0884987ca89f34a455cf16c543c
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
|
||||
%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
|
||||
%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
|
||||
|
||||
%global commit_date 20240706
|
||||
%global commit_date 20240501
|
||||
%global snapshot_info %{commit_date}.%{shortcommit}
|
||||
|
||||
%bcond_without qt6
|
||||
@@ -38,6 +40,8 @@ Group: Amusements/Games
|
||||
URL: https://prismlauncher.org/
|
||||
Source0: https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz
|
||||
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
|
||||
@@ -46,7 +50,6 @@ BuildRequires: gcc-c++
|
||||
BuildRequires: java-17-openjdk-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: tomlplusplus-devel
|
||||
BuildRequires: cmake(ghc_filesystem)
|
||||
BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version}
|
||||
@@ -55,13 +58,9 @@ BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}NetworkAuth) >= %{min_qt_version}
|
||||
|
||||
%if %{with qt6}
|
||||
BuildRequires: cmake(Qt6Core5Compat)
|
||||
BuildRequires: quazip-qt6-devel
|
||||
%else
|
||||
BuildRequires: quazip-qt5-devel
|
||||
%endif
|
||||
|
||||
BuildRequires: pkgconfig(libcmark)
|
||||
@@ -104,9 +103,13 @@ multiple installations of Minecraft at once (Fork of MultiMC)
|
||||
%autosetup -p1 -n PrismLauncher-%{commit}
|
||||
|
||||
tar -xzf %{SOURCE1} -C libraries
|
||||
tar -xvf %{SOURCE2} -C libraries
|
||||
tar -xvf %{SOURCE3} -C libraries
|
||||
|
||||
rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,zlib}/
|
||||
rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/
|
||||
mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus
|
||||
mv -f libraries/quazip-%{quazip_commit} libraries/quazip
|
||||
mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus
|
||||
|
||||
# Do not set RPATH
|
||||
sed -i "s|\$ORIGIN/||" CMakeLists.txt
|
||||
@@ -153,9 +156,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jun 19 2024 Trung Lê <8 at tle dot id dot au> - 9.0^20240619.8014283-1
|
||||
- use system quazip-qt and tomlplusplus
|
||||
|
||||
* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 8.0^20230726.4f00012-1
|
||||
- remove terra-fractureiser-detector from recommends, use proper build platform,
|
||||
and add patches for epel/older fedora versions
|
||||
|
||||
@@ -22,8 +22,8 @@ Name: prismlauncher
|
||||
%else
|
||||
Name: prismlauncher-qt5
|
||||
%endif
|
||||
Version: 8.4
|
||||
Release: 2%?dist
|
||||
Version: 8.3
|
||||
Release: 1%?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
|
||||
@@ -46,16 +46,11 @@ BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
|
||||
BuildRequires: tomlplusplus-devel
|
||||
|
||||
%if %{with qt6}
|
||||
BuildRequires: cmake(Qt6Core5Compat)
|
||||
BuildRequires: quazip-qt6-devel
|
||||
%else
|
||||
BuildRequires: quazip-qt5-devel
|
||||
%endif
|
||||
|
||||
|
||||
BuildRequires: pkgconfig(libcmark)
|
||||
BuildRequires: pkgconfig(scdoc)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
@@ -137,9 +132,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Jun 23 2024 Trung Lê <8@tle.id.au> - 8.2-2
|
||||
- update to 8.4. Add quazip-qt deps
|
||||
|
||||
* Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
|
||||
- move JREs to weak deps, add java 21 for snapshots
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define debug_package %nil
|
||||
|
||||
Name: crystal
|
||||
Version: 1.12.2
|
||||
Version: 1.12.1
|
||||
Release: 1%?dist
|
||||
Summary: The Crystal Programming Language
|
||||
License: Apache-2.0
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: dart
|
||||
Version: 3.4.4
|
||||
Version: 3.3.4
|
||||
Release: 1%?dist
|
||||
Summary: The Dart Language
|
||||
License: BSD-3-Clause
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
%define debug_package %nil
|
||||
%global commit 688ca6ae29de89174794a48be61ecd0fb1111c96
|
||||
%global commit_date 20240430
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
|
||||
Name: albius
|
||||
Version: %commit_date.%shortcommit
|
||||
Release: 1%?dist
|
||||
Summary: A Linux installer backend with support for SquashFS and OCI installations
|
||||
License: GPL-3.0
|
||||
URL: https://github.com/Vanilla-OS/Albius
|
||||
Source0: %url/archive/%commit/albius-%commit.tar.gz
|
||||
BuildRequires: go anda-srpm-macros btrfs-progs-devel pkgconfig(devmapper) pkgconfig(gpgme) lvm2 gcc
|
||||
|
||||
%description
|
||||
Albius is a Linux installer backend originally designed for Vanilla OS,
|
||||
but capable of handling any Linux distribution that uses either Squashfs
|
||||
or OCI images for distributing the base system. Albius is written entirely
|
||||
in Go and uses a recipe system (see "recipes" subsection) for describing
|
||||
operations, mountpoints and options.
|
||||
|
||||
%prep
|
||||
%autosetup -n Albius-%commit
|
||||
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/albius .
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{_bindir}/
|
||||
install -pm755 build/bin/albius %{buildroot}%{_bindir}/
|
||||
|
||||
%files
|
||||
%_bindir/albius
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
@@ -1,5 +0,0 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "albius.spec"
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
rpm.version(gh("Vanilla-OS/Albius"));
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
# https://github.com/xyproto/gendesk
|
||||
%global goipath github.com/xyproto/gendesk
|
||||
Version: 1.0.10
|
||||
Version: 1.0.9
|
||||
%global tag 1.0.9
|
||||
%global commit f074161864697100fdc21a99e09b567e82aeb1b9
|
||||
|
||||
@@ -20,14 +20,13 @@ of information.}
|
||||
%global godocs README.md
|
||||
|
||||
Name: %{goname}
|
||||
Release: 1%?dist
|
||||
Release: 1%{?dist}
|
||||
Summary: Generate .desktop files and download .png icons
|
||||
|
||||
License: BSD-3-Clause
|
||||
URL: %{gourl}
|
||||
Source: %{gosource}
|
||||
BuildRequires: git-core gcc
|
||||
Provides: gendesk
|
||||
|
||||
%description %{common_description}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
# https://github.com/xyproto/textoutput
|
||||
%global goipath github.com/xyproto/textoutput
|
||||
Version: 1.16.4
|
||||
Version: 1.16.3
|
||||
|
||||
%gometa -f
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
# https://github.com/xyproto/vt100
|
||||
%global goipath github.com/xyproto/vt100
|
||||
Version: 1.14.4
|
||||
Version: 1.14.3
|
||||
|
||||
%gometa -f
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: groovy-docs
|
||||
Version: 4.0.22
|
||||
Version: 4.0.21
|
||||
Release: 1%?dist
|
||||
Summary: Documentation for the Groovy programming language
|
||||
URL: https://groovy-lang.org/
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user