Sdk 7 updates

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "shared-modules"]
+	path = shared-modules
+	url = https://github.com/flathub/shared-modules.git

Makefile

@@ -8,10 +8,10 @@ REPO ?= repo
 SDK_BRANCH ?= master
 
 # The version of the Freedesktop runtime we build on
-FDO_RUNTIME_VERSION ?= 1.6
+FDO_RUNTIME_VERSION ?= 25.08
 
 # The version of the GNOME runtime we build on
-GNOME_RUNTIME_VERSION ?= 3.28
+GNOME_RUNTIME_VERSION ?= 49
 
 BUILD_TAG ?= $(shell date +%Y-%m-%d)
 
@@ -52,11 +52,6 @@ GOOGLE_FONTS = \
 	Roboto \
 	$()
 
-ICONTHEME_DEPS = \
-	org.freedesktop.Platform.Icontheme.EndlessOS.json \
-	org.freedesktop.Platform.Icontheme.EndlessOS.appdata.xml \
-	$()
-
 # Generic substitution rule
 %: %.in
 	@echo "  GEN   $@" &&                                            \
@@ -67,25 +62,23 @@ ICONTHEME_DEPS = \
 	    $< > $@.tmp && mv $@.tmp $@
 
 define build-manifest
-	@flatpak-builder --version
-	flatpak-builder \
+	@flatpak run org.flatpak.Builder --version
+	flatpak run org.flatpak.Builder \
 		--force-clean --ccache --require-changes \
 		--repo=${REPO} \
 		--arch=${ARCH} \
+		--disable-rofiles-fuse \
 		--subject="Build of $1, `date`" \
 		${EXPORT_ARGS} \
 		builddir \
 		$1
 endef
 
-all: sdk icontheme
+all: sdk
 
 sdk: ${REPO} $(SDK_DEPS)
 	$(call build-manifest,com.endlessm.apps.Sdk.json)
 
-icontheme: ${REPO} $(ICONTHEME_DEPS)
-	$(call build-manifest,org.freedesktop.Platform.Icontheme.EndlessOS.json)
-
 ${REPO}:
 	ostree init --mode=archive-z2 --repo=${REPO}
 
@@ -146,4 +139,4 @@ update-fonts:
 		wget https://fonts.google.com/download?family=$$font -O fonts/$$font.zip; \
 	done
 
-.PHONY: sdk icontheme add-repo install-dependencies clean-dependencies maintainer-clean bundle-artefacts
+.PHONY: sdk add-repo install-dependencies clean-dependencies maintainer-clean bundle-artefacts

README.md

@@ -9,8 +9,8 @@ modules for the Endless platform.
 
 ### Building the run times
 
-In order to build the run times, you will need `flatpak-builder` and the
-following run times:
+In order to build the run times, you will need `flatpak-builder`
+(`org.flatpak.Builder` on Flathub) and the following run times:
 
  * org.freedesktop.Sdk
  * org.freedesktop.Platform