- startplasmacompositor.patch (#1297528)
- disable bootstrap
epel9
Rex Dieter 9 years ago
parent f9971641bb
commit c2b0491324

@ -1,13 +1,13 @@
# Define (as 1) to enable bootstrap when building plasma-workspace on a new # Define (as 1) to enable bootstrap when building plasma-workspace on a new
# repo or arch where there's no package that would provide plasmashell # repo or arch where there's no package that would provide plasmashell
%define bootstrap 1 #define bootstrap 1
%global kf5_version 5.13.0 %global kf5_version 5.13.0
Name: plasma-workspace Name: plasma-workspace
Summary: Plasma workspace, applications and applets Summary: Plasma workspace, applications and applets
Version: 5.5.3 Version: 5.5.3
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
URL: https://projects.kde.org/plasma-workspace URL: https://projects.kde.org/plasma-workspace
@ -33,6 +33,7 @@ Patch10: plasma-workspace-5.3.0-konsole-in-contextmenu.patch
Patch11: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch Patch11: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch
# remove stuff we don't want or need, plus a minor bit of customization --rex # remove stuff we don't want or need, plus a minor bit of customization --rex
Patch12: startkde.patch Patch12: startkde.patch
Patch13: startplasmacompositor.patch
Patch14: plasma-workspace-5.5.0-plasmawayland_desktop.patch Patch14: plasma-workspace-5.5.0-plasmawayland_desktop.patch
## upstreamable Patches ## upstreamable Patches
@ -357,6 +358,7 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee
shell/packageplugins/lookandfeel/lookandfeel.cpp shell/packageplugins/lookandfeel/lookandfeel.cpp
%endif %endif
%patch12 -p1 -b .startkde %patch12 -p1 -b .startkde
%patch13 -p1 -b .startplasmacompositor
%patch14 -p1 -b .plasmawayland %patch14 -p1 -b .plasmawayland
@ -570,6 +572,10 @@ fi
%changelog %changelog
* Mon Jan 11 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.5.3-4
- startplasmacompositor.patch (#1297528)
- disable bootstrap
* Sun Jan 10 2016 Rex Dieter <rdieter@fedoraproject.org> 5.5.3-3 * Sun Jan 10 2016 Rex Dieter <rdieter@fedoraproject.org> 5.5.3-3
- drop hacked klipper/prison support (until we have kf5-prison available properly) - drop hacked klipper/prison support (until we have kf5-prison available properly)

@ -0,0 +1,62 @@
diff -up plasma-workspace-5.5.3/startkde/startplasmacompositor.cmake.startplasmacompositor plasma-workspace-5.5.3/startkde/startplasmacompositor.cmake
--- plasma-workspace-5.5.3/startkde/startplasmacompositor.cmake.startplasmacompositor 2016-01-06 06:17:36.000000000 -0600
+++ plasma-workspace-5.5.3/startkde/startplasmacompositor.cmake 2016-01-11 08:20:08.629227225 -0600
@@ -3,18 +3,7 @@
# DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
- qbindir=`qtpaths --binaries-dir`
- qdbus=$qbindir/qdbus
- case $PATH in
- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
- *) PATH=$bindir:$PATH; export PATH;;
- esac
-else
- qdbus=qdbus
-fi
+qdbus=qdbus-qt5
# We need to create config folder so we can write startupconfigkeys
if [ ${XDG_CONFIG_HOME} ]; then
@@ -62,38 +51,6 @@ XftSubPixel=none
EOF
}
-# Make sure the Oxygen font is installed
-# This is necessary for setups where CMAKE_INSTALL_PREFIX
-# is not in /usr. fontconfig looks in /usr, ~/.fonts and
-# $XDG_DATA_HOME for fonts. In this case, we symlink the
-# Oxygen font under ${XDG_DATA_HOME} and make it known to
-# fontconfig
-
-usr_share="/usr/share"
-install_share="@KDE_INSTALL_FULL_DATADIR@"
-
-if [ ! $install_share = $usr_share ]; then
-
- if [ ${XDG_DATA_HOME} ]; then
- fontsDir="${XDG_DATA_HOME}/fonts"
- else
- fontsDir="${HOME}/.fonts"
- fi
-
- test -d $fontsDir || {
- mkdir -p $fontsDir
- }
-
- oxygenDir=$fontsDir/truetype/oxygen
- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/truetype/oxygen"
-
- # if the oxygen dir doesn't exist, create a symlink to be sure that the
- # Oxygen font is available to the user
- test -d $oxygenDir || test -d $prefixDir && {
- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
- }
-fi
-
kstartupconfig5
returncode=$?
if test $returncode -ne 0; then
Loading…
Cancel
Save