Try to fix build for xenial and flatpak

Former-commit-id: ef33bc5
tkashkin · Oct 16, 2018 · d49d673 · d49d673
1 parent a41ec84
commit d49d673
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/debian/control.in b/debian/control.in
@@ -14,9 +14,7 @@ Build-Depends: meson (>= 0.40),
                libsoup2.4-dev,
                libsqlite3-dev,
                libxml2-dev,
-               libmanette-0.2-dev,
-               libxtst-dev,
-               libx11-dev
+               libx11-dev, libmanette-0.2-dev, libxtst-dev
 Standards-Version: 4.1.4
 
 Package: com.github.tkashkin.gamehub

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -106,7 +106,7 @@ build_deb()
 	cd "$_ROOT"
 	sed "s/\$VERSION/$_DEB_VERSION/g; s/\$DISTRO/$_DEB_TARGET_DISTRO/g; s/\$DATE/`date -R`/g" "debian/changelog.in" > "debian/changelog"
 	if [[ "$APPVEYOR_BUILD_WORKER_IMAGE" = "Ubuntu1604" ]]; then
-		sed "s/libmanette-0.2-dev,//g" "debian/control.in" > "debian/control"
+		sed "s/, libmanette-0.2-dev,//g" "debian/control.in" > "debian/control"
 	else
 		cp -f "debian/control.in" "debian/control"
 	fi
@@ -243,7 +243,7 @@ build_flatpak()
 	echo "[scripts/build.sh] Autoinstalling dependencies"
 	flatpak-builder -y --user --install-deps-from=flathub --install-deps-only build com.github.tkashkin.gamehub.json
 	echo "[scripts/build.sh] Installing dependencies"
-	flatpak install -y --user flathub org.gnome.Platform//3.28 org.freedesktop.Platform//1.6 org.freedesktop.Platform.GL org.freedesktop.Platform.GL32 io.elementary.Loki.BaseApp//stable org.gnome.Sdk//3.28
+	flatpak install -y --user flathub org.gnome.Platform//3.30 org.freedesktop.Platform//1.6 org.freedesktop.ffmpeg//1.6 io.elementary.Loki.BaseApp//stable org.gnome.Sdk//3.30
 	flatpak-builder -y --user --repo=repo --force-clean build com.github.tkashkin.gamehub.json
 	flatpak build-bundle repo "$_ROOT/build/flatpak/GameHub-$_VERSION.flatpak" com.github.tkashkin.gamehub
 	return 0