[packages/kdelibs/dev-trinity] merge boost-1.50.patch to kdelibs-lib_loader.patch

[glen]

commit 750e64fcf5f45155de23a81cf81a58682d31ef87
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed May 28 11:45:42 2014 +0300

    merge boost-1.50.patch to kdelibs-lib_loader.patch

 boost-1.50.patch         | 19 -------------------
 kdelibs-lib_loader.patch | 20 +++++++-------------
 kdelibs.spec             |  3 ---
 3 files changed, 7 insertions(+), 35 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 8219cc7..c7ce24b 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -69,7 +69,6 @@ Patch17:	%{name}-3.5.10-LDFLAG_fix-1.patch
 # http://www.thel.ro/kde3-fedora/SOURCES/kdelibs-3.5.10-ossl-1.x.patch
 Patch18:	%{name}-3.5.10-ossl-1.x.patch
 Patch19:	%{name}-gcc4.patch
-Patch20:	boost-1.50.patch
 Patch21:	%{name}-cups16.patch
 URL:		http://www.kde.org/
 %{?with_openexr:BuildRequires:	OpenEXR-devel >= 1.4.0.a}
@@ -385,8 +384,6 @@ strony innych użytkowników lokalnych.
 %patch17 -p1
 #%patch18 -p1 assume outdated
 %patch19 -p1
-# TODO: MERGE WITH lib_loader.patch
-%patch20 -p1
 #%patch21 -p1 seems outdated
 
 #mv -f configure{,.dist}
diff --git a/boost-1.50.patch b/boost-1.50.patch
deleted file mode 100644
index 48c935e..0000000
--- a/boost-1.50.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kdelibs-trinity-3.5.13.2/kdecore/klibloader.cpp~	2014-05-27 23:28:54.291178525 +0300
-+++ kdelibs-trinity-3.5.13.2/kdecore/klibloader.cpp	2014-05-27 23:30:56.593147558 +0300
-@@ -25,6 +25,7 @@
- #include <tqtimer.h>
- #include <tqobjectdict.h>
- 
-+#define BOOST_FILESYSTEM_VERSION 3
- #include <boost/filesystem/exception.hpp>
- #include <boost/filesystem/operations.hpp>
- #include <boost/filesystem/path.hpp>
-@@ -350,7 +350,7 @@
- 			i != boost::filesystem::directory_iterator(); ++i )
- 		{
- 			boost::smatch m;
--			if ( boost::regex_match( i->string(), m, re ) )
-+			if ( boost::regex_match( i->path().string(), m, re ) )
- 				return m.str().c_str();
- 		}
- 	}
diff --git a/kdelibs-lib_loader.patch b/kdelibs-lib_loader.patch
index dbc7238..bb4aa53 100644
--- a/kdelibs-lib_loader.patch
+++ b/kdelibs-lib_loader.patch
@@ -1,10 +1,3 @@
-
- kdecore/Makefile.am    |    2 +
- kdecore/klibloader.cpp |   86 +++++++++++++++++++++++++++----------------------
- kdecore/klibloader.h   |    2 -
- kinit/kinit.cpp        |    8 +---
- 4 files changed, 55 insertions(+), 43 deletions(-)
-
 --- kdelibs-3.5.12/kdecore/Makefile.am~	2010-08-12 06:04:03.000000000 +0300
 +++ kdelibs-3.5.12/kdecore/Makefile.am	2011-01-04 19:13:22.247155923 +0200
 @@ -121,9 +121,11 @@
@@ -30,12 +23,13 @@
       * @param instance a KInstance used to get the standard paths
       */
      static QString findLibrary( const char * name, const KInstance * instance = KGlobal::instance() );
---- kdelibs-3.5.12/kdecore/klibloader.cpp~	2010-08-12 11:30:26.000000000 +0300
-+++ kdelibs-3.5.12/kdecore/klibloader.cpp	2011-01-04 19:22:53.611031525 +0200
-@@ -25,6 +25,11 @@
+--- kdelibs-trinity-3.5.13.2/kdecore/klibloader.cpp	2012-09-16 12:38:12.000000000 +0300
++++ kdelibs-trinity-3.5.13.2/kdecore/klibloader.cpp	2014-05-28 11:16:42.469374659 +0300
+@@ -25,6 +25,12 @@
  #include <tqtimer.h>
  #include <tqobjectdict.h>
  
++#define BOOST_FILESYSTEM_VERSION 3
 +#include <boost/filesystem/exception.hpp>
 +#include <boost/filesystem/operations.hpp>
 +#include <boost/filesystem/path.hpp>
@@ -44,7 +38,7 @@
  #include "kapplication.h"
  #include "klibloader.h"
  #include "kstandarddirs.h"
-@@ -331,46 +336,56 @@
+@@ -331,46 +337,56 @@
      d = 0L;
  }
  
@@ -72,7 +66,7 @@
 +			i != boost::filesystem::directory_iterator(); ++i )
 +		{
 +			boost::smatch m;
-+			if ( boost::regex_match( i->string(), m, re ) )
++			if ( boost::regex_match( i->path().string(), m, re ) )
 +				return m.str().c_str();
 +		}
 +	}
@@ -135,7 +129,7 @@
  KLibrary* KLibLoader::globalLibrary( const char *name )
  {
  KLibrary *tmp;
-@@ -418,11 +433,7 @@
+@@ -418,11 +434,7 @@
        TQString libfile = findLibrary( name );
        if ( libfile.isEmpty() )
        {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kdelibs.git/commitdiff/848a40b8c13b70528acf57d9f12dbb4a107c153d