projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4a23fb5
)
Try to fix run on Ubuntu 18.04 wrt libcurl3/4.
v2.13.20
author
Carl Hetherington
<cth@carlh.net>
Tue, 8 May 2018 22:43:28 +0000
(23:43 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 8 May 2018 22:43:28 +0000
(23:43 +0100)
cscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 900113caa2718c3c7e29070ab98a6976a8fe3b82..350c677a798ba807e84fefd9522a2b31c504402d 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-46,7
+46,7
@@
deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
deb_depends = dict()
deb_depends = dict()
-deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'lib
curl3', 'lib
gtk2.0-0']
+deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libgtk2.0-0']
deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
@@
-61,7
+61,8
@@
deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
'libicu52',
'libnettle4',
'libssh-4',
'libicu52',
'libnettle4',
'libssh-4',
- 'libx264-142'])
+ 'libx264-142',
+ 'libcurl3'])
deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
@@
-77,7
+78,8
@@
deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
'libicu55',
'libnettle6',
'libssh-4',
'libicu55',
'libnettle6',
'libssh-4',
- 'libx264-148'])
+ 'libx264-148',
+ 'libcurl3'])
deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
@@
-91,7
+93,8
@@
deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
'libicu57',
'libnettle6',
'libssh-4',
'libicu57',
'libnettle6',
'libssh-4',
- 'libx264-148'])
+ 'libx264-148',
+ 'libcurl3'])
deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
@@
-107,22
+110,24
@@
deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
'libicu60',
'libnettle6',
'libssh-4',
'libicu60',
'libnettle6',
'libssh-4',
- 'libx264-152'])
+ 'libx264-152',
+ 'libcurl4'])
deb_depends['7'] = copy.deepcopy(deb_depends_base)
deb_depends['7'].extend(['libboost-filesystem1.49.0',
deb_depends['7'] = copy.deepcopy(deb_depends_base)
deb_depends['7'].extend(['libboost-filesystem1.49.0',
- 'libboost-thread1.49.0',
- 'libboost-regex1.49.0',
- 'libmagick++5',
- 'libxml++2.6-2',
- 'libboost-date-time1.49.0',
- 'libzip2',
- 'libcairomm-1.0-1',
- 'libpangomm-1.4-1',
- 'libicu48',
- 'libnettle4',
- 'libnotify4',
- 'libx264-123'])
+ 'libboost-thread1.49.0',
+ 'libboost-regex1.49.0',
+ 'libmagick++5',
+ 'libxml++2.6-2',
+ 'libboost-date-time1.49.0',
+ 'libzip2',
+ 'libcairomm-1.0-1',
+ 'libpangomm-1.4-1',
+ 'libicu48',
+ 'libnettle4',
+ 'libnotify4',
+ 'libx264-123',
+ 'libcurl3'])
deb_depends['8'] = copy.deepcopy(deb_depends_base)
deb_depends['8'].extend(['libboost-filesystem1.55.0',
deb_depends['8'] = copy.deepcopy(deb_depends_base)
deb_depends['8'].extend(['libboost-filesystem1.55.0',
@@
-140,7
+145,8
@@
deb_depends['8'].extend(['libboost-filesystem1.55.0',
'libicu52',
'libnettle4',
'libssh-4',
'libicu52',
'libnettle4',
'libssh-4',
- 'libx264-142'])
+ 'libx264-142',
+ 'libcurl3'])
deb_depends['9'] = copy.deepcopy(deb_depends_base)
deb_depends['9'].extend(['libboost-filesystem1.62.0',
deb_depends['9'] = copy.deepcopy(deb_depends_base)
deb_depends['9'].extend(['libboost-filesystem1.62.0',
@@
-162,7
+168,8
@@
deb_depends['9'].extend(['libboost-filesystem1.62.0',
'libssh-gcrypt-4',
'libnettle6',
'libx264-148',
'libssh-gcrypt-4',
'libnettle6',
'libx264-148',
- 'libpulse0'])
+ 'libpulse0',
+ 'libcurl3'])
deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
@@
-175,7
+182,8
@@
deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
'libzip4',
'libicu57',
'libnettle6',
'libzip4',
'libicu57',
'libnettle6',
- 'libx264-148'])
+ 'libx264-148',
+ 'libcurl3'])
def packages(name, packages, f):
s = '%s: ' % name
def packages(name, packages, f):
s = '%s: ' % name