Daniel Holbach has proposed merging lp:~dholbach/ubuntu-clock-app/snap-the-clock into lp:ubuntu-clock-app.
Requested reviews: Ubuntu Clock Developers (ubuntu-clock-dev) For more details, see: https://code.launchpad.net/~dholbach/ubuntu-clock-app/snap-the-clock/+merge/299947 -- Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~dholbach/ubuntu-clock-app/snap-the-clock into lp:ubuntu-clock-app.
=== modified file '.bzrignore' --- .bzrignore 2014-07-15 12:41:13 +0000 +++ .bzrignore 2016-07-13 13:54:09 +0000 @@ -1,2 +1,6 @@ *.user builddir +stage +prime +parts +ubuntu-clock-app_*.snap === added file 'clock.wrapper' --- clock.wrapper 1970-01-01 00:00:00 +0000 +++ clock.wrapper 2016-07-13 13:54:09 +0000 @@ -0,0 +1,60 @@ +#!/bin/bash + +if [ "$SNAP_ARCH" == "amd64" ]; then + ARCH="x86_64-linux-gnu" +elif [ "$SNAP_ARCH" == "armhf" ]; then + ARCH="arm-linux-gnueabihf" +else + ARCH="$SNAP_ARCH-linux-gnu" +fi + +export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH:$LD_LIBRARY_PATH + +# XKB config +export XKB_CONFIG_ROOT=$SNAP/usr/share/X11/xkb + +# Qt Platform to Mir +#export QT_QPA_PLATFORM=ubuntumirclient +export QTCHOOSER_NO_GLOBAL_DIR=1 +export QT_SELECT=snappy-qt5 + +# Qt Libs +export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/qt5/libs:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/pulseaudio:$LD_LIBRARY_PATH + +# Qt Modules +export QT_PLUGIN_PATH=$SNAP/usr/lib/$ARCH/qt5/plugins +export QML2_IMPORT_PATH=$SNAP/usr/lib/$ARCH/qt5/qml/ClockApp +export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/usr/lib/$ARCH/qt5/qml +export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/lib/$ARCH + +# Mesa Libs +export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/mesa:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/mesa-egl:$LD_LIBRARY_PATH + +# XDG Config +export XDG_CONFIG_DIRS=$SNAP/etc/xdg:$XDG_CONFIG_DIRS +export XDG_CONFIG_DIRS=$SNAP/usr/xdg:$XDG_CONFIG_DIRS +# Note: this doesn't seem to work, QML's LocalStorage either ignores +# or fails to use $SNAP_USER_DATA if defined here +export XDG_DATA_DIRS=$SNAP_USER_DATA:$XDG_DATA_DIRS +export XDG_DATA_DIRS=$SNAP/usr/share:$XDG_DATA_DIRS + +# Not good, needed for fontconfig +export XDG_DATA_HOME=$SNAP/usr/share + +# Font Config +export FONTCONFIG_PATH=$SNAP/etc/fonts/config.d +export FONTCONFIG_FILE=$SNAP/etc/fonts/fonts.conf + +# Tell libGL where to find the drivers +export LIBGL_DRIVERS_PATH=$SNAP/usr/lib/$ARCH/dri + +# Necessary for the SDK to find the translations directory +export APP_DIR=$SNAP + +# ensure the snappy gl libs win +export LD_LIBRARY_PATH="$SNAP_LIBRARY_PATH:$LD_LIBRARY_PATH" + +cd $SNAP +exec $SNAP/usr/bin/qmlscene $SNAP/usr/share/ubuntu-clock-app/ubuntu-clock-app.qml === added file 'snapcraft.yaml' --- snapcraft.yaml 1970-01-01 00:00:00 +0000 +++ snapcraft.yaml 2016-07-13 13:54:09 +0000 @@ -0,0 +1,49 @@ +name: ubuntu-clock-app +version: 3.6+snap2 +summary: Ubuntu Clock app +description: The clock app for all Ubuntu devices +confinement: strict + +apps: + ubuntu-clock-app: + command: clock + plugs: [unity7,opengl] + +parts: + clock: + source: . + plugin: cmake + configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off] + build-packages: + - build-essential + - cmake + - gettext + - intltool + - ubuntu-touch-sounds + - suru-icon-theme + - qml-module-qttest + - qml-module-qtsysteminfo + - qml-module-qt-labs-settings + - qtdeclarative5-u1db1.0 + - qtdeclarative5-qtmultimedia-plugin + - qtdeclarative5-qtpositioning-plugin + - qtdeclarative5-ubuntu-content1 + - qt5-default + - qtbase5-dev + - qtdeclarative5-dev + - qtdeclarative5-dev-tools + - qtdeclarative5-folderlistmodel-plugin + - qtdeclarative5-ubuntu-ui-toolkit-plugin + - xvfb + stage-packages: + - ubuntu-sdk-libs + - qtubuntu-desktop + - qml-module-qtsysteminfo + snap: + - -usr/share/doc + - -usr/include + environment: + plugin: copy + files: + clock.wrapper: bin/clock + snappy-qt5.conf: etc/xdg/qtchooser/snappy-qt5.conf === added file 'snappy-qt5.conf' --- snappy-qt5.conf 1970-01-01 00:00:00 +0000 +++ snappy-qt5.conf 2016-07-13 13:54:09 +0000 @@ -0,0 +1,2 @@ +./usr/lib/x86_64-linux-gnu/qt5/bin +./usr/lib/x86_64-linux-gnu
-- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
