mirror of
https://github.com/terrapkg/packages.git
synced 2026-05-31 09:01:55 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fb551fdce9 | |||
| 4d0120f0e7 | |||
| ac73072e61 |
@@ -6,7 +6,7 @@
|
||||
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
|
||||
|
||||
Name: discord-canary-openasar
|
||||
Version: 0.0.383
|
||||
Version: 0.0.346
|
||||
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.383
|
||||
Version: 0.0.346
|
||||
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.53
|
||||
Version: 0.0.49
|
||||
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.84
|
||||
Version: 0.0.79
|
||||
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.84
|
||||
Version: 0.0.79
|
||||
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.53
|
||||
Version: 0.0.49
|
||||
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.7.0
|
||||
Version: 0.6.1
|
||||
Release: 1%?dist
|
||||
Summary: A modern self-hosted music player
|
||||
License: GPL-3.0
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%global commit 943a50b300a081bb223325295040846fe435a861
|
||||
%global commit a46ce9e28cd97f7280c085649a79f85aa1d0fe70
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global commit_date 20240504
|
||||
%global ver v0.38.0
|
||||
%global commit_date 20240325
|
||||
%global ver v0.37.0
|
||||
|
||||
Name: mpv-nightly
|
||||
Version: %ver^%commit_date.%shortcommit
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
%global crate sccache
|
||||
|
||||
Name: rust-sccache
|
||||
Version: 0.8.0
|
||||
Release: 1%?dist
|
||||
Version: 0.7.7
|
||||
Release: 1%{?dist}
|
||||
Summary: Ccache-like tool
|
||||
|
||||
License: Apache-2.0
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
Name: vencord-desktop
|
||||
Provides: VencordDesktop = %{version}-%{release}
|
||||
Version: 1.5.2
|
||||
Version: 1.5.1
|
||||
Release: 1%?dist
|
||||
License: GPL-3.0
|
||||
Summary: Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
%global nodev 20.12.2
|
||||
%global npmv 10.5.0
|
||||
%global ver 0.19.1
|
||||
%global nodev 18.13.0
|
||||
%global npmv 8.19.3
|
||||
%global ver 0.18.1
|
||||
%define debug_package %nil
|
||||
%global _build_id_links none
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Name: elementary-appcenter
|
||||
Summary: Software Center from elementary
|
||||
Version: 7.4.0
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
License: GPL-3.0
|
||||
|
||||
Provides: appcenter = %{version}-%{release}
|
||||
@@ -12,8 +12,6 @@ Obsoletes: appcenter < 7.2.1-2
|
||||
URL: https://github.com/elementary/appcenter
|
||||
Source0: %url/archive/%{version}/appcenter-%{version}.tar.gz
|
||||
|
||||
Patch0: pr2099.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libappstream-glib
|
||||
|
||||
@@ -1,311 +0,0 @@
|
||||
commit fce55d9373bfb82953191b32e276a2129ffcb8c1
|
||||
Author: Marius Meisenzahl <meisenzahl@users.noreply.github.com>
|
||||
Date: Wed Feb 7 00:14:43 2024 +0100
|
||||
|
||||
Add support for AppStream 1.0 (#2099)
|
||||
|
||||
diff --git a/src/Core/FlatpakBackend.vala b/src/Core/FlatpakBackend.vala
|
||||
index 98931505..10f2baab 100644
|
||||
--- a/src/Core/FlatpakBackend.vala
|
||||
+++ b/src/Core/FlatpakBackend.vala
|
||||
@@ -400,8 +400,13 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
|
||||
|
||||
var category_array = new GLib.GenericArray<AppStream.Category> ();
|
||||
category_array.add (category);
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components ().as_array (), category_array, false);
|
||||
+ AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components ().as_array (), category_array, false);
|
||||
+#else
|
||||
AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components (), category_array, false);
|
||||
AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components (), category_array, false);
|
||||
+#endif
|
||||
components = category.get_components ();
|
||||
|
||||
var apps = new Gee.TreeSet<AppCenterCore.Package> ();
|
||||
@@ -417,13 +422,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
|
||||
var apps = new Gee.TreeSet<AppCenterCore.Package> ();
|
||||
var comps = user_appstream_pool.search (query);
|
||||
if (category == null) {
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ comps.as_array ().foreach ((comp) => {
|
||||
+#else
|
||||
comps.foreach ((comp) => {
|
||||
+#endif
|
||||
var packages = get_packages_for_component_id (comp.get_id ());
|
||||
apps.add_all (packages);
|
||||
});
|
||||
} else {
|
||||
var cat_packages = get_applications_for_category (category);
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ comps.as_array ().foreach ((comp) => {
|
||||
+#else
|
||||
comps.foreach ((comp) => {
|
||||
+#endif
|
||||
var packages = get_packages_for_component_id (comp.get_id ());
|
||||
foreach (var package in packages) {
|
||||
if (package in cat_packages) {
|
||||
@@ -435,13 +448,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
|
||||
|
||||
comps = system_appstream_pool.search (query);
|
||||
if (category == null) {
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ comps.as_array ().foreach ((comp) => {
|
||||
+#else
|
||||
comps.foreach ((comp) => {
|
||||
+#endif
|
||||
var packages = get_packages_for_component_id (comp.get_id ());
|
||||
apps.add_all (packages);
|
||||
});
|
||||
} else {
|
||||
var cat_packages = get_applications_for_category (category);
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ comps.as_array ().foreach ((comp) => {
|
||||
+#else
|
||||
comps.foreach ((comp) => {
|
||||
+#endif
|
||||
var packages = get_packages_for_component_id (comp.get_id ());
|
||||
foreach (var package in packages) {
|
||||
if (package in cat_packages) {
|
||||
@@ -510,7 +531,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
|
||||
continue;
|
||||
}
|
||||
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ if (package.component.get_developer ().get_name () == author) {
|
||||
+#else
|
||||
if (package.component.developer_name == author) {
|
||||
+#endif
|
||||
package_ids.add (package.component.id);
|
||||
|
||||
AppCenterCore.Package? user_package = null;
|
||||
@@ -1095,7 +1120,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
|
||||
warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
|
||||
} finally {
|
||||
var comp_validator = ComponentValidator.get_default ();
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ user_appstream_pool.get_components ().as_array ().foreach ((comp) => {
|
||||
+#else
|
||||
user_appstream_pool.get_components ().foreach ((comp) => {
|
||||
+#endif
|
||||
if (!comp_validator.validate (comp)) {
|
||||
return;
|
||||
}
|
||||
@@ -1133,7 +1162,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
|
||||
warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
|
||||
} finally {
|
||||
var comp_validator = ComponentValidator.get_default ();
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ system_appstream_pool.get_components ().as_array ().foreach ((comp) => {
|
||||
+#else
|
||||
system_appstream_pool.get_components ().foreach ((comp) => {
|
||||
+#endif
|
||||
if (!comp_validator.validate (comp)) {
|
||||
return;
|
||||
}
|
||||
diff --git a/src/Core/Package.vala b/src/Core/Package.vala
|
||||
index 0f9a90c4..ed141292 100644
|
||||
--- a/src/Core/Package.vala
|
||||
+++ b/src/Core/Package.vala
|
||||
@@ -306,7 +306,11 @@ public class AppCenterCore.Package : Object {
|
||||
return _author;
|
||||
}
|
||||
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ _author = component.get_developer ().get_name ();
|
||||
+#else
|
||||
_author = component.developer_name;
|
||||
+#endif
|
||||
|
||||
if (_author == null) {
|
||||
var project_group = component.project_group;
|
||||
@@ -677,7 +681,11 @@ public class AppCenterCore.Package : Object {
|
||||
}
|
||||
|
||||
try {
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ description = AppStream.markup_convert (description, TEXT);
|
||||
+#else
|
||||
description = AppStream.markup_convert_simple (description);
|
||||
+#endif
|
||||
} catch (Error e) {
|
||||
warning ("Failed to convert description to markup: %s", e.message);
|
||||
}
|
||||
@@ -919,7 +927,11 @@ public class AppCenterCore.Package : Object {
|
||||
}
|
||||
|
||||
public AppStream.Release? get_newest_release () {
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ var releases = component.get_releases_plain ().get_entries ();
|
||||
+#else
|
||||
var releases = component.get_releases ();
|
||||
+#endif
|
||||
releases.sort_with_data ((a, b) => {
|
||||
if (a.get_version () == null || b.get_version () == null) {
|
||||
if (a.get_version () != null) {
|
||||
diff --git a/src/Core/PackageKitBackend.vala b/src/Core/PackageKitBackend.vala
|
||||
index 09da4074..a108831e 100644
|
||||
--- a/src/Core/PackageKitBackend.vala
|
||||
+++ b/src/Core/PackageKitBackend.vala
|
||||
@@ -275,7 +275,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
|
||||
} finally {
|
||||
var new_package_list = new Gee.HashMap<string, Package> ();
|
||||
var comp_validator = ComponentValidator.get_default ();
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ appstream_pool.get_components ().as_array ().foreach ((comp) => {
|
||||
+#else
|
||||
appstream_pool.get_components ().foreach ((comp) => {
|
||||
+#endif
|
||||
if (!comp_validator.validate (comp)) {
|
||||
return;
|
||||
}
|
||||
@@ -317,7 +321,12 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
|
||||
component.set_id (id);
|
||||
component.set_origin (Package.APPCENTER_PACKAGE_ORIGIN);
|
||||
|
||||
-#if HAS_APPSTREAM_0_15
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ var components = new AppStream.ComponentBox (AppStream.ComponentBoxFlags.NONE);
|
||||
+ components.add (component);
|
||||
+
|
||||
+ appstream_pool.add_components (components);
|
||||
+#elif HAS_APPSTREAM_0_15
|
||||
var components = new GenericArray<AppStream.Component> ();
|
||||
components.add (component);
|
||||
|
||||
@@ -430,7 +439,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
|
||||
break;
|
||||
}
|
||||
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ if (package.component.get_developer ().get_name () == author) {
|
||||
+#else
|
||||
if (package.component.developer_name == author) {
|
||||
+#endif
|
||||
packages.add (package);
|
||||
}
|
||||
}
|
||||
@@ -447,7 +460,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
|
||||
|
||||
var category_array = new GLib.GenericArray<AppStream.Category> ();
|
||||
category_array.add (category);
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ AppStream.utils_sort_components_into_categories (appstream_pool.get_components ().as_array (), category_array, true);
|
||||
+#else
|
||||
AppStream.utils_sort_components_into_categories (appstream_pool.get_components (), category_array, true);
|
||||
+#endif
|
||||
components = category.get_components ();
|
||||
|
||||
var apps = new Gee.TreeSet<AppCenterCore.Package> ();
|
||||
@@ -465,7 +482,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
|
||||
var apps = new Gee.TreeSet<AppCenterCore.Package> ();
|
||||
var comps = appstream_pool.search (query);
|
||||
if (category == null) {
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ comps.as_array ().foreach ((comp) => {
|
||||
+#else
|
||||
comps.foreach ((comp) => {
|
||||
+#endif
|
||||
var package = get_package_for_component_id (comp.get_id ());
|
||||
if (package != null) {
|
||||
apps.add (package);
|
||||
@@ -473,7 +494,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
|
||||
});
|
||||
} else {
|
||||
var cat_packages = get_applications_for_category (category);
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ comps.as_array ().foreach ((comp) => {
|
||||
+#else
|
||||
comps.foreach ((comp) => {
|
||||
+#endif
|
||||
var package = get_package_for_component_id (comp.get_id ());
|
||||
if (package != null && package in cat_packages) {
|
||||
apps.add (package);
|
||||
diff --git a/src/Views/AppInfoView.vala b/src/Views/AppInfoView.vala
|
||||
index 5a3a361a..bef37f0e 100644
|
||||
--- a/src/Views/AppInfoView.vala
|
||||
+++ b/src/Views/AppInfoView.vala
|
||||
@@ -310,8 +310,16 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
|
||||
oars_flowbox.add (uncurated);
|
||||
}
|
||||
#endif
|
||||
+
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ var active_locale = "en-US";
|
||||
+ if (package_component.get_context () != null) {
|
||||
+ active_locale = package_component.get_context ().get_locale () ?? "en-US";
|
||||
+ }
|
||||
+#else
|
||||
var active_locale = package_component.get_active_locale ();
|
||||
- if (active_locale != "en_US") {
|
||||
+#endif
|
||||
+ if (active_locale != "en_US" && active_locale != "en-US") {
|
||||
var percent_translated = package_component.get_language (
|
||||
// Expects language without locale
|
||||
active_locale.split ("_")[0]
|
||||
@@ -492,7 +500,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
|
||||
}
|
||||
}
|
||||
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ screenshots = package_component.get_screenshots_all ();
|
||||
+#else
|
||||
screenshots = package_component.get_screenshots ();
|
||||
+#endif
|
||||
|
||||
if (screenshots.length > 0) {
|
||||
screenshot_carousel = new Hdy.Carousel () {
|
||||
@@ -1030,7 +1042,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
|
||||
get_app_download_size.begin ();
|
||||
|
||||
Idle.add (() => {
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ var releases = package.component.get_releases_plain ().get_entries ();
|
||||
+#else
|
||||
var releases = package.component.get_releases ();
|
||||
+#endif
|
||||
|
||||
foreach (unowned var release in releases) {
|
||||
if (release.get_version () == null) {
|
||||
@@ -1049,7 +1065,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
|
||||
|
||||
release_carousel.add (release_row);
|
||||
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ if (package.installed && AppStream.vercmp_simple (release.get_version (), package.get_version ()) <= 0) {
|
||||
+#else
|
||||
if (package.installed && AppStream.utils_compare_versions (release.get_version (), package.get_version ()) <= 0) {
|
||||
+#endif
|
||||
break;
|
||||
}
|
||||
}
|
||||
diff --git a/src/Widgets/ReleaseRow.vala b/src/Widgets/ReleaseRow.vala
|
||||
index 3b487914..36fcbc76 100644
|
||||
--- a/src/Widgets/ReleaseRow.vala
|
||||
+++ b/src/Widgets/ReleaseRow.vala
|
||||
@@ -116,7 +116,11 @@ public class AppCenter.Widgets.ReleaseRow : Gtk.Box {
|
||||
private string format_release_description (string? description ) {
|
||||
if (description != null) {
|
||||
try {
|
||||
+#if HAS_APPSTREAM_1_0
|
||||
+ var markup = AppStream.markup_convert (description, TEXT);
|
||||
+#else
|
||||
var markup = AppStream.markup_convert_simple (description);
|
||||
+#endif
|
||||
|
||||
if (markup.strip () != "") {
|
||||
return markup;
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index d3d558ef..df69a0bf 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -78,6 +78,10 @@ if appstream.version().version_compare('>=0.16')
|
||||
args += '--define=HAS_APPSTREAM_0_16'
|
||||
endif
|
||||
|
||||
+if appstream.version().version_compare('>=1.0')
|
||||
+ args += '--define=HAS_APPSTREAM_1_0'
|
||||
+endif
|
||||
+
|
||||
if get_option('packagekit_backend')
|
||||
appcenter_files += files(
|
||||
'Core/PackageKitBackend.vala',
|
||||
@@ -11,7 +11,7 @@ URL: https://github.com/elementary/greeter
|
||||
Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
|
||||
Source1: 40-%{appname}.conf
|
||||
|
||||
Patch0: https://github.com/elementary/greeter/compare/7.0.0..42320c266395606b0c20782603e7407124c3f7a4.patch
|
||||
Patch0: https://github.com/elementary/greeter/commit/dbd9b6f9701f5992c3b3257c025b9cd80d041cc8.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
@@ -36,9 +36,9 @@ BuildRequires: pkgconfig(granite) >= 5.0
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libhandy-1)
|
||||
BuildRequires: pkgconfig(liblightdm-gobject-1)
|
||||
BuildRequires: pkgconfig(mutter-clutter-14)
|
||||
BuildRequires: pkgconfig(mutter-cogl-14)
|
||||
BuildRequires: pkgconfig(mutter-cogl-pango-14)
|
||||
BuildRequires: pkgconfig(mutter-clutter-13)
|
||||
BuildRequires: pkgconfig(mutter-cogl-13)
|
||||
BuildRequires: pkgconfig(mutter-cogl-pango-13)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
|
||||
Provides: pantheon-greeter = %{version}-%{release}
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
Name: elementary-theme
|
||||
Summary: Elementary GTK+ Stylesheet
|
||||
Version: 8.0.0
|
||||
Release: 1%?dist
|
||||
Version: 7.3.0
|
||||
Release: 1%{?dist}
|
||||
License: GPL-3.0
|
||||
|
||||
URL: https://github.com/elementary/stylesheet
|
||||
|
||||
@@ -3,16 +3,14 @@
|
||||
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
|
||||
|
||||
# patch some default settings to better match Fedora
|
||||
Patch0: 0000-Modify-default-settings-for-Fedora.patch
|
||||
Patch: https://github.com/elementary/gala/compare/7.1.3..43d1e6a01b56a84a4e752e1970a35c19402941eb.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
@@ -33,13 +31,11 @@ BuildRequires: pkgconfig(granite) >= 5.4.0
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libbamf3)
|
||||
BuildRequires: pkgconfig(libcanberra)
|
||||
BuildRequires: pkgconfig(libhandy-1)
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
BuildRequires: pkgconfig(mutter-clutter-14)
|
||||
BuildRequires: pkgconfig(mutter-cogl-14)
|
||||
BuildRequires: pkgconfig(mutter-cogl-pango-14)
|
||||
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
|
||||
@@ -65,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.
|
||||
@@ -89,8 +85,8 @@ This package contains the development headers.
|
||||
|
||||
|
||||
%check
|
||||
%dnl desktop-file-validate \
|
||||
%dnl %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop
|
||||
desktop-file-validate \
|
||||
%{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop
|
||||
|
||||
desktop-file-validate \
|
||||
%{buildroot}/%{_datadir}/applications/gala*.desktop
|
||||
@@ -102,7 +98,7 @@ desktop-file-validate \
|
||||
%files -f gala.lang
|
||||
%doc README.md
|
||||
%license COPYING
|
||||
%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
|
||||
%config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
|
||||
|
||||
%{_bindir}/gala
|
||||
%{_bindir}/gala-daemon
|
||||
|
||||
@@ -5,8 +5,8 @@ apps built for elementary.}
|
||||
|
||||
Name: granite-7
|
||||
Summary: Elementary companion library for GTK+ and GLib
|
||||
Version: 7.5.0
|
||||
Release: 1%?dist
|
||||
Version: 7.4.0
|
||||
Release: 1%{?dist}
|
||||
License: LGPL-3.0-or-later
|
||||
|
||||
URL: https://github.com/elementary/granite
|
||||
@@ -82,7 +82,6 @@ desktop-file-validate \
|
||||
|
||||
%{_datadir}/metainfo/granite-7.metainfo.xml
|
||||
%{_datadir}/icons/hicolor/*/apps/io.elementary.granite-7.svg
|
||||
%{_datadir}/themes/Granite/
|
||||
|
||||
|
||||
%files devel
|
||||
|
||||
@@ -9,14 +9,12 @@
|
||||
Name: switchboard-plug-about
|
||||
Summary: Switchboard System Information plug
|
||||
Version: 6.2.0
|
||||
Release: 3%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPL-3.0-or-later
|
||||
|
||||
URL: https://github.com/elementary/switchboard-plug-about
|
||||
Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
|
||||
|
||||
Patch0: https://github.com/elementary/switchboard-plug-about/compare/6.2.0..72d7da13da2824812908276751fd3024db2dd0f8.patch
|
||||
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: meson
|
||||
|
||||
@@ -9,11 +9,10 @@ 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
|
||||
Patch0: https://github.com/elementary/wingpanel/compare/3.0.5..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch
|
||||
Patch0: https://github.com/elementary/wingpanel/commit/d6009d9f0d5c7479172093447ccceccba86ff1f3.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
@@ -23,17 +22,17 @@ BuildRequires: vala >= 0.24.0
|
||||
|
||||
BuildRequires: mesa-libEGL-devel
|
||||
|
||||
BuildRequires: pkgconfig(gala) >= 7.1.3-2
|
||||
BuildRequires: pkgconfig(gala)
|
||||
BuildRequires: pkgconfig(gdk-x11-3.0)
|
||||
BuildRequires: pkgconfig(gee-0.8)
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.32
|
||||
BuildRequires: pkgconfig(granite) >= 5.4.0
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.10
|
||||
BuildRequires: pkgconfig(mutter-clutter-14)
|
||||
BuildRequires: pkgconfig(mutter-cogl-14)
|
||||
BuildRequires: pkgconfig(mutter-cogl-pango-14)
|
||||
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}
|
||||
|
||||
|
||||
+3
-3
@@ -1,13 +1,13 @@
|
||||
# from Fedora upstream
|
||||
%global extension pop-shell
|
||||
%global uuid %{extension}@system76.com
|
||||
%global commit cfa0c55e84b7ce339e5ce83832f76fee17e99d51
|
||||
%global commit 9a30c5bd49c373896410852d6477596ac4c43bd3
|
||||
%global shortcommit %{lua:print(macros.commit:sub(1,7))}
|
||||
%global commit_date 20240404
|
||||
%global commit_date 240218
|
||||
%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,5 +1,5 @@
|
||||
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
|
||||
%global commit 99fa99c6e8af868f64dbfdb973eebeb2ca3ad14a
|
||||
%global commit 11bddd982b3643aacdf052cf339ae1ca1873fbb2
|
||||
%forgemeta
|
||||
|
||||
Name: lomiri-app-launch
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
%define _ubuntu_rel 1ubuntu4
|
||||
%define _ubuntu_rel 1ubuntu3
|
||||
|
||||
Name: unity-session
|
||||
Summary: Lightdm profile for Unity 7
|
||||
|
||||
@@ -1,142 +0,0 @@
|
||||
From 4d44531c8f624f5b479c3ff23e8fecc67eb848ab Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Linton <jeremy.linton@arm.com>
|
||||
Date: Fri, 22 Oct 2021 14:51:54 -0500
|
||||
Subject: [PATCH] Delay for logind, and fallback to seat0
|
||||
|
||||
There is systemd/logind race with when restarting
|
||||
sddm that causes logind1 not to be available. Previously
|
||||
this meant the seat0 was immediately created regardless
|
||||
of the state of CanGraphical.
|
||||
|
||||
Fixing this, though we still want seat0 to be started
|
||||
if none of the seats appear to be graphical. Presumably
|
||||
there are some graphics on the machine, otherwise
|
||||
why run sddm? Wait a bit, and create seat0 anyway. If
|
||||
this fails the output from Xorg should tell us why. This
|
||||
is generally a better strategy than what happens a good
|
||||
amount of time now, where sddm is started and silent about
|
||||
why the screen is blank.
|
||||
|
||||
References:
|
||||
* https://bugzilla.redhat.com/2011991
|
||||
* https://bugzilla.redhat.com/2016310
|
||||
|
||||
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
|
||||
---
|
||||
src/daemon/LogindDBusTypes.cpp | 31 +++++++++++++++++++++----------
|
||||
src/daemon/SeatManager.cpp | 22 ++++++++++++++++++++++
|
||||
src/daemon/SeatManager.h | 1 +
|
||||
3 files changed, 44 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
|
||||
index 011bb7f..6255c69 100644
|
||||
--- a/src/daemon/LogindDBusTypes.cpp
|
||||
+++ b/src/daemon/LogindDBusTypes.cpp
|
||||
@@ -8,6 +8,8 @@
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
+#include <unistd.h>
|
||||
+
|
||||
class LogindPathInternal {
|
||||
public:
|
||||
LogindPathInternal();
|
||||
@@ -46,17 +48,26 @@ LogindPathInternal::LogindPathInternal()
|
||||
qRegisterMetaType<UserInfoList>("UserInfoList");
|
||||
qDBusRegisterMetaType<UserInfoList>();
|
||||
|
||||
- if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
|
||||
- qDebug() << "Logind interface found";
|
||||
- available = true;
|
||||
- serviceName = QStringLiteral("org.freedesktop.login1");
|
||||
- managerPath = QStringLiteral("/org/freedesktop/login1");
|
||||
- managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
|
||||
- seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
|
||||
- sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
|
||||
- userIfaceName = QStringLiteral("org.freedesktop.login1.User");
|
||||
- return;
|
||||
+#ifdef HAVE_SYSTEMD
|
||||
+ // systemd-logind should be running, although because it takes a few moments to restart after
|
||||
+ // systemctl isolate calls, it may not yet be running. Wait a few seconds for it, while blocking everything else.
|
||||
+ int logind_wait_seconds = 50;
|
||||
+ while (logind_wait_seconds--) {
|
||||
+ if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
|
||||
+ qDebug() << "Logind interface found";
|
||||
+ available = true;
|
||||
+ serviceName = QStringLiteral("org.freedesktop.login1");
|
||||
+ managerPath = QStringLiteral("/org/freedesktop/login1");
|
||||
+ managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
|
||||
+ seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
|
||||
+ sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
|
||||
+ userIfaceName = QStringLiteral("org.freedesktop.login1.User");
|
||||
+ return;
|
||||
+ }
|
||||
+ qDebug() << "Sleeping for systemd-logind";
|
||||
+ usleep(100000);
|
||||
}
|
||||
+#endif
|
||||
|
||||
if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
|
||||
qDebug() << "Console kit interface found";
|
||||
diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp
|
||||
index bd207e6..39d8b85 100644
|
||||
--- a/src/daemon/SeatManager.cpp
|
||||
+++ b/src/daemon/SeatManager.cpp
|
||||
@@ -26,6 +26,9 @@
|
||||
#include <QDBusMessage>
|
||||
#include <QDBusPendingReply>
|
||||
#include <QDBusContext>
|
||||
+#include <QDebug>
|
||||
+#include <QFileInfo>
|
||||
+#include <QTimer>
|
||||
|
||||
#include "LogindDBusTypes.h"
|
||||
|
||||
@@ -115,6 +118,8 @@ namespace SDDM {
|
||||
|
||||
QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatNew"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath)));
|
||||
QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath)));
|
||||
+
|
||||
+ QTimer::singleShot(5000, this, &SeatManager::checkSeat);
|
||||
}
|
||||
|
||||
void SeatManager::createSeat(const QString &name) {
|
||||
@@ -152,6 +157,23 @@ namespace SDDM {
|
||||
m_seats.value(name)->createDisplay(Display::defaultDisplayServerType());
|
||||
}
|
||||
|
||||
+ // this is a bit hacky, but linux DRM drivers
|
||||
+ // won't initially be available so there is a race
|
||||
+ // between determing if a efifb/etc graphical object
|
||||
+ // is the only graphics on the machine, or a DRM driver
|
||||
+ // will take over the display. So we will hang out for a few
|
||||
+ // seconds and if none of the seats are declared cangraphical
|
||||
+ // its possible the only graphics on the machine don't have
|
||||
+ // a drm driver.
|
||||
+ void SeatManager::checkSeat(void) {
|
||||
+ if (m_seats.isEmpty()) {
|
||||
+ //if (QFileInfo::exists(QStringLiteral("/dev/fb0"))) {
|
||||
+ qWarning() << "No graphical seats found, attempt to start one on the main console anyway...";
|
||||
+ createSeat(QStringLiteral("seat0"));
|
||||
+ //}
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath)
|
||||
{
|
||||
auto logindSeat = new LogindSeat(name, objectPath);
|
||||
diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h
|
||||
index b2f9796..aa43047 100644
|
||||
--- a/src/daemon/SeatManager.h
|
||||
+++ b/src/daemon/SeatManager.h
|
||||
@@ -49,6 +49,7 @@ namespace SDDM {
|
||||
private:
|
||||
QHash<QString, Seat *> m_seats; //these will exist only for graphical seats
|
||||
QHash<QString, LogindSeat*> m_systemSeats; //these will exist for all seats
|
||||
+ void checkSeat(void);
|
||||
};
|
||||
}
|
||||
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
This scripts dir contains only samples, but are generally not used directly.
|
||||
In practice, sddm runtime uses items under /etc/sddm by default
|
||||
@@ -1,5 +0,0 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "terra-sddm.spec"
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
diff -up sddm-0.18.0/services/sddm.service.in.env sddm-0.18.0/services/sddm.service.in
|
||||
--- sddm-0.18.0/services/sddm.service.in.env 2018-07-18 05:31:40.000000000 -0500
|
||||
+++ sddm-0.18.0/services/sddm.service.in 2019-03-14 08:23:22.095498405 -0500
|
||||
@@ -7,6 +7,7 @@ After=systemd-user-sessions.service gett
|
||||
[Service]
|
||||
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
|
||||
Restart=always
|
||||
+EnvironmentFile=-/etc/sysconfig/sddm
|
||||
|
||||
[Install]
|
||||
Alias=display-manager.service
|
||||
@@ -1,53 +0,0 @@
|
||||
diff --git a/src/common/Configuration.h b/src/common/Configuration.h
|
||||
index 54bcace..9b8fa22 100644
|
||||
--- a/src/common/Configuration.h
|
||||
+++ b/src/common/Configuration.h
|
||||
@@ -37,9 +37,8 @@ namespace SDDM {
|
||||
enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
|
||||
|
||||
// Name Type Default value Description
|
||||
- // TODO: Change default to x11-user in a future release
|
||||
- Entry(DisplayServer, QString, _S("x11"), _S("Which display server should be used.\n"
|
||||
- "Valid values are: x11, x11-user, wayland. Wayland support is experimental"));
|
||||
+ Entry(DisplayServer, QString, _S("wayland"), _S("Which display server should be used.\n"
|
||||
+ "Valid values are: x11, x11-user, wayland."));
|
||||
Entry(HaltCommand, QString, _S(HALT_COMMAND), _S("Halt command"));
|
||||
Entry(RebootCommand, QString, _S(REBOOT_COMMAND), _S("Reboot command"));
|
||||
Entry(Numlock, NumState, NUM_NONE, _S("Initial NumLock state. Can be on, off or none.\n"
|
||||
@@ -51,7 +50,7 @@ namespace SDDM {
|
||||
// Name Entries (but it's a regular class again)
|
||||
Section(Theme,
|
||||
Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path"));
|
||||
- Entry(Current, QString, _S(""), _S("Current theme name"));
|
||||
+ Entry(Current, QString, _S("01-breeze-fedora"), _S("Current theme name"));
|
||||
Entry(FacesDir, QString, _S(DATA_INSTALL_DIR "/faces"), _S("Global directory for user avatars\n"
|
||||
"The files should be named <username>.face.icon"));
|
||||
Entry(CursorTheme, QString, QString(), _S("Cursor theme used in the greeter"));
|
||||
@@ -71,9 +70,9 @@ namespace SDDM {
|
||||
Entry(SessionDir, QStringList, {_S("/usr/local/share/xsessions"),
|
||||
_S("/usr/share/xsessions")}, _S("Comma-separated list of directories containing available X sessions"));
|
||||
Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session"));
|
||||
- Entry(SessionLogFile, QString, _S(".local/share/sddm/xorg-session.log"), _S("Path to the user session log file"));
|
||||
- Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Path to a script to execute when starting the display server"));
|
||||
- Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Path to a script to execute when stopping the display server"));
|
||||
+ Entry(SessionLogFile, QString, _S(".cache/xsession-errors"), _S("Path to the user session log file"));
|
||||
+ Entry(DisplayCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xsetup"), _S("Path to a script to execute when starting the display server"));
|
||||
+ Entry(DisplayStopCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xstop"), _S("Path to a script to execute when stopping the display server"));
|
||||
Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling"));
|
||||
);
|
||||
|
||||
@@ -82,12 +81,12 @@ namespace SDDM {
|
||||
Entry(SessionDir, QStringList, {_S("/usr/local/share/wayland-sessions"),
|
||||
_S("/usr/share/wayland-sessions")}, _S("Comma-separated list of directories containing available Wayland sessions"));
|
||||
Entry(SessionCommand, QString, _S(WAYLAND_SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session"));
|
||||
- Entry(SessionLogFile, QString, _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
|
||||
+ Entry(SessionLogFile, QString, _S(".cache/wayland-errors"), _S("Path to the user session log file"));
|
||||
Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling"));
|
||||
);
|
||||
|
||||
Section(Users,
|
||||
- Entry(DefaultPath, QString, _S("/usr/local/bin:/usr/bin:/bin"), _S("Default $PATH for logged in users"));
|
||||
+ Entry(DefaultPath, QString, _S("/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"), _S("Default $PATH for logged in users"));
|
||||
Entry(MinimumUid, int, UID_MIN, _S("Minimum user id for displayed users"));
|
||||
Entry(MaximumUid, int, UID_MAX, _S("Maximum user id for displayed users"));
|
||||
Entry(HideUsers, QStringList, QStringList(), _S("Comma-separated list of users that should not be listed"));
|
||||
@@ -1,67 +0,0 @@
|
||||
From 52175648f4e1b415f93b24a3ef970983024659f2 Mon Sep 17 00:00:00 2001
|
||||
From: Neal Gompa <neal@gompa.dev>
|
||||
Date: Wed, 28 Feb 2024 16:47:16 -0500
|
||||
Subject: [PATCH] Default to Qt6 and always use versioned greeters
|
||||
|
||||
Distributors can handle creating an unversioned name if necessary.
|
||||
---
|
||||
src/common/ThemeMetadata.cpp | 4 ++--
|
||||
src/daemon/Greeter.cpp | 3 +--
|
||||
src/greeter/CMakeLists.txt | 9 +--------
|
||||
3 files changed, 4 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/src/common/ThemeMetadata.cpp b/src/common/ThemeMetadata.cpp
|
||||
index 2cb3762..003056a 100644
|
||||
--- a/src/common/ThemeMetadata.cpp
|
||||
+++ b/src/common/ThemeMetadata.cpp
|
||||
@@ -28,7 +28,7 @@ namespace SDDM {
|
||||
QString mainScript { QStringLiteral("Main.qml") };
|
||||
QString configFile;
|
||||
QString translationsDirectory { QStringLiteral(".") };
|
||||
- int qtVersion = 5;
|
||||
+ int qtVersion = 6;
|
||||
};
|
||||
|
||||
ThemeMetadata::ThemeMetadata(const QString &path, QObject *parent) : QObject(parent), d(new ThemeMetadataPrivate()) {
|
||||
@@ -61,6 +61,6 @@ namespace SDDM {
|
||||
d->mainScript = settings.value(QStringLiteral("SddmGreeterTheme/MainScript"), QStringLiteral("Main.qml")).toString();
|
||||
d->configFile = settings.value(QStringLiteral("SddmGreeterTheme/ConfigFile"), QStringLiteral("theme.conf")).toString();
|
||||
d->translationsDirectory = settings.value(QStringLiteral("SddmGreeterTheme/TranslationsDirectory"), QStringLiteral(".")).toString();
|
||||
- d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 5).toInt();
|
||||
+ d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 6).toInt();
|
||||
}
|
||||
}
|
||||
diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
|
||||
index 07fccde..5a956b6 100644
|
||||
--- a/src/daemon/Greeter.cpp
|
||||
+++ b/src/daemon/Greeter.cpp
|
||||
@@ -82,8 +82,7 @@ namespace SDDM {
|
||||
|
||||
QString Greeter::greeterPathForQt(int qtVersion)
|
||||
{
|
||||
- const QString suffix = qtVersion == 5 ? QString() : QStringLiteral("-qt%1").arg(qtVersion);
|
||||
- return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter%1").arg(suffix);
|
||||
+ return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter-qt%1").arg(qtVersion);
|
||||
}
|
||||
|
||||
bool Greeter::start() {
|
||||
diff --git a/src/greeter/CMakeLists.txt b/src/greeter/CMakeLists.txt
|
||||
index 72769e4..524368d 100644
|
||||
--- a/src/greeter/CMakeLists.txt
|
||||
+++ b/src/greeter/CMakeLists.txt
|
||||
@@ -1,11 +1,4 @@
|
||||
-if(QT_MAJOR_VERSION EQUAL "5")
|
||||
- # Keep the unversioned name for Qt5. When upgrading SDDM, the old daemon
|
||||
- # might still be running and only know about "sddm-greeter". Keeping the
|
||||
- # previous name around also helps users calling it directly.
|
||||
- set(GREETER_TARGET sddm-greeter)
|
||||
-else()
|
||||
- set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
|
||||
-endif()
|
||||
+set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
|
||||
|
||||
message(STATUS "Building greeter for Qt ${QT_MAJOR_VERSION} as ${GREETER_TARGET}")
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,20 +0,0 @@
|
||||
#%PAM-1.0
|
||||
auth required pam_env.so
|
||||
auth required pam_permit.so
|
||||
auth include postlogin
|
||||
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
|
||||
password include system-auth
|
||||
|
||||
session required pam_selinux.so close
|
||||
session required pam_loginuid.so
|
||||
session required pam_selinux.so open
|
||||
session optional pam_keyinit.so force revoke
|
||||
session required pam_namespace.so
|
||||
session include system-auth
|
||||
-session optional pam_gnome_keyring.so auto_start
|
||||
-session optional pam_kwallet5.so auto_start
|
||||
-session optional pam_kwallet.so auto_start
|
||||
session include postlogin
|
||||
@@ -1,17 +0,0 @@
|
||||
#%PAM-1.0
|
||||
|
||||
# Load environment from /etc/environment and ~/.pam_environment
|
||||
auth required pam_env.so
|
||||
|
||||
# Always let the greeter start without authentication
|
||||
auth required pam_permit.so
|
||||
|
||||
# No action required for account management
|
||||
account required pam_permit.so
|
||||
|
||||
# Can't change password
|
||||
password required pam_deny.so
|
||||
|
||||
# Setup session
|
||||
session required pam_unix.so
|
||||
session optional pam_systemd.so
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/services/sddm-tmpfiles.conf.in b/services/sddm-tmpfiles.conf.in
|
||||
index fb45553..6acfb6c 100644
|
||||
--- a/services/sddm-tmpfiles.conf.in
|
||||
+++ b/services/sddm-tmpfiles.conf.in
|
||||
@@ -1,5 +1,7 @@
|
||||
# Home dir of the sddm user, also contains state.conf
|
||||
d ${STATE_DIR} 0750 sddm sddm
|
||||
+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
|
||||
+Z ${STATE_DIR} - sddm sddm
|
||||
# This contains X11 auth files passed to Xorg and the greeter
|
||||
d ${RUNTIME_DIR} 0711 root root
|
||||
# Sockets for IPC
|
||||
@@ -1,2 +0,0 @@
|
||||
#Type Name ID GECOS Home directory Shell
|
||||
u sddm - "SDDM Greeter Account" /var/lib/sddm -
|
||||
@@ -1,2 +0,0 @@
|
||||
[General]
|
||||
DisplayServer=x11
|
||||
@@ -1,122 +0,0 @@
|
||||
[Autologin]
|
||||
# Whether sddm should automatically log back into sessions when they exit
|
||||
#Relogin=false
|
||||
|
||||
# Name of session file for autologin session
|
||||
#Session=
|
||||
|
||||
# Username for autologin session
|
||||
#User=
|
||||
|
||||
|
||||
[General]
|
||||
# Enable Qt's automatic high-DPI scaling
|
||||
#EnableHiDPI=false
|
||||
|
||||
# Halt command
|
||||
#HaltCommand=/usr/bin/systemctl poweroff
|
||||
|
||||
# Initial NumLock state. Can be on, off or none.
|
||||
# If property is set to none, numlock won't be changed
|
||||
# NOTE: Currently ignored if autologin is enabled.
|
||||
#Numlock=none
|
||||
|
||||
# Reboot command
|
||||
#RebootCommand=/usr/bin/systemctl reboot
|
||||
|
||||
# Control x11/wayland startup
|
||||
# DisplayServer=wayland
|
||||
|
||||
[Theme]
|
||||
# Current theme name
|
||||
#Current=01-breeze-fedora
|
||||
|
||||
# Cursor theme used in the greeter
|
||||
#CursorTheme=
|
||||
|
||||
# Number of users to use as threshold
|
||||
# above which avatars are disabled
|
||||
# unless explicitly enabled with EnableAvatars
|
||||
#DisableAvatarsThreshold=7
|
||||
|
||||
# Enable display of custom user avatars
|
||||
#EnableAvatars=true
|
||||
|
||||
# Global directory for user avatars
|
||||
# The files should be named <username>.face.icon
|
||||
#FacesDir=/usr/share/sddm/faces
|
||||
|
||||
# Theme directory path
|
||||
#ThemeDir=/usr/share/sddm/themes
|
||||
|
||||
|
||||
[Users]
|
||||
# Default $PATH for logged in users
|
||||
#DefaultPath=/usr/local/bin:/usr/bin:/bin
|
||||
|
||||
# Comma-separated list of shells.
|
||||
# Users with these shells as their default won't be listed
|
||||
#HideShells=
|
||||
|
||||
# Comma-separated list of users that should not be listed
|
||||
#HideUsers=
|
||||
|
||||
# Maximum user id for displayed users
|
||||
#MaximumUid=60000
|
||||
|
||||
# Minimum user id for displayed users
|
||||
#MinimumUid=1000
|
||||
|
||||
# Remember the session of the last successfully logged in user
|
||||
#RememberLastSession=true
|
||||
|
||||
# Remember the last successfully logged in user
|
||||
#RememberLastUser=true
|
||||
|
||||
|
||||
[Wayland]
|
||||
# Path to a script to execute when starting the desktop session
|
||||
#SessionCommand=/etc/sddm/wayland-session
|
||||
|
||||
# Directory containing available Wayland sessions
|
||||
#SessionDir=/usr/share/wayland-sessions
|
||||
|
||||
# Path to the user session log file
|
||||
#SessionLogFile=.cache/wayland-errors
|
||||
|
||||
|
||||
[X11]
|
||||
# Path to a script to execute when starting the display server
|
||||
#DisplayCommand=/etc/sddm/Xsetup
|
||||
|
||||
# Path to a script to execute when stopping the display server
|
||||
#DisplayStopCommand=/etc/sddm/Xstop
|
||||
|
||||
# The lowest virtual terminal number that will be used.
|
||||
#MinimumVT=1
|
||||
|
||||
# Arguments passed to the X server invocation
|
||||
#ServerArguments=-nolisten tcp
|
||||
|
||||
# Path to X server binary
|
||||
#ServerPath=/usr/bin/X
|
||||
|
||||
# Path to a script to execute when starting the desktop session
|
||||
#SessionCommand=/etc/X11/xinit/Xsession
|
||||
|
||||
# Directory containing available X sessions
|
||||
#SessionDir=/usr/share/xsessions
|
||||
|
||||
# Path to the user session log file
|
||||
#SessionLogFile=.cache/xsession-errors
|
||||
|
||||
# Path to the Xauthority file
|
||||
#UserAuthFile=.Xauthority
|
||||
|
||||
# Path to xauth binary
|
||||
#XauthPath=/usr/bin/xauth
|
||||
|
||||
# Path to Xephyr binary
|
||||
#XephyrPath=/usr/bin/Xephyr
|
||||
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
|
||||
auth substack password-auth
|
||||
-auth optional pam_gnome_keyring.so
|
||||
-auth optional pam_kwallet5.so
|
||||
-auth optional pam_kwallet.so
|
||||
auth include postlogin
|
||||
|
||||
account required pam_nologin.so
|
||||
account include password-auth
|
||||
|
||||
password include password-auth
|
||||
|
||||
session required pam_selinux.so close
|
||||
session required pam_loginuid.so
|
||||
-session optional pam_ck_connector.so
|
||||
session required pam_selinux.so open
|
||||
session optional pam_keyinit.so force revoke
|
||||
session required pam_namespace.so
|
||||
session include password-auth
|
||||
-session optional pam_gnome_keyring.so auto_start
|
||||
-session optional pam_kwallet5.so auto_start
|
||||
-session optional pam_kwallet.so auto_start
|
||||
session include postlogin
|
||||
@@ -1,5 +0,0 @@
|
||||
# workaround https://bugzilla.redhat.com/1686675
|
||||
# see also https://bugreports.qt.io/browse/QTBUG-58508
|
||||
QML_DISABLE_DISK_CACHE=1
|
||||
# enable qDebug messages for debug build
|
||||
# QT_LOGGING_RULES="*.debug=true"
|
||||
@@ -1,293 +0,0 @@
|
||||
# Disable X11 for RHEL 10+
|
||||
%bcond x11 %[%{undefined rhel} || 0%{?rhel} < 10]
|
||||
|
||||
Name: terra-sddm
|
||||
Version: 0.21.0
|
||||
Release: 5%{?dist}
|
||||
License: GPL-2.0-or-later
|
||||
Summary: QML based desktop and login manager
|
||||
Provides: sddm = %version-%release
|
||||
|
||||
URL: https://github.com/sddm/sddm
|
||||
Source0: %{url}/archive/v%{version}/sddm-%{version}.tar.gz
|
||||
|
||||
## upstream patches
|
||||
# Port all themes to Qt 6
|
||||
# Submitted: https://github.com/sddm/sddm/pull/1876
|
||||
Patch1: sddm-PR1876.patch
|
||||
|
||||
## upstreamable patches
|
||||
# Fix race with logind restart, and start seat0 if !CanGraphical on timer
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2011991
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2016310
|
||||
# Submmited: https://github.com/sddm/sddm/pull/1494
|
||||
Patch11: 0001-Delay-for-logind-and-fallback-to-seat0.patch
|
||||
|
||||
## downstream patches
|
||||
Patch101: sddm-0.20.0-fedora_config.patch
|
||||
|
||||
# sddm.service: +EnvironmentFile=-/etc/sysconfig/sddm
|
||||
Patch103: sddm-0.18.0-environment_file.patch
|
||||
|
||||
# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
|
||||
Patch104: sddm-rpmostree-tmpfiles-hack.patch
|
||||
|
||||
# Workaround lack of Qt 5 greeter build
|
||||
Patch105: sddm-0.21.0-qt6greeter.patch
|
||||
|
||||
# https://github.com/sddm/sddm/pull/1779
|
||||
Patch106: https://github.com/sddm/sddm/pull/1779.patch
|
||||
|
||||
# Shamelessly stolen from gdm
|
||||
Source10: sddm.pam
|
||||
# Shamelessly stolen from gdm
|
||||
Source11: sddm-autologin.pam
|
||||
# Previously included in sddm sources
|
||||
Source12: sddm-greeter.pam
|
||||
# sample sddm.conf generated with sddm --example-config, and entries commented-out
|
||||
Source13: sddm.conf
|
||||
# README.scripts
|
||||
Source14: README.scripts
|
||||
# sysconfig snippet
|
||||
Source15: sddm.sysconfig
|
||||
# sddm x11 override config
|
||||
Source16: sddm-x11.conf
|
||||
# sysusers config file. note these are shipped in the upstream tarball
|
||||
# but we cannot use the files from the tarball for %pre scriptlet
|
||||
# generation, so we duplicate them as source files for that purpose;
|
||||
# this is an ugly hack that should be removed if it becomes possible.
|
||||
# see https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/TFDMAU7KLMSQTKPJELHSM6PFVXIZ56GK/
|
||||
Source17: sddm-systemd-sysusers.conf
|
||||
|
||||
|
||||
Provides: service(graphical-login) = sddm
|
||||
|
||||
BuildRequires: cmake >= 2.8.8
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: pkgconfig(xcb)
|
||||
BuildRequires: pkgconfig(xcb-xkb)
|
||||
# sometimes python-docutils, sometimes python2-docutils, sometimes python3-docutils.
|
||||
# use path then for sanity
|
||||
BuildRequires: /usr/bin/rst2man
|
||||
BuildRequires: cmake(Qt6Core)
|
||||
BuildRequires: cmake(Qt6DBus)
|
||||
BuildRequires: cmake(Qt6Gui)
|
||||
BuildRequires: cmake(Qt6Qml)
|
||||
BuildRequires: cmake(Qt6Quick)
|
||||
BuildRequires: cmake(Qt6LinguistTools)
|
||||
BuildRequires: cmake(Qt6Test)
|
||||
BuildRequires: cmake(Qt6QuickTest)
|
||||
# verify presence to pull defaults from /etc/login.defs
|
||||
BuildRequires: shadow-utils
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-rpm-macros
|
||||
|
||||
Obsoletes: kde-settings-sddm < 20-5
|
||||
|
||||
%if 0%{?fedora}
|
||||
# for /usr/share/backgrounds/default.png
|
||||
BuildRequires: desktop-backgrounds-compat
|
||||
BuildRequires: GraphicsMagick
|
||||
Requires: desktop-backgrounds-compat
|
||||
# for /usr/share/pixmaps/system-logo-white.png
|
||||
Requires: system-logos
|
||||
%endif
|
||||
Requires: systemd
|
||||
%if %{with x11}
|
||||
Requires: xorg-x11-xinit
|
||||
%endif
|
||||
%{?systemd_requires}
|
||||
|
||||
Requires(pre): shadow-utils
|
||||
|
||||
# Virtual dependency for sddm greeter setup
|
||||
Requires: sddm-greeter-displayserver
|
||||
Suggests: sddm-wayland-generic
|
||||
|
||||
%description
|
||||
SDDM is a modern graphical display manager aiming to be fast, simple and
|
||||
beautiful. It uses modern technologies like QtQuick, which in turn gives the
|
||||
designer the ability to create smooth, animated user interfaces.
|
||||
|
||||
%package wayland-generic
|
||||
Summary: Generic Wayland SDDM greeter configuration
|
||||
Provides: sddm-greeter-displayserver
|
||||
Conflicts: sddm-greeter-displayserver
|
||||
Requires: weston
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description wayland-generic
|
||||
This package contains configuration and dependencies for SDDM
|
||||
to use Weston for the greeter display server.
|
||||
|
||||
This is the generic default Wayland configuration provided
|
||||
by SDDM.
|
||||
|
||||
%if %{with x11}
|
||||
%package x11
|
||||
Summary: X11 SDDM greeter configuration
|
||||
Provides: sddm-greeter-displayserver
|
||||
Conflicts: sddm-greeter-displayserver
|
||||
# This will eventually go away...
|
||||
Provides: deprecated()
|
||||
Requires: xorg-x11-server-Xorg
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Recommends: qt6-qtvirtualkeyboard
|
||||
BuildArch: noarch
|
||||
|
||||
%description x11
|
||||
This package contains configuration and dependencies for SDDM
|
||||
to use X11 for the greeter display server.
|
||||
%endif
|
||||
|
||||
%package themes
|
||||
Summary: SDDM Themes
|
||||
# for upgrade path
|
||||
Obsoletes: sddm < 0.2.0-0.12
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
%description themes
|
||||
A collection of sddm themes, including: elarun, maldives, maya
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 %{?commitdate:-n sddm-%{commit}} -n sddm-%version
|
||||
|
||||
%if 0%{?fedora}
|
||||
#FIXME/TODO: use version on filesystem instead of using a bundled copy
|
||||
cp -v /usr/share/backgrounds/default.png \
|
||||
src/greeter/theme/background.png
|
||||
ls -sh src/greeter/theme/background.png
|
||||
gm mogrify -resize 1920x1200 src/greeter/theme/background.png
|
||||
ls -sh src/greeter/theme/background.png
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
-DBUILD_WITH_QT6:BOOL=ON \
|
||||
-DBUILD_MAN_PAGES:BOOL=ON \
|
||||
-DCMAKE_BUILD_TYPE:STRING="Release" \
|
||||
-DENABLE_JOURNALD:BOOL=ON \
|
||||
-DSESSION_COMMAND:PATH=/etc/X11/xinit/Xsession \
|
||||
-DWAYLAND_SESSION_COMMAND:PATH=/etc/sddm/wayland-session
|
||||
|
||||
%cmake_build
|
||||
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/sddm.conf.d
|
||||
mkdir -p %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d
|
||||
install -Dpm 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/sddm
|
||||
install -Dpm 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/sddm-autologin
|
||||
install -Dpm 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pam.d/sddm-greeter
|
||||
install -Dpm 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/sddm.conf
|
||||
install -Dpm 644 %{SOURCE14} %{buildroot}%{_datadir}/sddm/scripts/README.scripts
|
||||
install -Dpm 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/sddm
|
||||
%if %{with x11}
|
||||
install -Dpm 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
|
||||
%endif
|
||||
mkdir -p %{buildroot}/run/sddm
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/sddm
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/sddm/
|
||||
cp -a %{buildroot}%{_datadir}/sddm/scripts/* \
|
||||
%{buildroot}%{_sysconfdir}/sddm/
|
||||
# we're using /etc/X11/xinit/Xsession (by default) instead
|
||||
rm -fv %{buildroot}%{_sysconfdir}/sddm/Xsession
|
||||
|
||||
# De-conflict the dbus file
|
||||
mv %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf \
|
||||
%{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
|
||||
|
||||
%if 0%{?fedora} && 0%{?fedora} < 43
|
||||
# Provide unversioned greeter until F40 is EOL
|
||||
ln -sr %{buildroot}%{_bindir}/sddm-greeter-qt6 %{buildroot}%{_bindir}/sddm-greeter
|
||||
%endif
|
||||
|
||||
|
||||
%pre
|
||||
%sysusers_create_compat %{SOURCE17}
|
||||
|
||||
%post
|
||||
%systemd_post sddm.service
|
||||
# handle incompatible configuration changes
|
||||
(grep \
|
||||
-e '^Current=fedora$' \
|
||||
-e '^\[XDisplay\]$' \
|
||||
-e '^\[WaylandDisplay\]$' \
|
||||
%{_sysconfdir}/sddm.conf > /dev/null && \
|
||||
sed -i.rpmsave \
|
||||
-e 's|^Current=fedora$|#Current=01-breeze-fedora|' \
|
||||
-e 's|^\[XDisplay\]$|\[X11\]|' \
|
||||
-e 's|^\[WaylandDisplay\]$|\[Wayland\]|' \
|
||||
%{_sysconfdir}/sddm.conf
|
||||
) ||:
|
||||
|
||||
|
||||
%preun
|
||||
%systemd_preun sddm.service
|
||||
|
||||
|
||||
%postun
|
||||
%systemd_postun sddm.service
|
||||
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md CONTRIBUTORS
|
||||
%dir %{_sysconfdir}/sddm/
|
||||
%dir %{_sysconfdir}/sddm.conf.d
|
||||
%dir %{_prefix}/lib/sddm/sddm.conf.d
|
||||
%config(noreplace) %{_sysconfdir}/sddm/*
|
||||
%config(noreplace) %{_sysconfdir}/sddm.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/sddm
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/sddm*
|
||||
%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
|
||||
%{_bindir}/sddm
|
||||
%{_bindir}/sddm-greeter*
|
||||
%{_libexecdir}/sddm-helper
|
||||
%{_libexecdir}/sddm-helper-start-wayland
|
||||
%{_libexecdir}/sddm-helper-start-x11user
|
||||
%{_tmpfilesdir}/sddm.conf
|
||||
%{_sysusersdir}/sddm.conf
|
||||
%attr(0711, root, sddm) %dir /run/sddm
|
||||
%attr(1770, sddm, sddm) %dir %{_localstatedir}/lib/sddm
|
||||
%{_unitdir}/sddm.service
|
||||
%{_qt6_archdatadir}/qml/SddmComponents/
|
||||
%dir %{_datadir}/sddm
|
||||
%{_datadir}/sddm/faces/
|
||||
%{_datadir}/sddm/flags/
|
||||
%{_datadir}/sddm/scripts/
|
||||
%dir %{_datadir}/sddm/themes/
|
||||
# %%lang'ify? they're small, probably not worth it -- rex
|
||||
%{_datadir}/sddm/translations*/
|
||||
%{_mandir}/man1/sddm.1*
|
||||
%{_mandir}/man1/sddm-greeter.1*
|
||||
%{_mandir}/man5/sddm.conf.5*
|
||||
%{_mandir}/man5/sddm-state.conf.5*
|
||||
|
||||
|
||||
%files wayland-generic
|
||||
# No files since default configuration
|
||||
|
||||
|
||||
%if %{with x11}
|
||||
%files x11
|
||||
%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
|
||||
%endif
|
||||
|
||||
|
||||
%files themes
|
||||
%{_datadir}/sddm/themes/elarun/
|
||||
%{_datadir}/sddm/themes/maldives/
|
||||
%{_datadir}/sddm/themes/maya/
|
||||
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
@@ -1 +0,0 @@
|
||||
rpm.version(gh("sddm/sddm"));
|
||||
@@ -12,7 +12,7 @@
|
||||
%endif
|
||||
|
||||
Name: codium
|
||||
Version: 1.89.0.24127
|
||||
Version: 1.88.1.24104
|
||||
Release: 1%?dist
|
||||
Summary: Code editing. Redefined.
|
||||
License: MIT
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: flutter
|
||||
Version: 3.19.6
|
||||
Version: 3.19.5
|
||||
Release: 1%?dist
|
||||
Summary: SDK for crafting beautiful, fast user experiences from a single codebase
|
||||
License: BSD-3-Clause
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
# https://github.com/containerd/containerd
|
||||
%global goipath github.com/containerd/containerd
|
||||
Version: 1.7.16
|
||||
Version: 1.7.15
|
||||
|
||||
%gometa
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define debug_package %nil
|
||||
|
||||
Name: moby-buildx
|
||||
Version: 0.14.0
|
||||
Version: 0.13.1
|
||||
Release: 1%?dist
|
||||
Summary: Docker CLI plugin for extended build capabilities with BuildKit
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: moby-compose
|
||||
Version: 2.27.0
|
||||
Version: 2.26.1
|
||||
Release: 1%?dist
|
||||
Summary: Define and run multi-container applications with Docker
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: sarasa-gothic-fonts
|
||||
Version: 1.0.11
|
||||
Version: 1.0.10
|
||||
Release: 1%?dist
|
||||
URL: https://github.com/be5invis/Sarasa-Gothic
|
||||
Source0: %url/releases/download/v%version/Sarasa-TTC-%version.7z
|
||||
|
||||
@@ -1,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
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
%global real_name prismlauncher
|
||||
%global nice_name PrismLauncher
|
||||
|
||||
%global commit bfac12604e9cd0884987ca89f34a455cf16c543c
|
||||
%global commit df0280f52b68f4352d8da711136609c16ce4db7b
|
||||
%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 20240325
|
||||
%global snapshot_info %{commit_date}.%{shortcommit}
|
||||
|
||||
%bcond_without qt6
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
%global real_name prismlauncher
|
||||
%global nice_name PrismLauncher
|
||||
|
||||
%global commit 2012b2c243dcfad8860847c0d85f184b6dd24504
|
||||
%global commit df0280f52b68f4352d8da711136609c16ce4db7b
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
|
||||
%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
|
||||
%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
|
||||
|
||||
%global commit_date 20240329
|
||||
%global commit_date 20240325
|
||||
%global snapshot_info %{commit_date}.%{shortcommit}
|
||||
|
||||
%bcond_with qt6
|
||||
|
||||
@@ -22,8 +22,8 @@ Name: prismlauncher
|
||||
%else
|
||||
Name: prismlauncher-qt5
|
||||
%endif
|
||||
Version: 8.3
|
||||
Release: 1%?dist
|
||||
Version: 8.2
|
||||
Release: 2%?dist
|
||||
Summary: Minecraft launcher with ability to manage multiple instances
|
||||
# see COPYING.md for more information
|
||||
# each file in the source also contains a SPDX-License-Identifier header that declares its license
|
||||
|
||||
@@ -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,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))
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: dart
|
||||
Version: 3.3.4
|
||||
Version: 3.3.3
|
||||
Release: 1%?dist
|
||||
Summary: The Dart Language
|
||||
License: BSD-3-Clause
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
%global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
|
||||
%global commit 185e06c92362083c06c76f87e325889b1c9dc659
|
||||
%global commit 33902d9dbb65fbfdfbd6e3b2a34c6e19eccb762f
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global ver 2.1.1
|
||||
%global commit_date 20240502
|
||||
%global commit_date 20240322
|
||||
%global debug_package %nil
|
||||
|
||||
Name: nim-nightly
|
||||
Name: nim-nighlty
|
||||
Version: %ver^%commit_date.%shortcommit
|
||||
Release: 2%?dist
|
||||
Release: 1%?dist
|
||||
Summary: Imperative, multi-paradigm, compiled programming language
|
||||
License: MIT and BSD
|
||||
URL: https://nim-lang.org
|
||||
@@ -19,9 +19,6 @@ Source4: nimsuggest.1
|
||||
BuildRequires: gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre pcre-devel
|
||||
Requires: redhat-rpm-config gcc
|
||||
Conflicts: choosenim
|
||||
# somehow wrong name and never noticed
|
||||
Provides: nim-nightly = %version-%release
|
||||
Obsoletes: nim-nighlty < 2.1.1^20240404.9e1b170-2
|
||||
|
||||
|
||||
%description
|
||||
@@ -32,9 +29,6 @@ order of priority).
|
||||
|
||||
%package tools
|
||||
Summary: Tools for Nim programming language
|
||||
Provides: nim-nightly-tools = %version-%release
|
||||
Obsoletes: nim-nighlty-tools < 2.1.1^20240404.9e1b170-2
|
||||
|
||||
%description tools
|
||||
Nim is a compiled, garbage-collected systems programming language with a
|
||||
design that focuses on efficiency, expressiveness, and elegance (in that
|
||||
@@ -47,8 +41,6 @@ This package provides various tools, which help Nim programmers.
|
||||
%package doc
|
||||
Summary: Documentation for Nim programming language
|
||||
BuildArch: noarch
|
||||
Provides: nim-nightly-doc = %version-%release
|
||||
Obsoletes: nim-nighlty-doc < 2.1.1^20240404.9e1b170-2
|
||||
%description doc
|
||||
Nim is a compiled, garbage-collected systems programming language with a
|
||||
design that focuses on efficiency, expressiveness, and elegance (in that
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
%global debug_package %{nil}
|
||||
|
||||
Name: nim
|
||||
Version: 2.0.4
|
||||
Release: 1%?dist
|
||||
Version: 2.0.2
|
||||
Release: 3%{?dist}
|
||||
Summary: Imperative, multi-paradigm, compiled programming language
|
||||
License: MIT and BSD
|
||||
URL: https://nim-lang.org
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
%define debug_package %nil
|
||||
|
||||
Name: python3-mpv
|
||||
Version: 1.0.6
|
||||
Release: 1%?dist
|
||||
Version: 1.0.5
|
||||
Release: 1%{?dist}
|
||||
Summary: Python interface to the awesome mpv media player
|
||||
License: GPL-2.0+ OR LGPL-2.1+
|
||||
URL: https://github.com/jaseg/python-mpv
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
project pkg {
|
||||
arches = ["x86_64"]
|
||||
rpm {
|
||||
spec = "python-pip-system-certs.spec"
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
# Created by pyp2rpm-3.3.10
|
||||
%global pypi_name pip-system-certs
|
||||
%global pypi_version 4.0
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: %{pypi_version}
|
||||
Release: 1%{?dist}
|
||||
Summary: Live patches pip to use system certs by default
|
||||
|
||||
License: BSD-2-Clause
|
||||
URL: https://gitlab.com/alelec/pip-system-certs
|
||||
Source0: https://files.pythonhosted.org/packages/source/p/%{pypi_name}/pip_system_certs-%{pypi_version}.tar.gz
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python3-devel python3-pip python3dist(setuptools) python3dist(wheel) git
|
||||
|
||||
|
||||
%description
|
||||
This package patches pip and requests at runtime to use
|
||||
certificates from the default system store (rather than the bundled certs
|
||||
ca). This will allow pip to verify tls/ssl connections to servers who's cert is
|
||||
trusted by your system install.
|
||||
|
||||
%package -n python3-%{pypi_name}
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python3-%{pypi_name}}
|
||||
|
||||
Requires: python3dist(wrapt) >= 1.10.4
|
||||
%description -n python3-%{pypi_name}
|
||||
This package patches pip and requests at runtime to use
|
||||
certificates from the default system store (rather than the bundled certs
|
||||
ca). This will allow pip to verify tls/ssl connections to servers who's cert is
|
||||
trusted by your system install.
|
||||
|
||||
%prep
|
||||
%autosetup -n pip_system_certs-%{pypi_version}
|
||||
# Remove bundled egg-info
|
||||
rm -rf %{pypi_name}.egg-info
|
||||
|
||||
%build
|
||||
pip install git-versioner
|
||||
%pyproject_wheel
|
||||
|
||||
%install
|
||||
%pyproject_install
|
||||
|
||||
%pyproject_save_files pip_system_certs
|
||||
|
||||
%files -n python3-%{pypi_name} -f %pyproject_files
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%python3_sitelib/pip_system_certs.pth
|
||||
|
||||
%changelog
|
||||
* Thu Apr 04 2024 madomado <madonuko@outlook.com> - 4.0-1
|
||||
- Initial package.
|
||||
@@ -1 +0,0 @@
|
||||
rpm.global("pypi_version", pypi("pip-system-certs"));
|
||||
@@ -1,7 +1,7 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: python3-ruff
|
||||
Version: 0.4.3
|
||||
Version: 0.3.7
|
||||
Release: 1%?dist
|
||||
Summary: An extremely fast Python linter, written in Rust
|
||||
License: MIT
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# Generated by rust2rpm 26
|
||||
# Generated by rust2rpm 24
|
||||
%global crate maturin
|
||||
|
||||
Name: rust-terra-maturin
|
||||
Version: 1.5.1
|
||||
Release: %autorelease
|
||||
Release: 1%?dist
|
||||
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,18 +296,6 @@ 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
|
||||
@@ -332,6 +320,18 @@ 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} -p1
|
||||
%autosetup -n %{crate}-%{version_no_tilde} -p1
|
||||
%cargo_prep_online
|
||||
|
||||
%build
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: nushell
|
||||
Version: 0.93.0
|
||||
Version: 0.92.2
|
||||
Release: 1%?dist
|
||||
Summary: A new type of shell
|
||||
License: MIT
|
||||
@@ -19,8 +19,7 @@ Requires: glibc openssl zlib
|
||||
%{cargo_build -f extra,dataframe} --workspace
|
||||
|
||||
%install
|
||||
mkdir -p %buildroot%_bindir
|
||||
cp target/rpm/nu* %buildroot%_bindir/
|
||||
%cargo_install -f extra,dataframe
|
||||
rm -rf .cargo
|
||||
|
||||
%post
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
%global crate oxipng
|
||||
|
||||
Name: rust-oxipng
|
||||
Version: 9.1.1
|
||||
Release: 1%?dist
|
||||
Version: 9.0.0
|
||||
Release: %autorelease
|
||||
Summary: Lossless PNG compression optimizer
|
||||
|
||||
License: MIT
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From b62e3879abe83e0b879421a023d8e944e31f00cb Mon Sep 17 00:00:00 2001
|
||||
From: madomado <madonuko@outlook.com>
|
||||
Date: Mon, 25 Mar 2024 18:33:25 +0800
|
||||
Subject: [PATCH] gix 0.61.1 -> 0.61.0
|
||||
|
||||
---
|
||||
Cargo.toml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index d98ba90..c3059c9 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -82,7 +82,7 @@ version = "1.0.4"
|
||||
version = "0.4.3"
|
||||
|
||||
[dependencies.gix]
|
||||
-version = "0.61.1"
|
||||
+version = "0.61.0"
|
||||
features = [
|
||||
"max-performance-safe",
|
||||
"revision",
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@@ -1,20 +1,21 @@
|
||||
# Generated by rust2rpm 26
|
||||
#bcond_without check
|
||||
%global debug_package %{nil}
|
||||
# Generated by rust2rpm 24
|
||||
%bcond_without check
|
||||
|
||||
%global crate starship
|
||||
|
||||
Name: rust-starship
|
||||
Version: 1.18.2
|
||||
Release: 2%?dist
|
||||
Version: 1.18.1
|
||||
Release: 1%?dist
|
||||
Summary: Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️
|
||||
|
||||
License: ISC
|
||||
URL: https://crates.io/crates/starship
|
||||
Source: %{crates_source}
|
||||
# Automatically generated patch to strip dependencies and normalize metadata
|
||||
Patch0: starship-fix-metadata-auto.diff
|
||||
# Automatically generated patch to strip foreign dependencies
|
||||
Patch: starship-fix-metadata-auto.diff
|
||||
|
||||
BuildRequires: cargo-rpm-macros >= 24
|
||||
BuildRequires: rust-packaging >= 21
|
||||
BuildRequires: anda-srpm-macros
|
||||
BuildRequires: cmake
|
||||
BuildRequires: pkgconfig
|
||||
@@ -28,13 +29,11 @@ shell! ☄🌌️.}
|
||||
|
||||
%package -n %{crate}
|
||||
Summary: %{summary}
|
||||
License: ISC
|
||||
|
||||
%description -n %{crate} %{_description}
|
||||
|
||||
%files -n %{crate}
|
||||
%license LICENSE
|
||||
#license LICENSE.dependencies
|
||||
%doc README.md
|
||||
%{_bindir}/starship
|
||||
|
||||
@@ -171,14 +170,14 @@ use the "starship-battery" feature of the "%{crate}" crate.
|
||||
%ghost %{crate_instdir}/Cargo.toml
|
||||
|
||||
%prep
|
||||
%autosetup -n %{crate}-%{version} -p1
|
||||
%autosetup -n %{crate}-%{version_no_tilde} -p1
|
||||
%cargo_prep_online
|
||||
|
||||
%build
|
||||
%{cargo_build}
|
||||
%cargo_build
|
||||
|
||||
%install
|
||||
%{cargo_install}
|
||||
%cargo_install
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- starship-1.18.1/Cargo.toml 1970-01-01T00:00:01+00:00
|
||||
+++ starship-1.18.1/Cargo.toml 2024-03-24T13:14:24.022475+00:00
|
||||
@@ -263,18 +263,3 @@
|
||||
--- starship-1.14.2/Cargo.toml 1970-01-01T00:00:01+00:00
|
||||
+++ starship-1.14.2/Cargo.toml 2023-04-25T12:48:23.509565+00:00
|
||||
@@ -254,18 +254,3 @@
|
||||
]
|
||||
default-features = false
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
-version = "0.2.0"
|
||||
-
|
||||
-[target."cfg(windows)".dependencies.windows]
|
||||
-version = "0.54.0"
|
||||
-version = "0.48.0"
|
||||
-features = [
|
||||
- "Win32_Foundation",
|
||||
- "Win32_UI_Shell",
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
%global crate zellij
|
||||
|
||||
Name: rust-zellij
|
||||
Version: 0.40.1
|
||||
Release: 1%?dist
|
||||
Version: 0.39.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Terminal workspace with batteries included
|
||||
|
||||
License: MIT
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
%global real_name vala-language-server
|
||||
|
||||
%global commit a49292758922160244d1842cdcba0a5154d1cb27
|
||||
%global commit 0b020298aa3dafacd2f6633533ca91fba5698340
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
|
||||
%global commit_date 20240330
|
||||
%global commit_date 20240323
|
||||
%global snapshot_info %{commit_date}.%{shortcommit}
|
||||
%global verrel 0.48.7
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
%global priority 90
|
||||
|
||||
%global real_name vala
|
||||
%global commit fa704b2c2385f35d12568ee31de33568d6d67749
|
||||
%global commit 933eb2d0e41bb7fdc4fe5fc01a03254965990f3e
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global repo https://gitlab.gnome.org/GNOME/%{real_name}.git
|
||||
|
||||
%global commit_date 20240426
|
||||
%global commit_date 20240218
|
||||
%global snapshot_info %{commit_date}.%{shortcommit}
|
||||
|
||||
Name: vala-nightly
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
%global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu
|
||||
%global commit bada552e3eb595d7205d3ec69ea2e0162b9cca12
|
||||
%global commit 2112c4e36243f2f625d7adb24ba1dfc029285c3f
|
||||
%forgemeta
|
||||
|
||||
Name: vala-panel-appmenu
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
rpm.version(gitlab("6865057"));
|
||||
@@ -1,9 +1,10 @@
|
||||
Name: vala-panel
|
||||
Version: 24.03
|
||||
%global forgeurl https://gitlab.com/vala-panel-project/vala-panel
|
||||
%global commit ead4e7a36b0e4b0a2ac43c5d9ca17eb753461afe
|
||||
%forgemeta
|
||||
|
||||
Release: 1%?dist
|
||||
Name: vala-panel
|
||||
Version: 0.5.0
|
||||
Release: 2%?dist
|
||||
License: LGPL-3.0-or-later
|
||||
Summary: This package provides Application Menu plugin for vala-panel
|
||||
Group: System/GUI/Other
|
||||
@@ -37,7 +38,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%forgeautosetup
|
||||
|
||||
%build
|
||||
%meson -Dwnck=enabled -Dplatforms='wayland,x11'
|
||||
%meson -Dwnck=enabled -Dplatforms='layer-shell,x11'
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
@@ -72,7 +73,6 @@ 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-*.typelib
|
||||
|
||||
%files devel
|
||||
%doc README.md
|
||||
@@ -82,7 +82,6 @@ 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-*.gir
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
|
||||
@@ -4,15 +4,14 @@
|
||||
|
||||
Name: apparmor
|
||||
Version: 4.0.0~alpha3
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?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}/%normver/+download/%{name}-%{version}.tar.gz
|
||||
Source0: %{url}/%{baseversion}/%(echo %version | sed 's/~/-/')/+download/%{name}-%{version}.tar.gz
|
||||
Source1: apparmor.preset
|
||||
Patch01: 0001-fix-avahi-daemon-authselect-denial-in-fedora.patch
|
||||
|
||||
@@ -139,8 +138,6 @@ 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}
|
||||
@@ -152,7 +149,7 @@ pushd libraries/libapparmor
|
||||
%configure \
|
||||
--with-python \
|
||||
|
||||
%make_build VERSION=%normver
|
||||
%make_build
|
||||
popd
|
||||
|
||||
%make_build -C binutils
|
||||
|
||||
@@ -7,7 +7,7 @@ Name: libappimage
|
||||
|
||||
|
||||
Version: %{libver_format}
|
||||
Release: 3%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Implements functionality for dealing with AppImage files
|
||||
|
||||
License: MIT
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
Name: libappimageupdate
|
||||
|
||||
Version: %{libver_format}
|
||||
Release: 3%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: AppImageUpdate lets you update AppImages in a decentral way using information embedded in the AppImage itself.
|
||||
|
||||
License: MIT
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
%global commit 77b34797d89d23ccfab3f3e1eab532f0bc73ab38
|
||||
%global ver 1.8.28
|
||||
%global commit 586bc784138042d2710168cd0b29f5dd6d415f45
|
||||
%global ver 1.8.26
|
||||
%global commit_date 20240219
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
rpm.global("ver", gh("AppImageCommunity/zsync2"));
|
||||
if rpm.changed() {
|
||||
rpm.global("git_commit", gh_commit("AppImageCommunity/zsync2"));
|
||||
}
|
||||
@@ -1,9 +1,8 @@
|
||||
%global git_commit 87fb5a0f3c14d3cf35aa6547cc60d099c89ca532
|
||||
%global git_commit 1608115705047d6826bcd7b35a6988deaf3dbfec
|
||||
|
||||
%global commit_short %(c=%{git_commit}; echo ${c:0:7})
|
||||
|
||||
%global ver 2.0.0-alpha-1-20230304
|
||||
%global libver %ver.git%{commit_short}
|
||||
%global libver 2.0.0-alpha-1-20220304.git%{commit_short}
|
||||
|
||||
# replace - with ~
|
||||
%global libver_format %(v=%{libver}; sed 's/-/~/g' <<< $v)
|
||||
@@ -18,6 +17,7 @@ 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,7 +47,6 @@ 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
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From db29e1ce9f1a2b6b2ac3ef9df8b8b8524ab895f9 Mon Sep 17 00:00:00 2001
|
||||
From: madomado <madonuko@outlook.com>
|
||||
Date: Mon, 29 Apr 2024 21:29:01 +0800
|
||||
Subject: [PATCH] fix: support esbuild
|
||||
|
||||
---
|
||||
src/process/index.js | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/process/index.js b/src/process/index.js
|
||||
index 97ea651..f5486ca 100644
|
||||
--- a/src/process/index.js
|
||||
+++ b/src/process/index.js
|
||||
@@ -1,13 +1,7 @@
|
||||
const rgb = (r, g, b, msg) => `\x1b[38;2;${r};${g};${b}m${msg}\x1b[0m`;
|
||||
const log = (...args) => console.log(`[${rgb(88, 101, 242, 'arRPC')} > ${rgb(237, 66, 69, 'process')}]`, ...args);
|
||||
|
||||
-import fs from 'node:fs';
|
||||
-import { dirname, join } from 'path';
|
||||
-import { fileURLToPath } from 'url';
|
||||
-
|
||||
-const __dirname = dirname(fileURLToPath(import.meta.url));
|
||||
-const DetectableDB = JSON.parse(fs.readFileSync(join(__dirname, 'detectable.json'), 'utf8'));
|
||||
-
|
||||
+import DetectableDB from './detectable.json' with { type: "json" };
|
||||
import * as Natives from './native/index.js';
|
||||
const Native = Natives[process.platform];
|
||||
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
%define debug_package %nil
|
||||
%define __strip /bin/true
|
||||
%global commit cca93db585dedf8acc1423f5e2db215de95c4c3b
|
||||
%global commit c6e23e7eb733ad396d3eebc328404cc656fed581
|
||||
|
||||
Name: arrpc
|
||||
Version: 3.4.0
|
||||
Release: 2%?dist
|
||||
Version: 3.3.1
|
||||
Release: 1%?dist
|
||||
Summary: Open Discord RPC server for atypical setups
|
||||
License: MIT
|
||||
URL: https://arrpc.openasar.dev
|
||||
Source0: https://github.com/OpenAsar/arrpc/archive/%commit.tar.gz
|
||||
Source1: arrpc.service
|
||||
Patch0: 0001-fix-support-esbuild.patch
|
||||
Requires: glibc
|
||||
BuildRequires: nodejs-npm systemd-rpm-macros
|
||||
|
||||
@@ -22,15 +20,15 @@ server which messages the JSON of exactly what to dispatch with in the client wi
|
||||
allowing small and simple mods or plugins. arRPC is experimental and a work in progress, so expect bugs, etc.
|
||||
|
||||
%prep
|
||||
%autosetup -n arrpc-%commit -p1
|
||||
%autosetup -n arrpc-%commit
|
||||
# patch for using esbuild
|
||||
sed -i -E 's@const server[^\n]+;@async function main() {\0@' src/index.js
|
||||
sed -i -E 's@server\.on[^\n]+;@\0}\nmain();@' src/index.js
|
||||
|
||||
%build
|
||||
npm i esbuild @yao-pkg/pkg
|
||||
npx esbuild --bundle --platform=node --target=node20 --outdir=dist ./src/index.js
|
||||
npx pkg -t node20-linux-x64 -o arrpc ./dist/index.js
|
||||
npm i esbuild pkg
|
||||
npx esbuild --bundle --platform=node --target=node18 --outdir=dist ./src/index.js
|
||||
npx pkg -t node18-linux-x64 -o arrpc ./dist/index.js
|
||||
|
||||
%install
|
||||
install -D -m755 arrpc %buildroot%_bindir/arrpc
|
||||
|
||||
@@ -11,6 +11,7 @@ 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
|
||||
@@ -62,7 +63,6 @@ Provides HTML and Manpage (documentation) for Click.
|
||||
NOCONFIGURE=1 \
|
||||
./autogen.sh
|
||||
|
||||
export CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
|
||||
%configure
|
||||
%make_build
|
||||
|
||||
|
||||
+4
-4
@@ -3,18 +3,18 @@
|
||||
Name: kwin-system76-scheduler-integration
|
||||
|
||||
%global forgeurl https://github.com/maxiberta/%{name}
|
||||
%global commit e00f1b74998d6513552633c791ea23ffa3fe78a0
|
||||
%global date 20240425
|
||||
%global commit 093a269670275feaa240d02c712f1ec8b812fd80
|
||||
%global date 20240320
|
||||
%forgemeta
|
||||
|
||||
Version: 0.1
|
||||
Release: 1%?dist
|
||||
Release: 5%?dist
|
||||
Summary: Notify the System76 Scheduler which app has focus so it can be prioritized
|
||||
License: MIT
|
||||
URL: %forgeurl
|
||||
Source0: %forgesource
|
||||
Source1: com.system76.Scheduler.dbusproxy.service
|
||||
Requires: bash dbus-tools system76-scheduler kde-cli-tools systemd kf6-kconfig
|
||||
Requires: bash dbus-tools system76-scheduler kde-cli-tools systemd kf6-kconfig-core
|
||||
BuildRequires: systemd-rpm-macros
|
||||
|
||||
%description
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
DBUS_SERVICE="com.system76.Scheduler"
|
||||
DBUS_PATH="/com/system76/Scheduler"
|
||||
DBUS_INTERFACE="com.system76.Scheduler"
|
||||
DBUS_METHOD="SetForegroundProcess"
|
||||
|
||||
while true; do
|
||||
read method call time sender _ dest serial path interface member
|
||||
read type pid
|
||||
[ "$member" = "member=$DBUS_METHOD" ] && qdbus --system $DBUS_SERVICE $DBUS_PATH $DBUS_INTERFACE.$DBUS_METHOD $pid
|
||||
done < <(dbus-monitor "destination=$DBUS_SERVICE,path=$DBUS_PATH,interface=$DBUS_INTERFACE,member=$DBUS_METHOD")
|
||||
@@ -1,4 +1,4 @@
|
||||
rpm.global("commit", gh_commit("maxiberta/kwin-system76-scheduler-integration"));
|
||||
rpm.global("commit", gh("maxiberta/kwin-system76-scheduler-integration"));
|
||||
if rpm.changed() {
|
||||
rpm.global("date", date()); // remove if we don't need the `date` macro
|
||||
rpm.release();
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "openbangla-keyboard-nightly.spec"
|
||||
}
|
||||
labels { nightly = "1" }
|
||||
}
|
||||
@@ -1,84 +0,0 @@
|
||||
%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
|
||||
@@ -1,8 +0,0 @@
|
||||
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.77.0
|
||||
Version: 1.75.0
|
||||
Release: 1%?dist
|
||||
Summary: The reference implementation of Sass, written in Dart
|
||||
License: MIT
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "gsctool.spec"
|
||||
spec = "sunshine.spec"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
|
||||
%global forgeurl https://github.com/LizardByte/Sunshine
|
||||
Name: sunshine
|
||||
Version: 0.23.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Self-hosted game stream host for Moonlight.
|
||||
|
||||
License: GPL-3.0-or-later
|
||||
URL: http://app.lizardbyte.dev/Sunshine
|
||||
Source0: %{forgeurl}/archive/refs/tags/v%{version}.tar.gz
|
||||
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: make
|
||||
%ifarch x86_64
|
||||
BuildRequires: intel-mediasdk-devel
|
||||
%endif
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: libdrm-devel
|
||||
BuildRequires: libevdev-devel
|
||||
BuildRequires: libnotify-devel
|
||||
BuildRequires: libva-devel
|
||||
BuildRequires: libvdpau-devel
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libxcb-devel
|
||||
BuildRequires: libXcursor-devel
|
||||
BuildRequires: libXfixes-devel
|
||||
BuildRequires: libXi-devel
|
||||
BuildRequires: libXinerama-devel
|
||||
BuildRequires: libXrandr-devel
|
||||
BuildRequires: libXtst-devel
|
||||
BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: miniupnpc-devel
|
||||
BuildRequires: npm
|
||||
BuildRequires: numactl-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: opus-devel
|
||||
BuildRequires: pulseaudio-libs-devel
|
||||
BuildRequires: wayland-devel
|
||||
|
||||
# TODO: Add CUDA support before merging PR
|
||||
# blocker: nvidia-driver
|
||||
|
||||
%description
|
||||
Sunshine is a self-hosted game stream host for Moonlight.
|
||||
Offering low latency, cloud gaming server capabilities with support for AMD, Intel, and Nvidia GPUs for hardware encoding.
|
||||
Software encoding is also available.
|
||||
You can connect to Sunshine from any Moonlight client on a variety of devices.
|
||||
A web UI is provided to allow configuration, and client pairing, from your favorite web browser.
|
||||
Pair from the local server or any mobile device.
|
||||
|
||||
%prep
|
||||
%autosetup -n Sunshine-%{version}
|
||||
|
||||
|
||||
%build
|
||||
%cmake .
|
||||
|
||||
%cmake_build
|
||||
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
|
||||
%files
|
||||
%license add-license-file-here
|
||||
%doc add-docs-here
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Apr 15 2024 Cappy Ishihara <cappy@cappuchino.xyz>
|
||||
- Initial re-packaging for Terra
|
||||
@@ -0,0 +1 @@
|
||||
rpm.version(gh("LizardByte/Sunshine"));
|
||||
@@ -1,6 +1,6 @@
|
||||
Name: uxplay
|
||||
Version: 1.68.3
|
||||
Release: 1%?dist
|
||||
Version: 1.68.2
|
||||
Release: 1%{?dist}
|
||||
Summary: AirPlay Unix mirroring server
|
||||
License: GPL-3.0
|
||||
URL: https://github.com/FDH2/UxPlay
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "cros-keyboard-map.spec"
|
||||
}
|
||||
labels {
|
||||
nightly = "1"
|
||||
}
|
||||
}
|
||||
@@ -1,89 +0,0 @@
|
||||
%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.
|
||||
@@ -1,7 +0,0 @@
|
||||
if filters.contains("nightly") {
|
||||
rpm.global("commit", gh_commit("WeirdTreeThing/cros-keyboard-map"));
|
||||
if rpm.changed() {
|
||||
rpm.release();
|
||||
rpm.global("commit_date", date());
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: limine
|
||||
Version: 7.5.0
|
||||
Version: 7.3.1
|
||||
Release: 1%?dist
|
||||
Summary: Modern, advanced, portable, multiprotocol bootloader
|
||||
License: BSD-2-Clause
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%global coreutils_ver 9.3
|
||||
|
||||
Name: uutils-coreutils
|
||||
Version: 0.0.26
|
||||
Version: 0.0.25
|
||||
Release: 1%?dist
|
||||
Summary: Cross-platform Rust rewrite of the GNU coreutils
|
||||
License: MIT
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
config_opts['releasever'] = 'rawhide'
|
||||
config_opts['target_arch'] = 'aarch64'
|
||||
config_opts['legal_host_arches'] = ('aarch64',)
|
||||
|
||||
include('templates/terra.tpl')
|
||||
@@ -1,5 +0,0 @@
|
||||
config_opts['releasever'] = 'rawhide'
|
||||
config_opts['target_arch'] = 'x86_64'
|
||||
config_opts['legal_host_arches'] = ('x86_64',)
|
||||
|
||||
include('templates/terra.tpl')
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: anda-srpm-macros
|
||||
Version: 0.1.6
|
||||
Version: 0.1.5
|
||||
Release: 1%{?dist}
|
||||
Summary: SRPM macros for extra Fedora packages
|
||||
|
||||
@@ -9,7 +9,6 @@ Source0: macros.cargo_extra
|
||||
Source1: macros.caching
|
||||
Source2: macros.anda
|
||||
Source3: macros.go_extra
|
||||
Source4: macros.nim_extra
|
||||
|
||||
Recommends: rust-packaging
|
||||
Requires: git-core
|
||||
@@ -29,20 +28,15 @@ install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE0}
|
||||
install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE1}
|
||||
install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE2}
|
||||
install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE3}
|
||||
install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE4}
|
||||
|
||||
%files
|
||||
%{_rpmmacrodir}/macros.cargo_extra
|
||||
%{_rpmmacrodir}/macros.caching
|
||||
%{_rpmmacrodir}/macros.anda
|
||||
%{_rpmmacrodir}/macros.go_extra
|
||||
%{_rpmmacrodir}/macros.nim_extra
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Mar 13 2024 madonuko <mado@fyralabs.com> - 0.1.6-1
|
||||
- Add nim_c, nim_tflags and nim_lflags
|
||||
|
||||
* Thu Aug 3 2023 madonuko <mado@fyralabs.com> - 0.1.4-1
|
||||
- Add go_build_online and go_prep_online
|
||||
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
%nim_tflags %(echo "%?build_cflags -fPIE" | sed "s/-O2/-Ofast/g" | sed "s/-Wall//g")
|
||||
|
||||
%nim_lflags %?build_ldflags -pie
|
||||
|
||||
%nim_c -d:release -t:"%nim_tflags" -l:"%nim_lflags"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user