From 5025c3e1850d529de76162053e033b89a3cc3267 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 04 2012 12:48:07 +0000 Subject: rebase patches --- diff --git a/kde-workspace-4.7.95-gcc47.patch b/kde-workspace-4.7.95-gcc47.patch deleted file mode 100644 index 59ecd47..0000000 --- a/kde-workspace-4.7.95-gcc47.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp.gcc47 kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp ---- kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp.gcc47 2011-12-20 18:40:36.000000000 -0600 -+++ kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp 2012-01-03 15:09:37.254323288 -0600 -@@ -20,6 +20,7 @@ - #include "SplashApp.h" - - #include -+#include - #include - - int main(int argc, char **argv) -diff -up kde-workspace-4.7.95/libs/ksysguard/processui/ProcessModel.cpp.gcc47 kde-workspace-4.7.95/libs/ksysguard/processui/ProcessModel.cpp ---- kde-workspace-4.7.95/libs/ksysguard/processui/ProcessModel.cpp.gcc47 2011-12-20 18:40:37.000000000 -0600 -+++ kde-workspace-4.7.95/libs/ksysguard/processui/ProcessModel.cpp 2012-01-03 15:32:37.991061709 -0600 -@@ -421,11 +421,11 @@ void ProcessModelPrivate::queryForAndUpd - return; - for (uint i=0; i < count; ++i) { - WId wid = children[i]; -- QMap::iterator i = mXResClientResources.lowerBound(-(qlonglong)(wid)); -- if(i == mXResClientResources.end()) -+ QMap::iterator j = mXResClientResources.lowerBound(-(qlonglong)(wid)); -+ if(j == mXResClientResources.end()) - continue; //We couldn't find it this time :-/ - -- if(-i.key() != (qlonglong)(wid & ~i.value())) -+ if(-j.key() != (qlonglong)(wid & ~j.value())) - continue; //Already added this window - - //Get the PID for this window if we do not know it -@@ -438,7 +438,7 @@ void ProcessModelPrivate::queryForAndUpd - if(!pid) - continue; - //We found a window with this client -- mXResClientResources.erase(i); -+ mXResClientResources.erase(j); - KSysGuard::Process *process = mProcesses->getProcess(pid); - if(!process) return; //shouldn't really happen.. maybe race condition etc - unsigned long previousPixmapBytes = process->pixmapBytes; diff --git a/kde-workspace-4.7.95-no_malloc_check.patch b/kde-workspace-4.7.95-no_malloc_check.patch deleted file mode 100644 index 6b3426b..0000000 --- a/kde-workspace-4.7.95-no_malloc_check.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up kde-workspace-4.7.95/startkde.cmake.no_malloc_check kde-workspace-4.7.95/startkde.cmake ---- kde-workspace-4.7.95/startkde.cmake.no_malloc_check 2011-12-29 17:54:24.634643588 -0600 -+++ kde-workspace-4.7.95/startkde.cmake 2011-12-29 17:54:50.460320722 -0600 -@@ -36,18 +36,6 @@ fi - # we have to unset this for Darwin since it will screw up KDE's dynamic-loading - unset DYLD_FORCE_FLAT_NAMESPACE - --# Enable lightweight memory corruption checker if not already set --# -- this is for trunk only, we remove it for releases --if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then -- # Extract the first two components of the version from the output. -- glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q') -- -- MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher. -- test $glibc_version \> 2.08 && MALLOC_CHECK_=3 -- -- export MALLOC_CHECK_ --fi -- - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage diff --git a/kde-workspace-4.7.97-gcc47.patch b/kde-workspace-4.7.97-gcc47.patch new file mode 100644 index 0000000..d29b4ff --- /dev/null +++ b/kde-workspace-4.7.97-gcc47.patch @@ -0,0 +1,12 @@ +diff -up kde-workspace-4.7.97/ksplash/ksplashqml/main.cpp.gcc47 kde-workspace-4.7.97/ksplash/ksplashqml/main.cpp +--- kde-workspace-4.7.97/ksplash/ksplashqml/main.cpp.gcc47 2012-01-03 13:43:13.000000000 -0600 ++++ kde-workspace-4.7.97/ksplash/ksplashqml/main.cpp 2012-01-04 06:45:43.494619293 -0600 +@@ -20,6 +20,7 @@ + #include "SplashApp.h" + + #include ++#include + #include + + int main(int argc, char **argv) +diff -up kde-workspace-4.7.97/libs/ksysguard/processui/ProcessModel.cpp.gcc47 kde-workspace-4.7.97/libs/ksysguard/processui/ProcessModel.cpp diff --git a/kde-workspace-4.7.97-redhat_startkde.patch b/kde-workspace-4.7.97-redhat_startkde.patch new file mode 100644 index 0000000..3dbd75a --- /dev/null +++ b/kde-workspace-4.7.97-redhat_startkde.patch @@ -0,0 +1,101 @@ +diff -up kde-workspace-4.7.97/startkde.cmake.redhat_startkde kde-workspace-4.7.97/startkde.cmake +--- kde-workspace-4.7.97/startkde.cmake.redhat_startkde 2012-01-03 13:43:14.000000000 -0600 ++++ kde-workspace-4.7.97/startkde.cmake 2012-01-04 06:43:55.711665134 -0600 +@@ -28,22 +28,6 @@ fi + # we have to unset this for Darwin since it will screw up KDE's dynamic-loading + unset DYLD_FORCE_FLAT_NAMESPACE + +-# 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=`$bindir/kde4-config --qt-binaries` +- if [ -n "$qbindir" ]; then +- case $PATH in +- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; +- *) PATH=$qbindir:$PATH; export PATH;; +- esac +- fi +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-fi +- + # Boot sequence: + # + # kdeinit is used to fork off processes which improves memory usage +@@ -64,6 +48,37 @@ fi + kdehome=$HOME/@KDE_DEFAULT_HOME@ + test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` + ++# Read LANG and write the country part to kdeglobals ++# de_AT.UTF-8 => Country=at ++# This is necessary because klocale.cpp (kdelibs) does only try to read the value ++# from kdeglobals and then falls back to default instead of triyng to detect it ++ ++if [ ! -e $kdehome/share/config/kdeglobals ] || [ ! `grep "Country=" $kdehome/share/config/kdeglobals` ]; then ++ if [ ! $LANG ]; then ++ if [ -e /etc/default/locale ]; then ++ localefile='/etc/default/locale' ++ elif [ -e /etc/sysconfig/i18n ]; then ++ localefile='/etc/sysconfig/i18n' ++ elif [ -e /etc/environment ]; then ++ localefile='/etc/environment' ++ fi ++ if [ $localefile ]; then ++ locale=`sed -ne 's/^LANG="\(.*\)"$/\1/p' $localefile` ++ fi ++ else ++ locale=$LANG ++ fi ++ if [ $locale ]; then ++ country=`echo $locale | sed -ne 's/^[A-Za-z]*_\([A-Za-z]*\).*$/\1/p'|tr 'A-Z' 'a-z'` ++ if [ ! $country = "" ]; then ++cat >>$kdehome/share/config/kdeglobals </dev/n + echo 'startkde: Running shutdown scripts...' 1>&2 + + # Run scripts found in $KDEDIRS/shutdown +-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do ++shutdownpath=/etc/kde/shutdown/ ++for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do + for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do + test -x "$prefix$file" && "$prefix$file" + done diff --git a/kdebase-workspace-4.7.80-redhat_startkde.patch b/kdebase-workspace-4.7.80-redhat_startkde.patch deleted file mode 100644 index d1c377f..0000000 --- a/kdebase-workspace-4.7.80-redhat_startkde.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -up kde-workspace-4.7.80/startkde.cmake.redhat_startkde kde-workspace-4.7.80/startkde.cmake ---- kde-workspace-4.7.80/startkde.cmake.redhat_startkde 2011-11-17 21:55:51.000000000 +0100 -+++ kde-workspace-4.7.80/startkde.cmake 2011-11-21 14:47:09.947290754 +0100 -@@ -40,22 +40,6 @@ if [ "x$MALLOC_CHECK_" = "x" ] && [ -x / - export MALLOC_CHECK_ - fi - --# 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=`$bindir/kde4-config --qt-binaries` -- if [ -n "$qbindir" ]; then -- case $PATH in -- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; -- *) PATH=$qbindir:$PATH; export PATH;; -- esac -- fi -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac --fi -- - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage -@@ -76,6 +60,37 @@ fi - kdehome=$HOME/@KDE_DEFAULT_HOME@ - test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` - -+# Read LANG and write the country part to kdeglobals -+# de_AT.UTF-8 => Country=at -+# This is necessary because klocale.cpp (kdelibs) does only try to read the value -+# from kdeglobals and then falls back to default instead of triyng to detect it -+ -+if [ ! -e $kdehome/share/config/kdeglobals ] || [ ! `grep "Country=" $kdehome/share/config/kdeglobals` ]; then -+ if [ ! $LANG ]; then -+ if [ -e /etc/default/locale ]; then -+ localefile='/etc/default/locale' -+ elif [ -e /etc/sysconfig/i18n ]; then -+ localefile='/etc/sysconfig/i18n' -+ elif [ -e /etc/environment ]; then -+ localefile='/etc/environment' -+ fi -+ if [ $localefile ]; then -+ locale=`sed -ne 's/^LANG="\(.*\)"$/\1/p' $localefile` -+ fi -+ else -+ locale=$LANG -+ fi -+ if [ $locale ]; then -+ country=`echo $locale | sed -ne 's/^[A-Za-z]*_\([A-Za-z]*\).*$/\1/p'|tr 'A-Z' 'a-z'` -+ if [ ! $country = "" ]; then -+cat >>$kdehome/share/config/kdeglobals </dev/n - echo 'startkde: Running shutdown scripts...' 1>&2 - - # Run scripts found in $KDEDIRS/shutdown --for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do -+shutdownpath=/etc/kde/shutdown/ -+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do - for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do - test -x "$prefix$file" && "$prefix$file" - done diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec index c77efd4..53053f7 100644 --- a/kdebase-workspace.spec +++ b/kdebase-workspace.spec @@ -18,7 +18,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-workspace-%{version BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # RH/Fedora-specific startkde changes -Patch1: kdebase-workspace-4.7.80-redhat_startkde.patch +Patch1: kde-workspace-4.7.97-redhat_startkde.patch # add konsole menuitem Patch2: kdebase-workspace-4.5.0-plasma-konsole.patch @@ -81,11 +81,9 @@ Patch52: kde-workspace-4.7.80-bz#732830-login.patch Patch53: kde-workspace-4.7.95-kdm_xauth.patch # gcc47 fixes (missing headers mostly) -Patch54: kde-workspace-4.7.95-gcc47.patch +Patch54: kde-workspace-4.7.97-gcc47.patch ## upstream patches -# omit MALLOC_CHECK_ from startkde -Patch100: kde-workspace-4.7.95-no_malloc_check.patch ## plasma active patches # adapted version of wac-html-widgets.patch @@ -400,7 +398,6 @@ Requires: akonadi %patch54 -p1 -b .gcc47 # upstream patches -%patch100 -p1 -b .no_malloc_check # plasma-active %patch153 -p1 -b .wac-html-widgets