From: Jan Rękorajski Date: Sun, 3 Mar 2019 21:15:30 +0000 (+0100) Subject: - smbclient detection is broken, but build succeeds X-Git-Tag: auto/th/kde4-kdebase-runtime-4.14.3-11 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=6d0f2470fc251e154308a0503179f92104d572a8;p=packages%2Fkde4-kdebase-runtime.git - smbclient detection is broken, but build succeeds - rel 11 --- diff --git a/kde4-kdebase-runtime.spec b/kde4-kdebase-runtime.spec index ba5e981..ae74e3e 100644 --- a/kde4-kdebase-runtime.spec +++ b/kde4-kdebase-runtime.spec @@ -12,7 +12,7 @@ Summary: KDE 4 base runtime components Summary(pl.UTF-8): Komponenty uruchomieniowe podstawowej części KDE 4 Name: kde4-kdebase-runtime Version: 4.14.3 -Release: 10 +Release: 11 License: GPL v2+ Group: X11/Applications Source0: http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz @@ -24,6 +24,7 @@ Patch100: %{name}-branch.diff Patch0: %{name}-rpc.patch Patch1: moc.patch Patch2: %{name}-exiv2.patch +Patch3: smbclient-detection.patch URL: http://www.kde.org/ BuildRequires: NetworkManager-devel >= 0.7.0 BuildRequires: OpenEXR-devel @@ -116,6 +117,7 @@ Wtyczki KDE 4 dla Phonona. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build install -d build diff --git a/smbclient-detection.patch b/smbclient-detection.patch new file mode 100644 index 0000000..88ec417 --- /dev/null +++ b/smbclient-detection.patch @@ -0,0 +1,11 @@ +--- kde-runtime-4.14.3/kioslave/CMakeLists.txt~ 2014-10-31 00:50:20.000000000 +0100 ++++ kde-runtime-4.14.3/kioslave/CMakeLists.txt 2019-03-03 22:09:03.628677423 +0100 +@@ -1,8 +1,6 @@ + + if(NOT WIN32) + # we need a version of samba which has already smbc_set_context(), Alex +-set(SAMBA_REQUIRE_SMBC_SET_CONTEXT TRUE) +-set(SAMBA_REQUIRE_SMBC_OPTION_SET TRUE) + macro_optional_find_package(Samba) + set_package_properties(Samba PROPERTIES DESCRIPTION "the SMB client library, a version with smbc_set_context() and smbc_option_set()" + URL "http://www.samba.org"