From 7135f80094bcc3aa2813e3a8a5e913d281b41e1a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 19 Sep 2023 21:27:20 +0200 Subject: [PATCH] Revert "build-aux/flatpak: use sassc from wrapdb" This reverts commit cac0cb7f02ec09e45474c8d80d5e4b86d5ac0f4c. This doesn't work since CI currently mixes flatpak-builder and the host git repo and doesn't download the gtk sources, so all subprojects are missing. --- build-aux/flatpak/org.gtk.Demo4.json | 54 ++++++++++--------- build-aux/flatpak/org.gtk.IconBrowser4.json | 54 ++++++++++--------- build-aux/flatpak/org.gtk.WidgetFactory4.json | 54 ++++++++++--------- .../flatpak/org.gtk.gtk4.NodeEditor.json | 54 ++++++++++--------- 4 files changed, 120 insertions(+), 96 deletions(-) diff --git a/build-aux/flatpak/org.gtk.Demo4.json b/build-aux/flatpak/org.gtk.Demo4.json index 51d207d461..5c75ece589 100644 --- a/build-aux/flatpak/org.gtk.Demo4.json +++ b/build-aux/flatpak/org.gtk.Demo4.json @@ -63,6 +63,36 @@ } ] }, + { + "name" : "libsass", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ + "--libdir=/app/lib" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://github.com/lazka/libsass.git", + "branch" : "meson" + } + ] + }, + { + "name" : "sassc", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ + "--libdir=/app/lib" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://github.com/lazka/sassc.git", + "branch" : "meson" + } + ] + }, { "name": "boost", "buildsystem": "simple", @@ -164,30 +194,6 @@ "type" : "git", "url" : "https://gitlab.gnome.org/GNOME/gtk.git", "branch" : "main" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass-3.6.4.tar.gz", - "sha256": "f9484d9a6df60576e791566eab2f757a97fd414fce01dd41fc0a693ea5db2889", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass_3.6.4-1_patch.zip", - "sha256": "c494221e13d5d223fa93f13bded8cac149ed8e231223ea3dfdab1c1871def42f", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc-3.6.2.tar.gz", - "sha256": "608dc9002b45a91d11ed59e352469ecc05e4f58fc1259fc9a9f5b8f0f8348a03", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc_3.6.2-1_patch.zip", - "sha256": "3b0616fa7f5a007e206fa322946755b3270ba696a3cbdc65b3f0d204998c076c", - "dest": "subprojects/packagecache" } ] } diff --git a/build-aux/flatpak/org.gtk.IconBrowser4.json b/build-aux/flatpak/org.gtk.IconBrowser4.json index 8f7396acd8..b563dbb285 100644 --- a/build-aux/flatpak/org.gtk.IconBrowser4.json +++ b/build-aux/flatpak/org.gtk.IconBrowser4.json @@ -63,6 +63,36 @@ } ] }, + { + "name" : "libsass", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ + "--libdir=/app/lib" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://github.com/lazka/libsass.git", + "branch" : "meson" + } + ] + }, + { + "name" : "sassc", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ + "--libdir=/app/lib" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://github.com/lazka/sassc.git", + "branch" : "meson" + } + ] + }, { "name" : "pango", "buildsystem" : "meson", @@ -93,30 +123,6 @@ "type" : "git", "url" : "https://gitlab.gnome.org/GNOME/gtk.git", "branch" : "main" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass-3.6.4.tar.gz", - "sha256": "f9484d9a6df60576e791566eab2f757a97fd414fce01dd41fc0a693ea5db2889", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass_3.6.4-1_patch.zip", - "sha256": "c494221e13d5d223fa93f13bded8cac149ed8e231223ea3dfdab1c1871def42f", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc-3.6.2.tar.gz", - "sha256": "608dc9002b45a91d11ed59e352469ecc05e4f58fc1259fc9a9f5b8f0f8348a03", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc_3.6.2-1_patch.zip", - "sha256": "3b0616fa7f5a007e206fa322946755b3270ba696a3cbdc65b3f0d204998c076c", - "dest": "subprojects/packagecache" } ] } diff --git a/build-aux/flatpak/org.gtk.WidgetFactory4.json b/build-aux/flatpak/org.gtk.WidgetFactory4.json index 9cd56f0c4c..390da50cac 100644 --- a/build-aux/flatpak/org.gtk.WidgetFactory4.json +++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json @@ -63,6 +63,36 @@ } ] }, + { + "name" : "libsass", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ + "--libdir=/app/lib" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://github.com/lazka/libsass.git", + "branch" : "meson" + } + ] + }, + { + "name" : "sassc", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ + "--libdir=/app/lib" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://github.com/lazka/sassc.git", + "branch" : "meson" + } + ] + }, { "name" : "pango", "buildsystem" : "meson", @@ -93,30 +123,6 @@ "type" : "git", "url" : "https://gitlab.gnome.org/GNOME/gtk.git", "branch" : "main" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass-3.6.4.tar.gz", - "sha256": "f9484d9a6df60576e791566eab2f757a97fd414fce01dd41fc0a693ea5db2889", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass_3.6.4-1_patch.zip", - "sha256": "c494221e13d5d223fa93f13bded8cac149ed8e231223ea3dfdab1c1871def42f", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc-3.6.2.tar.gz", - "sha256": "608dc9002b45a91d11ed59e352469ecc05e4f58fc1259fc9a9f5b8f0f8348a03", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc_3.6.2-1_patch.zip", - "sha256": "3b0616fa7f5a007e206fa322946755b3270ba696a3cbdc65b3f0d204998c076c", - "dest": "subprojects/packagecache" } ] } diff --git a/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json b/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json index 1357fff76e..ef60c66084 100644 --- a/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json +++ b/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json @@ -63,6 +63,36 @@ } ] }, + { + "name" : "libsass", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ + "--libdir=/app/lib" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://github.com/lazka/libsass.git", + "branch" : "meson" + } + ] + }, + { + "name" : "sassc", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ + "--libdir=/app/lib" + ], + "sources" : [ + { + "type" : "git", + "url" : "https://github.com/lazka/sassc.git", + "branch" : "meson" + } + ] + }, { "name" : "pango", "buildsystem" : "meson", @@ -93,30 +123,6 @@ "type" : "git", "url" : "https://gitlab.gnome.org/GNOME/gtk.git", "branch" : "main" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass-3.6.4.tar.gz", - "sha256": "f9484d9a6df60576e791566eab2f757a97fd414fce01dd41fc0a693ea5db2889", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/libsass_3.6.4-1/libsass_3.6.4-1_patch.zip", - "sha256": "c494221e13d5d223fa93f13bded8cac149ed8e231223ea3dfdab1c1871def42f", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc-3.6.2.tar.gz", - "sha256": "608dc9002b45a91d11ed59e352469ecc05e4f58fc1259fc9a9f5b8f0f8348a03", - "dest": "subprojects/packagecache" - }, - { - "type" : "file", - "url" : "https://github.com/mesonbuild/wrapdb/releases/download/sassc_3.6.2-1/sassc_3.6.2-1_patch.zip", - "sha256": "3b0616fa7f5a007e206fa322946755b3270ba696a3cbdc65b3f0d204998c076c", - "dest": "subprojects/packagecache" } ] }