Skip to content

Commit 9f23a9b

Browse files
committed
Modify Debian package versions to work with Ubuntu Xenial
Check build dependencies on DebianPlatform initialization Update BUILDING.md with Ubuntu info Remove old Ubuntu files
1 parent c267d32 commit 9f23a9b

File tree

6 files changed

+13
-24
lines changed

6 files changed

+13
-24
lines changed

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Building is done by simply invoking a Python script like `build.py`. It will tak
2525

2626
## Debian and derivatives
2727

28-
As of now, only Debian Stretch 64-bit is tested. Ubuntu Xenial 64-bit support will come soon.
28+
As of now, Debian Stretch 64-bit and Ubuntu Xenial 64-bit are tested.
2929
This may work on other Debian-based distributions and 32-bit systems
3030

3131
**Note for Debian Jessie users**: ungoogled-chromium is configured to build against the system's [FFmpeg](//www.ffmpeg.org/) (available in Stretch and onwards); [Libav](//libav.org) (used in Jessie) will not work. However, FFmpeg is available in `jessie-backports`. To install it, add `jessie-backports` to the apt sources, and then install `libavutil-dev`, `libavcodec-dev`, and `libavformat-dev` from it. Note that this will replace Libav.

buildlib/debian.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,16 @@ def __init__(self, *args, **kwargs):
5656
"QUILT_SERIES": str(self.PATCH_ORDER)
5757
}
5858

59+
self.logger.info("Checking build dependencies...")
60+
if not self._dpkg_checkbuilddeps():
61+
raise Exception("Build dependencies not met")
62+
63+
def _dpkg_checkbuilddeps(self):
64+
result = subprocess.run(["dpkg-checkbuilddeps", str(self.DPKG_DIR / pathlib.Path("control"))])
65+
if not result.returncode == 0:
66+
return False
67+
return True
68+
5969
def _get_dpkg_changelog_datetime(self, override_datetime=None):
6070
if override_datetime is None:
6171
current_datetime = datetime.date.today()

resources/debian/dpkg_dir/control

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ Build-Depends:
6060
libsnappy-dev,
6161
libgconf2-dev,
6262
libavutil-dev,
63-
libavcodec-dev (>= 7:3.0),
63+
libavcodec-dev (>= 7),
6464
libavformat-dev,
6565
libasound2-dev,
6666
libsqlite3-dev,
6767
libjsoncpp-dev,
68-
libspeechd-dev (>= 0.8.4),
68+
libspeechd-dev (>= 0.8.3),
6969
libminizip-dev,
7070
libhunspell-dev,
7171
libmodpbase64-dev,
@@ -78,8 +78,6 @@ Build-Depends:
7878
libjs-excanvas,
7979
libjs-jquery-flot,
8080
libgcrypt20-dev,
81-
fonts-ipafont-gothic,
82-
fonts-ipafont-mincho,
8381
Standards-Version: 3.9.7
8482

8583
Package: chromium

resources/ubuntu/changelog

Lines changed: 0 additions & 5 deletions
This file was deleted.

resources/ubuntu/patches/ubuntu_patches/ubuntu_patch_order

Lines changed: 0 additions & 2 deletions
This file was deleted.

resources/ubuntu/patches/ubuntu_patches/use-internal-libspeechd.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)