Commit 5207584b authored by Avi Wadhwa's avatar Avi Wadhwa
Browse files

add libhandy as a module, for HdyLeaflet and HdyColumn. Yay!

parent 9b409fc3
No preview for this file type
# ninja log v5
1 1229 1547124836 data/org.gnome.Organizer.desktop 5eef453bac4365cd
0 18 1549080980 src/organizer.gresource 78c4809cb7171ed0
1 1198 1547124836 data/org.gnome.Organizer.appdata.xml d5833cf89d9d45a7
0 1555 0 meson-install 9bd7faa9472bf40f
0 1425 0 meson-install 9bd7faa9472bf40f
0 1460 0 meson-install 9bd7faa9472bf40f
0 1511 0 meson-install 9bd7faa9472bf40f
0 1476 0 meson-install 9bd7faa9472bf40f
0 1564 0 meson-install 9bd7faa9472bf40f
0 15 1549087379 src/organizer.gresource 78c4809cb7171ed0
0 1409 0 meson-install 9bd7faa9472bf40f
0 14 1549087471 src/organizer.gresource 78c4809cb7171ed0
0 1424 0 meson-install 9bd7faa9472bf40f
0 15 1549087612 src/organizer.gresource 78c4809cb7171ed0
0 1394 0 meson-install 9bd7faa9472bf40f
0 15 1549087636 src/organizer.gresource 78c4809cb7171ed0
0 1419 0 meson-install 9bd7faa9472bf40f
0 1428 0 meson-install 9bd7faa9472bf40f
0 1552 0 meson-install 9bd7faa9472bf40f
0 1428 0 meson-install 9bd7faa9472bf40f
1 16 1549111067 src/organizer.gresource 78c4809cb7171ed0
0 459 1549111067 data/org.gnome.Organizer.desktop 5eef453bac4365cd
0 463 1549111067 data/org.gnome.Organizer.appdata.xml d5833cf89d9d45a7
0 877 0 meson-install 9bd7faa9472bf40f
0 583 1549111239 build.ninja 6f549376c78e4586
0 925 0 meson-install 9bd7faa9472bf40f
......@@ -54,7 +54,7 @@ build src/organizer.gresource: CUSTOM_COMMAND_DEP ../src/organizer.gresource.xml
description = Generating$ organizer_gresource$ with$ a$ custom$ command.
build meson-organizer-pot: CUSTOM_COMMAND
COMMAND = /usr/bin/meson --internal commandrunner /home/aviwad/Projects/Organizer /home/aviwad/Projects/Organizer/_build po /usr/bin/meson /usr/bin/meson --internal gettext pot --pkgname=organizer --extra-args=--flag=g_error_new:3:c-format@@--keyword=C_:1c,2@@--add-comments@@--keyword=_@@--flag=NC_:2:pass-c-format@@--keyword=NC_:1c,2@@--keyword=g_dngettext:2,3@@--flag=N_:1:pass-c-format@@--from-code=UTF-8@@--keyword=g_dpgettext2:2c,3@@--flag=C_:2:pass-c-format@@--flag=g_dngettext:2:pass-c-format@@--flag=g_set_error:4:c-format@@--keyword=g_dcgettext:2@@--flag=g_string_printf:2:c-format@@--flag=g_strdup_printf:1:c-format@@--flag=g_string_append_printf:2:c-format@@--keyword=N_
COMMAND = /usr/bin/meson --internal commandrunner /home/aviwad/Projects/Organizer /home/aviwad/Projects/Organizer/_build po /usr/bin/meson /usr/bin/meson --internal gettext pot --pkgname=organizer --extra-args=--flag=N_:1:pass-c-format@@--keyword=NC_:1c,2@@--flag=g_string_printf:2:c-format@@--keyword=g_dngettext:2,3@@--keyword=g_dcgettext:2@@--keyword=_@@--keyword=N_@@--keyword=g_dpgettext2:2c,3@@--flag=NC_:2:pass-c-format@@--flag=g_strdup_printf:1:c-format@@--flag=g_dngettext:2:pass-c-format@@--flag=g_set_error:4:c-format@@--flag=C_:2:pass-c-format@@--from-code=UTF-8@@--keyword=C_:1c,2@@--flag=g_error_new:3:c-format@@--flag=g_string_append_printf:2:c-format@@--add-comments
description = Running$ external$ command$ organizer-pot.
pool = console
......@@ -68,7 +68,7 @@ build meson-organizer-gmo: CUSTOM_COMMAND
build organizer-gmo: phony meson-organizer-gmo
build meson-organizer-update-po: CUSTOM_COMMAND
COMMAND = /usr/bin/meson --internal commandrunner /home/aviwad/Projects/Organizer /home/aviwad/Projects/Organizer/_build po /usr/bin/meson /usr/bin/meson --internal gettext update_po --pkgname=organizer --extra-args=--flag=g_error_new:3:c-format@@--keyword=C_:1c,2@@--add-comments@@--keyword=_@@--flag=NC_:2:pass-c-format@@--keyword=NC_:1c,2@@--keyword=g_dngettext:2,3@@--flag=N_:1:pass-c-format@@--from-code=UTF-8@@--keyword=g_dpgettext2:2c,3@@--flag=C_:2:pass-c-format@@--flag=g_dngettext:2:pass-c-format@@--flag=g_set_error:4:c-format@@--keyword=g_dcgettext:2@@--flag=g_string_printf:2:c-format@@--flag=g_strdup_printf:1:c-format@@--flag=g_string_append_printf:2:c-format@@--keyword=N_
COMMAND = /usr/bin/meson --internal commandrunner /home/aviwad/Projects/Organizer /home/aviwad/Projects/Organizer/_build po /usr/bin/meson /usr/bin/meson --internal gettext update_po --pkgname=organizer --extra-args=--flag=N_:1:pass-c-format@@--keyword=NC_:1c,2@@--flag=g_string_printf:2:c-format@@--keyword=g_dngettext:2,3@@--keyword=g_dcgettext:2@@--keyword=_@@--keyword=N_@@--keyword=g_dpgettext2:2c,3@@--flag=NC_:2:pass-c-format@@--flag=g_strdup_printf:1:c-format@@--flag=g_dngettext:2:pass-c-format@@--flag=g_set_error:4:c-format@@--flag=C_:2:pass-c-format@@--from-code=UTF-8@@--keyword=C_:1c,2@@--flag=g_error_new:3:c-format@@--flag=g_string_append_printf:2:c-format@@--add-comments
description = Running$ external$ command$ organizer-update-po.
pool = console
......
......@@ -9,3 +9,9 @@
/app/share/organizer/organizer/gi_composites.py
/app/share/organizer/organizer/main.py
/app/share/organizer/organizer/window.py
/app/share/organizer/organizer
/app/share/glib-2.0/schemas
/app/share/glib-2.0
/app/share/organizer
/app/share/appdata
/app/share/applications
Build started at 2019-01-10T16:03:54.115525
Build started at 2019-02-02T18:10:39.713993
Main binary: /usr/bin/python3.7
Python system: Linux
The Meson build system
Version: 0.48.2
Version: 0.49.0
Source dir: /home/aviwad/Projects/Organizer
Build dir: /home/aviwad/Projects/Organizer/_build
Build type: native build
......@@ -10,23 +10,36 @@ Project name: organizer
Project version: 0.1.0
Build machine cpu family: x86_64
Build machine cpu: x86_64
Found pkg-config: /usr/bin/pkg-config (1.5.3)
Determining dependency 'libhandy-0.0' with pkg-config executable '/usr/bin/pkg-config'
Called `/usr/bin/pkg-config --modversion libhandy-0.0` -> 0
0.0.7
Called `/usr/bin/pkg-config --cflags libhandy-0.0` -> 0
-I/app/include/libhandy-0.0 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/libffi-3.2.1/include -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/uuid -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/gio-unix-2.0 -I/usr/include/libdrm -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -pthread
Called `/usr/bin/pkg-config libhandy-0.0 --libs` -> 0
-L/app/lib/ -lhandy-0.0 -L/usr/lib/x86_64-linux-gnu -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
Called `/usr/bin/pkg-config libhandy-0.0 --libs` -> 0
-L/app/lib/ -lhandy-0.0 -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
Dependency libhandy-0.0 found: YES 0.0.7
Program desktop-file-validate found: YES (/usr/bin/desktop-file-validate)
Adding test "Validate desktop file"
Program appstream-util found: YES (/usr/bin/appstream-util)
Adding test "Validate appstream file"
Program glib-compile-schemas found: YES (/usr/bin/glib-compile-schemas)
Adding test "Validate schema file"
Found pkg-config: /usr/bin/pkg-config (1.5.3)
Determining dependency 'glib-2.0' with pkg-config executable '/usr/bin/pkg-config'
Called `/usr/bin/pkg-config --modversion glib-2.0` -> 0
2.58.1
2.59.1
Called `/usr/bin/pkg-config --cflags glib-2.0` -> 0
-I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
Called `/usr/bin/pkg-config glib-2.0 --libs` -> 0
-L/usr/lib/x86_64-linux-gnu -lglib-2.0
Called `/usr/bin/pkg-config glib-2.0 --libs` -> 0
-lglib-2.0
DEPRECATION: Project targetting '>= 0.40.0' but tried to use feature deprecated since '0.48.0': python3 module
Configuring organizer using configuration
Program build-aux/meson/postinstall.py found: YES (/home/aviwad/Projects/Organizer/build-aux/meson/postinstall.py)
Build targets in project: 6
WARNING: Deprecated features used:
* 0.48.0: {'python3 module'}
Found ninja-1.8.2 at /usr/bin/ninja
......@@ -4,9 +4,10 @@ project('organizer', version: '0.1.0',
i18n = import('i18n')
dependency('libhandy-0.0', version :'>=0.0.3')
subdir('data')
subdir('src')
subdir('po')
meson.add_install_script('build-aux/meson/postinstall.py')
\ No newline at end of file
meson.add_install_script('build-aux/meson/postinstall.py')
......@@ -39,6 +39,19 @@
"*.a"
],
"modules" : [
{ "name" : "libhandy",
"buildsystem" : "meson",
"config-opts": [
"-Dglade_catalog=disabled"
],
"sources" : [
{
"type" : "git",
"url" : "https://source.puri.sm/Librem5/libhandy.git"
}
]
},
{
"name" : "organizer",
"buildsystem" : "meson",
......
......@@ -539,7 +539,7 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
......@@ -579,16 +579,18 @@
<property name="can_focus">False</property>
<property name="margin_left">30</property>
<property name="margin_right">30</property>
<property name="margin_top">20</property>
<property name="margin_bottom">20</property>
<property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
<object class="GtkScrolledWindow" id="all_scrolled">
<property name="width_request">200</property>
<property name="width_request">430</property>
<property name="height_request">-1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
......@@ -601,6 +603,7 @@
<object class="GtkListBox" id="all_location_list">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="selection_mode">none</property>
</object>
</child>
......@@ -608,8 +611,8 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
......
......@@ -539,7 +539,7 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
......@@ -579,16 +579,17 @@
<property name="can_focus">False</property>
<property name="margin_left">30</property>
<property name="margin_right">30</property>
<property name="margin_top">20</property>
<property name="margin_bottom">20</property>
<property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
<object class="GtkScrolledWindow" id="all_scrolled">
<property name="width_request">200</property>
<property name="height_request">-1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
......@@ -601,6 +602,7 @@
<object class="GtkListBox" id="all_location_list">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="selection_mode">none</property>
</object>
</child>
......@@ -608,8 +610,8 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
......@@ -679,7 +681,7 @@
</child>
</object>
<packing>
<property name="resize">False</property>
<property name="resize">True</property>
<property name="shrink">False</property>
</packing>
</child>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment