Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port to Gtk4 #327

Closed
wants to merge 6 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
56 changes: 7 additions & 49 deletions io.elementary.tasks.yml
Original file line number Diff line number Diff line change
@@ -41,6 +41,13 @@ modules:
url: https://github.com/libical/libical.git
tag: v3.0.16

- 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:
@@ -76,55 +83,6 @@ modules:
url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
md5: 12e517cac2b57a0121cda351570f1e63

- name: clutter-gtk
cleanup:
- "/share/gtk-doc"
sources:
- type: archive
url: https://download.gnome.org/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz
sha256: 521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06
modules:
- name: cogl
config-opts:
- "--disable-cogl-gst"
- "--disable-gtk-doc"
- "--enable-xlib-egl-platform"
- "--enable-wayland-egl-platform"
cleanup:
- "/share/gtk-doc"
- "/share/cogl/examples-data"
sources:
- type: archive
url: https://download.gnome.org/sources/cogl/1.22/cogl-1.22.8.tar.xz
sha256: a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759
- name: clutter
config-opts:
- "--disable-gtk-doc"
- "--enable-egl-backend"
- "--enable-wayland-backend"
cleanup:
- "/share/gtk-doc"
sources:
- type: archive
url: https://download.gnome.org/sources/clutter/1.26/clutter-1.26.4.tar.xz
sha256: 8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6
- name: clutter-gst
config-opts:
- "--disable-gtk-doc"
cleanup:
- "/share/gtk-doc"
sources:
- type: archive
url: https://download.gnome.org/sources/clutter-gst/3.0/clutter-gst-3.0.27.tar.xz
sha256: fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d

- name: champlain
buildsystem: meson
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/libchamplain.git
branch: 'tintou/libsoup3'

- name: geocode-glib
buildsystem: meson
config-opts:
9 changes: 4 additions & 5 deletions meson.build
Original file line number Diff line number Diff line change
@@ -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',
@@ -30,16 +31,14 @@ libecal_dep = dependency('libecal-2.0')
tasks_deps = [
dependency('champlain-0.12'),
dependency('champlain-gtk-0.12'),
dependency('clutter-1.0'),
dependency('clutter-gtk-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('shumate-0.0'),
dependency('libical-glib')
]