Fix: qt, add recheck-all to config, add XDG_DATA_DIRS to snapcraft

ioncoincore · Jan 31, 2019 · 511a704 · 511a704
1 parent 909bec2
commit 511a704
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
@@ -85,6 +85,7 @@ $(package)_config_opts += -no-feature-textodfwriter
 $(package)_config_opts += -no-feature-udpsocket
 $(package)_config_opts += -no-feature-wizard
 $(package)_config_opts += -no-feature-xml
+$(package)_config_opts += -recheck-all
 
 ifneq ($(build_os),darwin)
 $(package)_config_opts_darwin = -xplatform macx-clang-linux

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -33,35 +33,40 @@ description: |
 
 grade: devel
 confinement: strict
-
 apps:
   daemon:
     command: iond
     plugs: [network, network-bind, home]
     environment:
-      XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
+      XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:/var/tmp:$XDG_DATA_DIRS
   daemon-testnet:
     command: iond --testnet
     plugs: [network, network-bind, home]
     environment:
-      XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
+      XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:/var/tmp:$XDG_DATA_DIRS
   test-daemon:
     command: test_ion
     plugs: [network, network-bind, home]
     environment:
-      XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
+      XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:/var/tmp:$XDG_DATA_DIRS
   qt:
     command: desktop-launch ion-qt
     plugs: [network, network-bind, unity7, unity8-calendar, unity8-contacts, desktop, desktop-legacy, wayland, x11, opengl, home]
     desktop: ion.desktop
+    environment:
+      XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:/var/tmp:$XDG_DATA_DIRS
   qt-testnet:
     command: desktop-launch ion-qt --testnet
     plugs: [network, network-bind, unity7, unity8-calendar, unity8-contacts, desktop, desktop-legacy, wayland, x11, opengl, home]
     desktop: ion-testnet.desktop
+    environment:
+      XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:/var/tmp:$XDG_DATA_DIRS
   test-qt:
     command: desktop-launch test_ion-qt
     plugs: [network, network-bind, unity7, unity8-calendar, unity8-contacts, desktop, desktop-legacy, wayland, x11, opengl, home]
     desktop: ion.desktop
+    environment:
+      XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:/var/tmp:$XDG_DATA_DIRS
   cli:
     command: ion-cli
     plugs: [network, network-bind, home]
@@ -81,7 +86,7 @@ parts:
     # updated, but there's no way to define a default data dir in ion-qt.
     # Also, it would be better if we could split the wallet from the blockchain
     override-build: |
-      # apply snap bbuild related patche
+      # apply snap build related patches
       git apply $SNAPCRAFT_STAGE/default_data_dir.patch
       #SNAPCRAFT_ARCH_TRIPLET=$(./depends/config.guess)
       echo "START BUILDING FOR $SNAPCRAFT_ARCH_TRIPLET architecture"