mirror of
https://github.com/terrapkg/packages.git
synced 2026-05-31 17:11:56 +00:00
Compare commits
98 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| eda902848b | |||
| b0a924f562 | |||
| d305feb173 | |||
| acff4983c5 | |||
| 9abb6cf584 | |||
| 329a736780 | |||
| 05ffaeff6c | |||
| 4fde2e3701 | |||
| ba1463369c | |||
| 3efd4c5eca | |||
| 43f158bb02 | |||
| 3836452e06 | |||
| b6b48e6172 | |||
| eb79f9652b | |||
| 45b2961324 | |||
| 7bc8c5fe17 | |||
| 7b034ffa8b | |||
| 68b258ed3d | |||
| 7e4bb084b8 | |||
| 4c0cc14339 | |||
| aa7dcf65e3 | |||
| b46f275124 | |||
| c7d513c7f0 | |||
| 2725487bff | |||
| 6ec4334f05 | |||
| 5153bb3d97 | |||
| bc45c8c396 | |||
| abdbd5d193 | |||
| 21443e086a | |||
| 30af746588 | |||
| db0f004f3f | |||
| 16fae52da2 | |||
| 2e31c5b88a | |||
| 5f84eee731 | |||
| cf3c21ddc8 | |||
| 3b1a441047 | |||
| 68585b2ccd | |||
| a0ef272a83 | |||
| c308583ef7 | |||
| 4dcbcd5023 | |||
| 34bdd673e7 | |||
| 1cf8f30c0e | |||
| 8fe9c05515 | |||
| cbf0625cfa | |||
| 52805bb6b9 | |||
| bb109cef4a | |||
| 8d08b93c2f | |||
| 0bad9f9a60 | |||
| a3d1694c44 | |||
| a7f53d3e3f | |||
| f65a90985b | |||
| c43c273016 | |||
| 92f8ad8756 | |||
| 63a7210b4b | |||
| f9dd7beb94 | |||
| f471139ec1 | |||
| 73052236e9 | |||
| 2c1f90c3bc | |||
| fd59692714 | |||
| ab3c97ae96 | |||
| 040242f705 | |||
| f99db348be | |||
| 5da6113622 | |||
| 4fafa8b4dd | |||
| d9219cfefd | |||
| e1431d172b | |||
| 9fd5583c55 | |||
| 24544e34df | |||
| b46963b804 | |||
| c072e1af8f | |||
| 173b93864b | |||
| 924efafd86 | |||
| 4032c9cd2f | |||
| 50440a806c | |||
| bda4cdf8f2 | |||
| d1bbafeb6e | |||
| 6d50cc7a45 | |||
| 61ee2b6de9 | |||
| 808438d1fa | |||
| a2e1dbe169 | |||
| e75fdbcb95 | |||
| f55e3ec73b | |||
| 392fedd41e | |||
| 02c77f6c33 | |||
| d61c6f01cc | |||
| 2025eafbf6 | |||
| 333d3bc8a6 | |||
| 7aa94d8391 | |||
| bbad4fd13b | |||
| 64474153f5 | |||
| 90a38d0aa9 | |||
| 87585ab26d | |||
| be52ce2f76 | |||
| b027b3e913 | |||
| 7483cc8aa1 | |||
| c7b12ea62f | |||
| 6446430c22 | |||
| 9dbb12b27d |
@@ -6,7 +6,7 @@
|
||||
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
|
||||
|
||||
Name: discord-canary-openasar
|
||||
Version: 0.0.376
|
||||
Version: 0.0.396
|
||||
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.376
|
||||
Version: 0.0.396
|
||||
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.52
|
||||
Version: 0.0.54
|
||||
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.81
|
||||
Version: 0.0.85
|
||||
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.81
|
||||
Version: 0.0.85
|
||||
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.52
|
||||
Version: 0.0.54
|
||||
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: feishin
|
||||
Version: 0.6.1
|
||||
Version: 0.7.1
|
||||
Release: 1%?dist
|
||||
Summary: A modern self-hosted music player
|
||||
License: GPL-3.0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
%global commit ec447fd4a266e8158519f5e89589c368211bfa14
|
||||
%global commit 03ca3408354e99a7c50838c57531bba1c167ef87
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global commit_date 20240502
|
||||
%global commit_date 20240516
|
||||
%global ver v0.38.0
|
||||
|
||||
Name: mpv-nightly
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
Name: elementary-icon-theme
|
||||
Summary: Icons from the Elementary Project
|
||||
Version: 7.3.1
|
||||
Release: 2%{?dist}
|
||||
Version: 8.0.0
|
||||
Release: 1%?dist
|
||||
License: GPL-3.0-or-later
|
||||
|
||||
URL: https://github.com/elementary/icons
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
Name: elementary-theme
|
||||
Summary: Elementary GTK+ Stylesheet
|
||||
Version: 7.3.0
|
||||
Release: 1%{?dist}
|
||||
Version: 8.0.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.4.0
|
||||
Release: 1%{?dist}
|
||||
Version: 7.5.0
|
||||
Release: 1%?dist
|
||||
License: LGPL-3.0-or-later
|
||||
|
||||
URL: https://github.com/elementary/granite
|
||||
@@ -82,6 +82,7 @@ desktop-file-validate \
|
||||
|
||||
%{_datadir}/metainfo/granite-7.metainfo.xml
|
||||
%{_datadir}/icons/hicolor/*/apps/io.elementary.granite-7.svg
|
||||
%{_datadir}/themes/Granite/
|
||||
|
||||
|
||||
%files devel
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
%global forgeurl https://github.com/KDE/latte-dock/
|
||||
|
||||
%global commit 23b9e9ea3694235e19868846bab5292b2518fd34
|
||||
%global commit 10be08a7940b86d1cdca963a01542c92b064c7bd
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global commit_date %(date '+%Y%m%d')
|
||||
%global snapshot_info %{commit_date}.%{shortcommit}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
|
||||
%global commit 10d7151a3e4ea08b92e85be7e6e631c48219feaf
|
||||
%global commit a17feddaac58fd275ee470dbce6d54df24da4a0d
|
||||
%forgemeta
|
||||
|
||||
Name: lomiri-system-settings
|
||||
@@ -9,8 +9,7 @@ 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
|
||||
Patch0: https://sources.debian.org/data/main/l/lomiri-system-settings/%version-3/debian/patches/2000_use-maliit-keyboard-for-language-plugin.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
Name: lomiri-url-dispatcher
|
||||
Version: 0.1.3
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: A small library for handling URLs over dbus
|
||||
|
||||
License: LGPL-3.0
|
||||
|
||||
@@ -0,0 +1,142 @@
|
||||
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
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
This scripts dir contains only samples, but are generally not used directly.
|
||||
In practice, sddm runtime uses items under /etc/sddm by default
|
||||
@@ -0,0 +1,5 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "terra-sddm.spec"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
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
|
||||
@@ -0,0 +1,53 @@
|
||||
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"));
|
||||
@@ -0,0 +1,67 @@
|
||||
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
@@ -0,0 +1,20 @@
|
||||
#%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
|
||||
@@ -0,0 +1,17 @@
|
||||
#%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
|
||||
@@ -0,0 +1,12 @@
|
||||
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
|
||||
@@ -0,0 +1,2 @@
|
||||
#Type Name ID GECOS Home directory Shell
|
||||
u sddm - "SDDM Greeter Account" /var/lib/sddm -
|
||||
@@ -0,0 +1,2 @@
|
||||
[General]
|
||||
DisplayServer=x11
|
||||
@@ -0,0 +1,122 @@
|
||||
[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
|
||||
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
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
|
||||
@@ -0,0 +1,5 @@
|
||||
# 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"
|
||||
@@ -0,0 +1,293 @@
|
||||
# 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
|
||||
@@ -0,0 +1 @@
|
||||
rpm.version(gh("sddm/sddm"));
|
||||
@@ -12,7 +12,7 @@
|
||||
%endif
|
||||
|
||||
Name: codium
|
||||
Version: 1.88.1.24104
|
||||
Version: 1.89.1.24130
|
||||
Release: 1%?dist
|
||||
Summary: Code editing. Redefined.
|
||||
License: MIT
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: flutter
|
||||
Version: 3.19.6
|
||||
Version: 3.22.0
|
||||
Release: 1%?dist
|
||||
Summary: SDK for crafting beautiful, fast user experiences from a single codebase
|
||||
License: BSD-3-Clause
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: sarasa-gothic-fonts
|
||||
Version: 1.0.10
|
||||
Version: 1.0.12
|
||||
Release: 1%?dist
|
||||
URL: https://github.com/be5invis/Sarasa-Gothic
|
||||
Source0: %url/releases/download/v%version/Sarasa-TTC-%version.7z
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
%define osuresver 2024.410.0
|
||||
%define osuresver 2024.510.0
|
||||
%global debug_package %{nil}
|
||||
%define __strip /bin/true
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
%global real_name prismlauncher
|
||||
%global nice_name PrismLauncher
|
||||
|
||||
%global commit bfac12604e9cd0884987ca89f34a455cf16c543c
|
||||
%global commit 93da066aa24220097d6f424fe13a74bbcfe54c21
|
||||
%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 20240513
|
||||
%global snapshot_info %{commit_date}.%{shortcommit}
|
||||
|
||||
%bcond_without qt6
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: dart
|
||||
Version: 3.3.4
|
||||
Version: 3.4.0
|
||||
Release: 1%?dist
|
||||
Summary: The Dart Language
|
||||
License: BSD-3-Clause
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Name: kotlin-native
|
||||
Version: 1.9.23
|
||||
Version: 1.9.24
|
||||
Release: 1%?dist
|
||||
Summary: LLVM backend for the Kotlin compiler
|
||||
ExclusiveArch: x86_64
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
Name: kotlin
|
||||
Version: 1.9.23
|
||||
Version: 1.9.24
|
||||
Release: 1%?dist
|
||||
Summary: Statically typed programming language
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
%global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
|
||||
%global commit 185e06c92362083c06c76f87e325889b1c9dc659
|
||||
%global commit 2c8551556e5b51b7a7e487b1043b92d4ad34dbf0
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global ver 2.1.1
|
||||
%global commit_date 20240502
|
||||
%global commit_date 20240516
|
||||
%global debug_package %nil
|
||||
|
||||
Name: nim-nightly
|
||||
@@ -100,11 +100,13 @@ mold -run bin/nim cc -d:nimCallDepthLimit=10000 -r tools/niminst/niminst --var:v
|
||||
|
||||
sh ./install.sh %buildroot/usr/bin
|
||||
|
||||
mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %buildroot/usr/lib/nim
|
||||
mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %buildroot/usr/lib/nim %buildroot%_datadir
|
||||
install -Dpm755 bin/nim{grep,suggest,pretty} %buildroot/%_bindir
|
||||
install -Dpm644 tools/nim.bash-completion %buildroot/%_datadir/bash-completion/completions/nim
|
||||
install -Dpm644 dist/nimble/nimble.bash-completion %buildroot/%_datadir/bash-completion/completions/nimble
|
||||
install -Dpm644 -t%buildroot/%_mandir/man1 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4
|
||||
mv %buildroot%_bindir/nim %buildroot%_datadir/
|
||||
ln -s %_datadir/nim/bin/nim %buildroot%_bindir/nim
|
||||
|
||||
%ifarch x86_64
|
||||
mkdir -p %buildroot/%_docdir/%name/html
|
||||
@@ -129,6 +131,7 @@ rm %buildroot%_bindir/*.bat || true
|
||||
%_bindir/nim{,ble}
|
||||
%_mandir/man1/nim{,ble}.1*
|
||||
%_datadir/bash-completion/completions/nim{,ble}
|
||||
%_datadir/nim/
|
||||
%_prefix/lib/nim/
|
||||
%_sysconfdir/nim/
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: python3-ruff
|
||||
Version: 0.4.2
|
||||
Version: 0.4.4
|
||||
Release: 1%?dist
|
||||
Summary: An extremely fast Python linter, written in Rust
|
||||
License: MIT
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# Generated by rust2rpm 24
|
||||
# Generated by rust2rpm 26
|
||||
%global crate maturin
|
||||
|
||||
Name: rust-terra-maturin
|
||||
Version: 1.5.1
|
||||
Release: 1%?dist
|
||||
Release: %autorelease
|
||||
Summary: Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages
|
||||
|
||||
License: MIT OR Apache-2.0
|
||||
@@ -296,6 +296,18 @@ use the "tracing-subscriber" feature of the "%{crate}" crate.
|
||||
%files -n %{name}+tracing-subscriber-devel
|
||||
%ghost %{crate_instdir}/Cargo.toml
|
||||
|
||||
%package -n %{name}+unicode-xid-devel
|
||||
Summary: %{summary}
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n %{name}+unicode-xid-devel %{_description}
|
||||
|
||||
This package contains library source intended for building other packages which
|
||||
use the "unicode-xid" feature of the "%{crate}" crate.
|
||||
|
||||
%files -n %{name}+unicode-xid-devel
|
||||
%ghost %{crate_instdir}/Cargo.toml
|
||||
|
||||
%package -n %{name}+upload-devel
|
||||
Summary: %{summary}
|
||||
BuildArch: noarch
|
||||
@@ -320,18 +332,6 @@ use the "ureq" feature of the "%{crate}" crate.
|
||||
%files -n %{name}+ureq-devel
|
||||
%ghost %{crate_instdir}/Cargo.toml
|
||||
|
||||
%package -n %{name}+url-devel
|
||||
Summary: %{summary}
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n %{name}+url-devel %{_description}
|
||||
|
||||
This package contains library source intended for building other packages which
|
||||
use the "url" feature of the "%{crate}" crate.
|
||||
|
||||
%files -n %{name}+url-devel
|
||||
%ghost %{crate_instdir}/Cargo.toml
|
||||
|
||||
%package -n %{name}+wild-devel
|
||||
Summary: %{summary}
|
||||
BuildArch: noarch
|
||||
@@ -369,7 +369,7 @@ use the "zig" feature of the "%{crate}" crate.
|
||||
%ghost %{crate_instdir}/Cargo.toml
|
||||
|
||||
%prep
|
||||
%autosetup -n %{crate}-%{version_no_tilde} -p1
|
||||
%autosetup -n %{crate}-%{version} -p1
|
||||
%cargo_prep_online
|
||||
|
||||
%build
|
||||
|
||||
@@ -19,7 +19,8 @@ Requires: glibc openssl zlib
|
||||
%{cargo_build -f extra,dataframe} --workspace
|
||||
|
||||
%install
|
||||
%cargo_install -f extra,dataframe
|
||||
mkdir -p %buildroot%_bindir
|
||||
cp target/rpm/nu* %buildroot%_bindir/
|
||||
rm -rf .cargo
|
||||
|
||||
%post
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
%global crate starship
|
||||
|
||||
Name: rust-starship
|
||||
Version: 1.18.2
|
||||
Release: 2%?dist
|
||||
Version: 1.19.0
|
||||
Release: 1%?dist
|
||||
Summary: Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️
|
||||
|
||||
License: ISC
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
%global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu
|
||||
%global commit a819ab7b36a449c2d5d0104b896c04115f875d05
|
||||
%global commit bada552e3eb595d7205d3ec69ea2e0162b9cca12
|
||||
%forgemeta
|
||||
|
||||
Name: vala-panel-appmenu
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: vala-panel
|
||||
Version: 24.03
|
||||
Version: 24.05
|
||||
%global forgeurl https://gitlab.com/vala-panel-project/vala-panel
|
||||
%forgemeta
|
||||
|
||||
@@ -72,7 +72,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
|
||||
%{_datadir}/vala-panel/applets/*.plugin
|
||||
%dir %{_datadir}/vala-panel/images
|
||||
%{_datadir}/vala-panel/images/background.png
|
||||
%{_libdir}/girepository-1.0/ValaPanel-%version.typelib
|
||||
%{_libdir}/girepository-1.0/ValaPanel-*.typelib
|
||||
|
||||
%files devel
|
||||
%doc README.md
|
||||
@@ -82,7 +82,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
|
||||
%{_libdir}/libvalapanel.so
|
||||
%{_libdir}/pkgconfig/vala-panel.pc
|
||||
%{_datadir}/vala/vapi/vala-panel.*
|
||||
%{_datadir}/gir-1.0/ValaPanel-%version.gir
|
||||
%{_datadir}/gir-1.0/ValaPanel-*.gir
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
|
||||
@@ -4,14 +4,15 @@
|
||||
|
||||
Name: apparmor
|
||||
Version: 4.0.0~alpha3
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: AppArmor userspace components
|
||||
|
||||
%define baseversion %(echo %{version} | cut -d. -f-2)
|
||||
%global normver %(echo %version | sed 's/~/-/')
|
||||
|
||||
License: GPL-2.0
|
||||
URL: https://launchpad.net/apparmor
|
||||
Source0: %{url}/%{baseversion}/%(echo %version | sed 's/~/-/')/+download/%{name}-%{version}.tar.gz
|
||||
Source0: %{url}/%{baseversion}/%normver/+download/%{name}-%{version}.tar.gz
|
||||
Source1: apparmor.preset
|
||||
Patch01: 0001-fix-avahi-daemon-authselect-denial-in-fedora.patch
|
||||
|
||||
@@ -138,6 +139,8 @@ changehat abilities exposed through libapparmor.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
sed -i 's/@VERSION@/%normver/g' libraries/libapparmor/swig/python/setup.py.in
|
||||
sed -i 's/${VERSION}/%normver/g' utils/Makefile
|
||||
|
||||
%build
|
||||
export PYTHON=%{__python3}
|
||||
@@ -149,7 +152,7 @@ pushd libraries/libapparmor
|
||||
%configure \
|
||||
--with-python \
|
||||
|
||||
%make_build
|
||||
%make_build VERSION=%normver
|
||||
popd
|
||||
|
||||
%make_build -C binutils
|
||||
|
||||
@@ -7,7 +7,7 @@ Name: libappimage
|
||||
|
||||
|
||||
Version: %{libver_format}
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Implements functionality for dealing with AppImage files
|
||||
|
||||
License: MIT
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Name: libayatana-common
|
||||
Summary: Common functions for Ayatana System Indicators
|
||||
Version: 0.9.10
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPL-3.0
|
||||
URL: https://github.com/AyatanaIndicators/libayatana-common
|
||||
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
%global commit 77b34797d89d23ccfab3f3e1eab532f0bc73ab38
|
||||
%global ver 1.8.28
|
||||
%global commit 12c1689b54cdc57d145b5ae74b63eaf713847104
|
||||
%global ver 1.8.29
|
||||
%global commit_date 20240219
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
rpm.global("ver", gh("AppImageCommunity/zsync2"));
|
||||
if rpm.changed() {
|
||||
rpm.global("git_commit", gh_commit("AppImageCommunity/zsync2"));
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
%global git_commit 1608115705047d6826bcd7b35a6988deaf3dbfec
|
||||
%global git_commit 87fb5a0f3c14d3cf35aa6547cc60d099c89ca532
|
||||
|
||||
%global commit_short %(c=%{git_commit}; echo ${c:0:7})
|
||||
|
||||
%global libver 2.0.0-alpha-1-20220304.git%{commit_short}
|
||||
%global ver 2.0.0-alpha-1-20230304
|
||||
%global libver %ver.git%{commit_short}
|
||||
|
||||
# replace - with ~
|
||||
%global libver_format %(v=%{libver}; sed 's/-/~/g' <<< $v)
|
||||
@@ -17,7 +18,6 @@ License: Artistic-2.0
|
||||
URL: https://github.com/AppImageCommunity/zsync2
|
||||
#Source0: %%{url}/archive/refs/%%{libver}.tar.gz
|
||||
Source0: %{url}/archive/%{git_commit}.tar.gz
|
||||
Patch0: https://github.com/AppImageCommunity/zsync2/commit/e57e1fce68194fa920542fd334488de5123e4832.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: cmake3
|
||||
@@ -47,6 +47,7 @@ developing applications that use %{name}.
|
||||
%autosetup -n zsync2-%{git_commit} -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="$CFLAGS -Wno-incompatible-pointer-types"
|
||||
%cmake -DCPR_FORCE_USE_SYSTEM_CURL=ON \
|
||||
-DUSE_SYSTEM_CURL=ON \
|
||||
-DUSE_SYSTEM_CPR=ON
|
||||
|
||||
@@ -11,7 +11,6 @@ URL: https://gitlab.com/ubports/development/core/click
|
||||
Source0: %{url}/-/archive/%commit/click-%commit.tar.gz
|
||||
|
||||
BuildRequires: automake libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: make
|
||||
BuildRequires: g++
|
||||
BuildRequires: gcc
|
||||
@@ -63,6 +62,7 @@ Provides HTML and Manpage (documentation) for Click.
|
||||
NOCONFIGURE=1 \
|
||||
./autogen.sh
|
||||
|
||||
export CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
|
||||
%configure
|
||||
%make_build
|
||||
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "openbangla-keyboard-nightly.spec"
|
||||
}
|
||||
labels { nightly = "1" }
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
%global ver 2.0.0
|
||||
%global commit c7aeeda40f528d647af0a019984897543ebb6d5e
|
||||
%global commit_date 20240505
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
|
||||
Name: openbangla-keyboard-nightly
|
||||
Version: %ver^%commit_date.%shortcommit
|
||||
Release: 1%?dist
|
||||
Summary: An OpenSource, Unicode compliant Bengali Input Method
|
||||
License: GPL-3.0-or-later
|
||||
URL: https://openbangla.github.io/
|
||||
Source0: https://github.com/OpenBangla/OpenBangla-Keyboard/archive/%commit.tar.gz
|
||||
Source1: https://github.com/OpenBangla/riti/archive/master.tar.gz
|
||||
BuildRequires: cmake anda-srpm-macros rust-packaging git-core gcc-c++
|
||||
BuildRequires: qt5-qtbase-devel pkgconfig(ibus-1.0) fcitx5-devel pkgconfig(libzstd)
|
||||
Requires: qt5-qtbase hicolor-icon-theme zstd
|
||||
Requires: openbangla-im = %version-%release
|
||||
Provides: openbangla-keyboard = %version-%release
|
||||
Conflicts: openbangla-keyboard
|
||||
|
||||
%description
|
||||
OpenBangla Keyboard is an open source, Unicode compliant, Bangla input method for GNU/Linux systems.
|
||||
It’s a full-fledged Bangla input method with typing automation tools, includes many famous typing
|
||||
methods such as Avro Phonetic, Probhat, Munir Optima, National (Jatiya) etc.
|
||||
|
||||
|
||||
%package -n ibus-openbangla
|
||||
Summary: OpenBangla Keyboard for IBus
|
||||
Requires: ibus
|
||||
Requires: openbangla-keyboard = %version-%release
|
||||
Provides: openbangla-im = %version-%release
|
||||
Conflicts: openbangla-im
|
||||
|
||||
%description -n ibus-openbangla
|
||||
OpenBangla Keyboard for IBus.
|
||||
|
||||
|
||||
%package -n fcitx5-openbangla
|
||||
Summary: OpenBangla Keyboard for Fcitx5
|
||||
Requires: fcitx5
|
||||
Requires: openbangla-keyboard = %version-%release
|
||||
Provides: openbangla-im = %version-%release
|
||||
Conflicts: openbangla-im
|
||||
|
||||
%description -n fcitx5-openbangla
|
||||
OpenBangla Keyboard for Fcitx5.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n OpenBangla-Keyboard-%commit
|
||||
rmdir src/engine/riti
|
||||
tar xf %SOURCE1 -C src/engine/
|
||||
mv src/engine/riti-master src/engine/riti
|
||||
|
||||
%build
|
||||
if [[ -d build ]]; then rm -rf build; fi
|
||||
%cmake -DENABLE_FCITX=YES -DENABLE_IBUS=YES
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
%files
|
||||
%doc README.adoc
|
||||
%license LICENSE
|
||||
%_bindir/openbangla-gui
|
||||
%_datadir/applications/openbangla-keyboard.desktop
|
||||
%_datadir/icons/hicolor/*/apps/openbangla-keyboard.png
|
||||
%_datadir/metainfo/io.github.openbangla.keyboard.metainfo.xml
|
||||
%_datadir/openbangla-keyboard/
|
||||
%_datadir/pixmaps/openbangla-keyboard.png
|
||||
|
||||
%files -n ibus-openbangla
|
||||
%_libexecdir/ibus-engine-openbangla
|
||||
%_datadir/ibus/component/openbangla.xml
|
||||
|
||||
%files -n fcitx5-openbangla
|
||||
%_libdir/fcitx5/openbangla.so
|
||||
%_datadir/fcitx5/addon/openbangla.conf
|
||||
%_datadir/fcitx5/inputmethod/openbangla.conf
|
||||
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
@@ -0,0 +1,8 @@
|
||||
if filters.contains("nightly") {
|
||||
rpm.global("commit", get("https://api.github.com/repos/OpenBangla/OpenBangla-Keyboard/commits/develop").json().sha);
|
||||
if rpm.changed() {
|
||||
rpm.global("ver", gh("OpenBangla/OpenBangla-Keyboard"));
|
||||
rpm.global("commit_date", date());
|
||||
rpm.release();
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
%define _build_id_links none
|
||||
|
||||
Name: sass
|
||||
Version: 1.76.0
|
||||
Version: 1.77.1
|
||||
Release: 1%?dist
|
||||
Summary: The reference implementation of Sass, written in Dart
|
||||
License: MIT
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "cros-keyboard-map.spec"
|
||||
}
|
||||
labels {
|
||||
nightly = "1"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
%global commit 1889baff16c08ddf2382d95ca18caa37001d5971
|
||||
%global commit_date 20240418
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global debug_package %{nil}
|
||||
%define __os_install_post %{nil}
|
||||
|
||||
Name: cros-keyboard-map
|
||||
Version: %commit_date.%shortcommit
|
||||
Release: 1%?dist
|
||||
|
||||
License: BSD-3-Clause
|
||||
Summary: Utility to generate keyd configurations for use on Chromebooks
|
||||
URL: https://github.com/WeirdTreeThing/cros-keyboard-map
|
||||
Source0: https://github.com/WeirdTreeThing/cros-keyboard-map/archive/%commit/cros-keyboard-map-%commit.tar.gz
|
||||
|
||||
%{?systemd_requires}
|
||||
BuildRequires: systemd-rpm-macros
|
||||
Requires: keyd python3
|
||||
|
||||
%description
|
||||
Set of tools designed to help develop and debug software and firmware on Intel platforms with AudioDSP onboard.
|
||||
|
||||
Related to alsa-utils which is also set of utilities but targets AdvancedLinuxSoundArchitecture (ALSA) audience in more general fashion.
|
||||
|
||||
%prep
|
||||
%autosetup -n cros-keyboard-map-%commit
|
||||
|
||||
%install
|
||||
mkdir -p %buildroot/etc/cros-keyboard-map/configs
|
||||
install -Dm755 cros-keyboard-map.py %buildroot/etc/cros-keyboard-map/cros-keyboard-map.py
|
||||
cp configs/* %buildroot/etc/cros-keyboard-map/configs
|
||||
|
||||
mkdir -p %buildroot/usr/bin
|
||||
tee %buildroot/usr/bin/um-generate-cros-keymap <<EOF
|
||||
if (grep -E "^(Nocturne|Atlas|Eve)$" /sys/class/dmi/id/product_name &> /dev/null)
|
||||
then
|
||||
cp /etc/cros-keyboard-map/configs/cros-pixel.conf /etc/cros-keyboard-map/current.config
|
||||
elif (grep -E "^(Sarien|Arcada)$" /sys/class/dmi/id/product_name &> /dev/null)
|
||||
then
|
||||
cp /etc/cros-keyboard-map/configs/cros-sarien.conf /etc/cros-keyboard-map/current.config
|
||||
else
|
||||
python3 /etc/cros-keyboard-map/cros-keyboard-map.py --file /etc/cros-keyboard-map/current.config
|
||||
fi
|
||||
|
||||
mkdir -p /etc/keyd
|
||||
if [[ -f /etc/keyd/default.conf ]]; then
|
||||
rm /etc/keyd/default.conf
|
||||
fi
|
||||
ln -s /etc/cros-keyboard-map/current.config /etc/keyd/default.conf
|
||||
EOF
|
||||
|
||||
mkdir -p %buildroot/etc/systemd/system
|
||||
tee %buildroot/etc/systemd/system/cros-keyboard-map.service <<EOF
|
||||
[Unit]
|
||||
Description=Generate chromebook keyboard layout
|
||||
Before=keyd.service
|
||||
After=tmp.mount
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/bin/bash /usr/bin/um-generate-cros-keymap
|
||||
|
||||
[Install]
|
||||
WantedBy=sysinit.target
|
||||
EOF
|
||||
chmod +x %buildroot/usr/bin/um-generate-cros-keymap
|
||||
|
||||
%post
|
||||
%systemd_post cros-keyboard-map.service
|
||||
%systemd_post keyd.service
|
||||
|
||||
%preun
|
||||
%systemd_preun cros-keyboard-map.service
|
||||
%systemd_preun keyd.service
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart cros-keyboard-map.service
|
||||
%systemd_postun_with_restart keyd.service
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
/etc/cros-keyboard-map/*
|
||||
/etc/systemd/system/cros-keyboard-map.service
|
||||
/usr/bin/um-generate-cros-keymap
|
||||
|
||||
%changelog
|
||||
* Sat May 4 2024 Owen-sz <owen@fyralabs.com>
|
||||
- Initial package.
|
||||
@@ -0,0 +1,7 @@
|
||||
if filters.contains("nightly") {
|
||||
rpm.global("commit", gh_commit("WeirdTreeThing/cros-keyboard-map"));
|
||||
if rpm.changed() {
|
||||
rpm.release();
|
||||
rpm.global("commit_date", date());
|
||||
}
|
||||
}
|
||||
Submodule anda/system/kernel-mt8183/source deleted from 849dc4a1bb
@@ -1,10 +1,11 @@
|
||||
Name: limine
|
||||
Version: 7.4.1
|
||||
Version: 7.5.1
|
||||
Release: 1%?dist
|
||||
Summary: Modern, advanced, portable, multiprotocol bootloader
|
||||
License: BSD-2-Clause
|
||||
URL: https://limine-bootloader.org
|
||||
Source0: https://github.com/limine-bootloader/limine/releases/download/v%version/limine-%version.tar.gz
|
||||
Source1: https://raw.githubusercontent.com/limine-bootloader/limine/v%version/README.md
|
||||
BuildRequires: nasm mtools llvm lld clang make
|
||||
|
||||
%description
|
||||
@@ -13,6 +14,7 @@ the reference implementation for the Limine boot protocol.
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
cp %SOURCE1 .
|
||||
|
||||
%build
|
||||
%configure --enable-all TOOLCHAIN_FOR_TARGET=llvm
|
||||
@@ -22,7 +24,7 @@ the reference implementation for the Limine boot protocol.
|
||||
%make_install
|
||||
|
||||
%files
|
||||
%doc README.md CONFIG.md PHILOSOPHY.md PROTOCOL.md COPYING
|
||||
%doc README.md CONFIG.md PHILOSOPHY.md PROTOCOL.md COPYING USAGE.md
|
||||
%license COPYING
|
||||
%_bindir/limine
|
||||
%_includedir/limine.h
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
%endif
|
||||
|
||||
Name: submarine
|
||||
Version: 0.2.0
|
||||
Version: 0.2.1
|
||||
Release: 1%?dist
|
||||
Summary: Experimental bootloader for ChomeOS's depthcharge
|
||||
License: GPL-3.0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Name: terra-release
|
||||
Version: 40
|
||||
Release: 1
|
||||
Release: 3
|
||||
Summary: Release package for Terra
|
||||
|
||||
License: MIT
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
[terra]
|
||||
name=Terra $releasever
|
||||
baseurl=https://repos.fyralabs.com/terra$releasever
|
||||
#baseurl=https://repos.fyralabs.com/terra$releasever
|
||||
metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever&arch=$basearch
|
||||
metadata_expire=6h
|
||||
type=rpm
|
||||
skip_if_unavailable=True
|
||||
gpgcheck=1
|
||||
gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
|
||||
repo_gpgcheck=1
|
||||
@@ -12,12 +12,12 @@ enabled_metadata=1
|
||||
|
||||
[terra-source]
|
||||
name=Terra $releasever - Source
|
||||
baseurl=https://repos.fyralabs.com/terra$releasever-source
|
||||
#baseurl=https://repos.fyralabs.com/terra$releasever-source
|
||||
metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever-source&arch=$basearch
|
||||
metadata_expire=6h
|
||||
type=rpm
|
||||
skip_if_unavailable=True
|
||||
gpgcheck=1
|
||||
gpgkey=https://repos.fyralabs.com/terra$releasever-source/key.asc
|
||||
repo_gpgcheck=1
|
||||
enabled=0
|
||||
enabled_metadata=0
|
||||
enabled_metadata=0
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define debug_package %nil
|
||||
|
||||
Name: katsu
|
||||
Version: 0.2.2
|
||||
Version: 0.2.3
|
||||
Release: 1%?dist
|
||||
Summary: The vicious image builder
|
||||
License: MIT
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
%global __provides_exclude_from %{_libdir}/%{name}/.*\\.so
|
||||
|
||||
Name: electron
|
||||
Version: 30.0.2
|
||||
Version: 30.0.6
|
||||
Release: 1%?dist
|
||||
Summary: Build cross platform desktop apps with web technologies
|
||||
License: MIT
|
||||
|
||||
@@ -18,7 +18,7 @@ Source0: %{forgesource}
|
||||
Provides: %{long_name} = %{version}-%{release}
|
||||
Provides: %{long_name}-core = %{version}-%{release}
|
||||
|
||||
BuildRequires: dotnet-sdk-7.0
|
||||
BuildRequires: dotnet-sdk-8.0
|
||||
# Require DPKG, so that we can use the `dpkg-architecture` command. which makes the build script happy.
|
||||
# TODO: Better solution: Patch out the debian-specific packaging code.
|
||||
BuildRequires: dpkg-dev
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "sbctl.spec"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
Name: sbctl
|
||||
Version: 0.14
|
||||
Release: 1%?dist
|
||||
Summary: Secure Boot key manager
|
||||
|
||||
License: MIT
|
||||
URL: https://github.com/Foxboron/sbctl
|
||||
Source0: https://github.com/Foxboron/sbctl/releases/download/%{version}/sbctl-%{version}.tar.gz
|
||||
|
||||
ExclusiveArch: %{golang_arches}
|
||||
|
||||
Requires: binutils
|
||||
Requires: util-linux
|
||||
|
||||
Recommends: systemd-udev
|
||||
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: git
|
||||
BuildRequires: go-rpm-macros
|
||||
|
||||
%description
|
||||
sbctl intends to be a user-friendly secure boot key manager capable of setting
|
||||
up secure boot, offer key management capabilities, and keep track of files that
|
||||
needs to be signed in the boot chain.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
sed -i '/go build/d' Makefile
|
||||
|
||||
|
||||
%build
|
||||
export GOPATH=%{_builddir}/go
|
||||
%global gomodulesmode GO111MODULE=on
|
||||
%gobuild -o sbctl ./cmd/sbctl
|
||||
%make_build
|
||||
|
||||
|
||||
%install
|
||||
%make_install PREFIX=%{_prefix}
|
||||
|
||||
|
||||
%transfiletriggerin -P 1 -- /boot /efi /usr/lib /usr/libexec
|
||||
if grep -q -m 1 -e '\.efi$' -e '/vmlinuz$'; then
|
||||
exec </dev/null
|
||||
%{_bindir}/sbctl sign-all -g
|
||||
fi
|
||||
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%{_bindir}/sbctl
|
||||
%{_prefix}/lib/kernel/install.d/91-sbctl.install
|
||||
%{_mandir}/man8/sbctl.8*
|
||||
%{_datadir}/bash-completion/completions/sbctl
|
||||
%{_datadir}/fish/vendor_completions.d/sbctl.fish
|
||||
%{_datadir}/zsh/site-functions/_sbctl
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Mar 30 2024 Cappy Ishihara <cappy@cappuchino.xyz> - 0.13-1
|
||||
- Push to Terra
|
||||
|
||||
* Tue Dec 26 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.13-1
|
||||
- Update to version 0.13
|
||||
|
||||
* Sun Nov 12 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.12-2
|
||||
- Switch to upstream 91-sbctl.install kernel-install script
|
||||
|
||||
* Fri Oct 20 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.12-1
|
||||
- Update to version 0.12
|
||||
|
||||
* Sat Mar 25 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.11-1
|
||||
- Update to version 0.11
|
||||
|
||||
* Mon Dec 12 2022 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.10-1
|
||||
- Update to version 0.10
|
||||
|
||||
* Tue May 3 2022 Andrew Gunnerson <chillermillerlong@hotmail.com> - 0.9-1
|
||||
- Update to version 0.9
|
||||
|
||||
* Thu Jan 27 2022 Andrew Gunnerson <chillermillerlong@hotmail.com> - 0.8-1
|
||||
- Initial release
|
||||
@@ -0,0 +1 @@
|
||||
rpm.version(gh("Foxboron/sbctl"));
|
||||
@@ -1,7 +1,7 @@
|
||||
#bcond_without tests
|
||||
%global commit ac817bc83efd939dca3e40c4b527d0ccfc77172b
|
||||
%global commit 351dc0bc334c4e1b5f00c152818c3ec0ed71f788
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global commit_date 20240429
|
||||
%global commit_date 20240514
|
||||
%global ver 2024.04.09
|
||||
|
||||
Name: yt-dlp-nightly
|
||||
|
||||
Reference in New Issue
Block a user