Verified Commit e73f3ec4 authored by tallero's avatar tallero

flatpak/update-dependencies: fix arg

parent 8db7d7b6
# This is the build file for project "daty"
# It is autogenerated by the Meson build system.
# Do not edit by hand.
ninja_required_version = 1.5.1
# Rules for compiling.
# Rules for linking.
# Other rules
command = $COMMAND
description = $DESC
restat = 1
command = /usr/bin/meson --internal regenerate /home/desktopper/Projects/Daty /home/desktopper/Projects/Daty/_build --backend ninja
description = Regenerating build files.
generator = 1
# Phony build target, always out of date
build PHONY: phony
# Build rules for targets
# Test rules
build meson-test: CUSTOM_COMMAND all PHONY
COMMAND = /usr/bin/meson test --no-rebuild --print-errorlogs
DESC = Running$ all$ tests.
pool = console
build test: phony meson-test
build meson-benchmark: CUSTOM_COMMAND all PHONY
COMMAND = /usr/bin/meson test --benchmark --logbase benchmarklog --num-processes=1 --no-rebuild
DESC = Running$ benchmark$ suite.
pool = console
build benchmark: phony meson-benchmark
# Install rules
build meson-install: CUSTOM_COMMAND PHONY | all
DESC = Installing$ files.
COMMAND = /usr/bin/meson install --no-rebuild
pool = console
build install: phony meson-install
build meson-dist: CUSTOM_COMMAND PHONY
DESC = Creating$ source$ packages
COMMAND = /usr/bin/meson --internal dist /home/desktopper/Projects/Daty /home/desktopper/Projects/Daty/_build /usr/bin/meson
pool = console
build dist: phony meson-dist
# Suffix
build meson-scan-build: CUSTOM_COMMAND PHONY
COMMAND = /usr/bin/meson --internal scanbuild /home/desktopper/Projects/Daty /home/desktopper/Projects/Daty/_build /usr/bin/meson
pool = console
build scan-build: phony meson-scan-build
build meson-uninstall: CUSTOM_COMMAND PHONY
COMMAND = /usr/bin/meson --internal uninstall
pool = console
build uninstall: phony meson-uninstall
build all: phony
build clean: phony meson-clean
build meson-clean: CUSTOM_COMMAND PHONY
COMMAND = /usr/bin/ninja -t clean
description = Cleaning.
build REGENERATE_BUILD ../ meson-private/coredata.dat
pool = console
build reconfigure: REGENERATE_BUILD PHONY
pool = console
build ../ meson-private/coredata.dat: phony
default all
\ No newline at end of file
[{"name": "auto_features", "value": "auto", "section": "core", "machine": "any", "choices": ["enabled", "disabled", "auto"], "type": "combo", "description": "Override value of all 'auto' features"}, {"name": "backend", "value": "ninja", "section": "core", "machine": "any", "choices": ["ninja", "vs", "vs2010", "vs2015", "vs2017", "vs2019", "xcode"], "type": "combo", "description": "Backend to use"}, {"name": "buildtype", "value": "debug", "section": "core", "machine": "any", "choices": ["plain", "debug", "debugoptimized", "release", "minsize", "custom"], "type": "combo", "description": "Build type to use"}, {"name": "debug", "value": true, "section": "core", "machine": "any", "type": "boolean", "description": "Debug"}, {"name": "default_library", "value": "shared", "section": "core", "machine": "any", "choices": ["shared", "static", "both"], "type": "combo", "description": "Default library type"}, {"name": "install_umask", "value": 18, "section": "core", "machine": "any", "type": "integer", "description": "Default umask to apply on permissions of installed files"}, {"name": "layout", "value": "mirror", "section": "core", "machine": "any", "choices": ["mirror", "flat"], "type": "combo", "description": "Build directory layout"}, {"name": "optimization", "value": "0", "section": "core", "machine": "any", "choices": ["0", "g", "1", "2", "3", "s"], "type": "combo", "description": "Optimization level"}, {"name": "strip", "value": false, "section": "core", "machine": "any", "type": "boolean", "description": "Strip targets on install"}, {"name": "unity", "value": "off", "section": "core", "machine": "any", "choices": ["on", "off", "subprojects"], "type": "combo", "description": "Unity build"}, {"name": "warning_level", "value": "1", "section": "core", "machine": "any", "choices": ["0", "1", "2", "3"], "type": "combo", "description": "Compiler warning level to use"}, {"name": "werror", "value": false, "section": "core", "machine": "any", "type": "boolean", "description": "Treat warnings as errors"}, {"name": "wrap_mode", "value": "default", "section": "core", "machine": "any", "choices": ["default", "nofallback", "nodownload", "forcefallback"], "type": "combo", "description": "Wrap mode"}, {"name": "cmake_prefix_path", "value": [], "section": "core", "machine": "host", "type": "array", "description": "List of additional prefixes for cmake to search"}, {"name": "pkg_config_path", "value": [], "section": "core", "machine": "host", "type": "array", "description": "List of additional paths for pkg-config to search"}, {"name": "build.cmake_prefix_path", "value": [], "section": "core", "machine": "build", "type": "array", "description": "List of additional prefixes for cmake to search"}, {"name": "build.pkg_config_path", "value": [], "section": "core", "machine": "build", "type": "array", "description": "List of additional paths for pkg-config to search"}, {"name": "backend_max_links", "value": 0, "section": "backend", "machine": "any", "type": "integer", "description": "Maximum number of linker processes to run or 0 for no limit"}, {"name": "b_asneeded", "value": true, "section": "base", "machine": "any", "type": "boolean", "description": "Use -Wl,--as-needed when linking"}, {"name": "b_colorout", "value": "always", "section": "base", "machine": "any", "choices": ["auto", "always", "never"], "type": "combo", "description": "Use colored output"}, {"name": "b_coverage", "value": false, "section": "base", "machine": "any", "type": "boolean", "description": "Enable coverage tracking."}, {"name": "b_lto", "value": false, "section": "base", "machine": "any", "type": "boolean", "description": "Use link time optimization"}, {"name": "b_lundef", "value": true, "section": "base", "machine": "any", "type": "boolean", "description": "Use -Wl,--no-undefined when linking"}, {"name": "b_ndebug", "value": "false", "section": "base", "machine": "any", "choices": ["true", "false", "if-release"], "type": "combo", "description": "Disable asserts"}, {"name": "b_pch", "value": true, "section": "base", "machine": "any", "type": "boolean", "description": "Use precompiled headers"}, {"name": "b_pgo", "value": "off", "section": "base", "machine": "any", "choices": ["off", "generate", "use"], "type": "combo", "description": "Use profile guided optimization"}, {"name": "b_pie", "value": false, "section": "base", "machine": "any", "type": "boolean", "description": "Build executables as position independent"}, {"name": "b_sanitize", "value": "none", "section": "base", "machine": "any", "choices": ["none", "address", "thread", "undefined", "memory", "address,undefined"], "type": "combo", "description": "Code sanitizer to use"}, {"name": "b_staticpic", "value": true, "section": "base", "machine": "any", "type": "boolean", "description": "Build static libraries as position independent"}, {"name": "c_args", "value": [], "section": "compiler", "machine": "host", "type": "array", "description": "Extra arguments passed to the C compiler"}, {"name": "c_link_args", "value": [], "section": "compiler", "machine": "host", "type": "array", "description": "Extra arguments passed to the C linker"}, {"name": "c_std", "value": "none", "section": "compiler", "machine": "host", "choices": ["none", "c89", "c99", "c11", "c17", "c18", "gnu89", "gnu99", "gnu11", "gnu17", "gnu18"], "type": "combo", "description": "C language standard to use"}, {"name": "build.c_args", "value": [], "section": "compiler", "machine": "build", "type": "array", "description": "Extra arguments passed to the C compiler"}, {"name": "build.c_link_args", "value": [], "section": "compiler", "machine": "build", "type": "array", "description": "Extra arguments passed to the C linker"}, {"name": "build.c_std", "value": "none", "section": "compiler", "machine": "build", "choices": ["none", "c89", "c99", "c11", "c17", "c18", "gnu89", "gnu99", "gnu11", "gnu17", "gnu18"], "type": "combo", "description": "C language standard to use"}, {"name": "bindir", "value": "bin", "section": "directory", "machine": "any", "type": "string", "description": "Executable directory"}, {"name": "datadir", "value": "share", "section": "directory", "machine": "any", "type": "string", "description": "Data file directory"}, {"name": "includedir", "value": "include", "section": "directory", "machine": "any", "type": "string", "description": "Header file directory"}, {"name": "infodir", "value": "share/info", "section": "directory", "machine": "any", "type": "string", "description": "Info page directory"}, {"name": "libdir", "value": "lib", "section": "directory", "machine": "any", "type": "string", "description": "Library directory"}, {"name": "libexecdir", "value": "libexec", "section": "directory", "machine": "any", "type": "string", "description": "Library executable directory"}, {"name": "localedir", "value": "share/locale", "section": "directory", "machine": "any", "type": "string", "description": "Locale data directory"}, {"name": "localstatedir", "value": "/var", "section": "directory", "machine": "any", "type": "string", "description": "Localstate data directory"}, {"name": "mandir", "value": "share/man", "section": "directory", "machine": "any", "type": "string", "description": "Manual page directory"}, {"name": "prefix", "value": "/usr", "section": "directory", "machine": "any", "type": "string", "description": "Installation prefix"}, {"name": "sbindir", "value": "sbin", "section": "directory", "machine": "any", "type": "string", "description": "System executable directory"}, {"name": "sharedstatedir", "value": "/var/lib", "section": "directory", "machine": "any", "type": "string", "description": "Architecture-independent data directory"}, {"name": "sysconfdir", "value": "/etc", "section": "directory", "machine": "any", "type": "string", "description": "Sysconf data directory"}, {"name": "errorlogs", "value": true, "section": "test", "machine": "any", "type": "boolean", "description": "Whether to print the logs from failing tests"}, {"name": "stdsplit", "value": true, "section": "test", "machine": "any", "type": "boolean", "description": "Split stdout and stderr in test logs"}]
\ No newline at end of file
["/home/desktopper/Projects/Daty/", "/home/desktopper/Projects/Daty/daty/resources/"]
\ No newline at end of file
[{"name": "glib-2.0", "compile_args": ["-I/usr/include/glib-2.0", "-I/usr/lib/glib-2.0/include"], "link_args": ["/usr/lib/"]}, {"name": "gobject-2.0", "compile_args": ["-I/usr/include/glib-2.0", "-I/usr/lib/glib-2.0/include", "-I/usr/lib/libffi-3.2.1/include"], "link_args": ["/usr/lib/", "/usr/lib/"]}, {"name": "gobject-introspection-1.0", "compile_args": ["-I/usr/include/gobject-introspection-1.0", "-I/usr/lib/libffi-3.2.1/include", "-I/usr/include/glib-2.0", "-I/usr/lib/glib-2.0/include", "-pthread"], "link_args": ["/usr/lib/", "/usr/lib/", "/usr/lib/"]}, {"name": "gmodule-2.0", "compile_args": ["-pthread", "-I/usr/include/glib-2.0", "-I/usr/lib/glib-2.0/include"], "link_args": ["-Wl,--export-dynamic", "-pthread", "/usr/lib/", "/usr/lib/"]}, {"name": "gtk+-3.0", "compile_args": ["-I/usr/include/gtk-3.0", "-I/usr/include/pango-1.0", "-I/usr/include/glib-2.0", "-I/usr/lib/glib-2.0/include", "-I/usr/lib/libffi-3.2.1/include", "-I/usr/include/harfbuzz", "-I/usr/include/fribidi", "-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/dbus-1.0/include", "-pthread"], "link_args": ["/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/"]}, {"name": "libhandy-0.0", "compile_args": ["-I/usr/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/glib-2.0/include", "-I/usr/lib/libffi-3.2.1/include", "-I/usr/include/harfbuzz", "-I/usr/include/fribidi", "-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/dbus-1.0/include", "-pthread"], "link_args": ["/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/", "/usr/lib/"]}]
\ No newline at end of file
\ No newline at end of file
{"version": "undefined", "descriptive_name": "daty", "subproject_dir": "subprojects", "subprojects": []}
\ No newline at end of file
\ No newline at end of file
\ No newline at end of file
{"meson_version": {"full": "0.51.2", "major": 0, "minor": 51, "patch": 2}, "directories": {"source": "/home/desktopper/Projects/Daty", "build": "/home/desktopper/Projects/Daty/_build", "info": "/home/desktopper/Projects/Daty/_build/meson-info"}, "introspection": {"version": {"full": "1.0.0", "major": 1, "minor": 0, "patch": 0}, "information": {"benchmarks": {"file": "intro-benchmarks.json", "updated": true}, "buildoptions": {"file": "intro-buildoptions.json", "updated": true}, "buildsystem_files": {"file": "intro-buildsystem_files.json", "updated": true}, "dependencies": {"file": "intro-dependencies.json", "updated": true}, "installed": {"file": "intro-installed.json", "updated": true}, "projectinfo": {"file": "intro-projectinfo.json", "updated": true}, "targets": {"file": "intro-targets.json", "updated": true}, "tests": {"file": "intro-tests.json", "updated": true}}}, "build_files_updated": true, "error": false}
\ No newline at end of file
Build started at 2019-09-21T17:38:50.977511
Main binary: /usr/bin/python
Python system: Linux
The Meson build system
Version: 0.51.2
Source dir: /home/desktopper/Projects/Daty
Build dir: /home/desktopper/Projects/Daty/_build
Build type: native build
Project name: daty
Project version: undefined
C compiler for the host machine: cc (gcc 9.1.0 "cc (GCC) 9.1.0")
Build machine cpu family: x86_64
Build machine cpu: x86_64
Message: Looking for dependencies
Program python3 found: YES (/usr/bin/python3)
Dependency glib-2.0 found: YES (cached)
Dependency gobject-2.0 found: YES (cached)
Dependency gobject-introspection-1.0 found: YES (cached)
Dependency gmodule-2.0 found: YES (cached)
Dependency gtk+-3.0 found: YES (cached)
Dependency libhandy-0.0 found: YES (cached)
Message: Getting python install dir
Running command: /usr/bin/python3 -c from distutils.sysconfig import get_python_lib; print(get_python_lib())
--- stdout ---
--- stderr ---
Build targets in project: 0
Found ninja-1.9.0 at /usr/bin/ninja
prefix = /usr
int main() { int class=0; return class; }
......@@ -55,9 +55,10 @@ class Config:
'cache':user_cache_dir(appname, appauthor)}
mobile = False
verbose = True
debug = False
def __init__(self):
def __init__(self, debug=True):
self.debug = debug
......@@ -96,6 +97,8 @@ class Config:
self.lang = translation(self.appname, self.exec_path,
languages=langs, fallback=True)
if self.debug: print("Config.set_locales: langs {}".format(langs))
def create_pywikibot_config(self, user, bot_user, bot_password):
"""Create pywikibot configuration files
......@@ -165,6 +168,9 @@ class Config:
path = join(self.exec_path, 'resources', 'daty.gresource')
resource = resource_load(path)
if not self.verbose:
if not self.debug:
flag = ResourceLookupFlags(0)
resource_path = "/ml/prevete/Daty/gtk/filterslist.ui"
resource_cmd = resource.lookup_data(resource_path, flag)
print("Config.set_resources: {}".format(resource_debug))
......@@ -239,11 +239,8 @@ class Entity(Stack):
self.emit("entity-editing", self.popover)
except AttributeError as e:
<<<<<<< HEAD
raise e
print("Exception", e)
>>>>>>> 4033436b19a40fea5b7d881328f2b82a1837d434
print("no popover available for this type of value")
......@@ -144,13 +144,10 @@ class Page(ScrolledWindow):
<<<<<<< HEAD
value = Value(claim=claim, new=True)
#value = Value(claim=claim, new=True)
value = Value(claim={}, new=True)
>>>>>>> 4033436b19a40fea5b7d881328f2b82a1837d434
#event = EventButton()
#value.entity.value_eventbox.do_button_press_event(self, event)
......@@ -46,6 +46,7 @@
<property name="vexpand">True</property>
<property name="label" translatable="yes">Label</property>
<property name="wrap">True</property>
<property name="wrap_mode">char</property>
<property name="xalign">0</property>
gnome = import('gnome')
# message('TODO: Compiling resources')
# gnome.compile_resources(
# 'daty', 'daty.gresource.xml',
# source_dir : '.',
# c_name : 'daty',
# install_dir : python_dir,
# install: true)
message('Compiling schemas')
install_dir : 'share/glib-2.0/schemas')
message('TODO: Making a .desktop file')
message('TODO: Preparing appdata')
message('Install a man page')
message('TODO: Making a list of icons')
icon_names = []
icon_themes = ['hicolor', 'HighContrast']
icon_sizes = ['16', '22', '32', '48', '256']
foreach theme : icon_themes
foreach size: icon_sizes
icon_names = icon_names + ['icons/' + theme + '/' + size + 'x' + size + '/apps/gnome-music.png']
icon_names = icon_names + ['icons/hicolor/gnome-music.svg']
install_data(icon_names, install_dir : 'share')
......@@ -27,7 +27,7 @@ from copy import deepcopy as cp
from gi.repository.GLib import idle_add
from gi.repository.Gtk import STYLE_PROVIDER_PRIORITY_APPLICATION, AccelFlags, CssProvider, accelerator_parse
from os import makedirs, umask
from pickle import dumpn
from pickle import dump
from pickle import load as pickle_load
from re import IGNORECASE, compile, escape, sub
from threading import BoundedSemaphore, Thread
......@@ -5,9 +5,6 @@
"sdk" : "org.gnome.Sdk",
"command" : "daty",
"x-run-args" : [
"finish-args" : [
......@@ -66,10 +63,5 @@
"build-options" : {
"env" : {
"GTK_DEBUG" : "interactive"
......@@ -7,8 +7,8 @@
"sources": [
"type": "file",
"url": "",
"sha256": "a5a6166b4767725fd52ae55fee8c8b6137d9a51e9f1edea461a062a759160118"
"url": "",
"sha256": "b91d676b330a0ebd5b21719cb6e9b57c57d433671f65b9c28dd3461d9a1ed0b6"
"type": "file",
......@@ -12,18 +12,18 @@
"type": "file",
"url": "",
"sha256": "b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1"
"url": "",
"sha256": "3de946ffbed6e6746608990594d08faac602528ac7015ac28d33cee6a45b7398"
"type": "file",
"url": "",
"sha256": "ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
"url": "",
"sha256": "fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef"
"type": "file",
"url": "",
"sha256": "fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef"
"url": "",
"sha256": "ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
"type": "file",
......@@ -7,13 +7,8 @@
"sources": [
"type": "file",
"url": "",
"sha256": "b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1"
"type": "file",
"url": "",
"sha256": "ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
"url": "",
"sha256": "3de946ffbed6e6746608990594d08faac602528ac7015ac28d33cee6a45b7398"
"type": "file",
......@@ -25,6 +20,11 @@
"url": "",
"sha256": "fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
"type": "file",
"url": "",
"sha256": "ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
"type": "file",
"url": "",
......@@ -39,7 +39,7 @@ def clone_exception_handler(exception):
pull = "git -C ./update-dependencies pull"
sh(clone, clone_exception_handler)
sh(clone, exception_handler=clone_exception_handler)
for x in ls():
if is_python_package(x):
# See
project('daty', 'c')
version = '3.35.1'
# Configuration params
conf = configuration_data()
conf.set('PACKAGE_VERSION', version)
conf.set('PACKAGE_URL', '')
message('Looking for dependencies')
py3 = find_program('python3')
glib = dependency('glib-2.0')
gobject = dependency('gobject-2.0')
gir = dependency('gobject-introspection-1.0')
gmod = dependency('gmodule-2.0')
gtk = dependency('gtk+-3.0', version : '>=3.13.2')
libhandy = dependency('libhandy-0.0', version :'>=0.0.3')
message('Getting python install dir')
r = run_command(py3, '-c', 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')
if r.returncode() != 0
error('Cannot find python install dir')
python_dir = r.stdout().strip()
# subdir('daty')
# subdir('po')
# subdir('help')
# message('Generate libgd')
# libsources = [
# 'libgd/libgd/gd-types-catalog.c', 'libgd/libgd/gd-types-catalog.h',
# 'libgd/libgd/gd-main-view-generic.c', 'libgd/libgd/gd-main-view-generic.h',
# 'libgd/libgd/gd-styled-text-renderer.c', 'libgd/libgd/gd-styled-text-renderer.h',
# 'libgd/libgd/gd-two-lines-renderer.c', 'libgd/libgd/gd-two-lines-renderer.h',
# 'libgd/libgd/gd-revealer.c', 'libgd/libgd/gd-revealer.h',
# 'libgd/libgd/gd-tagged-entry.c', 'libgd/libgd/gd-tagged-entry.h',
# ]
# libgdgir = shared_library('libgd', libsources,
# dependencies : [glib, gtk, gobject, gir, gmod])
# gnome.generate_gir(
# libgdgir,
# sources : libsources,
# nsversion : '1.0',
# namespace : 'Gd',
# symbol_prefix : 'gd_',
# identifier_prefix : 'Gd',
# includes : ['GObject-2.0', 'Gio-2.0', 'Gtk-3.0'],
# install : true
# )
# message('TODO: Generate authors list')
install_subdir('daty', install_dir: python_dir)
# message('Preparing init file')
# configure_file(input : '', output : 'gnome-music', configuration : conf)
# install_data('daty', install_dir: 'bin')
# meson.set_install_script('')
broadwayd :6345 & (sleep 3 && env GDK_BACKEND=broadway BROADWAY_DISPLAY=:6345 GTK_DEBUG=touchscreen daty)
Markdown is supported
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