From ae68718282afed6cc483769b1604f443471224d5 Mon Sep 17 00:00:00 2001 From: soumyadghosh Date: Fri, 27 Oct 2023 19:21:21 +0530 Subject: [PATCH 1/7] yaru gtk theme files --- snapcraft.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index 99732912..a91e036d 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1521,6 +1521,18 @@ parts: echo 'Disabled for this architecture' fi + yaru-theme-files: + plugin: meson + source: https://github.com/ubuntu/yaru.git + source-tag: 'r29' + meson-parameters: + - --prefix=/usr + - -Dgnome-shell-gresource=true + - -Dgnome-shell-user-themes-support=true + - -Dmetacity=false + - -Dsounds=false + - -Dsessions=false + debs: after: [ libgnome-games-support, libadwaita, libgweather, poppler, libayatana-appindicator, intel-media-driver ] plugin: nil From 06dac1c85cccafb0715b5e7ef921c5933e219451 Mon Sep 17 00:00:00 2001 From: soumyadghosh Date: Fri, 27 Oct 2023 19:33:32 +0530 Subject: [PATCH 2/7] fixed build environment for yaru-theme part --- snapcraft.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index a91e036d..038409a9 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1522,8 +1522,10 @@ parts: fi yaru-theme-files: + after: [ meson-deps ] plugin: meson source: https://github.com/ubuntu/yaru.git + build-environment: *buildenv source-tag: 'r29' meson-parameters: - --prefix=/usr From b7d53974eb612f2f069da8d4e9843da26d55fb11 Mon Sep 17 00:00:00 2001 From: soumyadghosh Date: Fri, 27 Oct 2023 19:42:36 +0530 Subject: [PATCH 3/7] only build gtksourceview files --- snapcraft.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 038409a9..cc0a327a 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1526,14 +1526,16 @@ parts: plugin: meson source: https://github.com/ubuntu/yaru.git build-environment: *buildenv - source-tag: 'r29' + source-branch: 'ubuntu/mantic' meson-parameters: - --prefix=/usr - -Dgnome-shell-gresource=true - - -Dgnome-shell-user-themes-support=true + - -Dgnome-shell-user-themes-support=false - -Dmetacity=false - -Dsounds=false + - -Dicons=false - -Dsessions=false + - -Dgnome-shell=false debs: after: [ libgnome-games-support, libadwaita, libgweather, poppler, libayatana-appindicator, intel-media-driver ] From d87af87ffc264ae5080ecc7fb3f3dcc31c3a6da7 Mon Sep 17 00:00:00 2001 From: soumyadghosh Date: Fri, 27 Oct 2023 20:41:07 +0530 Subject: [PATCH 4/7] fix meson parameter --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index cc0a327a..a0ab996e 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1530,7 +1530,7 @@ parts: meson-parameters: - --prefix=/usr - -Dgnome-shell-gresource=true - - -Dgnome-shell-user-themes-support=false + - -Dgnome-shell-user-themes-support=disabled - -Dmetacity=false - -Dsounds=false - -Dicons=false From b87b59f0f788eb5c9d0ec9118226f9967dc921e5 Mon Sep 17 00:00:00 2001 From: soumyadghosh Date: Tue, 23 Jan 2024 18:22:46 +0530 Subject: [PATCH 5/7] add `source-depth` entry and ignore the part --- snapcraft.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index a0ab996e..31cad343 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1527,6 +1527,10 @@ parts: source: https://github.com/ubuntu/yaru.git build-environment: *buildenv source-branch: 'ubuntu/mantic' + source-depth: 1 +# ext:updatesnap +# version-format: +# ignore: true meson-parameters: - --prefix=/usr - -Dgnome-shell-gresource=true From 589597c9306d9c435c470a850d6dde1588cc6774 Mon Sep 17 00:00:00 2001 From: soumyadghosh Date: Tue, 23 Jan 2024 19:32:14 +0530 Subject: [PATCH 6/7] don't allow usr/share/theme files here --- snapcraft.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index 31cad343..1adfffc5 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1540,6 +1540,8 @@ parts: - -Dicons=false - -Dsessions=false - -Dgnome-shell=false + prime: + - -usr/share/theme debs: after: [ libgnome-games-support, libadwaita, libgweather, poppler, libayatana-appindicator, intel-media-driver ] From 7fc0c2783b5c92e685cda67894ac03fb1d15b700 Mon Sep 17 00:00:00 2001 From: soumyadghosh Date: Wed, 24 Jan 2024 02:52:39 +0530 Subject: [PATCH 7/7] pull from master to get the gedit gtksourceview fix --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 1adfffc5..808fe5e3 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1526,7 +1526,7 @@ parts: plugin: meson source: https://github.com/ubuntu/yaru.git build-environment: *buildenv - source-branch: 'ubuntu/mantic' + #source-branch: 'ubuntu/mantic' source-depth: 1 # ext:updatesnap # version-format: