From 820792bc79632aaa02ddb1856b4b433fcdb875b6 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 19 May 2016 23:14:34 +1000 Subject: [PATCH] Add patch to fix ksysguarddrc path definition --- kde-workspace-4.11.22-ksysguarddrc.patch | 13 +++++++++++++ kdebase4-workspace.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 kde-workspace-4.11.22-ksysguarddrc.patch diff --git a/kde-workspace-4.11.22-ksysguarddrc.patch b/kde-workspace-4.11.22-ksysguarddrc.patch new file mode 100644 index 0000000..01f5962 --- /dev/null +++ b/kde-workspace-4.11.22-ksysguarddrc.patch @@ -0,0 +1,13 @@ +Файл kde-workspace-4.11.22/build/testsock это сокет, тогда как файл kde-workspace-4.11.22-patched/build/testsock -- сокет +diff -urN kde-workspace-4.11.22/ksysguard/ksysguardd/CMakeLists.txt kde-workspace-4.11.22-patched/ksysguard/ksysguardd/CMakeLists.txt +--- kde-workspace-4.11.22/ksysguard/ksysguardd/CMakeLists.txt 2015-08-12 17:03:15.000000000 +1000 ++++ kde-workspace-4.11.22-patched/ksysguard/ksysguardd/CMakeLists.txt 2016-05-19 23:11:39.338509839 +1000 +@@ -7,7 +7,7 @@ + # Laurent: Verify that we install it into (kdeprefix)/etc/ and not into /etc + # otherwise it's necessary to change it. + # into kde 3.x it was installed into /etc/ +-add_definitions( -DKSYSGUARDDRCFILE="\\"${SYSCONF_INSTALL_DIR}/ksysguarddrc\\"" ) ++add_definitions( -DKSYSGUARDDRCFILE="${SYSCONF_INSTALL_DIR}/ksysguarddrc" ) + + add_definitions(-DOSTYPE_${CMAKE_SYSTEM_NAME}) + diff --git a/kdebase4-workspace.spec b/kdebase4-workspace.spec index 4a0b1bc..b33e189 100644 --- a/kdebase4-workspace.spec +++ b/kdebase4-workspace.spec @@ -13,7 +13,7 @@ Summary: KDE 4 application workspace components Name: kdebase4-workspace Version: 4.11.22 -Release: 4 +Release: 5 Epoch: 2 License: GPLv2+ Group: Graphical desktop/KDE @@ -86,6 +86,7 @@ Patch26: kdebase-workspace-4.11.0-simpleapplet-defaults.patch # Make it possible to set wallpaper via dbus # See https://bugs.kde.org/show_bug.cgi?id=217950 Patch27: kde-workspace-4.11.6-dbus-wallpaper.patch +Patch28: kde-workspace-4.11.22-ksysguarddrc.patch # See http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=c1469413f36d4e4cd9dd49e70bc5d660cf2f3c55 # And http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=dcc70fbb55919ac56ae188ceb3d5bf7b94c2dbcd # We partially revert it because we need at least deKorator to work @@ -1646,6 +1647,7 @@ tar xf %{SOURCE6} %patch25 -p1 %patch26 -p1 %patch27 -p1 +%patch28 -p1 %patch50 -p1 %patch100 -p1 %patch101 -p1 @@ -1761,6 +1763,9 @@ for f in %{buildroot}%{_kde_applicationsdir}/*.desktop ; do done %changelog +* Thu May 19 2016 Andrey Bondrov 2:4.11.22-5 +- Add patch to fix ksysguarddrc path definition + * Mon Apr 25 2016 Andrey Bondrov 2:4.11.22-4 - Backport systemsettings-icons patch to fix icons in System Settings