zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mruby-zest: Do not install dummy MainWindow.qml

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-09-16 21:52:04 +02:00
parent 73253530fc
commit 6bc488de13
2 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
recipes-misc/recipes-multimedia/zynaddsubfx/mruby-zest.bb
View File

@@ -8,6 +8,7 @@ SRC_URI += " \
file://0005-mruby-Use-native-mrbc.patch \
file://0006-mruby-regexp-pcre-link-against-libpcre.patch \
file://0007-Load-schema-from-usr-share-zyn-fusion-schema.patch \
file://0008-Do-not-require-dummy-MainWindow.qml.patch \
"
DEPENDS += " \
@@ -54,8 +55,6 @@ do_install() {
install -d ${D}/opt/zyn-fusion
cp -r ${B}/package/{libzest.so,font} ${D}/opt/zyn-fusion/
install -d ${D}/opt/zyn-fusion/qml
touch ${D}/opt/zyn-fusion/qml/MainWindow.qml
}
FILES_${PN} += " \

41
recipes-misc/recipes-multimedia/zynaddsubfx/mruby-zest/0008-Do-not-require-dummy-MainWindow.qml.patch Normal file
View File

@@ -0,0 +1,41 @@
From 3fb95d2ec341330e3fa02112768ca60065dd7838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 16 Sep 2018 21:23:35 +0200
Subject: [PATCH] Do not require dummy MainWindow.qml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/mruby-widget-lib/src/api.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/mruby-widget-lib/src/api.c b/src/mruby-widget-lib/src/api.c
index 88d245c..f30544f 100644
--- a/src/mruby-widget-lib/src/api.c
+++ b/src/mruby-widget-lib/src/api.c
@@ -101,18 +101,8 @@ zest_open(char *address)
if(!dev_mode) {
if(strstr(path, "libzest"))
strstr(path, "libzest")[0] = 0;
- char path2[256];
- snprintf(path2, sizeof(path2), "%s%s", path, "./qml/MainWindow.qml");
- FILE *f = fopen(path2, "r");
- if(f) {
- printf("[INFO:Zyn] Found Assets at %s\n", path);
- zest_search_path = path;
- fclose(f);
- } else {
- printf("[ERROR:Zyn] QML Not Found At \"%s\"...\n", path2);
- printf("[ERROR:Zyn] Zyn Fusion Assets Missing, Please Check Install...\n");
- exit(1);
- }
+ printf("[INFO:Zyn] Found Assets at %s\n", path);
+ zest_search_path = path;
}
#if DEMO_MODE
--
2.14.4