Compare commits

..

1 Commits

Author SHA1 Message Date
Lleyton Gray 24aaa5ef66 feat: begin work on update PR strategy 2024-02-05 00:20:26 -08:00
232 changed files with 1025 additions and 3880 deletions
-9
View File
@@ -1,9 +0,0 @@
{
"repoOwner": "terrapkg",
"repoName": "packages",
"resetAuthor": true,
"targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
"branchLabelMapping": {
"^sync-(.+)$": "$1"
}
}
+10 -4
View File
@@ -29,7 +29,7 @@ jobs:
- name: Set workspace as safe
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Generate build matrix
@@ -48,12 +48,19 @@ jobs:
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up git repository
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Cache buildroot
id: br-cache
uses: actions/cache@v3
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
- name: Include custom build template instead of package default
run: |
cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
@@ -68,10 +75,9 @@ jobs:
x=${NAME//\//@}
echo "name=$x" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: ${{ steps.art.outputs.name }}
compression-level: 0 # The RPMs are already compressed :p
path: |
anda-build/rpm/rpms/*
anda-build/rpm/srpm/*
+1 -1
View File
@@ -21,7 +21,7 @@ jobs:
- name: Install Anda
run: cargo install anda
- uses: actions/checkout@v4
- uses: actions/checkout@v3
with:
ref: f${{ matrix.version }}
fetch-depth: 1
+4 -4
View File
@@ -30,7 +30,7 @@ jobs:
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up git repository
@@ -38,7 +38,7 @@ jobs:
- name: Cache buildroot
id: br-cache
uses: actions/cache@v4
uses: actions/cache@v3
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
@@ -53,10 +53,9 @@ jobs:
x=${NAME//\//@}
echo "name=$x" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: ${{ steps.art.outputs.name }}
compression-level: 0 # The RPMs are already compressed :p
path: |
anda-build/rpm/rpms/*
anda-build/rpm/srpm/*
@@ -69,6 +68,7 @@ jobs:
terra${{ matrix.version }} anda-build/rpm/rpms/*
- name: Upload source packages to subatomic
if: github.event_name == 'push'
run: |
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
+3 -4
View File
@@ -19,7 +19,7 @@ jobs:
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up git repository
@@ -27,7 +27,7 @@ jobs:
- name: Cache buildroot
id: br-cache
uses: actions/cache@v4
uses: actions/cache@v3
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
@@ -42,10 +42,9 @@ jobs:
x=${NAME//\//@}
echo "name=$x" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: ${{ steps.art.outputs.name }}
compression-level: 0 # The RPMs are already compressed :p
path: |
anda-build/rpm/rpms/*
anda-build/rpm/srpm/*
+1 -1
View File
@@ -17,6 +17,6 @@ jobs:
image: ghcr.io/terrapkg/builder:f39
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v3
- name: Lint spec files
run: rpmlint $(find anda -type f -name "*.spec" -type f)
-37
View File
@@ -1,37 +0,0 @@
name: Automatic backport/sync action
on:
pull_request_target:
types: ["labeled", "closed"]
jobs:
backport:
name: Backport/sync PR
runs-on: ubuntu-latest
if: github.event.pull_request.merged
steps:
- name: Install SSH signing key
run: |
mkdir -p ${{ runner.temp }}
echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
chmod 0700 ${{ runner.temp }}/signing_key
- name: Setup Raboneko Signing
run: |
git config --global gpg.format "ssh"
git config --global user.signingkey "${{ runner.temp }}/signing_key"
git config --global commit.gpgsign true
- name: Backport Action
uses: sorenlouv/backport-github-action@v9.3.0
with:
github_token: ${{ secrets.RABONEKO_BACKPORT_GITHUB_TOKEN }}
auto_backport_label_prefix: sync-
- name: Info log
if: ${{ success() }}
run: cat ~/.backport/backport.info.log
- name: Debug log
if: ${{ failure() }}
run: cat ~/.backport/backport.debug.log
+1 -1
View File
@@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
+1 -1
View File
@@ -16,7 +16,7 @@ jobs:
container:
image: ghcr.io/terrapkg/builder:f39
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- name: Push to subatomic
run: |
branch=${{ github.ref_name }}
+2 -2
View File
@@ -12,7 +12,7 @@ jobs:
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -46,8 +46,8 @@ jobs:
git add *
git commit -S -a -m "$msg"
}
copy_over f37 || true
copy_over f38 || true
copy_over f40 || true
copy_over frawhide || true
git push -u origin --all
fi
+13 -2
View File
@@ -12,7 +12,7 @@ jobs:
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -47,8 +47,19 @@ jobs:
git add *
git commit -S -a -m "$msg"
}
copy_over f37 || true
copy_over f38 || true
copy_over f40 || true
copy_over frawhide || true
git remote add raboneko git@github.com:raboneko/packages.git
git push -u origin --all
gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f37" --head "raboneko:f37"
gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f38" --head "raboneko:f38"
gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "frawhide" --head "raboneko:frawhide"
gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f39" --head "raboneko:f39"
gh pr merge --auto --squash raboneko:f37
gh pr merge --auto --squash raboneko:f38
gh pr merge --auto --squash raboneko:frawhide
gh pr merge --auto --squash raboneko:f39
fi
+30
View File
@@ -0,0 +1,30 @@
# Repository
/.github @lleyton
/.devcontainer @lleyton
/.gitignore @windowsboy111
/CODE_OF_CONDUCT.md @lleyton
/CONTRIBUTING.md @lleyton
/LICENSE @lleyton
/README.md @windowsboy111
/SECURITY.md @lleyton
/anda.hcl @lleyton
/comps.xml @lleyton
# Package maintainers
/anda/lib/libbismuth @lainsce
/anda/lib/libhelium @lainsce
/anda/others/tau-helium @lainsce
/anda/others/tau-hydrogen @lainsce
/anda/tools/melody @lleyton
/anda/go/curlie @lleyton
/anda/games/prismlauncher @getchoo
/anda/games/prismlauncher-nightly @getchoo
/anda/games/prismlauncher-qt5-nightly @getchoo
/anda/games/prismlauncher-qt5 @getchoo
/anda/srpm-macros @korewaChino
/anda/rust/starship @korewaChino
/anda/rust/zellij @korewaChino
/anda/audio/distrho @korewaChino
-2
View File
@@ -2,8 +2,6 @@
[![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38)
[![Repository status](https://repology.org/badge/repository-big/terra_39.svg?header=Terra+39)](https://repology.org/repository/terra_39)
[![Repository status](https://repology.org/badge/repository-big/terra_40.svg?header=Terra+40)](https://repology.org/repository/terra_40)
[![Repository status](https://repology.org/badge/repository-big/terra_rawhide.svg?header=Terra+Rawhide)](https://repology.org/repository/terra_rawhide)
Terra is a rolling-release Fedora repository for all the software you need.
With Terra, you can install the latest packages knowing that quality and security are assured.
+2 -2
View File
@@ -1,6 +1,6 @@
Name: anki-bin
Version: 24.04.1
Release: 1%?dist
Version: 23.12.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
URL: https://apps.ankiweb.net/
+2 -2
View File
@@ -1,6 +1,6 @@
Name: anki-qt5
Version: 24.04.1
Release: 1%?dist
Version: 23.12.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
URL: https://apps.ankiweb.net/
+2 -2
View File
@@ -1,6 +1,6 @@
Name: anki
Version: 24.04.1
Release: 1%?dist
Version: 23.12.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
URL: https://apps.ankiweb.net/
+2 -2
View File
@@ -6,12 +6,12 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: authy
Version: 2.5.0
Version: 2.4.2
Release: 1%{?dist}
Summary: Two factor authentication desktop application
License: Unlicense
URL: https://authy.com/
Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_23.snap
Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_22.snap
Requires: gtk3
Requires: nss
BuildRequires: squashfs-tools desktop-file-utils
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-canary-openasar
Version: 0.0.381
Release: 1%?dist
Version: 0.0.267
Release: 1%{?dist}
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
URL: https://github.com/GooseMod/OpenAsar
+2 -2
View File
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-canary
Version: 0.0.381
Release: 1%?dist
Version: 0.0.267
Release: 1%{?dist}
Summary: Free Voice and Text Chat for Gamers
URL: discord.com
Source0: https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-openasar
Version: 0.0.52
Release: 1%?dist
Version: 0.0.42
Release: 1%{?dist}
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
URL: https://github.com/GooseMod/OpenAsar
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-ptb-openasar
Version: 0.0.84
Release: 1%?dist
Version: 0.0.66
Release: 1%{?dist}
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
URL: https://github.com/GooseMod/OpenAsar
+2 -2
View File
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-ptb
Version: 0.0.84
Release: 1%?dist
Version: 0.0.66
Release: 1%{?dist}
Summary: Free Voice and Text Chat for Gamers.
URL: https://discord.com
Source0: https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
+2 -2
View File
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord
Version: 0.0.52
Release: 1%?dist
Version: 0.0.42
Release: 1%{?dist}
Summary: Free Voice and Text Chat for Gamers
URL: https://discord.com
Source0: https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
-5
View File
@@ -1,5 +0,0 @@
project pkg {
rpm {
spec = "feishin.spec"
}
}
-69
View File
@@ -1,69 +0,0 @@
%define debug_package %nil
%global _build_id_links none
# Exclude private libraries
%global __requires_exclude libffmpeg.so
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: feishin
Version: 0.6.1
Release: 1%?dist
Summary: A modern self-hosted music player
License: GPL-3.0
URL: https://github.com/jeffvli/feishin
Source0: %url/archive/refs/tags/v%version.tar.gz
Requires: fuse mpv
BuildRequires: nodejs-npm jq libxcrypt-compat
%description
%summary.
%prep
%autosetup
cat package.json | jq '.author += { "email": "jeffvictorli@gmail.com" }' | jq '.build.linux += { "maintainer": "mado@fyralabs.com", "vendor": "Fyra Labs Terra" }' > a
mv a package.json
cat package.json
cat<<EOF > feishin.desktop
[Desktop Entry]
Type=Application
Name=Feishin
Comment=Rewrite of Sonixd
Exec=/usr/bin/feishin
Icon=feishin
Terminal=false
Categories=Network;Audio;Music
Keywords=Music;Jellyfin;Audio;Stream;Sonixd
EOF
%build
npm install --legacy-peer-deps
npm run postinstall
npm run build
%ifarch x86_64
%define a linux
%elifarch aarch64
%define a arm64
%endif
npx electron-builder --linux dir --%a
%install
mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir
mv release/build/*-unpacked %buildroot%_datadir/feishin
install -Dm644 assets/icons/icon.png %buildroot%_datadir/pixmaps/feishin.png
ln -s %_datadir/feishin/feishin %buildroot%_bindir/feishin
install -Dm644 feishin.desktop %buildroot%_datadir/applications/
%files
%doc README.md CHANGELOG.md
%license LICENSE
%_bindir/feishin
%_datadir/feishin/
%_datadir/applications/feishin.desktop
%_datadir/pixmaps/feishin.png
%changelog
%autochangelog
-1
View File
@@ -1 +0,0 @@
rpm.version(gh("jeffvli/feishin"));
-8
View File
@@ -1,8 +0,0 @@
project pkg {
rpm {
spec = "mpv-nightly.spec"
}
labels {
nightly = "1"
}
}
-230
View File
@@ -1,230 +0,0 @@
%global commit 943a50b300a081bb223325295040846fe435a861
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240504
%global ver v0.38.0
Name: mpv-nightly
Version: %ver^%commit_date.%shortcommit
Release: 1%?dist
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Summary: Movie player playing most video formats and DVDs
URL: https://mpv.io/
Source0: https://github.com/mpv-player/mpv/archive/%commit/mpv-%commit.tar.gz
Conflicts: mpv
BuildRequires: desktop-file-utils
BuildRequires: gcc
BuildRequires: libappstream-glib
BuildRequires: libatomic
BuildRequires: meson
BuildRequires: python3-docutils
BuildRequires: perl(Encode)
BuildRequires: perl(Math::BigInt)
BuildRequires: perl(Math::BigRat)
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(caca)
BuildRequires: pkgconfig(dvdnav)
BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(ffnvcodec)
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libarchive) >= 3.4.0
BuildRequires: pkgconfig(libass)
BuildRequires: pkgconfig(libavcodec) >= 59.27.100
BuildRequires: pkgconfig(libavdevice) >= 58.13.100
BuildRequires: pkgconfig(libavfilter) >= 7.110.100
BuildRequires: pkgconfig(libavformat) >= 59.24.100
BuildRequires: pkgconfig(libavutil) >= 57.24.100
BuildRequires: pkgconfig(libbluray)
BuildRequires: pkgconfig(libcdio)
BuildRequires: pkgconfig(libcdio_paranoia)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpipewire-0.3) >= 0.3.19
BuildRequires: pkgconfig(libplacebo) >= 6.338.0
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libswresample) >= 3.9.100
BuildRequires: pkgconfig(libswscale) >= 5.9.100
BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(lua-5.1)
BuildRequires: pkgconfig(mujs)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(rubberband)
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(shaderc)
BuildRequires: pkgconfig(uchardet) >= 0.0.5
BuildRequires: pkgconfig(vapoursynth)
BuildRequires: pkgconfig(vdpau)
BuildRequires: pkgconfig(vulkan)
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-cursor)
BuildRequires: pkgconfig(wayland-egl)
BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xdamage)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: pkgconfig(xpresent)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xscrnsaver)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(zimg) >= 2.9
BuildRequires: pkgconfig(zlib)
Requires: hicolor-icon-theme
Provides: mplayer-backend
Recommends: (yt-dlp or youtube-dl)
Suggests: yt-dlp
%description
Mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
of video file formats, audio and video codecs, and subtitle types. Special
input URL types are available to read input from a variety of sources other
than disk files. Depending on platform, a variety of different video and audio
output methods are supported.
Mpv has an OpenGL, Vulkan, and D3D11 based video output that is capable of many
features loved by videophiles, such as video scaling with popular high quality
algorithms, color management, frame timing, interpolation, HDR, and more.
While mpv strives for minimalism and provides no real GUI, it has a small
controller on top of the video for basic control.
Mpv can leverage most hardware decoding APIs on all platforms. Hardware
decoding can be enabled at runtime on demand.
Powerful scripting capabilities can make the player do almost anything. There
is a large selection of user scripts on the wiki.
A straightforward C API was designed from the ground up to make mpv usable as
a library and facilitate easy integration into other applications.
%package libs
Summary: Dynamic library for Mpv frontends
%description libs
This package contains the dynamic library libmpv, which provides access to Mpv.
%package devel
Summary: Development package for libmpv
Provides: mpv-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: mpv-nightly-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: mpv-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: mpv-nightly-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Requires: mpv-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: mpv-nightly-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
This package contains development header files and libraries for Mpv.
%prep
%autosetup -p1 -n mpv-%commit
sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf
%build
%meson --auto-features=auto \
-Dalsa=enabled \
-Dbuild-date=false \
-Dcaca=enabled \
-Dcdda=enabled \
-Dcplayer=true \
-Dcplugins=enabled \
-Dcuda-hwaccel=enabled \
-Dcuda-interop=enabled \
-Ddmabuf-wayland=enabled \
-Ddrm=enabled \
-Ddvbin=enabled \
-Ddvdnav=enabled \
-Degl-drm=enabled \
-Degl-wayland=enabled \
-Degl-x11=enabled \
-Degl=enabled \
-Dgbm=enabled \
-Dgl-x11=enabled \
-Dgl=enabled \
-Dhtml-build=enabled \
-Diconv=enabled \
-Djack=enabled \
-Djavascript=enabled \
-Djpeg=enabled \
-Dlcms2=enabled \
-Dlibarchive=enabled \
-Dlibavdevice=enabled \
-Dlibbluray=enabled \
-Dlibmpv=true \
-Dlua=enabled \
-Dmanpage-build=enabled \
-Dopenal=enabled \
-Dopensles=disabled \
-Doss-audio=disabled \
-Dpipewire=enabled \
-Dplain-gl=enabled \
-Dpulse=enabled \
-Drubberband=enabled \
-Dsdl2-audio=enabled \
-Dsdl2-gamepad=enabled \
-Dsdl2-video=enabled \
-Dsdl2=enabled \
-Dsndio=disabled \
-Dspirv-cross=disabled \
-Duchardet=enabled \
-Dvaapi-drm=enabled \
-Dvaapi-wayland=enabled \
-Dvaapi-x11=enabled \
-Dvaapi=enabled \
-Dvapoursynth=enabled \
-Dvdpau-gl-x11=enabled \
-Dvdpau=enabled \
-Dvector=enabled \
-Dvulkan-interop=disabled \
-Dvulkan=enabled \
-Dwayland=enabled \
-Dwerror=false \
-Dx11=enabled \
-Dxv=enabled \
-Dzimg=enabled \
-Dzlib=enabled
%meson_build
%install
%meson_install
%check
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/mpv.metainfo.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop
%files
%docdir %{_docdir}/mpv/
%license LICENSE.GPL LICENSE.LGPL Copyright
%{_docdir}/mpv/
%{_bindir}/mpv
%{_datadir}/applications/mpv.desktop
%dir %{_datadir}/bash-completion/
%dir %{_datadir}/bash-completion/completions/
%{_datadir}/bash-completion/completions/mpv
%{_datadir}/icons/hicolor/*/apps/mpv*.*
%dir %{_datadir}/zsh/
%dir %{_datadir}/zsh/site-functions/
%{_datadir}/zsh/site-functions/_mpv
%{_mandir}/man1/mpv.*
%{_metainfodir}/mpv.metainfo.xml
%dir %{_sysconfdir}/mpv/
%config(noreplace) %{_sysconfdir}/mpv/encoding-profiles.conf
%files libs
%license LICENSE.GPL LICENSE.LGPL Copyright
%{_libdir}/libmpv.so.2{,.*}
%files devel
%{_includedir}/mpv/
%{_libdir}/libmpv.so
%{_libdir}/pkgconfig/mpv.pc
%changelog
%autochangelog
-8
View File
@@ -1,8 +0,0 @@
if filters.contains("nightly") {
rpm.global("commit", gh_commit("mpv-player/mpv"));
if rpm.changed() {
rpm.global("ver", gh("mpv-player/mpv"));
rpm.global("commit_date", date());
rpm.release();
}
}
+2 -2
View File
@@ -13,8 +13,8 @@
%global crate sccache
Name: rust-sccache
Version: 0.8.0
Release: 1%?dist
Version: 0.7.6
Release: %autorelease
Summary: Ccache-like tool
License: Apache-2.0
@@ -6,8 +6,8 @@
Name: vencord-desktop
Provides: VencordDesktop = %{version}-%{release}
Version: 1.5.2
Release: 1%?dist
Version: 1.5.0
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
URL: https://github.com/Vencord/Vesktop
+3 -3
View File
@@ -1,6 +1,6 @@
%global nodev 20.12.2
%global npmv 10.5.0
%global ver 0.19.1
%global nodev 18.13.0
%global npmv 8.19.3
%global ver 0.15.2
%define debug_package %nil
%global _build_id_links none
@@ -1,5 +1,5 @@
Name: budgie-extras
Version: 1.8.0
Version: 1.7.1
Release: 1%{?dist}
License: GPL-3.0
+1 -1
View File
@@ -1,4 +1,4 @@
%define _ubuntu_rel 22.10.20220822-0ubuntu12
%define _ubuntu_rel 22.10.20220822-0ubuntu6
%global _hardened_build 0
Name: compiz9
+3 -4
View File
@@ -3,9 +3,8 @@
Name: gala
Summary: Gala window manager
Version: 7.1.3
Release: 2%{?dist}
Release: 1%{?dist}
License: GPL-3.0-or-later
Epoch: 1
URL: https://github.com/elementary/gala
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -36,7 +35,7 @@ BuildRequires: pkgconfig(mutter-clutter-13)
BuildRequires: pkgconfig(mutter-cogl-13)
BuildRequires: pkgconfig(mutter-cogl-pango-13)
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# gala provides a generic icon (apps/multitasking-view)
Requires: hicolor-icon-theme
@@ -62,7 +61,7 @@ This package contains the shared libraries.
%package devel
Summary: Gala window manager development files
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
Gala is Pantheon's Window Manager, part of the elementary project.
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "switchboard-plug-wallet.spec"
}
}
@@ -0,0 +1,62 @@
%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
%global srcname switchboard-plug-wallet
%global plug_type personal
%global plug_name wallet
%global plug_rdnn io.elementary.switchboard.wallet
%global commit 50582fc7ee43a4b47647d04786dcf1d0eb45af36
Name: switchboard-plug-wallet
Summary: Switchboard Wallet Plug
Version: %(c=%commit; echo ${c:0:7})
Release: 2%?dist
License: GPL-3.0-or-later
URL: https://github.com/elementary/%name
Source0: %url/archive/%version/%srcname-%version.tar.gz
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala
BuildRequires: fdupes
BuildRequires: pkgconfig(granite) >= 0.5
BuildRequires: gtk3-devel
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: switchboard-devel
Requires: switchboard%{?_isa}
Supplements: switchboard%{?_isa}
%description
Manage Payment Methods and related settings.
%prep
%autosetup -n %srcname-%commit -p1
%build
%meson
%meson_build
%install
%meson_install
%fdupes %buildroot%_datadir/icons/hicolor
%files
%doc README.md
%license COPYING
%_libdir/switchboard/%plug_type/lib%plug_rdnn.so
%_datadir/icons/hicolor/*/apps/%plug_rdnn.svg
%_datadir/locale/*/LC_MESSAGES/%plug_rdnn.mo
%changelog
* Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - bfe73dfb95d9b46a0a34e0db35a178233c8552b0-1
- Initial package.
@@ -0,0 +1,3 @@
let req = new_req("https://api.github.com/repos/elementary/switchboard-plug-wallet/commits/HEAD");
req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
rpm.global("commit", json(req.get()).sha);
@@ -9,7 +9,6 @@ Summary: Stylish top panel
Version: 3.0.5
Release: 1%{?dist}
License: GPL-2.0-or-later
Epoch: 1
URL: https://github.com/elementary/wingpanel
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -33,7 +32,7 @@ BuildRequires: pkgconfig(mutter-clutter-13)
BuildRequires: pkgconfig(mutter-cogl-13)
BuildRequires: pkgconfig(mutter-cogl-pango-13)
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# wingpanel ayatana appindicator support was abandoned by upstream
# wingpanel-indicator-ayatana-2.0.3-10.fc32 retired for fedora 33+
@@ -44,8 +43,8 @@ Obsoletes: wingpanel-indicator-ayatana < 2.0.3-11
%package libs
Summary: Stylish top panel (shared library)
Enhances: %{name} = %{epoch}:%{version}-%{release}
Enhances: %{name}-devel = %{epoch}:%{version}-%{release}
Enhances: %{name} = %{version}-%{release}
Enhances: %{name}-devel = %{version}-%{release}
%description libs %{common_description}
@@ -54,7 +53,7 @@ This package contains the shared library.
%package devel
Summary: Stylish top panel (development files)
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel %{common_description}
@@ -1,13 +1,12 @@
# from Fedora upstream
%global extension pop-shell
%global uuid %{extension}@system76.com
%global commit 9418d0a9af7c9b30b61ac3eeb5ca432a3ad3e651
%global commit cf3c932b55d5c247906efe9d81f988ee092d9f51
%global shortcommit %{lua:print(macros.commit:sub(1,7))}
%global commit_date 20240401
%global ver 1.2.0
Name: terra-gnome-shell-extension-%{extension}
Version: %{ver}^%commit_date.%{shortcommit}
Version: %{ver}^%{shortcommit}
Release: 1%?dist
Summary: GNOME Shell extension for advanced tiling window management
License: GPL-3.0-only
@@ -1,8 +1,4 @@
if filters.contains("nightly") {
rpm.global("commit", gh_commit("pop-os/shell"));
if rpm.changed() {
rpm.global("ver", gh("pop-os/shell"));
rpm.release();
rpm.global("commit_date", date());
}
rpm.global("commit", get("https://api.github.com/repos/pop-os/shell/commits/HEAD").json().sha);
rpm.global("ver", gh("pop-os/shell"));
}
@@ -5,7 +5,7 @@
# https://github.com/FyshOS/fynedesk
%global goipath github.com/FyshOS/fynedesk
Version: 0.4.0
Version: 0.3.0
%gometa -f
@@ -17,7 +17,7 @@ A full desktop environment for Linux/Unix using Fyne.}
%global godocs AUTHORS README.md CHANGELOG.md
Name: %{goname}
Release: 1%?dist
Release: 1%{?dist}
Summary: A full desktop environment for Linux/Unix using Fyne
License: BSD-3-Clause
@@ -1,6 +1,6 @@
%global forgeurl https://github.com/KDE/latte-dock/
%global commit b4b16f61f1d69c994701f149e54335c40b9b201d
%global commit 131ee4d39ce8913b2de8f9a673903225345c7a38
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date %(date '+%Y%m%d')
%global snapshot_info %{commit_date}.%{shortcommit}
@@ -9,7 +9,7 @@ Name: latte-dock-nightly
Version: 0.10.0^%{snapshot_info}
%forgemeta
Release: 1%?dist
Release: 1%{?dist}
Summary: Latte is a dock based on plasma frameworks
License: GPL-2.0-or-later
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
%global commit 99fa99c6e8af868f64dbfdb973eebeb2ca3ad14a
%global commit d3bc3b7296a01f6b020e32080c9c40dd1c656b05
%forgemeta
Name: lomiri-app-launch
@@ -1,10 +1,10 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager
%global commit 682c4928a91da598767e0be2496d9c35af7db035
%global commit 2c7d6921ac56862c197958f4e5c31aa76a1a50e1
%forgemeta
Name: lomiri-download-manager
Version: 0.1.3
Release: 1%{?dist}
Version: 0.1.2
Release: %autorelease
Summary: Upload Download Manager for Lomiri
License: LGPLv3
URL: https://gitlab.com/ubports/development/core/lomiri-download-manager
@@ -23,7 +23,6 @@ BuildRequires: qt5-qtdeclarative-devel
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(libglog)
BuildRequires: pkgconfig(liblomiri-api)
BuildRequires: pkgconfig(systemd)
BuildRequires: fdupes
%description
@@ -61,7 +60,7 @@ sed -e "s/-Werror//g" -i CMakeLists.txt
%files -f %{name}.lang
%license COPYING
%config /usr/etc/dbus-1/system.d/*.conf
%config %{_sysconfdir}/dbus-1/system.d/*.conf
%{_bindir}/lomiri-*
%{_userunitdir}/*.service
%{_libdir}/liblomiri-download-manager-client.so.*
@@ -1,7 +0,0 @@
let o = get("https://gitlab.com/api/v4/projects/17088252/repository/tags").json_arr()[0];
let f = rpm.f;
rpm.version(o.name);
// check if changed
if rpm.f != f {
rpm.global("commit", o.commit.id);
}
@@ -30,7 +30,6 @@ BuildRequires: pkgconfig(libgmenuharness)
BuildRequires: pkgconfig(ofono)
BuildRequires: pkgconfig(qofono-qt5)
BuildRequires: pkgconfig(lomiri-url-dispatcher)
BuildRequires: pkgconfig(systemd)
Requires: gmenuharness
%description
@@ -65,7 +64,7 @@ The %{name}-doc package contains documentation files for %{name}.
%files -f %{name}.lang
%doc README.md
%license COPYING COPYING.LGPL
%config /usr/etc/xdg/autostart/lomiri-indicator-network.desktop
%config %{_sysconfdir}/xdg/autostart/lomiri-indicator-network.desktop
%{_userunitdir}/*.service
%{_libdir}/liblomiri-connectivity-qt1.so.*
%dir %{_qt5_qmldir}/Lomiri/Connectivity
@@ -92,7 +91,10 @@ The %{name}-doc package contains documentation files for %{name}.
%{_libdir}/pkgconfig/lomiri-connectivity-qt1.pc
%files doc
%{_docdir}/lomiri-indicator-network
%dir %{_docdir}/lomiri-connectivity-doc
%{_docdir}/lomiri-connectivity-doc/cpp/
%{_docdir}/lomiri-connectivity-doc/dbus/
%{_docdir}/lomiri-connectivity-doc/qml/
%changelog
%autochangelog
@@ -1,15 +1,16 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
%global commit aacd2e4704112468b44332e8c8b1f7445651b8da
%global commit ad39d8a88e71320c2d6f1a39a96bfe421f644519
%forgemeta
Name: lomiri-system-settings
Version: 1.1.0
Release: 1%?dist
Version: 1.0.2
Release: 1%{?dist}
Summary: The system settings application for Lomiri
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++
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
%global commit 454d980c352f3cea725458ff8a3d04ae686d2a96
%global commit 28178b0be8fc2c66934da155dee1c6238ecc98c0
%forgemeta
Name: lomiri-ui-toolkit
@@ -1,4 +1,2 @@
rpm.version(gitlab_tag("19057685"));
if rpm.changed() {
rpm.global("commit", gitlab_commit("19057685"));
}
rpm.version(get("https://gitlab.com/api/v4/projects/19057685/repository/tags").json_arr()[0].name);
rpm.global("commit", get("https://gitlab.com/api/v4/projects/19057685/repository/commits").json_arr()[0].id);
@@ -1,4 +1,2 @@
rpm.version(gitlab_tag("17424894"));
if rpm.changed() {
rpm.global("commit", get("https://gitlab.com/api/v4/projects/17424894/repository/commits").json_arr()[0].id);
}
rpm.version(get("https://gitlab.com/api/v4/projects/17424894/repository/tags").json_arr()[0].name);
rpm.global("commit", get("https://gitlab.com/api/v4/projects/17424894/repository/commits").json_arr()[0].id);
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri
%global commit 426b9f3436938f149490cee340e1fab79ee7b650
%global commit a083a14fe65105fc1996ceb1b92165ca3b0cb94e
%forgemeta
Name: lomiri
@@ -1,4 +1,3 @@
rpm.version(gitlab_tag("25716028"));
if rpm.changed() {
rpm.global("commit", get("https://gitlab.com/api/v4/projects/25716028/repository/commits").json_arr()[0].id);
}
let o = get("https://gitlab.com/api/v4/projects/25716028/repository/tags").json_arr()[0];
rpm.version(o.name);
rpm.global("commit", get("https://gitlab.com/api/v4/projects/25716028/repository/commits").json_arr()[0].id);
@@ -1,4 +1,4 @@
%global rn 4
%global rn 1
Name: unity-greeter
Version: 23.10.1
@@ -1,9 +1,9 @@
%define _ubuntu_rel 1ubuntu4
%define _ubuntu_rel 1ubuntu1
Name: unity-session
Summary: Lightdm profile for Unity 7
Version: 46.0
Release: 1%?dist
Version: 45.0
Release: 1%{?dist}
License: GPL-2.0
URL: https://packages.ubuntu.com/jammy/unity-session
@@ -1,4 +1,4 @@
%define archive unity_7.7.0+23.04.20230222.2-0ubuntu7.tar.xz
%define archive unity_7.7.0+23.04.20230222.2-0ubuntu4.tar.xz
Name: unity-shell
Version: 7.7.0
@@ -1,6 +1,6 @@
Name: ayatana-indicator-datetime
Summary: A GTK implementation of the StatusNotifierItem Specification
Version: 24.2.0
Version: 23.10.1
Release: 1%{?dist}
License: GPL-3.0
URL: https://github.com/AyatanaIndicators/ayatana-indicator-datetime
@@ -38,7 +38,7 @@ Unity7 desktop and Lomiri desktop.
%build
%cmake -DENABLE_LOMIRI_FEATURES=ON \
-DENABLE_TESTS=OFF\
-DENABLE_TESTS=ON \
-DENABLE_COVERAGE=OFF \
%cmake_build
@@ -1,7 +1,7 @@
Name: ayatana-indicator-notifications
Summary: Ayatana Indicator Notifications Applet
Version: 23.10.1
Release: 1%?dist
Version: 23.10.0
Release: 1%{?dist}
License: GPL-3.0
URL: https://github.com/AyatanaIndicators/ayatana-indicator-notifications
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
Name: ayatana-indicator-session
Summary: Ayatana Indicator Session Applet
Version: 24.2.0
Release: 1%?dist
Version: 23.10.3
Release: 1%{?dist}
License: GPL-3.0
URL: https://github.com/AyatanaIndicators/ayatana-indicator-session
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
Name: ayatana-indicator-sound
Summary: Ayatana Indicator Sound Applet
Version: 24.4.0
Release: 1%?dist
Version: 23.10.3
Release: 1%{?dist}
License: GPLv3
URL: https://github.com/AyatanaIndicators/ayatana-indicator-sound
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
@@ -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
-2
View File
@@ -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
-5
View File
@@ -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
-20
View File
@@ -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
-17
View File
@@ -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 -
-2
View File
@@ -1,2 +0,0 @@
[General]
DisplayServer=x11
-122
View File
@@ -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
-23
View File
@@ -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
-5
View File
@@ -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"
-293
View File
@@ -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
View File
@@ -1 +0,0 @@
rpm.version(gh("sddm/sddm"));
@@ -1,6 +1,6 @@
Name: terra-blueprint-compiler
Version: 0.12.0
Release: 1%?dist
Version: 0.10.0
Release: 1%{?dist}
License: LGPL-3.0-or-later
Summary: Markup language for GTK user interfaces
URL: https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/
+2 -2
View File
@@ -12,8 +12,8 @@
%endif
Name: codium
Version: 1.88.1.24104
Release: 1%?dist
Version: 1.85.2.24019
Release: 1%{?dist}
Summary: Code editing. Redefined.
License: MIT
URL: https://vscodium.com/
+2 -2
View File
@@ -1,6 +1,6 @@
Name: flutter
Version: 3.19.6
Release: 1%?dist
Version: 3.19.0.0.4.pre
Release: 1%{?dist}
Summary: SDK for crafting beautiful, fast user experiences from a single codebase
License: BSD-3-Clause
URL: https://flutter.dev
+1 -6
View File
@@ -1,7 +1,2 @@
let obj = get("https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json").json();
for release in obj.releases {
if release.channel == "stable" {
rpm.version(release.version);
break;
}
}
rpm.version(obj.releases[0].version);
+2 -2
View File
@@ -7,7 +7,7 @@
# https://github.com/containerd/containerd
%global goipath github.com/containerd/containerd
Version: 1.7.16
Version: 1.7.13
%gometa
@@ -26,7 +26,7 @@ low-level storage and network attachments, etc.}
BUILDING.md README.md RELEASES.md
Name: %{goname}
Release: 1%?dist
Release: 1%{?dist}
Summary: Open and reliable container runtime
License: Apache-2.0
+2 -2
View File
@@ -1,8 +1,8 @@
%define debug_package %nil
Name: moby-buildx
Version: 0.14.0
Release: 1%?dist
Version: 0.12.1
Release: 1%{?dist}
Summary: Docker CLI plugin for extended build capabilities with BuildKit
License: Apache-2.0
+2 -2
View File
@@ -1,8 +1,8 @@
%define debug_package %{nil}
Name: moby-compose
Version: 2.27.0
Release: 1%?dist
Version: 2.24.5
Release: 1%{?dist}
Summary: Define and run multi-container applications with Docker
License: Apache-2.0
@@ -2,8 +2,8 @@
%global debug_package %{nil}
Name: iosevka-fusion-fonts
Version: 29.2.0
Release: 1%?dist
Version: 28.1.0
Release: 1%{?dist}
Summary: A custom font based on iosevka
License: OFL-1.1
+2 -2
View File
@@ -4,8 +4,8 @@ Nerd Fonts is a project that patches developer targeted fonts with a high
number of glyphs (icons).}
Name: nerd-fonts
Version: 3.2.1
Release: 1%?dist
Version: 3.1.1
Release: 1%{?dist}
URL: https://nerdfonts.com/
Source0: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%version/readme.md
Source1: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%version/LICENSE
@@ -1,6 +1,6 @@
Name: sarasa-gothic-fonts
Version: 1.0.11
Release: 1%?dist
Version: 1.0.5
Release: 1%{?dist}
URL: https://github.com/be5invis/Sarasa-Gothic
Source0: %url/releases/download/v%version/Sarasa-TTC-%version.7z
Source1: %url/releases/download/v%version/Sarasa-SuperTTC-%version.7z
+9 -5
View File
@@ -1,10 +1,11 @@
Name: seto-fonts
Version: 6.20
Release: 3%?dist
Release: 2%?dist
URL: https://setofont.osdn.jp/
Source0: https://github.com/terrapkg/pkg-seto-fonts/archive/refs/tags/%version.tar.gz
Source0: https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip
License: OFL-1.1
Summary: A handwritten font that contains kanji up to JIS 4th level and difficult kanji
BuildRequires: unzip
BuildArch: noarch
@@ -13,7 +14,7 @@ BuildArch: noarch
%prep
%setup -q -n pkg-seto-fonts-%version
%setup -q -n setofont
%build
@@ -24,8 +25,11 @@ install -Dm644 *.ttf %buildroot/%_datadir/fonts/%name/
%files
%doc readme.txt
%license LICENSE.md
%_datadir/fonts/%name/
%changelog
%autochangelog
* Sun Jun 18 2023 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-2
- Fix install dir.
* Tue Nov 22 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-1
- Initial package
+3 -4
View File
@@ -1,10 +1,9 @@
%define osuresver 2024.410.0
%define osuresver 2024.129.0
%global debug_package %{nil}
%define __strip /bin/true
Name: osu-lazer
Version: 2024.412.1
Release: 1%?dist
Version: 2024.131.0
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
URL: https://osu.ppy.sh/
@@ -1,13 +1,13 @@
%global real_name prismlauncher
%global nice_name PrismLauncher
%global commit bfac12604e9cd0884987ca89f34a455cf16c543c
%global commit 6935c0dc3ba6463b95c66c12ff2e2e0de1fa5ec0
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
%global commit_date 20240501
%global commit_date %(date '+%Y%m%d')
%global snapshot_info %{commit_date}.%{shortcommit}
%bcond_without qt6
@@ -32,8 +32,8 @@ Name: prismlauncher-nightly
%else
Name: prismlauncher-qt5-nightly
%endif
Version: 9.0^%{snapshot_info}
Release: 1%?dist
Version: 8.0^%{snapshot_info}
Release: 1%{?dist}
Summary: Minecraft launcher with ability to manage multiple instances
License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
Group: Amusements/Games
@@ -76,9 +76,8 @@ Requires(postun): desktop-file-utils
Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
Recommends: java-21-openjdk
Recommends: java-17-openjdk
Suggests: java-1.8.0-openjdk
Requires: java-17-openjdk
Requires: java-1.8.0-openjdk
# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
Recommends: xrandr
+9 -9
View File
@@ -1,11 +1,11 @@
if filters.contains("nightly") {
rpm.global("commit", gh_commit("PrismLauncher/PrismLauncher"));
if rpm.changed() {
rpm.release();
let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt");
let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1);
let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1);
rpm.global("commit_date", date());
rpm.version(`${maj}.${min}^%{snapshot_info}`);
}
let req = new_req("https://api.github.com/repos/PrismLauncher/PrismLauncher/commits/HEAD");
req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
let sha = req.get().json().sha;
rpm.global("commit", sha);
rpm.release();
let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt");
let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1);
let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1);
rpm.version(`${maj}.${min}^%{snapshot_info}`);
}
@@ -1,13 +1,13 @@
%global real_name prismlauncher
%global nice_name PrismLauncher
%global commit a2d28f6872841d047ce3854365c595ebf941b848
%global commit 6935c0dc3ba6463b95c66c12ff2e2e0de1fa5ec0
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
%global commit_date 20240401
%global commit_date %(date '+%Y%m%d')
%global snapshot_info %{commit_date}.%{shortcommit}
%bcond_with qt6
@@ -32,8 +32,8 @@ Name: prismlauncher-nightly
%else
Name: prismlauncher-qt5-nightly
%endif
Version: 9.0^%{snapshot_info}
Release: 1%?dist
Version: 8.0^%{snapshot_info}
Release: 1%{?dist}
Summary: Minecraft launcher with ability to manage multiple instances
License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
Group: Amusements/Games
@@ -76,9 +76,8 @@ Requires(postun): desktop-file-utils
Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
Recommends: java-21-openjdk
Recommends: java-17-openjdk
Suggests: java-1.8.0-openjdk
Requires: java-17-openjdk
Requires: java-1.8.0-openjdk
# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
Recommends: xrandr
@@ -1,11 +1,11 @@
if filters.contains("nightly") {
rpm.global("commit", gh_commit("PrismLauncher/PrismLauncher"));
if rpm.changed() {
rpm.release();
let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt");
let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1);
let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1);
rpm.global("commit_date", date());
rpm.version(`${maj}.${min}^%{snapshot_info}`);
}
let req = new_req("https://api.github.com/repos/PrismLauncher/PrismLauncher/commits/HEAD");
req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
let sha = req.get().json().sha;
rpm.global("commit", sha);
rpm.release();
let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt");
let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1);
let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1);
rpm.version(`${maj}.${min}^%{snapshot_info}`);
}
@@ -22,8 +22,8 @@ Name: prismlauncher
%else
Name: prismlauncher-qt5
%endif
Version: 8.2
Release: 2%?dist
Version: 8.0
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
@@ -61,9 +61,8 @@ Requires(postun): desktop-file-utils
Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
Recommends: java-21-openjdk
Recommends: java-17-openjdk
Suggests: java-1.8.0-openjdk
Requires: java-17-openjdk
Requires: java-1.8.0-openjdk
# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
Recommends: xrandr
@@ -132,9 +131,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
%changelog
* Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
- move JREs to weak deps, add java 21 for snapshots
* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 7.2-2
- remove terra-fractureiser-detector from recommends, use proper build platform
+4 -8
View File
@@ -22,8 +22,8 @@ Name: prismlauncher
%else
Name: prismlauncher-qt5
%endif
Version: 8.3
Release: 1%?dist
Version: 8.0
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
@@ -61,9 +61,8 @@ Requires(postun): desktop-file-utils
Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
Recommends: java-21-openjdk
Recommends: java-17-openjdk
Suggests: java-1.8.0-openjdk
Requires: java-17-openjdk
Requires: java-1.8.0-openjdk
# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
Recommends: xrandr
@@ -132,9 +131,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
%changelog
* Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
- move JREs to weak deps, add java 21 for snapshots
* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 7.2-2
- remove terra-fractureiser-detector from recommends, use proper build platform
+2 -2
View File
@@ -1,8 +1,8 @@
%define debug_package %nil
Name: crystal
Version: 1.12.1
Release: 1%?dist
Version: 1.11.2
Release: 1%{?dist}
Summary: The Crystal Programming Language
License: Apache-2.0
URL: https://crystal-lang.org/
+1 -1
View File
@@ -1,2 +1,2 @@
let html = get("https://crystal-lang.org/");
rpm.version(find("Latest release: <strong>(.+?)</strong>", html, 1))
rpm.version(find("Latest release <.+>(.+)</a>", html, 1))
+2 -2
View File
@@ -1,8 +1,8 @@
%define debug_package %{nil}
Name: dart
Version: 3.3.4
Release: 1%?dist
Version: 3.2.6
Release: 1%{?dist}
Summary: The Dart Language
License: BSD-3-Clause
URL: https://dart.dev/
@@ -20,7 +20,7 @@ of information.}
%global godocs README.md
Name: %{goname}
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Generate .desktop files and download .png icons
License: BSD-3-Clause
-5
View File
@@ -1,5 +0,0 @@
project pkg {
rpm {
spec = "golang-github-charmbracelet-glow.spec"
}
}

Some files were not shown because too many files have changed in this diff Show More