control: tags -1 patch
Hello, looks like two upstream commit (rebased on this version) helped
diff attached.
G.
diff -Nru pitivi-0.999/debian/changelog pitivi-0.999/debian/changelog
--- pitivi-0.999/debian/changelog 2020-02-07 19:01:06.000000000 +0100
+++ pitivi-0.999/debian/changelog 2020-02-21 18:59:53.000000000 +0100
@@ -1,3 +1,11 @@
+pitivi (0.999-1.2) unstable; urgency=medium
+
+ * Cherry-pick upstream fixes for python3.8 (Closes: #951779)
+ * debian/patches/9fc400ca6f3f59fd2b2abfb8e39f0cf7a4031e09.patch:
+ * debian/patches/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch:
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Fri, 21 Feb 2020
18:59:53 +0100
+
pitivi (0.999-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru
pitivi-0.999/debian/patches/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch
pitivi-0.999/debian/patches/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch
--- pitivi-0.999/debian/patches/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch
1970-01-01 01:00:00.000000000 +0100
+++ pitivi-0.999/debian/patches/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch
2020-02-21 18:59:53.000000000 +0100
@@ -0,0 +1,49 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+From 0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexandru=20B=C4=83lu=C8=9B?= <alexandru.ba...@gmail.com>
+Date: Tue, 28 Jan 2020 22:34:40 +0100
+Subject: [PATCH] meson: Support Python 3.8
+
+To link to Python we need to use python-3.8-embed.
+---
+ meson.build | 13 ++++++++++---
+ meson_options.txt | 3 ++-
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 0885329f..060ab47a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,11 +1,18 @@
+ project('pitivi', 'c', version : '0.999', meson_version : '>= 0.41.0')
+
+-python = find_program('python3')
++pymod = import('python')
++python = pymod.find_installation(get_option('python'))
++pythonver = python.language_version()
++# Workaround for https://github.com/mesonbuild/meson/issues/5629
++# https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
++python_dep = dependency('python-@0@-embed'.format(pythonver), version: '>=
3.3', required: false)
++if not python_dep.found()
++ python_dep = python.dependency('python3', version: '>= 3.3')
++endif
+ intltool_merge = find_program('intltool-merge')
+ itstool = find_program('itstool')
+ msgfmt = find_program('msgfmt')
+
+-python_dep = dependency(version: '>= 3.3')
+
+ if get_option('build-gst')
+ subproject('gst-build', default_options: ['enable_python=true',
+ 'disable_gstreamer_sharp=true', 'disable_rtsp_server=true',
+diff --git a/meson_options.txt b/meson_options.txt
+index c6590dd1..7d6bad29 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,2 +1,3 @@
+-option('disable-help', type : 'boolean', value : false)
+ option('build-gst', type : 'boolean', value : false)
++option('disable-help', type : 'boolean', value : false)
++option('python', type : 'string', value : 'python3')
diff -Nru
pitivi-0.999/debian/patches/9fc400ca6f3f59fd2b2abfb8e39f0cf7a4031e09.patch
pitivi-0.999/debian/patches/9fc400ca6f3f59fd2b2abfb8e39f0cf7a4031e09.patch
--- pitivi-0.999/debian/patches/9fc400ca6f3f59fd2b2abfb8e39f0cf7a4031e09.patch
1970-01-01 01:00:00.000000000 +0100
+++ pitivi-0.999/debian/patches/9fc400ca6f3f59fd2b2abfb8e39f0cf7a4031e09.patch
2020-02-21 18:59:53.000000000 +0100
@@ -0,0 +1,27 @@
+From 9fc400ca6f3f59fd2b2abfb8e39f0cf7a4031e09 Mon Sep 17 00:00:00 2001
+From: Thibault Saunier <tsaun...@igalia.com>
+Date: Thu, 30 Jan 2020 12:34:41 -0300
+Subject: [PATCH] build: Fix build when python-embeded is not found
+
+Error message is:
+
+```
+ meson.build:11:2: ERROR: Function does not take positional arguments.
+```
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: pitivi-0.999/meson.build
+===================================================================
+--- pitivi-0.999.orig/meson.build
++++ pitivi-0.999/meson.build
+@@ -5,7 +5,7 @@
+ itstool = find_program('itstool')
+ msgfmt = find_program('msgfmt')
+
+-python_dep = dependency('python3', version : '>= 3.3')
++python_dep = dependency(version: '>= 3.3')
+
+ if get_option('build-gst')
+ subproject('gst-build', default_options: ['enable_python=true',
diff -Nru pitivi-0.999/debian/patches/series pitivi-0.999/debian/patches/series
--- pitivi-0.999/debian/patches/series 2018-09-07 16:01:24.000000000 +0200
+++ pitivi-0.999/debian/patches/series 2020-02-21 18:59:53.000000000 +0100
@@ -0,0 +1,2 @@
+9fc400ca6f3f59fd2b2abfb8e39f0cf7a4031e09.patch
+0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch
