]> granicus.if.org Git - handbrake/commitdiff
Specify flatpak branch when building the bundle
authorFrederick Ding <frederick@frederickding.com>
Wed, 4 Jul 2018 21:09:25 +0000 (17:09 -0400)
committerJohn Stebbins <jstebbins.hb@gmail.com>
Wed, 4 Jul 2018 22:44:59 +0000 (15:44 -0700)
Fixes a bug introduced in 70a0ad3b0088f86fa26e3f8fe9006834155c7d4d. Branch must be either `development` or `stable`, can't rely on defaults. See http://docs.flatpak.org/en/latest/flatpak-command-reference.html#flatpak-build-bundle for CLI reference.

pkg/linux/module.rules

index b36d8899c22ee4d559ccd85d9e604d0c6382f12f..45cd6817605a7ed9c82963583a8e9560e5ff7443 100644 (file)
@@ -74,14 +74,14 @@ $(PKG.gui.flatpak): GNUmakefile $(PKG.src.tar.bz2)
        $(MKDIR.exe) -p $(PKG.out.flatpak/)
        $(SRC/)scripts/create_flatpak_manifest.py -a "$(abspath $(PKG.src.tar.bz2))" -t $(PKG.gui.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(abspath $(CONTRIB.download/)$($m.FETCH.basename))") $(STAGE.out.flatpak/)fr.handbrake.ghb.json
        flatpak-builder --default-branch=$(PKG.flatpak.branch) --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.gui.build.flatpak) $(STAGE.out.flatpak/)fr.handbrake.ghb.json
-       flatpak build-bundle $(PKG.repo.flatpak) $(PKG.gui.flatpak) fr.handbrake.ghb
+       flatpak build-bundle $(PKG.repo.flatpak) $(PKG.gui.flatpak) fr.handbrake.ghb $(PKG.flatpak.branch)
 
 $(PKG.cli.flatpak): GNUmakefile $(PKG.src.tar.bz2)
        $(MKDIR.exe) -p $(STAGE.out.flatpak/)
        $(MKDIR.exe) -p $(PKG.out.flatpak/)
        $(SRC/)scripts/create_flatpak_manifest.py -a "$(abspath $(PKG.src.tar.bz2))" -t $(PKG.cli.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(abspath $(CONTRIB.download/)$($m.FETCH.basename))") $(STAGE.out.flatpak/)fr.handbrake.HandBrakeCLI.json
        flatpak-builder --default-branch=$(PKG.flatpak.branch) --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.cli.build.flatpak) $(STAGE.out.flatpak/)fr.handbrake.HandBrakeCLI.json
-       flatpak build-bundle $(PKG.repo.flatpak) $(PKG.cli.flatpak) fr.handbrake.HandBrakeCLI
+       flatpak build-bundle $(PKG.repo.flatpak) $(PKG.cli.flatpak) fr.handbrake.HandBrakeCLI $(PKG.flatpak.branch)
 
 #
 # Debian binary package rules