From: Carl Hetherington <cth@carlh.net>
Date: Fri, 24 Apr 2020 11:31:51 +0000 (+0200)
Subject: Ubuntu 20.04 packaging.
X-Git-Tag: v2.15.56~1
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=6ea0becd89bb223f26196aa9db13371990f5a1a8;p=dcpomatic.git

Ubuntu 20.04 packaging.
---

diff --git a/cscript b/cscript
index a90e5f6bd..112a48e36 100644
--- a/cscript
+++ b/cscript
@@ -33,12 +33,10 @@ deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['16.04'].extend(['libssh-dev'])
 deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['18.04'].extend(['libssh-dev'])
-deb_build_depends['19.04'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['19.04'].extend(['libssh-dev'])
 deb_build_depends['19.10'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['19.10'].extend(['libssh-dev'])
-deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['7'].extend(['libssh-dev'])
+deb_build_depends['20.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['20.04'].extend(['libssh-dev'])
 deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['8'].extend(['libssh-gcrypt-dev'])
 deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base)
@@ -85,8 +83,8 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libcurl4',
                              'libpulse0'])
 
-deb_depends['19.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['19.04'].extend(['libboost-filesystem1.67.0',
+deb_depends['19.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
                              'libboost-thread1.67.0',
                              'libboost-regex1.67.0',
                              'libboost-date-time1.67.0',
@@ -102,22 +100,23 @@ deb_depends['19.04'].extend(['libboost-filesystem1.67.0',
                              'libcurl4',
                              'libpulse0'])
 
-deb_depends['19.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
-                             'libboost-thread1.67.0',
-                             'libboost-regex1.67.0',
-                             'libboost-date-time1.67.0',
+deb_depends['20.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
+                             'libboost-thread1.71.0',
+                             'libboost-regex1.71.0',
+                             'libboost-date-time1.71.0',
                              'libcairomm-1.0-1v5',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
                              'libzip5',
-                             'libwxgtk3.0-0v5',
-                             'libicu63',
-                             'libnettle6',
+                             'libwxgtk3.0-gtk3-0v5',
+                             'libicu66',
+                             'libnettle7',
                              'libssh-4',
                              'libx264-155',
                              'libcurl4',
-                             'libpulse0'])
+                             'libpulse0',
+                             'libxerces-c3.2'])
 
 deb_depends['8'] = copy.deepcopy(deb_depends_base)
 deb_depends['8'].extend(['libboost-filesystem1.55.0',
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index c7268e8a5..af62b557c 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -36,7 +36,7 @@
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
 #include <dcp/locale_convert.h>
-#ifdef __WXGTK__
+#ifndef __WXGTK3__
 #include <gtk/gtk.h>
 #endif
 #include <boost/foreach.hpp>
@@ -68,23 +68,23 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
 
 	//// TRANSLATORS: this is an abbreviation for "hours"
 	_h_label = new StaticText (this, _("h"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
-#ifdef DCPOMATIC_LINUX
+#ifndef __WXGTK3__
 	/* Hack to work around failure to centre text on GTK */
 	gtk_label_set_line_wrap (GTK_LABEL(_h_label->GetHandle()), FALSE);
 #endif
 	//// TRANSLATORS: this is an abbreviation for "minutes"
 	_m_label = new StaticText (this, _("m"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
-#ifdef DCPOMATIC_LINUX
+#ifndef __WXGTK3__
 	gtk_label_set_line_wrap (GTK_LABEL (_m_label->GetHandle()), FALSE);
 #endif
 	//// TRANSLATORS: this is an abbreviation for "seconds"
 	_s_label = new StaticText (this, _("s"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
-#ifdef DCPOMATIC_LINUX
+#ifndef __WXGTK3__
 	gtk_label_set_line_wrap (GTK_LABEL(_s_label->GetHandle()), FALSE);
 #endif
 	//// TRANSLATORS: this is an abbreviation for "frames"
 	_f_label = new StaticText (this, _("f"), wxDefaultPosition, size, wxALIGN_CENTRE_HORIZONTAL);
-#ifdef DCPOMATIC_LINUX
+#ifndef __WXGTK3__
 	gtk_label_set_line_wrap (GTK_LABEL(_f_label->GetHandle()), FALSE);
 #endif