Fix spec files for RHEL 10 compatibility and SonicDE source changes
- sonic-win: Add sonic-win binary and systemd service to %files - sonic-drawing-tablet: Stub WACOM_PROP_* constants (xorg-wacom not on RHEL 10) - sonic-workspace: Remove Fedora look-and-feel setup, fix libklookandfeel version, add unpackaged files (kconf_update, plasma-startup-sound, plasmanotify.portal) - sonic-desktop-interface: Remove non-applicable SDDM patch, fix find_lang names, remove non-existent files from %files, add unpackaged keyboardlayout/kconf_update - sonic-login-manager: Rename plasmalogin -> soniclogin throughout spec, patch CMakeLists.txt to use Xwayland instead of Xorg, update %files for new paths - sonic-workspace-addons: Add missing dbus service file - sonic-dr-robotnik: Add unpackaged systemd files and binaries - sonic-system-info: Remove missing desktop file - sonic-breeze: Add unpackaged kcursorgen, cmake, desktoptheme files - sonic-sysguard-library: Fix tarball directory name, add ksysguard-identify - sonic-ecco: Disable tests (xorg-x11-server-Xvfb not on RHEL 10) - sonic-network-manager: Accept older Qt6Keychain version - sonic-partition-manager: Accept older KPMcore version - Various other find_lang and %files fixes All 136 packages now build successfully on RHEL 10.
This commit is contained in:
parent
34e4d76ca7
commit
ad442ae622
18 changed files with 126 additions and 197 deletions
|
|
@ -54,7 +54,6 @@ BuildRequires: qt6-qtdeclarative-devel
|
|||
BuildRequires: pkgconfig(libwacom)
|
||||
BuildRequires: pkgconfig(xcb-xinput)
|
||||
BuildRequires: pkgconfig(xi)
|
||||
BuildRequires: pkgconfig(xorg-wacom)
|
||||
BuildRequires: pkgconfig(xrandr)
|
||||
|
||||
ExcludeArch: s390 s390x
|
||||
|
|
@ -72,6 +71,10 @@ with profile support to handle different button/pen layouts per profile.
|
|||
|
||||
%prep
|
||||
%autosetup -n %{reponame}-%{version}
|
||||
sed -i '/pkg_check_modules(XORGWACOM/d' CMakeLists.txt
|
||||
sed -i 's/XORGWACOM_LIBRARIES//g' CMakeLists.txt
|
||||
sed -i 's|#include <xorg/wacom-properties.h>|#define WACOM_PROP_SERIALIDS "Wacom Serial IDs"\n#define WACOM_PROP_TABLET_AREA "Wacom Tablet Area"\n#define WACOM_PROP_TOOL_TYPE "Wacom Tool Type"\n#define WACOM_PROP_PRESSURE_THRESHOLD "Wacom Pressure Threshold"\n#define WACOM_PROP_SAMPLEGROUP "Wacom Sample and Group"\n#define WACOM_PROP_PRESSURECURVE "Wacom Pressure Curve"\n#define WACOM_PROP_BUTTONMODES "Wacom Button Modes"\n#define WACOM_PROP_BUTTONACTIONS "Wacom Button Actions"\n#define WACOM_PROP_WHEELBUTTONS "Wacom Wheel Buttons"\n#define WACOM_PROP_STRIPBUTTONS "Wacom Strip Buttons"\n#define WACOM_PROP_ROTATION "Wacom Rotation"\n#define WACOM_PROP_TOUCH "Wacom Enable Touch"\n#define WACOM_PROP_GESTURE_ENABLE "Wacom Enable Gesture"\n#define WACOM_PROP_HOVER "Wacom Hover Enable"\n#define WACOM_PROP_PROXIMITY_THRESHOLD "Wacom Proximity Threshold"\n#define WACOM_PROP_DEBUGLEVEL "Wacom Debug Level"|' src/common/x11input.cpp
|
||||
sed -i 's|#include <X11/Xwacomdefs.h>|/* #include <X11/Xwacomdefs.h> */|' src/common/x11input.cpp
|
||||
|
||||
|
||||
%build
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue