Merge branch 'f18' into f17
This commit is contained in:
Rex Dieter
commit
97eef5da7b
28
kdelibs-4.9.2-FindSamba_samba4.patch
Normal file
28
kdelibs-4.9.2-FindSamba_samba4.patch
Normal file
@ -0,0 +1,28 @@
|
||||
diff -up kdelibs-4.9.2/cmake/modules/FindSamba.cmake.samba4 kdelibs-4.9.2/cmake/modules/FindSamba.cmake
|
||||
--- kdelibs-4.9.2/cmake/modules/FindSamba.cmake.samba4 2012-09-27 19:09:04.000000000 -0500
|
||||
+++ kdelibs-4.9.2/cmake/modules/FindSamba.cmake 2012-10-02 07:11:38.137381941 -0500
|
||||
@@ -17,10 +17,22 @@ 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 )
|
||||
+IF (NOT WIN32)
|
||||
+ # 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)
|
||||
+ENDIF (NOT WIN32)
|
||||
|
||||
-find_library(SAMBA_LIBRARIES NAMES smbclient )
|
||||
+find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h
|
||||
+ PATHS
|
||||
+ ${PC_LIBSMBCLIENT_INCLUDEDIR}
|
||||
+ ${PC_LIBSMBCLIENT_INCLUDE_DIRS})
|
||||
|
||||
+find_library(SAMBA_LIBRARIES NAMES smbclient
|
||||
+ PATHS
|
||||
+ ${PC_LIBSMBCLIENT_LIBDIR}
|
||||
+ ${PC_LIBSMBCLIENT_LIB_DIRS})
|
||||
|
||||
if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||
set(SAMBA_FOUND TRUE)
|
||||
57
kdelibs-4.9.2-revert-kde#108510-kde#183534.patch
Normal file
57
kdelibs-4.9.2-revert-kde#108510-kde#183534.patch
Normal file
@ -0,0 +1,57 @@
|
||||
diff -up kdelibs-4.9.2/kinit/kinit.cpp.me kdelibs-4.9.2/kinit/kinit.cpp
|
||||
--- kdelibs-4.9.2/kinit/kinit.cpp.me 2012-10-04 14:14:07.992428593 +0200
|
||||
+++ kdelibs-4.9.2/kinit/kinit.cpp 2012-10-04 14:19:28.783484339 +0200
|
||||
@@ -57,7 +57,6 @@
|
||||
#include <klibrary.h>
|
||||
#include <kdemacros.h>
|
||||
#include <kstandarddirs.h>
|
||||
-#include <kglobalsettings.h>
|
||||
#include <kglobal.h>
|
||||
#include <kconfig.h>
|
||||
#include <kapplication.h>
|
||||
@@ -538,7 +537,6 @@ static pid_t launch(int argc, const char
|
||||
#endif
|
||||
// find out these paths before forking, doing it afterwards
|
||||
// crashes on some platforms, notably OSX
|
||||
- const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());
|
||||
#ifdef Q_WS_MAC
|
||||
const QString bundlepath = s_instance->dirs()->findExe(QFile::decodeName(execpath));
|
||||
#endif
|
||||
@@ -567,12 +565,6 @@ static pid_t launch(int argc, const char
|
||||
// we still want to execute `foo` even if the chdir() failed.
|
||||
if (cwd && *cwd) {
|
||||
(void)chdir(cwd);
|
||||
- } else {
|
||||
- // on Maemo5, documentPath() is on the SD card, setting it as working directory would block
|
||||
- // USB mass storage access
|
||||
-#ifndef Q_WS_MAEMO_5
|
||||
- (void)chdir(docPath.constData());
|
||||
-#endif
|
||||
}
|
||||
|
||||
if( reset_env ) // KWRAPPER/SHELL
|
||||
diff -up kdelibs-4.9.2/kio/kio/krun.cpp.me kdelibs-4.9.2/kio/kio/krun.cpp
|
||||
--- kdelibs-4.9.2/kio/kio/krun.cpp.me 2012-10-04 14:24:07.520105922 +0200
|
||||
+++ kdelibs-4.9.2/kio/kio/krun.cpp 2012-10-04 14:45:34.687377085 +0200
|
||||
@@ -55,7 +55,6 @@
|
||||
#include <kmessageboxwrapper.h>
|
||||
#include <kurl.h>
|
||||
#include <kglobal.h>
|
||||
-#include <kglobalsettings.h>
|
||||
#include <ktoolinvocation.h>
|
||||
#include <kdebug.h>
|
||||
#include <klocale.h>
|
||||
@@ -1073,13 +1072,6 @@ bool KRun::runCommand(const QString& cmd
|
||||
kDebug(7010) << "runCommand " << cmd << "," << execName;
|
||||
KProcess * proc = new KProcess;
|
||||
proc->setShellCommand(cmd);
|
||||
- if (workingDirectory.isEmpty()) {
|
||||
- // see bug 108510, and we need "alt+f2 editor" (which starts a desktop file via klauncher)
|
||||
- // and "alt+f2 editor -someoption" (which calls runCommand) to be consistent.
|
||||
- proc->setWorkingDirectory(KGlobalSettings::documentPath());
|
||||
- } else {
|
||||
- proc->setWorkingDirectory(workingDirectory);
|
||||
- }
|
||||
QString bin = binaryName(execName, true);
|
||||
KService::Ptr service = KService::serviceByDesktopName(bin);
|
||||
return runCommandInternal(proc, service.data(),
|
||||
16
kdelibs.spec
16
kdelibs.spec
@ -25,7 +25,7 @@
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.9.2
|
||||
Release: 2%{?dist}
|
||||
Release: 4%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
@ -142,9 +142,15 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
|
||||
# return valid locale (RFC 1766)
|
||||
Patch54: kdelibs-4.8.4-kjs-locale.patch
|
||||
|
||||
# patch FindSamba.cmake to find samba4 libs (using pkg-config hints)
|
||||
Patch55: kdelibs-4.9.2-FindSamba_samba4.patch
|
||||
|
||||
# backport FindKipi.cmake from Digikam SC 3.0.0-beta1 for libkipi 2 (kde#307213)
|
||||
Patch56: kdelibs-4.9.1-FindKipi-libkipi2.patch
|
||||
|
||||
# krunner using ~/Documents as working directory, revert kde#108510, kde#183534
|
||||
Patch57: kdelibs-4.9.2-revert-kde#108510-kde#183534.patch
|
||||
|
||||
## upstream
|
||||
|
||||
## security fix
|
||||
@ -313,7 +319,9 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||
%patch52 -p1 -b .SOLID_UPNP
|
||||
%patch53 -p1 -b .kjs-s390
|
||||
%patch54 -p1 -b .kjs-locale
|
||||
%patch55 -p1 -b .FindSamba-samba4
|
||||
%patch56 -p1 -b .FindKipi-libkipi2
|
||||
%patch57 -p1 -b .revert-kde#108510-kde#183534
|
||||
|
||||
# upstream patches
|
||||
|
||||
@ -571,6 +579,12 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Oct 04 2012 Than Ngo <than@redhat.com> - 6:4.9.2-4
|
||||
- revert kde#108510, kde#183534
|
||||
|
||||
* Tue Oct 02 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.2-3
|
||||
- patch FindSamba.cmake to use pkg-config hints (#862169)
|
||||
|
||||
* Sat Sep 29 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.2-2
|
||||
- respin
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user