From 206bdff6d4f5b1cca93cc93eb20203f39c8ad8cf Mon Sep 17 00:00:00 2001 From: Anders da Silva Rytter Hansen Date: Fri, 29 May 2026 17:15:12 -0300 Subject: [PATCH] Add SDL2 and delete old files --- SDL2/SDL2-2.0.22-prefer-wayland.patch | 81 ++++++++ SDL2.spec => SDL2/SDL2.spec | 0 SDL2/SDL_config.h | 83 ++++++++ SDL2/SDL_revision.h | 83 ++++++++ SDL2/multilib.patch | 27 +++ SonicDE-package-mapping.xlsx | Bin 0 -> 9685 bytes sonic-interface-libraries.spec | 138 ------------- sonic-win.spec | 209 -------------------- sonic-workspace.spec | 275 -------------------------- 9 files changed, 274 insertions(+), 622 deletions(-) create mode 100644 SDL2/SDL2-2.0.22-prefer-wayland.patch rename SDL2.spec => SDL2/SDL2.spec (100%) create mode 100644 SDL2/SDL_config.h create mode 100644 SDL2/SDL_revision.h create mode 100644 SDL2/multilib.patch create mode 100644 SonicDE-package-mapping.xlsx delete mode 100644 sonic-interface-libraries.spec delete mode 100644 sonic-win.spec delete mode 100644 sonic-workspace.spec diff --git a/SDL2/SDL2-2.0.22-prefer-wayland.patch b/SDL2/SDL2-2.0.22-prefer-wayland.patch new file mode 100644 index 0000000..af8a745 --- /dev/null +++ b/SDL2/SDL2-2.0.22-prefer-wayland.patch @@ -0,0 +1,81 @@ +From 68d8a2c6b4f732920df40bd79dc3c18b71a4a349 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Fri, 29 Apr 2022 23:39:39 -0400 +Subject: [PATCH] Revert "Revert "video: Prefer Wayland over X11"" + +For Fedora/RHEL, we want to continue using Wayland by default. + +The majority of issues around Wayland by default seem to center +around cases that are issues for the Steam Runtime's bundled +copy of SDL and proprietary games that depend on that runtime. + +These issues do not apply to us. + +This reverts commit 254fcc90eb22bb159ab365ad956222a9c5632841. +--- + src/video/SDL_video.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c +index 2b896c44b..6f31f4c9e 100644 +--- a/src/video/SDL_video.c ++++ b/src/video/SDL_video.c +@@ -61,12 +61,12 @@ static VideoBootStrap *bootstrap[] = { + #if SDL_VIDEO_DRIVER_COCOA + &COCOA_bootstrap, + #endif +-#if SDL_VIDEO_DRIVER_X11 +- &X11_bootstrap, +-#endif + #if SDL_VIDEO_DRIVER_WAYLAND + &Wayland_bootstrap, + #endif ++#if SDL_VIDEO_DRIVER_X11 ++ &X11_bootstrap, ++#endif + #if SDL_VIDEO_DRIVER_VIVANTE + &VIVANTE_bootstrap, + #endif +@@ -4275,12 +4275,12 @@ SDL_IsScreenKeyboardShown(SDL_Window *window) + #if SDL_VIDEO_DRIVER_UIKIT + #include "uikit/SDL_uikitmessagebox.h" + #endif +-#if SDL_VIDEO_DRIVER_X11 +-#include "x11/SDL_x11messagebox.h" +-#endif + #if SDL_VIDEO_DRIVER_WAYLAND + #include "wayland/SDL_waylandmessagebox.h" + #endif ++#if SDL_VIDEO_DRIVER_X11 ++#include "x11/SDL_x11messagebox.h" ++#endif + #if SDL_VIDEO_DRIVER_HAIKU + #include "haiku/SDL_bmessagebox.h" + #endif +@@ -4388,17 +4388,17 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) + retval = 0; + } + #endif +-#if SDL_VIDEO_DRIVER_X11 ++#if SDL_VIDEO_DRIVER_WAYLAND + if (retval == -1 && +- SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_X11) && +- X11_ShowMessageBox(messageboxdata, buttonid) == 0) { ++ SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_WAYLAND) && ++ Wayland_ShowMessageBox(messageboxdata, buttonid) == 0) { + retval = 0; + } + #endif +-#if SDL_VIDEO_DRIVER_WAYLAND ++#if SDL_VIDEO_DRIVER_X11 + if (retval == -1 && +- SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_WAYLAND) && +- Wayland_ShowMessageBox(messageboxdata, buttonid) == 0) { ++ SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_X11) && ++ X11_ShowMessageBox(messageboxdata, buttonid) == 0) { + retval = 0; + } + #endif +-- +2.35.1 + diff --git a/SDL2.spec b/SDL2/SDL2.spec similarity index 100% rename from SDL2.spec rename to SDL2/SDL2.spec diff --git a/SDL2/SDL_config.h b/SDL2/SDL_config.h new file mode 100644 index 0000000..7862549 --- /dev/null +++ b/SDL2/SDL_config.h @@ -0,0 +1,83 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2013 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/* + * This SDL_config.h is a wrapper include file for the original SDL_config.h, + * which has been renamed to SDL_config-.h. There are conflicts for the + * original SDL_config.h on multilib systems, which result from arch-specific + * configuration options. Please do not use the arch-specific file directly. + * + * Copyright (C) 2013 Igor Gnatenko + * Igor Gnatenko + */ + +/** + * \file SDL_config.h + */ + +#ifdef SDL_config_wrapper_h +#error "SDL_config_wrapper_h should not be defined!" +#endif +#define SDL_config_wrapper_h + +#if defined(__i386__) +#include "SDL_config-i386.h" +#elif defined(__ia64__) +#include "SDL_config-ia64.h" +#elif defined(__powerpc64__) +# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#include "SDL_config-ppc64.h" +# else +#include "SDL_config-ppc64le.h" +# endif +#elif defined(__powerpc__) +#include "SDL_config-ppc.h" +#elif defined(__s390x__) +#include "SDL_config-s390x.h" +#elif defined(__s390__) +#include "SDL_config-s390.h" +#elif defined(__x86_64__) +#include "SDL_config-x86_64.h" +#elif defined(__arm__) +#include "SDL_config-arm.h" +#elif defined(__alpha__) +#include "SDL_config-alpha.h" +#elif defined(__sparc__) && defined (__arch64__) +#include "SDL_config-sparc64.h" +#elif defined(__sparc__) +#include "SDL_config-sparc.h" +#elif defined(__aarch64__) +#include "SDL_config-aarch64.h" +#elif defined(__mips64) && defined(__MIPSEL__) +#include "SDL_config-mips64el.h" +#elif defined(__mips64) +#include "SDL_config-mips64.h" +#elif defined(__mips) && defined(__MIPSEL__) +#include "SDL_config-mipsel.h" +#elif defined(__mips) +#include "SDL_config-mips.h" +#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 +#include "SDL_config-riscv64.h" +#else +#error "The SDL2-devel package is not usable with the architecture." +#endif + +#undef SDL_config_wrapper_h diff --git a/SDL2/SDL_revision.h b/SDL2/SDL_revision.h new file mode 100644 index 0000000..e43c4ec --- /dev/null +++ b/SDL2/SDL_revision.h @@ -0,0 +1,83 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2020 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/* + * This SDL_revision.h is a wrapper include file for the original SDL_revision.h, + * which has been renamed to SDL_revision-.h. There are conflicts for the + * original SDL_revision.h on multilib systems, which result from REVISION + * inconsistency between architecture builds, though, I'm not sure why. + * Computers are weird. + * + * Copyright (C) 2021 Tom Callaway + */ + +/** + * \file SDL_revision.h + */ + +#ifdef SDL_revision_wrapper_h +#error "SDL_revision_wrapper_h should not be defined!" +#endif +#define SDL_revision_wrapper_h + +#if defined(__i386__) +#include "SDL_revision-i386.h" +#elif defined(__ia64__) +#include "SDL_revision-ia64.h" +#elif defined(__powerpc64__) +# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#include "SDL_revision-ppc64.h" +# else +#include "SDL_revision-ppc64le.h" +# endif +#elif defined(__powerpc__) +#include "SDL_revision-ppc.h" +#elif defined(__s390x__) +#include "SDL_revision-s390x.h" +#elif defined(__s390__) +#include "SDL_revision-s390.h" +#elif defined(__x86_64__) +#include "SDL_revision-x86_64.h" +#elif defined(__arm__) +#include "SDL_revision-arm.h" +#elif defined(__alpha__) +#include "SDL_revision-alpha.h" +#elif defined(__sparc__) && defined (__arch64__) +#include "SDL_revision-sparc64.h" +#elif defined(__sparc__) +#include "SDL_revision-sparc.h" +#elif defined(__aarch64__) +#include "SDL_revision-aarch64.h" +#elif defined(__mips64) && defined(__MIPSEL__) +#include "SDL_revision-mips64el.h" +#elif defined(__mips64) +#include "SDL_revision-mips64.h" +#elif defined(__mips) && defined(__MIPSEL__) +#include "SDL_revision-mipsel.h" +#elif defined(__mips) +#include "SDL_revision-mips.h" +#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 +#include "SDL_revision-riscv64.h" +#else +#error "The SDL2-devel package is not usable with the architecture." +#endif + +#undef SDL_revision_wrapper_h diff --git a/SDL2/multilib.patch b/SDL2/multilib.patch new file mode 100644 index 0000000..db59b08 --- /dev/null +++ b/SDL2/multilib.patch @@ -0,0 +1,27 @@ +diff --git a/sdl2-config.in b/sdl2-config.in +index f6eca7668..93460f7ae 100644 +--- a/sdl2-config.in ++++ b/sdl2-config.in +@@ -7,7 +7,6 @@ bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") + prefix=$(cd -P -- "$bindir/@bin_prefix_relpath@" && printf '%s\n' "$(pwd -P)") + exec_prefix=@exec_prefix@ + exec_prefix_set=no +-libdir=@libdir@ + + @ENABLE_STATIC_FALSE@usage="\ + @ENABLE_STATIC_FALSE@Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" +@@ -49,12 +48,11 @@ while test $# -gt 0; do + echo -I@includedir@/SDL2 @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) +-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ ++@ENABLE_SHARED_TRUE@ echo @SDL_RLD_FLAGS@ @SDL_LIBS@ + @ENABLE_SHARED_TRUE@ ;; + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) +-@ENABLE_STATIC_TRUE@ sdl_static_libs=$(echo "@SDL_LIBS@ @SDL_STATIC_LIBS@" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g") +-@ENABLE_STATIC_TRUE@ echo -L@libdir@ $sdl_static_libs ++@ENABLE_STATIC_TRUE@ echo @SDL_LIBS@ @SDL_STATIC_LIBS@ + @ENABLE_STATIC_TRUE@ ;; + *) + echo "${usage}" 1>&2 diff --git a/SonicDE-package-mapping.xlsx b/SonicDE-package-mapping.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..aede892955aabd6332e4aa4dc90eb259956e8bb8 GIT binary patch literal 9685 zcmb_i1z1#Tw;o{VP9>$gK}xzirKDr%p=LlrK)R(%N5x7?htzyXE9nHPHtLikh7JGwY{^g7_IJIc@803Y6#TA z+1kR%#Tg_<>kWd?N{C~KekVZ<2RlQ=Xzid-R}n5Qh?N}(YyshPaRoWUpV+v#gDs%& zukN;7t`=5~7PcTRUT$syE~_76a6qrbpcNOD1=(15I6U5XWIYN z@NhxyySO`Ay0|$0=bB#&&ue~mpp!Gx!Av#Vsnb(I((|Ht$#s{M0P`9EgyUlJ2Mi~mfMnp(+P zjMiPrnunJ9NA~{LTf~nwll@0Z{jpR0!h`EK;R7dc;cg3piqZZVD}MwkJbnFEB;J2t zq+fQeUu6Mz>(fB*n4-0QC4E0RoHW~qt7E-{uD5RCg{3xwXhWxrQwqI$2%lu*@@ z2#F-VXRQ7bW>xe^e~s}aD?&K#VJnwH_>4{g8#MkEo1^=%JQ1CJ2uJeF`sa-y-pA&v zNP@^!ike4NY+lgrzGAo6+M6+5c&EzPDwT!x1h0HvpwmgVXTbaeA}o7>zhU_;a5~v%{_9Os9(CKgrD6k z9FVw|-6BrgeLHzR&hypMWrLgULxa;BNE8k0dHg)?I>@Nby48=St$^lJH|LxX9|u~w-ZIcb9{yyqViFGM{}6?3P*nEjDk zeys9XjKmXEBmjVn006iu9DkSoEA(fbXSuO1h`UFVvWeuliIk$i^9v|gZGi5Dn~`q7 zon>YB@vj%F&0uHsOhtblCqvPVcp?Ue2j{eMwX#+%dP&f9>~SFRo0u}oL~*fiv}O}M zBAQqsdO}K5b`!H()A!Q6R6tByT`k*;qZ}qrfSFquDVKax@R+H{8_+)e0yqID5N*OC3Nvq*$&D+~&9V@r8IlzXZ5kxWX5z1uE_6Nl~Rl*U??XrXIT9MT9>r0p=$VSCdC9ECO_ zZ$71Gza1e}r07U0%f!!tNR1?QP` zp^M4)?2QKK6$xaFL`*_&Cz4Nqp+P`2lh5PHOI%JCnO#&J@00ZjB5_12NIk!i`w7$D z86qvQHHI$mNPNt1h>3Z+J!dao;J=5f9(usO&RSgg#0Hl8u#{j^Q5TbZ{p7rYc3YW1 zK~0ZZ7Mb|*K=c@i?H#_Rw`!M2zXs0hOjH|3_=fC&0svtDBXIsKiYs)%F7LSUzOf~= zPqbngNGY*uk(FrctFfk>yrIW2_^4uihuP^}z~T%JeW=n-=^?_R7|i!WOC9!>Nxz{h zwXzNiFVUhbGj)D4G4TtmHs`284vhNF{4Q0D#5}sOO-_vlVcw%!rXHXqH8kv`kAH}J zaxKTT+{Ic3xI3xs=G3A4LQ^nmNqLt3RTq8KI!*sw>e1@eHD5&`y~SA@ZRG`XnWkhd z2-KMAF=vkHq3b=?5)jy#nk(5uO~swV7N65cs?}KhL&#mPp(h~o9?o9l4Hw0 zSMX3Ex}8KH(P$U*VbsU^)UM4Z$raqLF=Bv?V>%&o6tt}J^C#RI$m>1br|DxA`6SS% zzUex43qg6dZqX>}FQ;1+gGA$tTnWOMwH^{4pR7-JtOAWmHCC3t5wz)izR6Ul6=d|} zgI*~{nTb(emS?KbZl6qb7_-m%U`X3M`lzY zBQ~Om0~8ij_tFBR!_cD}KzlzYn*+4F6JUgy&Z@nVnla+dClh=TdbfUUPW?@hkcp48*qL5Uy8tO?6u^I1cs&cg> zlp%k9p!}6iND^Z?=N8GC0@NH5G@QA8eM*49g}th z>v2~{cNfWLKXmsJW!Gqi8 zdcl~T=;GMLjn~(%Jm{OrYNe{gCc}hdjq$eAbYZ*<+c7CVOYU?l%~|tux7U3CXb$rA zXwJ>j$7#D*ZX;!kg}e_vT2n=bxlLn+(+rEsU=OXwpo($hy8{fOv{8Bnib zC}+)-4Pv8x<_Dd$BE>LOjiA|nVp4o z+GzVa6S-H0SAC-%0rPNrg_)kqPVch!Nl*WwNmftyn8Cpi4!)gHGHTIgGDDD=a!rcn z3j6Cj8|*yXdG^m|30*s6k&AokU+=e%F5M1_R!4TOePHy9p6T=@C zv5WbukvoZ=!WQAiO@td7|7RorQ3QL$tEu#GT(q1mq6dC+gG%9W5{7mm|&$y#~aKBc$ zqNN}<>j^9U163MJ%iz19xFXYDEs6{)T*>VSb?qed+-?~~b$6->EUi*OVLIc6J!~QC z5(X6^%$;V^-ZbqpHPXc-4#Wxohsd$&>)VuHt78VodT|-P$cc12_C#;qZysafC2wX| zsWZO8zrWbI^X+{});;n7XXQNR3j?LrQ8_BC?H3+oOSw($V(PiSTI0}eEs`C+K~&xX z0N@4IRdw}K`{L?YyJt8WM<_@n{?W_;68<$SUe0=qF;fx~vus|ncPvAQ&qiz|VQ)9l z2)SQ5rF6VBoc7aOnKvZpg{GTkbsV}X4BtY|BTOKyHEeUHurGp+=;b4}hkAdL{a06;W~a=6QhgrQ=uD(v(4A z@18b9YHq_um)JDj2~8dv;Sipy6TOiQya+|(5ijo405jXx_5($F%B`dZcqGUY!(U2c zsURa!mXZ0DD`Qm@P7h$~tT|)d2;Q`6j&MUy^4XSdE*Mq-zn*Ju&5pj8tH2R*e12it zo*JDfRlOn!c95%He`2!pIAOgJrJmce%0WMK=yhmuEbXRz(`XTT}dP5*s-)N-b zjG#Uv{9R~^XOmCcTY||~GDdQ*JJ(|MAf)e<^Qa0srSLWHYd9b24510U-<2n=#U5y! z@eZqj4f{OcJ0U98<=9_AHOA^-M(?f8N6@Z|SFJ``7u$^k_G$@JZiwHxr;5bVniht*rr?Y}4OcPH+yUeaZp&vDUPS`^D3>??;y8_cjWO zN!Y&V7T$5!N?lf?oGc&WcU3WrD6xMYerSOnxgd>nTtvf;aBsPJBY|Sg1Vt>+ga9w} z_@)GP;Z5({apSi8#dOW9grOgFCVT746=g)Udz;B8!&x#@xI@DRbR9RSw%zpztTQRr zV=ZVb^p?}BjloqbC0+iczPo%ApGovg(cfQWxVjV45Z4E(+*G*WNvH*SDh#_%x>({h z*TSYP_#|A|iNu(BV4=c-u}xp3M!WqD`f^cn?7t<5KJ@RiODp3Q5N)qKzO9OnqxY#> zOnI{8&3jIdwq?d~Ivop9TGf;|P%er~f}gz9>0-uiFbsBfvW3d}+2}x$-B2N#x4jFh zHRo#_vlaeyZ`O-!m%xB#W89x}4}PPyH_JmS!iUPVukcAeADKekiEMWtmB@?PDpy;H7=|Fq^V<1wZl)&aHl{*ixRG`m7N0{>sgzXnwMH8>GejoK@M% z9AVix@M^lVSDYu!i$Amc^9Z67cC~+oj^i6EpVzhN2{k!OFG1$Tl9YCJiMcF~hmA;hHTl(*#?s#y}#h`skBO^`7idJv(&)xGCn8q{z~ zN5pfT&s*V3CJy+0!`LFJ1wF0V?uk$fP>Q8*f$A4!_Q?{57*1Ulmbt_SVbY~w_O@vS ze(@>{O!vsQd(Su*AM;g|N1GOyoL`QqEPzm=+hiFDmy1LFd7W)&mVLtz4@+n*7s+qs z;b%sPVUY@~z^HW4H8y;FXe3=9D-CV*ax}@`SUh>kX3*coe(ah*viDT?CS9HXP{asZ zDxE}o0;st$i+rDP1GFYQ`lUjcX&l!!txrg;FYqF}18oa=qNZ7s3Uv@$Y#R&cgpQpP zj}X*bHc0pEvUtoep3>7J)G zXB(uwq+uVAFhGzKzhlbk@p4s)$OpUo z1TD(eyy?oF!8a230X%3N1Zrd?rmS*$7Xv>$4M2oP&VZ=Xx9bOxDZ^$o_{p6Se)_l? z?)8U_6uZ|&Dr}E|uq=?#Y+&0R*VO62Y0QLZ$K`mMn9#M?6bsrhh;2Te`v>FTby55 zax_Vd@_M+wO*VR=y>muJlM-~Zj7^IW=eh9!hNHntL=ZuH&{R~O7G8{2D9h=6FJU0p zQP#6nslwSPS8%psS2a9~C^fs*hspNOWO5FWh;p!4N%?sI-q<*K#ZUR`HmW1?+yK>U|o=k2}(yjWZvMk%!1SFT}Ej``~ZaaFMQ!wtXC*`Wo!PIXz{%N)$hlqvVJ%kYThF zwex{U|FhD-?c(9p4%kwTf0@!FooWM1dBMbcBn3|8Xr8Jc75or14bf#z6H#Wj#Pj2C;rD9}$6Cfs zI{lIq_;p|l!HEo4u*pn_YQ|hN#ZsO(e%GctLlQdPrBSbwB1HGXKMdRvd(2A4nJ-2)qDQq7ZcjFOi zn41!#>*i-u`IIo65yTe{Z#e0I`3%yD50cdzj>TAxT}p@g38q$Ev5sMc?_)c*35>Ry z=R@S*wanqV38QDkYfQ-aHOvw1M4Q?6N7HD$AL`T+WLTYBIq?zldl@}Kn7oFNgJ$$> z&wh-Kw|chy*P?7^{barlJ`qJC1psdT2%JCr@IUwYvol;=W(DBqfv6{^4RYH7_(jEF zAX{}s@4JdB`^d&f#eDfOw{ZRrQhn?e=u1eqL{Na8OGP+ z`{d=Yn9)(u(vn>q;!nzdFDRYd9!9ShlQ5?`f+0hjbjCF1lEp%F(Q9ycGg`f~%M2?u zrc-*cEc!GTC-$zBe#YLN!jblNa`{WT&ndu}>-x_fu4ef5hVCyoNRu-C6uT5tYfcJ@$RB7!RY1@XvQiWqLyhDw%@;cKDc z;1JlWPfPbwjc_OQ# zIk@h7ec|UF`LLfX>RXCyo`2$UR!B~h-Qxco_d}}2MIoEfY>Z@M4QZ&8W1XwDO5F+b z!$*k4w}qq;ok-{q1XSVy-Oq>A$Pmz#wq|L&v}Em&RT9uLL5d+G?(|(Y^j=0%{HzhX zW6U#-0IfzrK$s%%;n*zgvX-n zoEK-)n#Wuo-%_Ho52s8TKNn`vfia>MwIeP zFpU8YwRVXzy(DR z2N_08h7K9Z8>o|qZjzKtsK;SxNrMWJU?2QOh+<8iOcY03QQbJNA#2SDm%9V7ScgtB zn{0+3_I}U$NZ0a?dCWYew$pyRWkC3GSZC6paU?jHr_oEXre7vXjcS~nQ-d*_p;4<( z*mUTb(!(i4@yGNt71_e1EHxM0ZpwgS9Yo1&0)S5$Fe!y#_L!gu_)vraFv%h%zRxGk zr0}$HpJ7v{I*e!v?KRON91qm8x4Tb?@yUqN#{i{JIXGo;H4Zs&0!>JdugG z4J~^3OfVV#mel?2Ni@wO`6s>}4*U~$x2#Ji8)3sG_)pYh0Ui!SBSd^(SR3ZKAb+UT z%h#*=RvC;me6WI|{k1ueNW$4iL}hrja`I%9q6rwkoC?sMBY2%5#-81p_6{dwr4d_u zu2Cv#RzRdK;c3!^_N+9-sXE>=IP|!Wk27oTc0DC;KbY?ceMc-`SF;C>?U|#{7e_SM zYgD40K%pKV>POW%86@QDB;?w7_!1cSeNUxtPO%p9eKIHl9I)N-ycbgQMq0IcDvYm9 zAgfg%Bph+t3BS)dn!9oK;Bwc~o|3#lng0xOCkx+K;ni8)p0m)CJIq?&ILX9~IYtyc zmjbvw@NCR`Pvs@66@#fq#+j+z$Usulcf~)mSU-1P3ilyrRb^JE#C3?s*iXnb;RR$5$9Rsx}<G_W@CgB&$SzJDiuUHBuN=j8xz7;l?fgQ-%A7DOr3Di_UfH!yk{tqzlZ2!~s zo4>n+5;phxgAARPKP4aMtpuD9F%qJsl(3|()&T}NNqW+21V|{q b6Zmb(p{arl?-pH6`7r?= %{plasma_version} -Provides: libplasma >= %{plasma_version} -Obsoletes: libplasma <= %{plasma_version} - -# Renamed from kf6-plasma -Obsoletes: kf6-plasma < 1:%{version}-%{release} -Provides: kf6-plasma = 1:%{version}-%{release} - -%description -Sonic Interface Libraries is a fork of libplasma, providing the foundational -libraries for themes, applets, and widgets in SonicDE. - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: cmake(KF6Package) -Requires: qt6-qtbase-devel -Requires: cmake(KF6Service) -Requires: cmake(KF6WindowSystem) -Provides: libplasma-devel%{?_isa} >= %{plasma_version} -Provides: libplasma-devel >= %{plasma_version} -Obsoletes: libplasma-devel <= %{plasma_version} - -Obsoletes: kf6-plasma-devel < 1:%{version}-%{release} -Provides: kf6-plasma-devel = 1:%{version}-%{release} - -%description devel -Development files for sonic-interface-libraries. - -%prep -%autosetup -p1 - -%build -%cmake_kf6 -%cmake_build - -%install -%cmake_install -%find_lang %{name} --all-name - -%files -f %{name}.lang -%license LICENSES/* -%{_libdir}/libPlasma.so.* -%{_libdir}/libPlasmaQuick.so.* -%{_qt6_plugindir}/kf6/ -%{_qt6_qmldir}/org/kde/plasma/ -%{_qt6_qmldir}/org/kde/kirigami/styles/Plasma/ -%{_datadir}/plasma/ -%{_datadir}/qlogging-categories6/*.categories -%{_datadir}/qlogging-categories6/*.renamecategories - -%files devel -%{_includedir}/Plasma/ -%{_includedir}/PlasmaQuick/ -%{_libdir}/libPlasma.so -%{_libdir}/libPlasmaQuick.so -%{_libdir}/cmake/Plasma/ -%{_libdir}/cmake/PlasmaQuick/ -%{_datadir}/doc/qt6/Plasma.qch -%{_datadir}/doc/qt6/Plasma.tags -%{_datadir}/kdevappwizard/templates/*.tar.bz2 - -%changelog -* Wed May 27 2026 Anders da Silva Rytter Hansen - 6.6.4-1 -- Upgrade to 6.6.4 - -* Wed Mar 21 2026 Anders da Silva Rytter Hansen - 6.4.5-7 -- Initial release of SonicDE/KDE Plasma X11 for EL10 (Downgraded to 6.4.5 for EL 10.1 compatibility) diff --git a/sonic-win.spec b/sonic-win.spec deleted file mode 100644 index 7e70858..0000000 --- a/sonic-win.spec +++ /dev/null @@ -1,209 +0,0 @@ -%define _disable_source_fetch 0 -%define debug_package %{nil} - -Name: sonic-win -Version: 6.6.4 -Release: 1%{?dist} -Summary: KWin window manager for SonicDE (fork of kwin) - -%global plasma_version %{version} - -License: GPL-2.0-or-later -URL: https://github.com/Sonic-DE/sonic-win -Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz - -BuildRequires: extra-cmake-modules -BuildRequires: kf6-rpm-macros -BuildRequires: systemd-rpm-macros - -# Qt -BuildRequires: cmake(QAccessibilityClient6) -BuildRequires: qt6-qtbase-devel -BuildRequires: qt6-qtbase-private-devel -BuildRequires: qt6-qtsensors-devel -BuildRequires: qt6-qttools-devel -BuildRequires: qt6-qtwayland-devel -BuildRequires: cmake(Qt6Core5Compat) -BuildRequires: cmake(Qt6Svg) -BuildRequires: cmake(Qt6Multimedia) - -# X11/OpenGL -BuildRequires: pkgconfig(libxcvt) -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libEGL-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: libxkbcommon-devel -BuildRequires: libxkbcommon-x11-devel -BuildRequires: libX11-devel -BuildRequires: libXi-devel -BuildRequires: libxcb-devel -BuildRequires: libICE-devel -BuildRequires: libSM-devel -BuildRequires: libXcursor-devel -BuildRequires: xcb-util-wm-devel -BuildRequires: xcb-util-image-devel -BuildRequires: xcb-util-keysyms-devel -BuildRequires: xcb-util-cursor-devel -BuildRequires: xcb-util-devel -BuildRequires: libepoxy-devel -BuildRequires: libcap-devel - -BuildRequires: lcms2-devel -BuildRequires: glib2-devel -BuildRequires: pipewire-devel - -# Wayland -BuildRequires: wayland-devel >= 1.22.0 -BuildRequires: wayland-protocols-devel -BuildRequires: pkgconfig(libinput) >= 0.10 -BuildRequires: pkgconfig(libudev) - -%if 0%{?rhel} == 10 -# Integrate with Xlibre on EL10 -BuildRequires: xlibre-xserver-devel -Requires: xlibre-xserver-Xorg -Requires: xlibre-xf86-input-libinput -%else -BuildRequires: pkgconfig(xwayland) -%endif - -# KF6 -BuildRequires: cmake(KF6Completion) -BuildRequires: cmake(KF6Config) -BuildRequires: cmake(KF6ConfigWidgets) -BuildRequires: cmake(KF6CoreAddons) -BuildRequires: cmake(KF6Crash) -BuildRequires: cmake(KF6DBusAddons) -BuildRequires: cmake(KF6GlobalAccel) -BuildRequires: cmake(KF6GuiAddons) -BuildRequires: cmake(KF6I18n) -BuildRequires: cmake(KF6KIO) -BuildRequires: cmake(KF6Notifications) -BuildRequires: cmake(KF6Service) -BuildRequires: cmake(KF6WidgetsAddons) -BuildRequires: cmake(KF6WindowSystem) -BuildRequires: cmake(KF6DocTools) -BuildRequires: cmake(KF6KCMUtils) -BuildRequires: cmake(KF6NewStuff) -BuildRequires: cmake(KF6Declarative) -BuildRequires: cmake(KF6IconThemes) -BuildRequires: cmake(KF6IdleTime) -BuildRequires: cmake(KF6TextWidgets) -BuildRequires: cmake(KF6Kirigami2) -BuildRequires: cmake(KF6Runner) -BuildRequires: cmake(KF6Svg) -BuildRequires: cmake(KNightTime) - -# Workspace components -BuildRequires: cmake(KDecoration3) -BuildRequires: kscreenlocker-devel -BuildRequires: plasma-breeze-devel -BuildRequires: plasma-wayland-protocols-devel -BuildRequires: cmake(KGlobalAccelD) -BuildRequires: libdisplay-info-devel - -BuildRequires: cmake(KWayland) -BuildRequires: cmake(Plasma) -BuildRequires: cmake(PlasmaActivities) - -BuildRequires: libeis-devel -BuildRequires: pkgconfig(libcanberra) - -# Conflicts with kwin-x11 -Conflicts: kwin-x11 - -Requires: sonic-interface-libraries%{?_isa} >= %{plasma_version} -Requires: kscreenlocker%{?_isa} -Requires: kf6-kirigami2%{?_isa} -Requires: kf6-kdeclarative%{?_isa} -Requires: qt6-qtmultimedia%{?_isa} -Requires: qt6-qtdeclarative%{?_isa} - -%description -Sonic Win is a fork of KWin, the window manager and compositor for SonicDE, -focusing on an optimized X11 experience. - -%package libs -Summary: KWin libraries for SonicDE -Conflicts: kwin-x11-libs - -%description libs -Shared libraries for sonic-win. - -%package devel -Summary: Development files for %{name} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: %{name}%{?_isa} = %{version}-%{release} -Conflicts: kwin-x11-devel - -%description devel -Development files for sonic-win. -Provides: kwin-devel = %{version}-%{release} -Provides: kwin-x11-devel = %{version}-%{release} -Provides: cmake(KWinDBusInterface) = %{version} - -%prep -%autosetup -p1 - -%build -%cmake_kf6 -%cmake_build - -%install -%cmake_install -# Create compatibility CMake files for sonic-workspace -mkdir -p %{buildroot}%{_libdir}/cmake/KWinDBusInterface -cat < %{buildroot}%{_libdir}/cmake/KWinDBusInterface/KWinDBusInterfaceConfig.cmake -find_package(KWinX11DBusInterface REQUIRED) -include(\${KWinX11DBusInterface_DIR}/KWinX11DBusInterfaceConfig.cmake) -EOF - -# Create compatibility symlinks for DBus interfaces -pushd %{buildroot}%{_datadir}/dbus-1/interfaces/ -for f in kwin_x11_*.xml; do - newname=$(echo $f | sed 's/kwin_x11_//') - ln -s "$f" "$newname" -done -popd - -# The translation domain in the source is likely still 'kwin' -%find_lang kwin --all-name --with-html - -%files -f kwin.lang -%license LICENSES/* -# Binares and specialized folders -%{_bindir}/kwin_x11 -%{_libdir}/kconf_update_bin/kwin* -%{_libexecdir}/kwin* -%{_userunitdir}/plasma-kwin_x11.service - -# Database and plugins -%{_libdir}/qt6/plugins/ -%{_qt6_qmldir}/org/kde/*/ - -# Data and Assets -%{_datadir}/kwin-x11/ -%{_datadir}/applications/*.desktop -%{_datadir}/dbus-1/interfaces/*.xml -%{_datadir}/icons/hicolor/*/apps/kwin-x11.* -%{_datadir}/kconf_update/kwin-x11.upd -%{_datadir}/knotifications6/kwin-x11.notifyrc -%{_datadir}/knsrcfiles/*.knsrc -%{_datadir}/krunner/dbusplugins/*.desktop -%{_datadir}/qlogging-categories6/*.categories - -%files libs -# Libraries -%{_libdir}/lib*.so.* - -%files devel -%{_includedir}/ -%{_libdir}/lib*.so -%{_libdir}/cmake/ - -%changelog -* Wed May 27 2026 Anders da Silva Rytter Hansen - 6.6.4-1 -- Upgrade to 6.6.4 - -* Wed Mar 21 2026 Anders da Silva Rytter Hansen - 6.4.5-8 -- Initial release of SonicDE/KDE Plasma X11 for EL10 (Downgraded to 6.4.5 for EL 10.1 compatibility) diff --git a/sonic-workspace.spec b/sonic-workspace.spec deleted file mode 100644 index 916c788..0000000 --- a/sonic-workspace.spec +++ /dev/null @@ -1,275 +0,0 @@ -%define _disable_source_fetch 0 -%define debug_package %{nil} - -Name: sonic-workspace -Version: 6.6.4 -Release: 1%{?dist} -Summary: Core workspace components for SonicDE (fork of plasma-workspace) - -License: GPL-2.0-or-later -URL: https://github.com/Sonic-DE/sonic-workspace -Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz - -%global plasma_version %(echo %{version} | cut -d. -f1-3) - -BuildRequires: extra-cmake-modules -BuildRequires: kf6-rpm-macros -BuildRequires: qt6-qtbase-devel -BuildRequires: qt6-qtbase-private-devel -BuildRequires: qt6-qtdeclarative-devel -BuildRequires: qt6-qtdeclarative-private-devel -BuildRequires: qt6-qtsvg-devel -BuildRequires: qt6-qtwayland-devel -BuildRequires: qt6-qtlocation-devel -BuildRequires: qt6-qtshadertools-devel -BuildRequires: qcoro-qt6-devel -BuildRequires: phonon-qt6-devel -BuildRequires: wayland-devel -BuildRequires: wayland-protocols-devel -BuildRequires: plasma-wayland-protocols-devel -BuildRequires: cmake(Qt6Core5Compat) - -BuildRequires: cmake(KF6Config) -BuildRequires: cmake(KF6Archive) -BuildRequires: cmake(KF6Declarative) -BuildRequires: cmake(KF6ConfigWidgets) -BuildRequires: cmake(KF6CoreAddons) -BuildRequires: cmake(KF6Crash) -BuildRequires: cmake(KF6DBusAddons) -BuildRequires: cmake(KF6GlobalAccel) -BuildRequires: cmake(KF6GuiAddons) -BuildRequires: cmake(KF6I18n) -BuildRequires: cmake(KF6IdleTime) -BuildRequires: cmake(KF6KIO) -BuildRequires: cmake(KF6Notifications) -BuildRequires: cmake(KF6NotifyConfig) -BuildRequires: cmake(KF6Runner) -BuildRequires: cmake(KF6Service) -BuildRequires: cmake(KF6Solid) -BuildRequires: cmake(KF6WidgetsAddons) -BuildRequires: cmake(KF6WindowSystem) -BuildRequires: cmake(KF6XmlGui) -BuildRequires: cmake(KF6DocTools) -BuildRequires: cmake(KF6ItemModels) -BuildRequires: cmake(KF6KDED) -BuildRequires: cmake(KF6StatusNotifierItem) -BuildRequires: cmake(KF6UnitConversion) -BuildRequires: cmake(KF6Wallet) -BuildRequires: cmake(KF6KCMUtils) -BuildRequires: cmake(KF6NewStuff) -BuildRequires: cmake(KF6Package) -BuildRequires: cmake(KF6Parts) -BuildRequires: cmake(KF6Prison) -BuildRequires: cmake(KF6Sonnet) -BuildRequires: cmake(KF6TextEditor) -BuildRequires: cmake(KF6TextWidgets) -BuildRequires: cmake(KF6Svg) -BuildRequires: cmake(KF6Kirigami2) -BuildRequires: cmake(KF6KirigamiAddons) -BuildRequires: cmake(KF6NetworkManagerQt) -BuildRequires: cmake(KF6QuickCharts) -BuildRequires: cmake(KF6UserFeedback) -BuildRequires: cmake(KF6Baloo) -BuildRequires: cmake(KF6Holidays) -BuildRequires: kf6-kdesu-devel -BuildRequires: pkgconfig(libqalculate) -BuildRequires: sonic-win-devel -BuildRequires: sonic-interface-libraries-devel -BuildRequires: kdecoration-devel -BuildRequires: libkscreen-devel -BuildRequires: libksysguard-devel -BuildRequires: plasma-activities-devel -BuildRequires: cmake(KSysGuard) -BuildRequires: cmake(Plasma5Support) -BuildRequires: cmake(KScreenLocker) -BuildRequires: cmake(Breeze) -BuildRequires: cmake(KExiv2Qt6) -BuildRequires: cmake(KPipeWire) -BuildRequires: cmake(PlasmaActivities) -BuildRequires: cmake(PlasmaActivitiesStats) -BuildRequires: cmake(KF6Screen) -BuildRequires: cmake(KWayland) -BuildRequires: cmake(Plasma) -BuildRequires: cmake(PlasmaQuick) -BuildRequires: cmake(LayerShellQt) -BuildRequires: cmake(KNightTime) - - -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xau) -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xcomposite) -BuildRequires: pkgconfig(xcursor) -BuildRequires: pkgconfig(xdamage) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xft) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(xinerama) -BuildRequires: pkgconfig(xres) -BuildRequires: pkgconfig(xkbcommon) -BuildRequires: pkgconfig(xkbfile) -BuildRequires: pkgconfig(xpm) -BuildRequires: pkgconfig(xrender) -BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(xxf86vm) -BuildRequires: pkgconfig(ice) -BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(xcb-aux) -BuildRequires: pkgconfig(xcb-cursor) -BuildRequires: pkgconfig(xcb-image) -BuildRequires: pkgconfig(xcb-event) -BuildRequires: pkgconfig(xcb-util) -BuildRequires: pkgconfig(xcb-keysyms) -BuildRequires: pkgconfig(xcb-icccm) -BuildRequires: pkgconfig(xcb-renderutil) -BuildRequires: pkgconfig(xcb-atom) -BuildRequires: pkgconfig(xcb-ewmh) -BuildRequires: systemd-devel -BuildRequires: NetworkManager-libnm-devel -BuildRequires: glib2-devel -BuildRequires: polkit-qt6-1-devel -BuildRequires: PackageKit-Qt6-devel -BuildRequires: appstream-qt-devel -BuildRequires: iso-codes-devel -BuildRequires: libcanberra-devel -BuildRequires: fontconfig-devel -BuildRequires: zlib-devel -BuildRequires: libicu-devel - -Requires: sonic-win -Requires: xmessage -Requires: xprop -Requires: xrdb -Requires: xsetroot - -Conflicts: plasma-workspace-x11 - -Provides: plasma-workspace%{?_isa} >= %{plasma_version} -Provides: plasma-workspace >= %{plasma_version} -Obsoletes: plasma-workspace <= %{plasma_version} - -Provides: plasma-workspace-libs%{?_isa} >= %{plasma_version} -Provides: plasma-workspace-libs >= %{plasma_version} -Obsoletes: plasma-workspace-libs <= %{plasma_version} - -Provides: libkworkspace6%{?_isa} >= %{plasma_version} -Provides: libkworkspace6 >= %{plasma_version} -Obsoletes: libkworkspace6 <= %{plasma_version} - -Provides: desktop-notification-daemon - -%description -Core workspace components for SonicDE, fork of plasma-workspace. - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Conflicts: plasma-workspace-devel - -%description devel -Development files for sonic-workspace. - -%package x11 -Summary: SonicDE X11 session -#Requires: %%{name}%%{?_isa} = %%{version}-%%{release} -Requires: xlibre-xserver-Xorg -Conflicts: plasma-workspace-x11 - -%description x11 -SonicDE X11 session. - -%prep -%autosetup -p1 - -%build -%cmake_kf6 -%cmake_build - -%install -%cmake_install -# Many translation files have different names than the package -%find_lang plasmanetworkmanagement --all-name || : -%find_lang plasmashell --all-name || : - -%files -%license LICENSES/* -%{_bindir}/plasma* -%{_bindir}/krunner -%{_bindir}/ksmserver -%{_bindir}/ksplashqml -%{_bindir}/kcminit* -%{_bindir}/kde-systemd-start-condition -%{_bindir}/lookandfeeltool -%{_bindir}/kcolorschemeeditor -%{_bindir}/kfontinst -%{_bindir}/kfontview -%{_bindir}/xembedsniproxy -%{_bindir}/gmenudbusmenuproxy -#%%{_bindir}/startplasma-wayland -%{_libdir}/lib*.so.* -%{_libdir}/kconf_update_bin/ -%{_libexecdir}/ksmserver-logout-greeter -%{_libexecdir}/plasma* -%{_libexecdir}/kf6/kauth/ -%{_libexecdir}/kfontprint -%{_libexecdir}/baloorunner -%{_libexecdir}/ksecretprompter -%{_qt6_plugindir}/plasma/ -%{_qt6_plugindir}/kf6/ -#%%{_qt6_plugindir}/phonon_platform/ -#%%{_qt6_plugindir}/plasma5support/ -%{_qt6_plugindir}/plasmacalendarplugins/ -%{_qt6_qmldir}/org/kde/ -%{_userunitdir}/plasma* -%{_datadir}/plasma/ -#%%{_datadir}/plasma5support/ -%{_datadir}/applications/*.desktop -%{_datadir}/desktop-directories/ -%{_datadir}/config.kcfg/ -%{_datadir}/dbus-1/ -%{_datadir}/doc/ -%{_datadir}/icons/ -%{_datadir}/kconf_update/ -%{_datadir}/kfontinst/ -%{_datadir}/kglobalaccel/ -%{_datadir}/kio*/ -%{_datadir}/knotifications6/ -%{_datadir}/knsrcfiles/ -%{_datadir}/konqsidebartng/ -%{_datadir}/krunner/ -%{_datadir}/kstyle/ -%{_datadir}/kxmlgui5/ -%{_datadir}/polkit-1/ -%{_datadir}/qlogging-categories6/ -%{_datadir}/solid/ -%{_datadir}/timezonefiles/ -%{_datadir}/wayland-sessions/ -%{_datadir}/xdg-desktop-portal/ -%{_datadir}/zsh/ -%{_datadir}/locale/*/LC_MESSAGES/*.mo -%{_sysconfdir}/xdg/* - -%files devel -%defattr(-,root,root,-) -%{_includedir}/kworkspace6/ -%{_includedir}/taskmanager/ -%{_includedir}/notificationmanager/ -#%%{_includedir}/colorcorrect/ -%{_includedir}/krdb/ -%{_includedir}/klookandfeel/ -#%%{_includedir}/plasma5support/ -%{_libdir}/lib*.so -%{_libdir}/cmake/*/ - -%files x11 -%defattr(-,root,root,-) -%{_datadir}/xsessions/plasmax11.desktop -%{_bindir}/startplasma-x11 - -%changelog -* Wed May 27 2026 Anders da Silva Rytter Hansen - 6.6.4-1 -- Upgrade to 6.6.4 - -* Wed Mar 21 2026 Anders da Silva Rytter Hansen - 6.4.5-5 -- Initial release of SonicDE/KDE Plasma X11 for EL10 (Downgraded to 6.4.5 for EL 10.1 compatibility)