From 76e3ad7e81d51bcbb4c07e5209b832e8ac7e8e23 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Tue, 26 Nov 2019 00:25:38 +0200 Subject: [PATCH 1/4] Update granite and drop libuntiy New release of granite provides replicates the api that was exposed by libunity and its no longer needed --- io.elementary.Sdk.json.in | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 4c2a36a..7de758e 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -50,7 +50,7 @@ { "type": "git", "url": "https://github.com/elementary/granite.git", - "tag": "5.2.4" + "tag": "5.2.5" } ] }, @@ -98,39 +98,6 @@ ] } ] - }, - { - "name": "libunity", - "buildsystem": "autotools", - "sources": [ - { - "type": "bzr", - "url": "https://code.launchpad.net/~unity-team/libunity/trunk" - } - ], - "modules": [ - { - "name": "libdbusmenu", - "buildsystem": "autotools", - "config-opts": [ "--disable-dumper" ], - "sources": [ - { - "type": "bzr", - "url": "https://code.launchpad.net/~dbusmenu-team/libdbusmenu/trunk.16.10" - } - ] - }, - { - "name": "dee", - "buildsystem": "autotools", - "sources": [ - { - "type": "bzr", - "url": "https://code.launchpad.net/~unity-team/dee/trunk" - } - ] - } - ] } ] } From 856b12af6b198b50e363b1ff25ea53f9ac158f6c Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Tue, 26 Nov 2019 00:42:35 +0200 Subject: [PATCH 2/4] drop libgee as its included in the gnome runtime already Close #2 --- io.elementary.Sdk.json.in | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 7de758e..96856ab 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -32,17 +32,6 @@ } }, "modules": [ - { - "name": "libgee", - "config-opts": [ "--disable-static" ], - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/libgee.git", - "tag": "0.20.2" - } - ] - }, { "name": "granite", "buildsystem": "meson", From f1a84c8f9cc1faab5a179f3ccb02361677f41bf6 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Tue, 26 Nov 2019 00:43:08 +0200 Subject: [PATCH 3/4] Update base gnome runtime to 3.34 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index cb82aef..344bfd8 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('io.elementary.Sdk', version: '0.1.0') data = configuration_data() data.set('SDK_BRANCH', meson.project_version()) -data.set('GNOME_VERSION', '3.32') +data.set('GNOME_VERSION', '3.34') sdk_json = configure_file( input: 'io.elementary.Sdk.json.in', From ba8cc83b1f37fd51b17e67bb8c09d08654dcc46d Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Tue, 26 Nov 2019 00:38:11 +0200 Subject: [PATCH 4/4] Start packaging the elmentary icons and stylesheet in the runtime The stylesheet should be provided by the platform, and apps can start using the bundled one instead of relying on the host system to provide it or some third-party flatpak extnension. --- io.elementary.Sdk.json.in | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 96856ab..20bae57 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -32,6 +32,28 @@ } }, "modules": [ + { + "name": "icons", + "buildsystem": "meson", + "sources": [ + { + "type": "git", + "url": "https://github.com/elementary/icons.git", + "tag": "5.1.0" + } + ] + }, + { + "name": "stylesheet", + "buildsystem": "meson", + "sources": [ + { + "type": "git", + "url": "https://github.com/elementary/stylesheet.git", + "tag": "5.3.0" + } + ] + }, { "name": "granite", "buildsystem": "meson",