]> git.pld-linux.org Git - packages/mkvtoolnix.git/commitdiff
- fixes working with Boost 1.50
authorKarol Krenski <charles@pld-linux.org>
Mon, 23 Jul 2012 23:14:14 +0000 (01:14 +0200)
committerKarol Krenski <charles@pld-linux.org>
Mon, 23 Jul 2012 23:14:14 +0000 (01:14 +0200)
- rel. 2

mkvtoolnix-boost_1_5.patch [new file with mode: 0644]
mkvtoolnix.spec

diff --git a/mkvtoolnix-boost_1_5.patch b/mkvtoolnix-boost_1_5.patch
new file mode 100644 (file)
index 0000000..707ef1a
--- /dev/null
@@ -0,0 +1,11 @@
+--- mkvtoolnix-5.7.0/src/common/mm_io.cpp.orig 2012-07-08 20:06:02.000000000 +0200
++++ mkvtoolnix-5.7.0/src/common/mm_io.cpp      2012-07-24 00:36:34.197525801 +0200
+@@ -147,7 +147,7 @@
+ void
+ mm_file_io_c::prepare_path(const std::string &path) {
+   boost::filesystem::path directory = boost::filesystem::path(path).parent_path();
+-  if (boost::filesystem::exists(directory))
++  if (directory.empty() || boost::filesystem::exists(directory))
+     return;
+   boost::system::error_code error_code;
index 36540eac592bb57106401575b5d02df84f12d999..0df7b68e49512c3d3f5d53d6c598388ae7c003bd 100644 (file)
@@ -11,12 +11,13 @@ Summary:    Matroska video utilities
 Summary(pl.UTF-8):     Narzędzia do filmów w formacie Matroska
 Name:          mkvtoolnix
 Version:       5.7.0
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/Multimedia
 Source0:       http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 # Source0-md5: 99ea44be570412dadafe4ccaee0cfe6e
 Patch0:                %{name}-init_locales.patch
+Patch1:                %{name}-boost_1_5.patch
 URL:           http://www.bunkus.org/videotools/mkvtoolnix/
 %{?with_qt:BuildRequires:      QtGui-devel}
 BuildRequires: boost-devel >= 1.36
@@ -50,6 +51,7 @@ Narzędzia do filmów w formacie Matroska.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
This page took 0.146833 seconds and 4 git commands to generate.