[sysprof] build: add libdazzle dependency
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sysprof] build: add libdazzle dependency
- Date: Wed, 29 May 2019 22:33:12 +0000 (UTC)
commit 2212650b0048543403e4505c9569b49e0b08745a
Author: Christian Hergert <chergert redhat com>
Date: Fri May 17 17:13:44 2019 -0700
build: add libdazzle dependency
Now that libdazzle can compile on gtk+-3 3.22 again, we can use it and
still keep things working on Debian stable, RHEL, etc.
build-aux/flatpak/org.gnome.Sysprof3.json | 17 +-
meson.build | 2 +
src/libsysprof-ui/meson.build | 3 +-
src/libsysprof-ui/sysprof-capture-view.c | 2 +
src/libsysprof-ui/sysprof-multi-paned.c | 1917 --------------------------
src/libsysprof-ui/sysprof-multi-paned.h | 62 -
src/libsysprof-ui/sysprof-ui.h | 2 +-
src/libsysprof-ui/ui/sysprof-capture-view.ui | 2 +-
8 files changed, 23 insertions(+), 1984 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Sysprof3.json b/build-aux/flatpak/org.gnome.Sysprof3.json
index e23b48f..b6b9fec 100644
--- a/build-aux/flatpak/org.gnome.Sysprof3.json
+++ b/build-aux/flatpak/org.gnome.Sysprof3.json
@@ -81,6 +81,21 @@
}
]
},
+ {
+ "name" : "libdazzle",
+ "config-opts" : [
+ "--libdir=/app/lib",
+ "--buildtype=debugoptimized"
+ ],
+ "buildsystem" : "meson",
+ "builddir" : true,
+ "sources" : [
+ {
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/GNOME/libdazzle.git"
+ }
+ ]
+ },
{
"name" : "sysprof",
"config-opts" : [
@@ -94,7 +109,7 @@
"sources" : [
{
"type" : "git",
- "url" : "https://git.gnome.org/browse/sysprof"
+ "url" : "https://gitlab.gnome.org/GNOME/sysprof.git"
}
]
}
diff --git a/meson.build b/meson.build
index 69732b3..b3bd939 100644
--- a/meson.build
+++ b/meson.build
@@ -20,6 +20,7 @@ podir = join_paths(meson.source_root(), 'po')
glib_req_version = '>= 2.50'
gtk_req_version = '>= 3.22'
polkit_req_version = '>= 0.105'
+dazzle_req_version = '>= 3.33.1'
cc = meson.get_compiler('c')
cxx = meson.get_compiler('cpp')
@@ -51,6 +52,7 @@ glib_dep = dependency('glib-2.0', version: glib_req_version)
gio_dep = dependency('gio-2.0', version: glib_req_version)
gio_unix_dep = dependency('gio-unix-2.0', version: glib_req_version)
gtk_dep = dependency('gtk+-3.0', version: gtk_req_version)
+dazzle_dep = dependency('libdazzle-1.0', version: dazzle_req_version)
# If we find polkit 0.114, we don't need to backport autoptr cleanups
polkit_dep = dependency('polkit-gobject-1', version: '>= 0.114', required: false)
diff --git a/src/libsysprof-ui/meson.build b/src/libsysprof-ui/meson.build
index 31bed09..549582b 100644
--- a/src/libsysprof-ui/meson.build
+++ b/src/libsysprof-ui/meson.build
@@ -11,7 +11,6 @@ libsysprof_ui_public_sources = [
'sysprof-marks-view.c',
'sysprof-mark-visualizer-row.c',
'sysprof-model-filter.c',
- 'sysprof-multi-paned.c',
'sysprof-notebook.c',
'sysprof-process-model-row.c',
'sysprof-profiler-menu-button.c',
@@ -48,7 +47,6 @@ libsysprof_ui_public_headers = [
'sysprof-marks-view.h',
'sysprof-mark-visualizer-row.h',
'sysprof-model-filter.h',
- 'sysprof-multi-paned.h',
'sysprof-notebook.h',
'sysprof-process-model-row.h',
'sysprof-profiler-menu-button.h',
@@ -70,6 +68,7 @@ libsysprof_ui_resources = gnome.compile_resources(
libsysprof_ui_deps = [
gio_dep,
gtk_dep,
+ dazzle_dep,
libsysprof_dep,
]
diff --git a/src/libsysprof-ui/sysprof-capture-view.c b/src/libsysprof-ui/sysprof-capture-view.c
index 41d718b..01b96be 100644
--- a/src/libsysprof-ui/sysprof-capture-view.c
+++ b/src/libsysprof-ui/sysprof-capture-view.c
@@ -22,6 +22,7 @@
#include "config.h"
+#include <dazzle.h>
#include <glib/gi18n.h>
#include "sysprof-callgraph-view.h"
@@ -814,6 +815,7 @@ sysprof_capture_view_class_init (SysprofCaptureViewClass *klass)
g_object_class_install_properties (object_class, N_PROPS, properties);
+ g_type_ensure (DZL_TYPE_MULTI_PANED);
g_type_ensure (SYSPROF_TYPE_DETAILS_VIEW);
}
diff --git a/src/libsysprof-ui/sysprof-ui.h b/src/libsysprof-ui/sysprof-ui.h
index 51cbb5b..796690e 100644
--- a/src/libsysprof-ui/sysprof-ui.h
+++ b/src/libsysprof-ui/sysprof-ui.h
@@ -20,6 +20,7 @@
#pragma once
+#include <dazzle.h>
#include <sysprof.h>
G_BEGIN_DECLS
@@ -38,7 +39,6 @@ G_BEGIN_DECLS
# include "sysprof-marks-view.h"
# include "sysprof-mark-visualizer-row.h"
# include "sysprof-model-filter.h"
-# include "sysprof-multi-paned.h"
# include "sysprof-notebook.h"
# include "sysprof-process-model-row.h"
# include "sysprof-profiler-menu-button.h"
diff --git a/src/libsysprof-ui/ui/sysprof-capture-view.ui b/src/libsysprof-ui/ui/sysprof-capture-view.ui
index 4cc195b..096b361 100644
--- a/src/libsysprof-ui/ui/sysprof-capture-view.ui
+++ b/src/libsysprof-ui/ui/sysprof-capture-view.ui
@@ -89,7 +89,7 @@
</object>
</child>
<child>
- <object class="SysprofMultiPaned">
+ <object class="DzlMultiPaned">
<property name="visible">true</property>
<child>
<object class="GtkBox">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]