From 7fbb6ee13d980a3623d060433e8adafa83a4f1c7 Mon Sep 17 00:00:00 2001 From: Marco Betschart Date: Mon, 25 Apr 2022 17:22:53 +0200 Subject: [PATCH 1/3] Initial Gtk4 steps --- io.elementary.tasks.yml | 2 +- meson.build | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/io.elementary.tasks.yml b/io.elementary.tasks.yml index 60ab9d1e14..f74b969237 100644 --- a/io.elementary.tasks.yml +++ b/io.elementary.tasks.yml @@ -1,6 +1,6 @@ app-id: io.elementary.tasks runtime: io.elementary.Platform -runtime-version: '6' +runtime-version: daily sdk: io.elementary.Sdk command: io.elementary.tasks finish-args: diff --git a/meson.build b/meson.build index 6acf601801..52de7b1a86 100644 --- a/meson.build +++ b/meson.build @@ -9,6 +9,7 @@ i18n = import('i18n') add_project_arguments('-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name()), language:'c') add_project_arguments('-DLIBICAL_GLIB_UNSTABLE_API=1', language: 'c') +add_project_arguments('-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED', language: 'c') gresource = gnome.compile_resources( 'gresource', @@ -28,19 +29,19 @@ config_file = configure_file( libecal_dep = dependency('libecal-2.0') tasks_deps = [ - dependency('champlain-0.12'), - dependency('champlain-gtk-0.12'), + #dependency('champlain-0.12'), + #dependency('champlain-gtk-0.12'), dependency('clutter-1.0'), - dependency('clutter-gtk-1.0'), + #dependency('clutter-gtk-1.0'), dependency('geocode-glib-1.0'), dependency('glib-2.0'), dependency('gobject-2.0'), - dependency('granite', version: '>=6.2.0'), - dependency('gtk+-3.0'), + dependency('granite-7', version: '>=7.0.0'), + dependency('gtk4'), libecal_dep, dependency('libedataserver-1.2'), dependency('libgeoclue-2.0'), - dependency('libhandy-1', version: '>=0.90.0'), + dependency('libadwaita-1', version: '>=1.0.0'), dependency('libical-glib'), dependency('libgdata') ] From d462c37446a11bec2d4359b136cd1bec2c86c566 Mon Sep 17 00:00:00 2001 From: Marco Betschart Date: Mon, 25 Apr 2022 18:53:22 +0200 Subject: [PATCH 2/3] Trying to get things build using flatpak --- README.md | 6 +++--- io.elementary.tasks.yml | 39 ++++++++++++++++++++++++++++++++------- meson.build | 3 +-- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index c0ee8ace73..abe37fd2ca 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ You'll need the following dependencies: * glib-2.0 * gobject-2.0 -* granite >=6.2.0 -* gtk+-3.0 +* libgranite-7-dev >= 7.0.0 +* gtk4 * libchamplain-0.12-dev * libchamplain-gtk-0.12-dev * libclutter-1.0-dev @@ -19,7 +19,7 @@ You'll need the following dependencies: * libgdata-dev * libgeoclue-2-dev * libgeocode-glib-dev -* libhandy-1-dev >= 0.90.0 +* libadwaita-1-dev >= 1.0.0 * libical * meson * valac diff --git a/io.elementary.tasks.yml b/io.elementary.tasks.yml index f74b969237..61ea025af6 100644 --- a/io.elementary.tasks.yml +++ b/io.elementary.tasks.yml @@ -51,6 +51,38 @@ modules: url: https://gitlab.gnome.org/GNOME/libgdata.git tag: '0.17.13' + - name: sassc + sources: + - type: git + url: https://github.com/sass/sassc.git + tag: '3.6.1' + - type: script + dest-filename: autogen.sh + commands: + - autoreconf -si + modules: + sources: + - type: git + url: https://github.com/sass/libsass.git + tag: '3.6.4' + - type: script + dest-filename: autogen.sh + commands: autoreconf -si + + - name: libadwaita + buildsystem: meson + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/libadwaita.git + tag: '1.1.1' + + - name: libshumate + buildsystem: meson + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/libshumate.git + # tag: '1.0.0.alpha.1' + - name: evolution-data-server buildsystem: cmake-ninja cleanup: @@ -84,13 +116,6 @@ modules: url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz md5: 12e517cac2b57a0121cda351570f1e63 - - name: champlain - buildsystem: meson - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/libchamplain.git - tag: 'LIBCHAMPLAIN_0_12_20' - - name: geocode-glib buildsystem: meson config-opts: diff --git a/meson.build b/meson.build index 52de7b1a86..669424eec5 100644 --- a/meson.build +++ b/meson.build @@ -29,8 +29,7 @@ config_file = configure_file( libecal_dep = dependency('libecal-2.0') tasks_deps = [ - #dependency('champlain-0.12'), - #dependency('champlain-gtk-0.12'), + dependency('libshumate'), dependency('clutter-1.0'), #dependency('clutter-gtk-1.0'), dependency('geocode-glib-1.0'), From 49b5b49c5b63b823f8512cee2412f6d57bee8a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 9 Jun 2022 11:13:12 -0700 Subject: [PATCH 3/3] fix Flatpak --- io.elementary.tasks.yml | 27 +-------------------------- meson.build | 6 +++--- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/io.elementary.tasks.yml b/io.elementary.tasks.yml index 61ea025af6..c51979ea8b 100644 --- a/io.elementary.tasks.yml +++ b/io.elementary.tasks.yml @@ -1,6 +1,6 @@ app-id: io.elementary.tasks runtime: io.elementary.Platform -runtime-version: daily +runtime-version: '7' sdk: io.elementary.Sdk command: io.elementary.tasks finish-args: @@ -51,31 +51,6 @@ modules: url: https://gitlab.gnome.org/GNOME/libgdata.git tag: '0.17.13' - - name: sassc - sources: - - type: git - url: https://github.com/sass/sassc.git - tag: '3.6.1' - - type: script - dest-filename: autogen.sh - commands: - - autoreconf -si - modules: - sources: - - type: git - url: https://github.com/sass/libsass.git - tag: '3.6.4' - - type: script - dest-filename: autogen.sh - commands: autoreconf -si - - - name: libadwaita - buildsystem: meson - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/libadwaita.git - tag: '1.1.1' - - name: libshumate buildsystem: meson sources: diff --git a/meson.build b/meson.build index 669424eec5..4c826f7210 100644 --- a/meson.build +++ b/meson.build @@ -29,8 +29,7 @@ config_file = configure_file( libecal_dep = dependency('libecal-2.0') tasks_deps = [ - dependency('libshumate'), - dependency('clutter-1.0'), + # dependency('clutter-1.0'), #dependency('clutter-gtk-1.0'), dependency('geocode-glib-1.0'), dependency('glib-2.0'), @@ -42,7 +41,8 @@ tasks_deps = [ dependency('libgeoclue-2.0'), dependency('libadwaita-1', version: '>=1.0.0'), dependency('libical-glib'), - dependency('libgdata') + dependency('libgdata'), + dependency('shumate-0.0') ] if libecal_dep.version().version_compare('>=3.39.2')