[packages/kdelibs/dev-trinity] fix missing opening paren in lib_loader patch
glen
glen at pld-linux.org
Mon Mar 23 06:36:09 CET 2015
commit 1ceda81cdc7c42057ae87e20d9d84c49c895b0d4
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Mar 23 07:35:53 2015 +0200
fix missing opening paren in lib_loader patch
kdelibs-lib_loader.patch | 5 +++--
kdelibs.spec | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index cf52a17..34e63fe 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -35,7 +35,7 @@ Summary(ru.UTF-8): K Desktop Environment 3 - Библиотеки
Summary(uk.UTF-8): K Desktop Environment 3 - Бібліотеки
Name: kdelibs
Version: R14.0.0
-Release: 0.23
+Release: 0.24
Epoch: 9
License: LGPL v2
Group: X11/Libraries
@@ -407,7 +407,7 @@ if [ ! -f installed.stamp ]; then
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libtdeinit_*.la
# remove unwanted boost deps from .la
- sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libexecdir}/plugins/designer/kdewidgets.la
+ sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libexecdir}/plugins/designer/tdewidgets.la
sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/*.la
%endif
diff --git a/kdelibs-lib_loader.patch b/kdelibs-lib_loader.patch
index 9e773ae..4103c9d 100644
--- a/kdelibs-lib_loader.patch
+++ b/kdelibs-lib_loader.patch
@@ -46,7 +46,7 @@
#include "tdeapplication.h"
#include "klibloader.h"
#include "kstandarddirs.h"
-@@ -331,46 +337,57 @@
+@@ -331,46 +337,58 @@
d = 0L;
}
@@ -89,6 +89,7 @@
-{
- TQCString libname = makeLibName( name );
+TQString KLibLoader::findLibrary( const char * name, const TDEInstance * instance )
++{
- // only look up the file if it is not an absolute filename
- // (mhk, 20000228)
@@ -137,7 +138,7 @@
KLibrary* KLibLoader::globalLibrary( const char *name )
{
KLibrary *tmp;
-@@ -418,11 +434,7 @@
+@@ -418,11 +435,7 @@
TQString libfile = findLibrary( name );
if ( libfile.isEmpty() )
{
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdelibs.git/commitdiff/1ceda81cdc7c42057ae87e20d9d84c49c895b0d4
More information about the pld-cvs-commit
mailing list