Skip to content

Commit

Permalink
Modify Debian package versions to work with Ubuntu Xenial
Browse files Browse the repository at this point in the history
Check build dependencies on DebianPlatform initialization
Update BUILDING.md with Ubuntu info
Remove old Ubuntu files
  • Loading branch information
Eloston committed Jul 25, 2016
1 parent c267d32 commit 9f23a9b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 24 deletions.
2 changes: 1 addition & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Building is done by simply invoking a Python script like `build.py`. It will tak

## Debian and derivatives

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

**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.
Expand Down
10 changes: 10 additions & 0 deletions buildlib/debian.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ def __init__(self, *args, **kwargs):
"QUILT_SERIES": str(self.PATCH_ORDER)
}

self.logger.info("Checking build dependencies...")
if not self._dpkg_checkbuilddeps():
raise Exception("Build dependencies not met")

def _dpkg_checkbuilddeps(self):
result = subprocess.run(["dpkg-checkbuilddeps", str(self.DPKG_DIR / pathlib.Path("control"))])
if not result.returncode == 0:
return False
return True

def _get_dpkg_changelog_datetime(self, override_datetime=None):
if override_datetime is None:
current_datetime = datetime.date.today()
Expand Down
6 changes: 2 additions & 4 deletions resources/debian/dpkg_dir/control
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ Build-Depends:
libsnappy-dev,
libgconf2-dev,
libavutil-dev,
libavcodec-dev (>= 7:3.0),
libavcodec-dev (>= 7),
libavformat-dev,
libasound2-dev,
libsqlite3-dev,
libjsoncpp-dev,
libspeechd-dev (>= 0.8.4),
libspeechd-dev (>= 0.8.3),
libminizip-dev,
libhunspell-dev,
libmodpbase64-dev,
Expand All @@ -78,8 +78,6 @@ Build-Depends:
libjs-excanvas,
libjs-jquery-flot,
libgcrypt20-dev,
fonts-ipafont-gothic,
fonts-ipafont-mincho,
Standards-Version: 3.9.7

Package: chromium
Expand Down
5 changes: 0 additions & 5 deletions resources/ubuntu/changelog

This file was deleted.

2 changes: 0 additions & 2 deletions resources/ubuntu/patches/ubuntu_patches/ubuntu_patch_order

This file was deleted.

This file was deleted.

0 comments on commit 9f23a9b

Please sign in to comment.