From 0065ec851f45c63ad2a0aa802c369a2f06e52bdb Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 29 Mar 2024 19:17:37 +0100 Subject: [PATCH] rebuilt with -DBUILD_DESKTOPTHEMES=OFF for framework 6 coinstallability [release 5.115.0-2mamba;Thu Mar 07 2024] --- openmamba-dark-metadata.json.cmake | 19 ------ openmamba-light-metadata.json.cmake | 19 ------ openmamba.svgz | Bin 1319 -> 0 bytes plasma-framework-5.55.0-arm-GLESv2.patch | 11 ---- plasma-framework.spec | 77 +++-------------------- 5 files changed, 9 insertions(+), 117 deletions(-) delete mode 100644 openmamba-dark-metadata.json.cmake delete mode 100644 openmamba-light-metadata.json.cmake delete mode 100644 openmamba.svgz delete mode 100644 plasma-framework-5.55.0-arm-GLESv2.patch diff --git a/openmamba-dark-metadata.json.cmake b/openmamba-dark-metadata.json.cmake deleted file mode 100644 index 5e0afa9..0000000 --- a/openmamba-dark-metadata.json.cmake +++ /dev/null @@ -1,19 +0,0 @@ -{ - "KPlugin": { - "Authors": [ - { - "Email": "info@openmamba.org", - "Name": "Silvan Calarco" - } - ], - "Category": "", - "Description": "openmamba Dark theme", - "EnabledByDefault": true, - "Id": "breeze-dark", - "License": "LGPL", - "Name": "openmamba Dark", - "Version": "1.0", - "Website": "https://openmamba.org" - }, - "X-Plasma-API": "5.0" -} diff --git a/openmamba-light-metadata.json.cmake b/openmamba-light-metadata.json.cmake deleted file mode 100644 index f1799be..0000000 --- a/openmamba-light-metadata.json.cmake +++ /dev/null @@ -1,19 +0,0 @@ -{ - "KPlugin": { - "Authors": [ - { - "Email": "info@openmamba.org", - "Name": "Silvan Calarco" - } - ], - "Category": "", - "Description": "openmamba Light theme", - "EnabledByDefault": true, - "Id": "default", - "License": "LGPL", - "Name": "openmamba Light", - "Version": "1.0", - "Website": "https://openmamba.org" - }, - "X-Plasma-API": "5.0" -} diff --git a/openmamba.svgz b/openmamba.svgz deleted file mode 100644 index caec9274c2b4dc4adca47b2bc1344c185bc9e1e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1319 zcmV+?1=#u@iwFpy(C<+I18;C;Zf#+0Vqq?Gc4q+XSKn_NMG$`PU$IItz zR^n12M1iUV5WJwHzBneXZP{+p{`Y*dwv#yIM0l!%;s@XD?(EDrGv9t|pS=9|ex|Pa z)q1*^k1EopQtM4OA9u6GydPEbMfLK~h)la{Cqu3ZS*|?^8^+Tnqi_Kbq|B=VE@OmfdQj7U!z%X0z#J)g7xlao+7FOSH?f zL)A6>32Y=fUymMu1sF!cS6h?gkF)9g@*zXYIX7jsQrFY*=3-Pa2OUFNZYp)rPbU|f zyHf}}?$6f^o)a}4kE&Vssb3k)E47<>J-zB@v&A1&sm-dJug@2&_oJ%3&XE0=WVH*y z9w~W=mcOdh`E)ju#?1TTXzyvVT6|cV12_M)Jus$!Ggc?dZgWvKtS`D{Zw5db9hi-v z#2a}I=?3O=&s}f1Qtp<|0s9arq?8oHz#?D>nmBvK zHf!TTOAJ?xaU@LuLfL5}@x4V$vEO3dGMH{P6SwTF_6Bw-!JpU}Z8OHvXz~tYr`ZFL zXH5q7K`>&>NW9=cSIH?dNmC;D1$8nCA$VeHksb=c$k%BU2kTDzgkj#o6c~=+Uc$f{ z<#Vw1UWW|tG7hecJ<1~H*2ucm**n-%nI|7nf7qeiWj|16WJ@_|gSwXL!JaZBI>yl# zw3M-5hC$;HqX+;e$tNVmv85nk1vF{vOAgiwX!Om)jFNUJ5mF4ETf|})sDMl!93h>I zlommAj4EVQFalgm0GV503gRWg93Avnrd_8Q*pafcPI3$I%Pk%zW><0zE+~`$o~V@4 zfeC1kk1WiJ+9un2k|^8CXOtXc2K6vz?UGZ%WJl5pqYcFtG}shyO2C3>Z0c(gE&vdKnHI+wa*$PhcNv6&rj*yc7jxskzOxG7 z1_G@1UMOqpM8kIecjI=CVZXk|xZi&-hi#emOdGt#?h*=;5CaH>6AO`j1fhmp?HF-{ zoS>1(eilA?gA1_mi2(w9N+uLKh2WvCa^RtdLv$MaeSz9!laJ&|#nBH>eBwv(DbpkP zH00`lPt5dL_!J}amQOa|qQm_t_l|?$JKPYEC){6dkWWLY9rB5u=rknc^5ZP?f1=Zn dtN#I=hOfIPI+gDe`Gfl6+20iaF$}K{006D6i?;v( diff --git a/plasma-framework-5.55.0-arm-GLESv2.patch b/plasma-framework-5.55.0-arm-GLESv2.patch deleted file mode 100644 index ae6723e..0000000 --- a/plasma-framework-5.55.0-arm-GLESv2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- plasma-framework-5.55.0/src/declarativeimports/core/CMakeLists.txt.orig 2019-02-26 11:42:17.278238636 +0100 -+++ plasma-framework-5.55.0/src/declarativeimports/core/CMakeLists.txt 2019-02-26 11:42:28.987445459 +0100 -@@ -60,7 +60,7 @@ - endif() - - if (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GLESv2") -- target_link_libraries(corebindingsplugin Qt5::Gui_GLESv2) -+ target_link_libraries(corebindingsplugin /usr/lib/libGLESv2.so) - endif() - - install(TARGETS corebindingsplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/core) diff --git a/plasma-framework.spec b/plasma-framework.spec index 786f483..2729a3d 100644 --- a/plasma-framework.spec +++ b/plasma-framework.spec @@ -2,7 +2,7 @@ Name: plasma-framework Version: 5.115.0 -Release: 1mamba +Release: 2mamba Summary: KDE Frameworks 5 foundations that can be used to build a primary user interface Group: System/Libraries Vendor: openmamba @@ -10,10 +10,6 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://kde.org/ Source: http://download.kde.org/stable/frameworks/%{majver}/plasma-framework-%{version}.tar.xz -Source1: openmamba.svgz -Source2: openmamba-light-metadata.json.cmake -Source3: openmamba-dark-metadata.json.cmake -Patch0: plasma-framework-5.55.0-arm-GLESv2.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -44,7 +40,7 @@ BuildRequires: libkjobwidgets-devel BuildRequires: libknotifications-devel BuildRequires: libkpackage-devel BuildRequires: libkservice-devel -BuildRequires: libkwayland-devel +BuildRequires: libkwayland5-devel BuildRequires: libkwidgetsaddons-devel BuildRequires: libkwindowsystem-devel BuildRequires: libkxmlgui-devel @@ -79,67 +75,32 @@ Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} %description -n lib%{name}-devel This package contains libraries and header files for developing applications that use %{name}. -%package desktopthemes -Group: Graphical Desktop/Look 'n' feel -Summary: Additional Plasma desktop themes -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} - -%description desktopthemes -Additional Plasma desktop themes. - -%package -n plasma-desktoptheme-openmamba -Group: Graphical Desktop/Look 'n' feel -Summary: Plasma desktop theme for openmamba -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} - -%description -n plasma-desktoptheme-openmamba -Plasma desktop theme for openmamba. - %debug_package %prep %setup -q -#%ifarch arm -#%patch0 -p1 -#%endif -cp -a src/desktoptheme/{breeze-dark,openmamba-dark} -cp -a src/desktoptheme/{breeze-light,openmamba-light} -cp -a %{SOURCE2} src/desktoptheme/openmamba-light/metadata.json.cmake -cp -a %{SOURCE3} src/desktoptheme/openmamba-dark/metadata.json.cmake -sed -i "s|61,174,233|82,174,50|" src/desktoptheme/openmamba-{light,dark}/colors -sed -i "s|defaultWallpaperTheme=.*|defaultWallpaperTheme=openmambaRandom|" src/desktoptheme/openmamba-{light,dark}/plasmarc -sed -i "s|desktoptheme/breeze|desktoptheme/openmamba|" src/desktoptheme/openmamba-{light,dark}/CMakeLists.txt -cat >> src/desktoptheme/CMakeLists.txt << _EOF -add_subdirectory( openmamba-dark ) -add_subdirectory( openmamba-light ) -_EOF %build -%cmake_kde5 -d build +%cmake_kde5 -d build \ + -DBUILD_DESKTOPTHEMES=OFF + %make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build -# Replace desktop menu icon (start.svgz) with openmamba icon -for d in %{buildroot}%{_datadir}/plasma/desktoptheme/*; do - [ -e ${d}/icons/start.svgz ] && install -m0644 %{SOURCE1} ${d}/icons/start.svgz -done - %find_lang %{name}5_qt --with-qt --all-name || touch %{name}5_qt.lang %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %post -n lib%{name} -p /sbin/ldconfig - %postun -n lib%{name} -p /sbin/ldconfig %files -f %{name}5_qt.lang %defattr(-,root,root) %{_bindir}/plasmapkg2 -#%{_datadir}/kservices5/plasma-scriptengine-applet-declarative.desktop %{_kde5_servicetypesdir}/plasma-applet.desktop %{_kde5_servicetypesdir}/plasma-containment.desktop %{_kde5_servicetypesdir}/plasma-containmentactions.desktop @@ -153,29 +114,13 @@ done %{_kde5_servicetypesdir}/plasma-wallpaper.desktop %{_datadir}/qlogging-categories5/plasma-framework.*categories %dir %{_datadir}/plasma -%dir %{_datadir}/plasma/desktoptheme -%dir %{_datadir}/plasma/desktoptheme/default -%{_datadir}/plasma/desktoptheme/default/* %{_datadir}/plasma/services/dataengineservice.operations %{_datadir}/plasma/services/plasmoidservice.operations %{_datadir}/plasma/services/storage.operations %{_datadir}/kdevappwizard/templates/* -#%{_datadir}/locale/lt/LC_SCRIPTS/libplasma5/libplasma5.js -#%{_datadir}/locale/lt/LC_SCRIPTS/libplasma5/plasmoids.js %{_mandir}/man1/plasmapkg2.1* %{_mandir}/*/man1/plasmapkg2.1* -%files desktopthemes -%defattr(-,root,root) -%dir %{_datadir}/plasma/desktoptheme/air -%{_datadir}/plasma/desktoptheme/air/* -%dir %{_datadir}/plasma/desktoptheme/breeze-light -%{_datadir}/plasma/desktoptheme/breeze-light/* -%dir %{_datadir}/plasma/desktoptheme/breeze-dark -%{_datadir}/plasma/desktoptheme/breeze-dark/* -%dir %{_datadir}/plasma/desktoptheme/oxygen -%{_datadir}/plasma/desktoptheme/oxygen/* - %files -n lib%{name} %defattr(-,root,root) %{_kde5_libdir}/libKF5Plasma.so.* @@ -204,7 +149,7 @@ done %{_libdir}/qt5/qml/org/kde/plasma/platformcomponents/plugins.qmltypes %{_libdir}/qt5/qml/org/kde/plasma/platformcomponents/libplatformcomponentsplugin.so %{_libdir}/qt5/qml/org/kde/plasma/platformcomponents/qmldir -%doc LICENSES +#%doc LICENSES %files -n lib%{name}-devel %defattr(-,root,root) @@ -223,14 +168,10 @@ done %{_kde5_libdir}/libKF5Plasma.so %{_kde5_libdir}/libKF5PlasmaQuick.so -%files -n plasma-desktoptheme-openmamba -%defattr(-,root,root) -%dir %{_datadir}/plasma/desktoptheme/openmamba-dark -%{_datadir}/plasma/desktoptheme/openmamba-dark/* -%dir %{_datadir}/plasma/desktoptheme/openmamba-light -%{_datadir}/plasma/desktoptheme/openmamba-light/* - %changelog +* Thu Mar 07 2024 Silvan Calarco 5.115.0-2mamba +- rebuilt with -DBUILD_DESKTOPTHEMES=OFF for framework 6 coinstallability + * Mon Feb 12 2024 Automatic Build System 5.115.0-1mamba - automatic version update by autodist