a

Signed-off-by: madomado <madonuko@outlook.com>
bdep cmake(KF6IconThemes)
2026-06-27 13:58:27 +00:00 · 2026-06-27 19:46:42 +08:00 · 2026-06-27 18:53:21 +08:00 · 2026-06-27 18:20:37 +08:00
8 changed files with 31 additions and 35 deletions
@@ -25,6 +25,7 @@ BuildRequires:  kf6-kwindowsystem-devel
 BuildRequires:  qt6-qtbase-devel
 BuildRequires:  qt6-qtdeclarative-devel
 BuildRequires:  qt6-qtsvg-devel
+BuildRequires:  cmake(KF6IconThemes)

 Requires:       tailscale
 Requires:       kf5-qqc2-desktop-style
@@ -42,8 +43,6 @@ Packager:       Owen Zimmerman <owen@fyralabs.com>

 %prep
 %autosetup -n KTailctl-%{version}
-cd src/wrapper
-go mod vendor

 %conf
 %cmake
@@ -58,12 +57,12 @@ go mod vendor
 %doc README.md
 %license LICENSE.txt
 %{_bindir}/ktailctl
-%{_libdir}/qt6/qml/org/fkoehler/KTailctl/Components/*.qml
-%{_libdir}/qt6/qml/org/fkoehler/KTailctl/Components/*.version
-%{_libdir}/qt6/qml/org/fkoehler/KTailctl/Components/*.qmltypes
-%{_libdir}/qt6/qml/org/fkoehler/KTailctl/Components/qmldir
+%dnl %{_libdir}/qt6/qml/org/fkoehler/KTailctl/Components/*.qml
+%dnl %{_libdir}/qt6/qml/org/fkoehler/KTailctl/Components/*.version
+%dnl %{_libdir}/qt6/qml/org/fkoehler/KTailctl/Components/*.qmltypes
+%dnl %{_libdir}/qt6/qml/org/fkoehler/KTailctl/Components/qmldir
 # Exclusive libs that the package needs to run
-%{_libdir}/qt6/qml/org/fkoehler/KTailctl/Components/libktailctl_components.so
+%dnl %{_libdir}/qt6/qml/org/fkoehler/KTailctl/Components/libktailctl_components.so
 %{_libdir}/libktailctl_wrapper_logging.so
 %{_appsdir}/org.fkoehler.KTailctl.desktop
 %{_scalableiconsdir}/org.fkoehler.KTailctl.svg
@@ -52,7 +52,7 @@
 %global fontdescription   %{expand:
 Versatile typeface for code, from code.}

-Version:		34.7.0
+Version:		34.6.3
 Release:		1%{?dist}
 Packager:       Cappy Ishihara <cappy@fyralabs.com>
 Summary:		Versatile typeface for code, from code.
@@ -1,7 +1,7 @@
 # Disabled because compiled without debug

 %global goipath         github.com/XTLS/Xray-core
-Version:                26.6.27
+Version:                26.6.22

 %global golicenses      LICENSE
 %global godocs          README.md SECURITY.md CODE_OF_CONDUCT.md
@@ -1,6 +1,6 @@
-%global commit da247eb378287b435fa2963bfaee634bda96caac
+%global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20260627
+%global commitdate 20240109
 %global ver 1.0
 %global modulename xpad-noone
 %global debug_package %{nil}
@@ -10,11 +10,14 @@ This is the original upstream xpad driver from the Linux kernel with support for

 Name:          %{modulename}-kmod
 Version:       %{ver}^%{commitdate}git.%{shortcommit}
-Release:       7%{?dist}
+Release:       6%{?dist}
 License:       GPL-2.0-or-later
 Summary:       xpad driver with support for XBox One controllers removed
-URL:           https://github.com/Jan200101/xpad-noone
+URL:           https://github.com/medusalix/xpad-noone
 Source0:       %{url}/archive/%{commit}/%{modulename}-%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz
+# Fix kmod compilation on kernel 6.18+
+Patch0:        https://github.com/medusalix/xpad-noone/pull/8.patch
+Patch1:        https://github.com/medusalix/xpad-noone/pull/9.patch
 BuildRequires: gcc
 BuildRequires: kmodtool
 BuildRequires: make
@@ -34,7 +37,7 @@ Packager:      Gilver E. <roachy@fyralabs.com>

 kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null

-%autosetup -c %{modulename}-%{commit}
+%autosetup -n %{modulename}-%{commit} -p1

 for kernel_version  in %{?kernel_versions} ; do
  cp -a %{modulename}-%{commit} _kmod_build_${kernel_version%%___*}
@@ -54,8 +57,5 @@ done
 %{?akmod_install}

 %changelog
-* Sat Jun 27 2026 Jan200101 <sentrycraft123@gmail.com> - 1.0^20260627git.da247eb-7
- Update package to use updated fork
-
 * Fri Mar 07 2025 Gilver E. <rockgrub@disroot.org>
 - Initial package
@@ -1,6 +1,6 @@
-%global commit da247eb378287b435fa2963bfaee634bda96caac
+%global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20260627
+%global commitdate 20240109
 %global ver 1.0
 %global modulename xpad-noone
 %global _description %{expand:
@@ -8,12 +8,15 @@ This is the original upstream xpad driver from the Linux kernel with support for

 Name:          dkms-%{modulename}
 Version:       %{ver}^%{commitdate}git.%{shortcommit}
-Release:       5%{?dist}
+Release:       4%{?dist}
 License:       GPL-2.0-or-later
 Summary:       xpad driver with support for XBox One controllers removed
-URL:           https://github.com/Jan200101/xpad-noone
+URL:           https://github.com/medusalix/xpad-noone
 Source0:       %{url}/archive/%{commit}/%{modulename}-%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz
 Source1:       no-weak-modules.conf
+# Fix kmod compilation on kernel 6.18+
+Patch0:        https://github.com/medusalix/xpad-noone/pull/8.patch
+Patch1:        https://github.com/medusalix/xpad-noone/pull/9.patch
 Requires:      %{modulename} = %{?epoch:%{epoch}:}%{version}
 Requires:      dkms
 Conflicts:     akmod-%{modulename}
@@ -23,7 +26,7 @@ Packager:      Gilver E. <roachy@fyralabs.com>
 %description %_description

 %prep
-%autosetup -n %{modulename}-%{commit}
+%autosetup -n %{modulename}-%{commit} -p1

 %build

@@ -51,8 +54,5 @@ dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || :
 %endif

 %changelog
-* Sat Jun 27 2026 Jan200101 <sentrycraft123@gmail.com> - 1.0^20260627git.da247eb-5
- Update package to use updated fork
-
 * Fri Mar 07 2025 Gilver E. <rockgrub@disroot.org>
 - Initial package
@@ -1,8 +1,8 @@
-rpm.global("commit", gh_commit("Jan200101/xpad-noone"));
+rpm.global("commit", gh_commit("medusalix/xpad-noone"));
 if rpm.changed() {
    rpm.release();
    rpm.global("commitdate", date());
-    let html = get(`https://raw.githubusercontent.com/Jan200101/xpad-noone/refs/heads/master/dkms.conf`);
+    let html = get(`https://raw.githubusercontent.com/medusalix/xpad-noone/refs/heads/master/dkms.conf`);
    let v = find("PACKAGE_VERSION=\"([\\d.]+)\"", html, 1);
    rpm.global("ver", v);
 }
@@ -1,16 +1,16 @@
-%global commit da247eb378287b435fa2963bfaee634bda96caac
+%global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20260627
+%global commitdate 20240109
 %global ver 1.0
 %global _description %{expand:
 This is the original upstream xpad driver from the Linux kernel with support for XBox One controllers removed. If you are running the xone driver you may have to replace the xpad kernel module with this one to retain the functionality of XBox and XBox 360 controllers.}

 Name:          xpad-noone
 Version:       %{ver}^%{commitdate}git.%{shortcommit}
-Release:       4%{?dist}
+Release:       3%{?dist}
 License:       GPL-2.0-or-later
 Summary:       xpad driver with support for XBox One controllers removed
-URL:           https://github.com/Jan200101/xpad-noone
+URL:           https://github.com/medusalix/xpad-noone
 Source0:       %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz
 BuildRequires: sed
 BuildRequires: systemd-rpm-macros
@@ -48,8 +48,5 @@ install -Dm644 %{name}.conf -t %{buildroot}%{_modulesloaddir}
 %{_modulesloaddir}/%{name}.conf

 %changelog
-* Sat Jun 27 2026 Jan200101 <sentrycraft123@gmail.com> - 1.0^20260627git.da247eb-4
- Update package to use updated fork
-
 * Fri Mar 07 2025 Gilver E. <rockgrub@disroot.org>
 - Initial package
@@ -1,5 +1,5 @@
 Name:           anda-srpm-macros
-Version:        0.3.12
+Version:        0.3.11
 Release:        1%{?dist}
 Summary:        SRPM macros for extra Fedora packages
Author	SHA1	Message	Date
madomado	3568ec1c1e	a Signed-off-by: madomado <madonuko@outlook.com>	2026-06-27 19:46:42 +08:00
madonuko	c0bfdab39a	bdep cmake(KF6IconThemes)	2026-06-27 18:53:21 +08:00
madomado	990c168d28	fix(KTailctl): no more wrappers Signed-off-by: madomado <madonuko@outlook.com>	2026-06-27 18:20:37 +08:00