[libgda] flatpak: added demo-ui application



commit e460c90f1c9b023ecc477f13b7f43755824b0b85
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date:   Sat Mar 9 21:57:39 2019 -0600

    flatpak: added demo-ui application
    
    meson fixes to now is possible to run demo in a
    flatpak sanboxed environment

 libgda-ui/demos/form_model_change.c |  2 +-
 libgda-ui/demos/main.c              |  1 +
 libgda-ui/demos/meson.build         | 19 +++++++++---
 org.gnome.gda.Demoui.json           | 62 +++++++++++++++++++++++++++++++++++++
 4 files changed, 78 insertions(+), 6 deletions(-)
---
diff --git a/libgda-ui/demos/form_model_change.c b/libgda-ui/demos/form_model_change.c
index 44ffd52bc..9591a1fb3 100644
--- a/libgda-ui/demos/form_model_change.c
+++ b/libgda-ui/demos/form_model_change.c
@@ -49,7 +49,7 @@ do_form_model_change (GtkWidget *do_widget)
                                    vbox, TRUE, TRUE, 0);
                gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
                
-               label = gtk_label_new ("The data in the same GdauiForm widget can be change don the fly.");
+               label = gtk_label_new ("The data in the same GdauiForm widget can be change on the fly.");
                gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
                /* creating data models */
diff --git a/libgda-ui/demos/main.c b/libgda-ui/demos/main.c
index 35d0a5e7d..d5c91f357 100644
--- a/libgda-ui/demos/main.c
+++ b/libgda-ui/demos/main.c
@@ -62,6 +62,7 @@ demo_find_file (const char *base, GError **err)
                gchar *filename;
 
                filename = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "demo", base, NULL);
+    g_message ("File name: %s", filename);
                if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
                        g_set_error (err, G_FILE_ERROR, G_FILE_ERROR_NOENT,
                                     "Cannot find demo data file \"%s\"", base);
diff --git a/libgda-ui/demos/meson.build b/libgda-ui/demos/meson.build
index 0575b6694..f9412e0db 100644
--- a/libgda-ui/demos/meson.build
+++ b/libgda-ui/demos/meson.build
@@ -10,7 +10,7 @@ geninclude = configure_file(
        input: 'geninclude.pl.in',
        output: 'genincluide.pl')
 
-demos = [
+demos = files([
        'basic_form.c',
        'data_model_dir.c',
        'form.c',
@@ -31,7 +31,7 @@ demos = [
        'tree.c',
        'cloud.c',
        'combo.c',
-       ]
+       ])
 
 demosh = custom_target('demos.h',
        command: [
@@ -62,11 +62,15 @@ install_data('custom_layout.xml',
        install_dir: join_paths(get_option('datadir'), project_package, 'demo')
        )
 
-demo_sources = [
+install_data(demos,
+       install_dir: join_paths(get_option('datadir'), project_package, 'demo')
+       )
+
+demo_sources = files([
        'main.c',
        'demo-common.h',
-       demos
-       ]
+       ])
+demo_sources += demos
 
 gdaui_demo = executable('org.gnome.gda.Demoui',
        demo_sources,
@@ -77,7 +81,12 @@ gdaui_demo = executable('org.gnome.gda.Demoui',
        dependencies: demo_deps,
        c_args: [
                libgda_ui_cargs,
+               '-DPREFIX=\"'+get_option('prefix')+'\"',
+               '-DSYSCONFDIR=\"'+get_option('sysconfdir')+'\"',
+               '-DDATADIR=\"'+get_option('datadir')+'\"',
+               '-DLIBDIR=\"'+get_option('libdir')+'\"'
        ],
+       install: true
        )
 
 endif
\ No newline at end of file
diff --git a/org.gnome.gda.Demoui.json b/org.gnome.gda.Demoui.json
new file mode 100644
index 000000000..4a20eca55
--- /dev/null
+++ b/org.gnome.gda.Demoui.json
@@ -0,0 +1,62 @@
+{
+    "app-id": "org.gnome.gda.Demoui",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "master",
+    "sdk": "org.gnome.Sdk",
+    "writable-sdk": true,
+    "command": "org.gnome.gda.Demoui",
+    "finish-args": [
+        "--share=network",
+        "--share=ipc",
+        "--socket=x11",
+        "--socket=wayland",
+        "--filesystem=home",
+        "--filesystem=xdg-run/dconf",
+        "--filesystem=~/.config/dconf:ro"
+    ],
+    "build-options": {
+        "cflags": "-O2 -g",
+        "cxxflags": "-O2 -g",
+        "env": {
+            "V": "1"
+        }
+    },
+    "cleanup": [
+        "/include",
+        "/lib/pkgconfig",
+        "/man",
+        "/share/doc",
+        "/share/gtk-doc",
+        "/share/man",
+        "/share/pkgconfig",
+        "/share/vala",
+        "*.la",
+        "*.a"
+    ],
+    "modules": [
+        {
+                "name": "gtksourceview",
+                "builddir": true,
+                "sources": [
+                        {
+                                "type": "archive",
+                                "url": 
"https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.9.tar.xz";,
+                                "sha256": "699d76a453e6a3d3331906346e3dbfa25f2cbc9ec090e46635e9c6bb595e07c2"
+                        }
+                ]
+        },
+        {
+                "name": "demoui",
+                "config-opts": [
+                        "-Denable-tools=true"
+                        ],
+                "builddir": true,
+                "sources": [
+                        {
+                                "type": "git",
+                                "url": "./"
+                        }
+                ]
+        }
+    ]
+}
\ No newline at end of file


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]