6:4.10.2-3
- fix/workaround plasma-desktop crash (kde#318806) - respin FindSamba patch
This commit is contained in:
Rex Dieter
parent
3d61393ab3
commit
0838c911b6
|
|
@ -0,0 +1,40 @@
|
|||
From aaeae76bc3e5fa02601608bae85cdd1478843678 Mon Sep 17 00:00:00 2001
|
||||
From: Rex Dieter <rdieter@math.unl.edu>
|
||||
Date: Sat, 6 Apr 2013 05:10:39 -0500
|
||||
Subject: [PATCH] FindSamba.cmake: help find samba4 more reliably
|
||||
|
||||
add PATH_SUFFIXES samba-4.0 and pkgconfig hints
|
||||
---
|
||||
cmake/modules/FindSamba.cmake | 14 ++++++++++++--
|
||||
1 file changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cmake/modules/FindSamba.cmake b/cmake/modules/FindSamba.cmake
|
||||
index 16522c6..ec1179d 100644
|
||||
--- a/cmake/modules/FindSamba.cmake
|
||||
+++ b/cmake/modules/FindSamba.cmake
|
||||
@@ -17,10 +17,20 @@ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
set(Samba_FIND_QUIETLY TRUE)
|
||||
endif(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
|
||||
-find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h )
|
||||
+# use pkg-config to get the directories and then use these values
|
||||
+# in the FIND_PATH() and FIND_LIBRARY() calls
|
||||
+find_package(PkgConfig)
|
||||
+pkg_check_modules(PC_LIBSMBCLIENT QUIET smbclient)
|
||||
|
||||
-find_library(SAMBA_LIBRARIES NAMES smbclient )
|
||||
+find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h PATH_SUFFIXES samba-4.0
|
||||
+ HINTS
|
||||
+ ${PC_LIBSMBCLIENT_INCLUDEDIR}
|
||||
+ ${PC_LIBSMBCLIENT_INCLUDE_DIRS})
|
||||
|
||||
+find_library(SAMBA_LIBRARIES NAMES smbclient
|
||||
+ HINTS
|
||||
+ ${PC_LIBSMBCLIENT_LIBDIR}
|
||||
+ ${PC_LIBSMBCLIENT_LIB_DIRS})
|
||||
|
||||
if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
set(SAMBA_FOUND TRUE)
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
diff -up kdelibs-4.9.90/cmake/modules/FindSamba.cmake.FindSamba-samba4 kdelibs-4.9.90/cmake/modules/FindSamba.cmake
|
||||
--- kdelibs-4.9.90/cmake/modules/FindSamba.cmake.FindSamba-samba4 2012-11-14 09:58:29.000000000 -0600
|
||||
+++ kdelibs-4.9.90/cmake/modules/FindSamba.cmake 2012-12-03 07:29:54.103057454 -0600
|
||||
@@ -17,10 +17,20 @@ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES
|
||||
set(Samba_FIND_QUIETLY TRUE)
|
||||
endif(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
|
||||
-find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h )
|
||||
+# use pkg-config to get the directories and then use these values
|
||||
+# in the FIND_PATH() and FIND_LIBRARY() calls
|
||||
+find_package(PkgConfig)
|
||||
+pkg_check_modules(PC_LIBSMBCLIENT QUIET smbclient)
|
||||
|
||||
-find_library(SAMBA_LIBRARIES NAMES smbclient )
|
||||
+find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h
|
||||
+ HINTS
|
||||
+ ${PC_LIBSMBCLIENT_INCLUDEDIR}
|
||||
+ ${PC_LIBSMBCLIENT_INCLUDE_DIRS})
|
||||
|
||||
+find_library(SAMBA_LIBRARIES NAMES smbclient
|
||||
+ HINTS
|
||||
+ ${PC_LIBSMBCLIENT_LIBDIR}
|
||||
+ ${PC_LIBSMBCLIENT_LIB_DIRS})
|
||||
|
||||
if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
set(SAMBA_FOUND TRUE)
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/plasma/applet.cpp b/plasma/applet.cpp
|
||||
index 9ed62bc..5ede42b 100644
|
||||
--- a/plasma/applet.cpp
|
||||
+++ b/plasma/applet.cpp
|
||||
@@ -2713,6 +2713,8 @@ AppletPrivate::AppletPrivate(KService::Ptr service, const KPluginInfo *info, int
|
||||
} else if (appletId > s_maxAppletId) {
|
||||
s_maxAppletId = appletId;
|
||||
}
|
||||
+
|
||||
+ publishUI.publishCheckbox = 0;
|
||||
}
|
||||
|
||||
AppletPrivate::~AppletPrivate()
|
||||
12
kdelibs.spec
12
kdelibs.spec
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.10.2
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
|
|
@ -146,7 +146,7 @@ Patch54: kdelibs-4.8.4-kjs-locale.patch
|
|||
|
||||
# patch FindSamba.cmake to find samba4 libs (using pkg-config hints)
|
||||
# https://git.reviewboard.kde.org/r/106861/
|
||||
Patch55: kdelibs-4.9.90-FindSamba_samba4.patch
|
||||
Patch55: FindSamba.cmake-help-find-samba4-more-reliably.patch
|
||||
|
||||
# make filter working, TODO: upstream? -- rex
|
||||
Patch59: kdelibs-4.9.3-kcm_ssl.patch
|
||||
|
|
@ -164,6 +164,9 @@ Patch100: return-not-break.-copy-paste-error.patch
|
|||
Patch101: coding-style-fixes.patch
|
||||
Patch102: return-application-icons-properly.patch
|
||||
|
||||
# https://git.reviewboard.kde.org/r/110158/
|
||||
Patch124: kdelibs-reviewboard-r110158.patch
|
||||
|
||||
## security fix
|
||||
# Not Upstreamed? why not ? -- Rex
|
||||
Patch200: kdelibs-4.10.0-CVE-2009-2702.patch
|
||||
|
|
@ -355,6 +358,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||
%patch100 -p1 -R -b .return-not-break.-copy-paste-error
|
||||
%patch101 -p1 -R -b .coding-style-fixes.patch
|
||||
%patch102 -p1 -R -b .return-application-icons-properly
|
||||
%patch124 -p1 -b .0024-2
|
||||
|
||||
# security fixes
|
||||
%patch200 -p1 -b .CVE-2009-2702
|
||||
|
|
@ -598,6 +602,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Apr 24 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.10.2-3
|
||||
- fix/workaround plasma-desktop crash (kde#318806)
|
||||
- respin FindSamba patch
|
||||
|
||||
* Tue Apr 16 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.10.2-2
|
||||
- revert upstream commit wrt icon inheritance, for now, to avoid regression (kde#317138)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue