summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBehnam Momeni2016-01-19 14:18:56 +0330
committerBehnam Momeni2016-01-19 14:18:56 +0330
commit6cfd50541b651b902ca3c79f21ac2080f6962de1 (patch)
tree6866fd6bfd9f1c122edc8ee83c5cad83f919a64c
parent9d6a27855047c5c62370734a0656522dd9cefd90 (diff)
downloadaur-6cfd50541b651b902ca3c79f21ac2080f6962de1.tar.gz
Patching deprecated API calls from the boost library
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
-rw-r--r--fix_deprecated_boost_api.patch156
3 files changed, 168 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d90c71385e9..9321782cfcb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bombono-dvd
pkgdesc = DVD authoring program with nice and clean GUI
pkgver = 1.2.2
- pkgrel = 6
+ pkgrel = 7
url = http://www.bombono.org
install = bombono-dvd.install
arch = i686
@@ -30,6 +30,7 @@ pkgbase = bombono-dvd
source = fix_crefoftemp_bug.patch
source = autoptr2uniqueptr.patch
source = stream_bool_cast.patch
+ source = fix_deprecated_boost_api.patch
sha256sums = 3ffaadc803dc2526d2805629ee928800ce150cb2e6a40b6724d898c76366f68b
sha256sums = decc8f9261b0fcd18780080438c9fc4297d56a281355f195a5dee9a92abf474a
sha256sums = ee89adeff7bd19d731eac96c180d5d59766bb3a68f3b21b898199e1cb6c5639e
@@ -38,6 +39,7 @@ pkgbase = bombono-dvd
sha256sums = 0ea8ad5ccf64d30d0463e9bde5b07abdedd00e2da2fa7f3f72de99aa3915a64c
sha256sums = 9214f838377cdf35bf1f151e4eaac10952049ccff4d74ca485fc8b6f05bc8ba4
sha256sums = 62d0f56ab4c2512bf004756426da6bf63cc0bd134ae6bc60304cc20116277e27
+ sha256sums = 8abd4e79a34a4d919060443439127cca95412d79534eef6554c300f55a0425ed
pkgname = bombono-dvd
diff --git a/PKGBUILD b/PKGBUILD
index 74088ba61e7..f714aeefee4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD
-# 2015.03.13 one more patch from gentoo
+# Maintainer: Behnam Momeni <sbmomeni [at the] gmail [dot] com>
+# Contributor: Sirocco <sirocco at ngs dot ru>
pkgname=bombono-dvd
pkgver=1.2.2
-pkgrel=6
+pkgrel=7
pkgdesc="DVD authoring program with nice and clean GUI"
arch=('i686' 'x86_64')
url="http://www.bombono.org"
@@ -16,7 +16,8 @@ conflicts=('bombono-dvd-git')
source=(http://downloads.sourceforge.net/bombono/$pkgname-$pkgver.tar.bz2
fix_ffmpeg_codecid.patch bombono-dvd-1.2.2-ffmpeg26.patch
fix_ptr2bool_cast.patch fix_c++11_literal_warnings.patch fix_crefoftemp_bug.patch
- autoptr2uniqueptr.patch stream_bool_cast.patch)
+ autoptr2uniqueptr.patch stream_bool_cast.patch
+ fix_deprecated_boost_api.patch)
install=bombono-dvd.install
sha256sums=('3ffaadc803dc2526d2805629ee928800ce150cb2e6a40b6724d898c76366f68b'
'decc8f9261b0fcd18780080438c9fc4297d56a281355f195a5dee9a92abf474a'
@@ -25,7 +26,8 @@ sha256sums=('3ffaadc803dc2526d2805629ee928800ce150cb2e6a40b6724d898c76366f68b'
'31dfc5400d450490a53bbd386bafb59d68a9a2d6f9036755419d3be035aa87be'
'0ea8ad5ccf64d30d0463e9bde5b07abdedd00e2da2fa7f3f72de99aa3915a64c'
'9214f838377cdf35bf1f151e4eaac10952049ccff4d74ca485fc8b6f05bc8ba4'
- '62d0f56ab4c2512bf004756426da6bf63cc0bd134ae6bc60304cc20116277e27')
+ '62d0f56ab4c2512bf004756426da6bf63cc0bd134ae6bc60304cc20116277e27'
+ '8abd4e79a34a4d919060443439127cca95412d79534eef6554c300f55a0425ed')
prepare() {
cd "${pkgname}-${pkgver}"
@@ -36,6 +38,7 @@ prepare() {
patch -Np1 -i "${srcdir}/fix_crefoftemp_bug.patch"
patch -Np1 -i "${srcdir}/autoptr2uniqueptr.patch"
patch -Np1 -i "${srcdir}/stream_bool_cast.patch"
+ patch -Np1 -i "${srcdir}/fix_deprecated_boost_api.patch"
# python2 fix
for file in $(find . -name '*.py' -print); do
sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file
@@ -58,7 +61,7 @@ prepare() {
build() {
cd "${pkgname}-${pkgver}"
- scons PREFIX="/usr" DESTDIR="$pkgdir" CPPFLAGS="-std=c++11 -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=3" USE_EXT_BOOST=1
+ scons PREFIX="/usr" DESTDIR="$pkgdir" CPPFLAGS="-std=c++11 -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=3" USE_EXT_BOOST=1
}
package() {
diff --git a/fix_deprecated_boost_api.patch b/fix_deprecated_boost_api.patch
new file mode 100644
index 00000000000..82d694f78ba
--- /dev/null
+++ b/fix_deprecated_boost_api.patch
@@ -0,0 +1,156 @@
+diff -ru bombono-dvd-1.2.2/src/mbase/project/table.cpp new/src/mbase/project/table.cpp
+--- bombono-dvd-1.2.2/src/mbase/project/table.cpp 2013-03-08 00:50:45.000000000 +0330
++++ new/src/mbase/project/table.cpp 2016-01-19 13:02:00.117338769 +0330
+@@ -154,7 +154,7 @@
+ void SerializePath(Archieve& ar, const char* tag_name, std::string& fpath)
+ {
+ //ar & NameValue("Path", mdPath);
+- fs::path rel_to_dir = fs::path(AData().GetProjectFName()).branch_path();
++ fs::path rel_to_dir = fs::path(AData().GetProjectFName()).parent_path();
+ if( ar.IsLoad() )
+ {
+ ar >> NameValue(tag_name, fpath);
+diff -ru bombono-dvd-1.2.2/src/mgui/author/script.cpp new/src/mgui/author/script.cpp
+--- bombono-dvd-1.2.2/src/mgui/author/script.cpp 2016-01-19 12:54:07.640700667 +0330
++++ new/src/mgui/author/script.cpp 2016-01-19 12:59:52.407346489 +0330
+@@ -676,7 +676,7 @@
+ if( !fs::exists(font_path) )
+ {
+ std::string err_str;
+- if( !CreateDirs(font_path.branch_path(), err_str) )
++ if( !CreateDirs(font_path.parent_path(), err_str) )
+ Error(err_str.c_str());
+ fs::copy_file(DataDirPath("copy-n-paste/FreeSans.ttf"), font_path);
+ }
+diff -ru bombono-dvd-1.2.2/src/mgui/mux.cpp new/src/mgui/mux.cpp
+--- bombono-dvd-1.2.2/src/mgui/mux.cpp 2013-03-08 00:50:45.000000000 +0330
++++ new/src/mgui/mux.cpp 2016-01-19 12:58:22.840685236 +0330
+@@ -162,7 +162,7 @@
+ fs::path pth = GetFilename(v_btn);
+ if( pth.empty() )
+ return;
+- std::string folder = pth.branch_path().string();
++ std::string folder = pth.parent_path().string();
+
+ if( a_btn.get_filename().empty() )
+ a_btn.set_current_folder(folder);
+diff -ru bombono-dvd-1.2.2/src/mgui/project/add.cpp new/src/mgui/project/add.cpp
+--- bombono-dvd-1.2.2/src/mgui/project/add.cpp 2016-01-19 12:54:07.634034002 +0330
++++ new/src/mgui/project/add.cpp 2016-01-19 13:00:49.220676388 +0330
+@@ -479,7 +479,7 @@
+ MessageBox(BF_("The file \"%1%\" looks like VOB from DVD.\nRun import?") % leaf % bf::stop,
+ Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL) == Gtk::RESPONSE_OK )
+ {
+- DVD::RunImport(*GetTopWindow(brw), pth.branch_path().string());
++ DVD::RunImport(*GetTopWindow(brw), pth.parent_path().string());
+ return;
+ }
+ }
+diff -ru bombono-dvd-1.2.2/src/mgui/project/serialize.cpp new/src/mgui/project/serialize.cpp
+--- bombono-dvd-1.2.2/src/mgui/project/serialize.cpp 2013-03-08 00:50:45.000000000 +0330
++++ new/src/mgui/project/serialize.cpp 2016-01-19 13:00:29.230677594 +0330
+@@ -73,7 +73,7 @@
+ fs::path full_path(db.GetProjectFName());
+ std::string res_str = fs::name_str(full_path);
+ if( with_path_breakdown )
+- res_str += " (" + full_path.branch_path().string() + ")";
++ res_str += " (" + full_path.parent_path().string() + ")";
+ return res_str;
+ }
+
+diff -ru bombono-dvd-1.2.2/src/mgui/timeline/select.cpp new/src/mgui/timeline/select.cpp
+--- bombono-dvd-1.2.2/src/mgui/timeline/select.cpp 2013-03-08 00:50:45.000000000 +0330
++++ new/src/mgui/timeline/select.cpp 2016-01-19 12:59:12.187348923 +0330
+@@ -152,7 +152,7 @@
+
+ mon.FramePixbuf()->save(fnam, ext);
+
+- SaveFrameDir() = fs::path(fnam).branch_path().string();
++ SaveFrameDir() = fs::path(fnam).parent_path().string();
+ if( add_btn.get_active() )
+ Project::TryAddMediaQuiet(fnam, "SaveFrame");
+ }
+diff -ru bombono-dvd-1.2.2/src/mbase/project/table.cpp new/src/mbase/project/table.cpp
+--- bombono-dvd-1.2.2/src/mbase/project/table.cpp 2016-01-19 13:11:42.883970202 +0330
++++ new/src/mbase/project/table.cpp 2016-01-19 13:42:58.317190146 +0330
+@@ -162,7 +162,7 @@
+ if( !fpath.empty() )
+ {
+ fs::path pth(fpath);
+- if( !pth.is_complete() )
++ if( !pth.is_absolute() )
+ fpath = (rel_to_dir/fpath).string();
+ }
+ }
+diff -ru bombono-dvd-1.2.2/src/mbase/project/tests/test_table.cpp new/src/mbase/project/tests/test_table.cpp
+--- bombono-dvd-1.2.2/src/mbase/project/tests/test_table.cpp 2013-03-08 00:50:45.000000000 +0330
++++ new/src/mbase/project/tests/test_table.cpp 2016-01-19 13:42:16.977192649 +0330
+@@ -129,7 +129,7 @@
+ // проверка чтения/записи путей
+ boost::intrusive_ptr<StillImageMD> pict2 = ptr::dynamic_pointer_cast<StillImageMD>(ml[2]);
+ fs::path pth = pict2->GetPath();
+- BOOST_CHECK( pth.is_complete() );
++ BOOST_CHECK( pth.is_absolute() );
+ BOOST_CHECK( fs::exists(pth) );
+
+ // проверка ссылок
+diff -ru bombono-dvd-1.2.2/src/mlib/tests/test_utils.cpp new/src/mlib/tests/test_utils.cpp
+--- bombono-dvd-1.2.2/src/mlib/tests/test_utils.cpp 2013-03-08 00:50:45.000000000 +0330
++++ new/src/mlib/tests/test_utils.cpp 2016-01-19 13:23:58.830592369 +0330
+@@ -139,17 +139,17 @@
+ #endif
+ }
+
+- // is_complete
++ // is_absolute
+ {
+ fs::path pth("../some_file");
+- BOOST_CHECK( !pth.is_complete() );
+- BOOST_CHECK( fs::current_path().is_complete() );
++ BOOST_CHECK( !pth.is_absolute() );
++ BOOST_CHECK( fs::current_path().is_absolute() );
+
+ fs::path apth = Project::MakeAbsolutePath(pth);
+ //LOG_INF << "Making abs path: " << pth.string() << " => " << apth.string() << io::endl;
+
+- BOOST_CHECK( Project::MakeAbsolutePath(pth, MakeRootComplete("/")).is_complete() );
+- BOOST_CHECK( !Project::MakeAbsolutePath(pth, "./").is_complete() );
++ BOOST_CHECK( Project::MakeAbsolutePath(pth, MakeRootComplete("/")).is_absolute() );
++ BOOST_CHECK( !Project::MakeAbsolutePath(pth, "./").is_absolute() );
+ }
+
+ // MakeRelativeToDir
+diff -ru bombono-dvd-1.2.2/src/mlib/filesystem.cpp new/src/mlib/filesystem.cpp
+--- bombono-dvd-1.2.2/src/mlib/filesystem.cpp 2013-03-08 00:50:45.000000000 +0330
++++ new/src/mlib/filesystem.cpp 2016-01-19 14:02:05.303787474 +0330
+@@ -161,25 +161,16 @@
+
+ fs::path MakeAbsolutePath(const fs::path& pth, const fs::path& cur_dir)
+ {
+- fs::path res;
+-
+- if( pth.is_complete() )
+- res = pth;
+- else
+- {
+- fs::path dir = cur_dir.empty() ? fs::current_path() : cur_dir ;
+- res = dir/pth;
+- }
+- return res.normalize();
++ return absolute(pth, cur_dir);
+ }
+
+ // оба аргумента должны быть абсолютными путями
+ bool MakeRelativeToDir(fs::path& pth, fs::path dir)
+ {
+- pth.normalize();
+- dir.normalize();
+- ASSERT( pth.is_complete() );
+- ASSERT( dir.is_complete() );
++ pth = canonical(pth);
++ dir = canonical(dir);
++ ASSERT( pth.is_absolute() );
++ ASSERT( dir.is_absolute() );
+
+ fs::path::iterator p_itr = pth.begin(), p_end = pth.end();
+ fs::path::iterator d_itr = dir.begin(), d_end = dir.end();