summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--inc_boost_header.patch79
3 files changed, 76 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index abcc4ab30a6..59aaf6e52b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
# Generated by mksrcinfo v8
-# Sun Mar 15 18:31:26 UTC 2020
+# Fri Feb 4 19:06:34 UTC 2022
pkgbase = bombono-dvd
pkgdesc = DVD authoring program with nice and clean GUI
pkgver = 1.2.4
- pkgrel = 5
+ pkgrel = 6
url = http://www.bombono.org
install = bombono-dvd.install
arch = i686
arch = x86_64
license = GPL
- makedepends = python2-scons
+ makedepends = scons2
depends = gtk2
depends = gtkmm
depends = mjpegtools
@@ -39,7 +39,7 @@ pkgbase = bombono-dvd
sha256sums = b0ff83b2fad27e39dfd77d12e00c25e554fe86ee1894c2f8fbe1915a2c46dd88
sha256sums = 28be98eb36eb6422717df7048c8ee74927495e7d7829e17cb54d746befc238c4
sha256sums = 4c29e9b19ba3bcf8c42c46aaea6c1411580629e581307a91f4d085fcdaa6eab6
- sha256sums = 14687493ffe5f95c60d4397e4a9f7d7a8434159e2e4338570856b5ee3e683b50
+ sha256sums = 49f61bb2db0498440ec8926c17a88a993081a583337f41c0d9fd8f1b11b0b0ac
sha256sums = a69f51f9d5bd6ebe26c13abeece9de012d110dcec944c76efbab59b6bc0ef915
sha256sums = 72b3d6c76cbf98fb9287f7ee5b7a57b6febe2a635d50758c2451e376e3e6ca02
sha256sums = 9d56f7d16c55a506b092dbec00789e4767963d6202d3d92b79ad389393d43c69
diff --git a/PKGBUILD b/PKGBUILD
index f344da1e31a..ecfb65ec27e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
pkgname=bombono-dvd
pkgver=1.2.4
-pkgrel=5
+pkgrel=6
pkgdesc="DVD authoring program with nice and clean GUI"
arch=('i686' 'x86_64')
url="http://www.bombono.org"
license=('GPL')
depends=('gtk2' 'gtkmm' 'mjpegtools' 'ffmpeg' 'libdvdread' 'dvdauthor' \
'dvd+rw-tools' 'twolame' 'libxml++2.6' 'boost' 'enca' 'cdrkit')
-makedepends=('python2-scons')
+makedepends=('scons2')
optdepends=('gvfs: web browser integration')
conflicts=('bombono-dvd-git')
source=("https://github.com/muravjov/${pkgname}/archive/${pkgver}.tar.gz"
@@ -29,7 +29,7 @@ sha256sums=('4f8c882a0c359ca8c182a627885c64aa271820eead2f9a64b34f1625c3b0a9d7'
'b0ff83b2fad27e39dfd77d12e00c25e554fe86ee1894c2f8fbe1915a2c46dd88'
'28be98eb36eb6422717df7048c8ee74927495e7d7829e17cb54d746befc238c4'
'4c29e9b19ba3bcf8c42c46aaea6c1411580629e581307a91f4d085fcdaa6eab6'
- '14687493ffe5f95c60d4397e4a9f7d7a8434159e2e4338570856b5ee3e683b50'
+ '49f61bb2db0498440ec8926c17a88a993081a583337f41c0d9fd8f1b11b0b0ac'
'a69f51f9d5bd6ebe26c13abeece9de012d110dcec944c76efbab59b6bc0ef915'
'72b3d6c76cbf98fb9287f7ee5b7a57b6febe2a635d50758c2451e376e3e6ca02'
'9d56f7d16c55a506b092dbec00789e4767963d6202d3d92b79ad389393d43c69'
diff --git a/inc_boost_header.patch b/inc_boost_header.patch
index 9aab93555cf..74a0387ec06 100644
--- a/inc_boost_header.patch
+++ b/inc_boost_header.patch
@@ -1,6 +1,6 @@
diff -ruN old/src/mbase/project/table.cpp new/src/mbase/project/table.cpp
---- old/src/mbase/project/table.cpp 2020-03-15 21:42:06.873029453 +0330
-+++ new/src/mbase/project/table.cpp 2020-03-15 21:45:19.241211612 +0330
+--- old/src/mbase/project/table.cpp 2022-02-04 22:35:45.903951084 +0330
++++ new/src/mbase/project/table.cpp 2022-02-04 22:33:44.542891731 +0330
@@ -29,6 +29,7 @@
#include "theme.h"
@@ -10,8 +10,8 @@ diff -ruN old/src/mbase/project/table.cpp new/src/mbase/project/table.cpp
const char* APROJECT_VERSION = "1.2.4";
diff -ruN old/src/mgui/editor/toolbar.cpp new/src/mgui/editor/toolbar.cpp
---- old/src/mgui/editor/toolbar.cpp 2020-03-15 21:43:22.593461317 +0330
-+++ new/src/mgui/editor/toolbar.cpp 2020-03-15 21:42:16.569751981 +0330
+--- old/src/mgui/editor/toolbar.cpp 2016-04-10 15:15:39.000000000 +0430
++++ new/src/mgui/editor/toolbar.cpp 2022-02-04 22:33:44.542891731 +0330
@@ -45,6 +45,8 @@
#include <mlib/sdk/logger.h>
#include <mlib/range/enumerate.h>
@@ -22,8 +22,8 @@ diff -ruN old/src/mgui/editor/toolbar.cpp new/src/mgui/editor/toolbar.cpp
{
diff -ruN old/src/mgui/project/mconstructor.cpp new/src/mgui/project/mconstructor.cpp
---- old/src/mgui/project/mconstructor.cpp 2020-03-15 21:43:22.596794669 +0330
-+++ new/src/mgui/project/mconstructor.cpp 2020-03-15 21:42:16.569751981 +0330
+--- old/src/mgui/project/mconstructor.cpp 2016-04-10 15:15:39.000000000 +0430
++++ new/src/mgui/project/mconstructor.cpp 2022-02-04 22:33:44.542891731 +0330
@@ -52,6 +52,8 @@
// COPY_N_PASTE_ETALON из go-file.c, проект Gnumeric, http://projects.gnome.org/gnumeric/
//
@@ -34,8 +34,8 @@ diff -ruN old/src/mgui/project/mconstructor.cpp new/src/mgui/project/mconstructo
static char *
check_program (char const *prog)
diff -ruN old/src/mlib/filesystem.cpp new/src/mlib/filesystem.cpp
---- old/src/mlib/filesystem.cpp 2020-03-15 21:42:06.876362806 +0330
-+++ new/src/mlib/filesystem.cpp 2020-03-15 21:54:14.022647682 +0330
+--- old/src/mlib/filesystem.cpp 2022-02-04 22:35:45.907284447 +0330
++++ new/src/mlib/filesystem.cpp 2022-02-04 22:33:44.542891731 +0330
@@ -30,6 +30,7 @@
#if BOOST_MINOR_VERSION >= 51
#define BOOST_FS_3 boost::filesystem
@@ -44,9 +44,44 @@ diff -ruN old/src/mlib/filesystem.cpp new/src/mlib/filesystem.cpp
#else
#define BOOST_FS_3 boost::filesystem3
#include <boost/filesystem/v3/path_traits.hpp>
+diff -ruN old/src/mlib/read_stream.h new/src/mlib/read_stream.h
+--- old/src/mlib/read_stream.h 2016-04-10 15:15:39.000000000 +0430
++++ new/src/mlib/read_stream.h 2022-02-04 22:33:44.542891731 +0330
+@@ -22,6 +22,8 @@
+ #ifndef __MLIB_READ_STREAM_H__
+ #define __MLIB_READ_STREAM_H__
+
++#include <boost/mpl/bool.hpp>
++
+ #include "stream.h"
+ #include "filesystem.h"
+
+diff -ruN old/src/mlib/regex.cpp new/src/mlib/regex.cpp
+--- old/src/mlib/regex.cpp 2016-04-10 15:15:39.000000000 +0430
++++ new/src/mlib/regex.cpp 2022-02-04 22:33:44.542891731 +0330
+@@ -22,7 +22,7 @@
+ #include "regex.h"
+ #include "string.h"
+
+-#include <boost/regex.hpp>
++#include <boost/regex/v4/regex.hpp>
+
+ namespace re
+ {
+diff -ruN old/src/mlib/regex.h new/src/mlib/regex.h
+--- old/src/mlib/regex.h 2022-02-04 22:35:35.320525320 +0330
++++ new/src/mlib/regex.h 2022-02-04 22:34:29.913287618 +0330
+@@ -27,6 +27,7 @@
+ #include <boost/regex/v4/regbase.hpp>
+ #include <boost/regex/v4/match_flags.hpp>
+
++#include <boost/mpl/bool.hpp>
+ #include <mlib/ptr.h>
+
+ #include <string>
diff -ruN old/src/mlib/sdk/bfs.h new/src/mlib/sdk/bfs.h
---- old/src/mlib/sdk/bfs.h 2020-03-15 21:43:22.596794669 +0330
-+++ new/src/mlib/sdk/bfs.h 2020-03-15 21:42:16.569751981 +0330
+--- old/src/mlib/sdk/bfs.h 2016-04-10 15:15:39.000000000 +0430
++++ new/src/mlib/sdk/bfs.h 2022-02-04 22:33:44.542891731 +0330
@@ -7,6 +7,7 @@
//#define BOOST_FILESYSTEM_NO_DEPRECATED
@@ -55,3 +90,27 @@ diff -ruN old/src/mlib/sdk/bfs.h new/src/mlib/sdk/bfs.h
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/convenience.hpp> // fs::create_directories()
+diff -ruN old/src/mlib/tech.h new/src/mlib/tech.h
+--- old/src/mlib/tech.h 2016-04-10 15:15:39.000000000 +0430
++++ new/src/mlib/tech.h 2022-02-04 22:33:44.542891731 +0330
+@@ -26,7 +26,7 @@
+ // Технические вещи
+ //
+ #include <boost/current_function.hpp> // для BOOST_CURRENT_FUNCTION
+-#include <boost/detail/endian.hpp> // для BOOST_XXX_ENDIAN
++#include <boost/predef/other/endian.h> // BOOST_ENDIAN_*_BYTE
+ #include <boost/version.hpp> // для BOOST_MINOR_VERSION
+
+ // для С-шного кода в С++
+@@ -78,9 +78,9 @@
+ long line, const char* function);
+
+ // endianness
+-#if defined(BOOST_BIG_ENDIAN)
++#if defined(BOOST_ENDIAN_BIG_BYTE)
+ # define HAS_BIG_ENDIAN
+-#elif defined(BOOST_LITTLE_ENDIAN)
++#elif defined(BOOST_ENDIAN_LITTLE_BYTE)
+ # define HAS_LITTLE_ENDIAN
+ #else
+ # error mlib/tech.h: unknown endianness (legacy PDP arch?)