From eca607733788dd141692f467b4b7c96520c513d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 7 Apr 2024 14:03:07 +0200 Subject: [PATCH 1/6] build: Drop `lib` when looking for libsoup via find_library() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Silences a meson warning Signed-off-by: Guido Günther Part-of: --- src/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build index 5e3b606f1..652b90f30 100644 --- a/src/meson.build +++ b/src/meson.build @@ -318,7 +318,7 @@ libphosh_sources = files( # See https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/394 custom_libsoup_dep = declare_dependency ( include_directories: libsoup_dep.get_variable(pkgconfig: 'includedir') / 'libsoup-3.0', - dependencies: cc.find_library('libsoup-3.0', required: true), + dependencies: cc.find_library('soup-3.0', required: true), ) phosh_deps = [ -- GitLab From 0bcb48f8e504ca286a58b13951f760a9967ccaf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 7 Apr 2024 13:49:50 +0200 Subject: [PATCH 2/6] build: Sort dependencies alphabetically MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sort by meson variable name. Signed-off-by: Guido Günther Part-of: --- meson.build | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index c4d2a4cd0..095294f00 100644 --- a/meson.build +++ b/meson.build @@ -119,14 +119,28 @@ fribidi_dep = dependency('fribidi') gcr_dep = dependency('gcr-3', version: '>= 3.7.5') glib_dep = dependency('glib-2.0', version: glib_ver_cmp) gio_dep = dependency('gio-2.0', version: glib_ver_cmp) -gobject_dep = dependency('gobject-2.0', version: glib_ver_cmp) gio_unix_dep = dependency('gio-unix-2.0', version: glib_ver_cmp) +gmobile = subproject('gmobile', + default_options: [ + 'examples=false', + 'gtk_doc=false', + 'tests=false', + ]) +gmobile_dep = gmobile.get_variable('gmobile_dep') gmodule_dep = dependency('gmodule-no-export-2.0', version: glib_ver_cmp) gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>=3.26') +gobject_dep = dependency('gobject-2.0', version: glib_ver_cmp) gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas', version: '>=42') gtk_dep = dependency('gtk+-3.0', version: '>=3.22') gtk_wayland_dep = dependency('gtk+-wayland-3.0', version: '>=3.22') gudev_dep = dependency('gudev-1.0') +libcall_ui = subproject('libcall-ui', + default_options: [ + 'examples=false', + 'gtk_doc=false', + 'tests=false', + 'install-i18n=@0@'.format(get_option('callui-i18n')), + ]) libfeedback_dep = dependency('libfeedback-0.0', version: '>= 0.2.0', fallback: ['libfeedback', 'libfeedback_dep'], @@ -148,21 +162,7 @@ libhandy_dep = dependency('libhandy-1', fallback: ['libhandy', 'libhandy_dep'], default_options: ['introspection=disabled'] ) -libcall_ui = subproject('libcall-ui', - default_options: [ - 'examples=false', - 'gtk_doc=false', - 'tests=false', - 'install-i18n=@0@'.format(get_option('callui-i18n')), - ]) libcall_ui_dep = libcall_ui.get_variable('libcall_ui_dep') -gmobile = subproject('gmobile', - default_options: [ - 'examples=false', - 'gtk_doc=false', - 'tests=false', - ]) -gmobile_dep = gmobile.get_variable('gmobile_dep') libnm_dep = dependency('libnm', version: '>= 1.14') libpolkit_agent_dep = dependency('polkit-agent-1', version: '>= 0.105') libsoup_dep = dependency('libsoup-3.0', version: '>= 3.0') -- GitLab From c97bcae46b80bee42271caedd6f7d11a2092680d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 7 Apr 2024 14:17:41 +0200 Subject: [PATCH 3/6] packaging: Allow to fetch meson wraps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed as long as gmobile isn't in Debian Signed-off-by: Guido Günther Part-of: --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 6439a08c5..5072dd797 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all -CONFIGURE_OPTS=-Dphoc_tests=disabled -Dsystemd=true +CONFIGURE_OPTS=--wrap-mode=default -Dphoc_tests=disabled -Dsystemd=true ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),) CONFIGURE_OPTS+=-Dgtk_doc=true -Dman=true -- GitLab From daf5a1048c395ab3ad39a5afea1cafa0d2045611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 7 Apr 2024 13:53:15 +0200 Subject: [PATCH 4/6] build: Allow to use shared gmobile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- meson.build | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 095294f00..e30f44754 100644 --- a/meson.build +++ b/meson.build @@ -120,13 +120,15 @@ gcr_dep = dependency('gcr-3', version: '>= 3.7.5') glib_dep = dependency('glib-2.0', version: glib_ver_cmp) gio_dep = dependency('gio-2.0', version: glib_ver_cmp) gio_unix_dep = dependency('gio-unix-2.0', version: glib_ver_cmp) -gmobile = subproject('gmobile', - default_options: [ - 'examples=false', - 'gtk_doc=false', - 'tests=false', - ]) -gmobile_dep = gmobile.get_variable('gmobile_dep') +gmobile_dep = dependency('gmobile', + version: '>= 0.1.0', + fallback: ['gmobile', 'gmobile_dep'], + default_options: + [ 'examples=false', + 'introspection=false', + 'gtk_doc=false', + 'tests=false' + ]) gmodule_dep = dependency('gmodule-no-export-2.0', version: glib_ver_cmp) gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>=3.26') gobject_dep = dependency('gobject-2.0', version: glib_ver_cmp) -- GitLab From da54fd8f05b36964f4f205dc8db023c1123934a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 7 Apr 2024 13:57:31 +0200 Subject: [PATCH 5/6] upcoming-events: Adjust to gmobile API change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- plugins/upcoming-events/upcoming-events.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/upcoming-events/upcoming-events.c b/plugins/upcoming-events/upcoming-events.c index 90b002901..034abde2a 100644 --- a/plugins/upcoming-events/upcoming-events.c +++ b/plugins/upcoming-events/upcoming-events.c @@ -249,14 +249,14 @@ on_client_disappeared (PhoshUpcomingEvents *self, const char *client_id) } -static gboolean -on_today_changed (PhoshUpcomingEvents *self) +static void +on_today_changed (gpointer data) { + PhoshUpcomingEvents *self = PHOSH_UPCOMING_EVENTS (data); + g_debug ("Date change, reloading events"); update_calendar (self, FALSE); - - return G_SOURCE_REMOVE; } @@ -297,7 +297,7 @@ setup_date_change_timeout (PhoshUpcomingEvents *self) g_debug ("Arming day change timer for %d seconds", seconds); self->today_changed_timeout_id = gm_timeout_add_seconds_once (seconds, - (GSourceFunc) on_today_changed, + on_today_changed, self); } -- GitLab From 21e2f2947b5f1887fba48406ca6b7cb8be0fed5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 7 Apr 2024 14:01:28 +0200 Subject: [PATCH 6/6] build: Use wrap for gmobile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We prefer the shared gmobile so no need to ship as submodule Signed-off-by: Guido Günther Part-of: --- .gitignore | 1 + .gitmodules | 3 --- debian/not-installed | 1 + subprojects/gmobile | 1 - subprojects/gmobile.wrap | 5 +++++ 5 files changed, 7 insertions(+), 4 deletions(-) delete mode 160000 subprojects/gmobile create mode 100644 subprojects/gmobile.wrap diff --git a/.gitignore b/.gitignore index 7dbef5b80..b84f5d1eb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ vgdump \#*# .\#* /subprojects/glib +/subprojects/gmobile /subprojects/libhandy .vscode/ *.gcov diff --git a/.gitmodules b/.gitmodules index b1bc4289a..23ae38008 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "subprojects/libcall-ui"] path = subprojects/libcall-ui url = https://gitlab.gnome.org/World/Phosh/libcall-ui.git -[submodule "subprojects/gmobile"] - path = subprojects/gmobile - url = https://gitlab.gnome.org/World/Phosh/gmobile.git diff --git a/debian/not-installed b/debian/not-installed index 1471c1a8a..86eff877b 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,3 +1,4 @@ +usr/include/gmobile/ usr/lib/*/libgmobile.a usr/lib/*/libgmobile.so* usr/lib/*/pkgconfig/gmobile.pc diff --git a/subprojects/gmobile b/subprojects/gmobile deleted file mode 160000 index 760d73bb7..000000000 --- a/subprojects/gmobile +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 760d73bb76ef450d375764cd33ca4e100f1a7c76 diff --git a/subprojects/gmobile.wrap b/subprojects/gmobile.wrap new file mode 100644 index 000000000..b9ec8e959 --- /dev/null +++ b/subprojects/gmobile.wrap @@ -0,0 +1,5 @@ +[wrap-git] +directory=gmobile +url=https://gitlab.gnome.org/World/Phosh/gmobile.git +revision=v0.1.0 +depth=1 -- GitLab