ccea24e · unity8 · git.iko.soy

Jenkinsfile+1−1

compare with xenial

unifiedsplit

@@ -34,7 +34,7 @@ build-binary.sh'''

34 export DEBBUILDOPTS="-sa"

35 export SKIP_ARCH_BUILD=false

36 export SKIP_SOURCE_REMOVAL=true

37− #build-binary.sh'''

37+ build-binary.sh'''

38 stash(includes: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,*.buildinfo,lintian.txt', name: 'build-arm64')

39 cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)

40 }

debian/control−2

@@ -56,7 +56,6 @@ Build-Depends: cmake,

56 qml-module-qtsysteminfo,

57 qml-module-qttest,

58 qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),

59− qml-module-ubuntu-web,

60 qt5-default,

59 qt5-default,

61 qtbase5-dev (>= 5.4),

60 qtbase5-dev (>= 5.4),

62 qtbase5-dev-tools,

61 qtbase5-dev-tools,

@@ -124,7 +123,6 @@ Depends: dmz-cursor-theme,

124 qml-module-qtqml-statemachine,

123 qml-module-qtqml-statemachine,

125 qml-module-qtquick-xmllistmodel,

124 qml-module-qtquick-xmllistmodel,

126 qml-module-qtsysteminfo,

125 qml-module-qtsysteminfo,

127− qml-module-ubuntu-web,

128 qtdeclarative5-qtmir-plugin (>= 0.4.8),

126 qtdeclarative5-qtmir-plugin (>= 0.4.8),

129 qtdeclarative5-ubuntu-telephony0.1,

127 qtdeclarative5-ubuntu-telephony0.1,

130 ubuntu-system-settings (>= 0.4),

128 ubuntu-system-settings (>= 0.4),

plugins/Wizard/System.cpp+5−1

@@ -119,7 +119,11 @@ void System::setWizardEnabled(bool enabled)

119 if (QDir(wizardEnabledPath()).exists()) {

120 QDir(wizardEnabledPath()).removeRecursively();

121 }

122− QFile::copy(currentFrameworkPath(), wizardEnabledPath());

122+ if (!QFile::copy(currentFrameworkPath(), wizardEnabledPath())) {

123+ // Make en empty file if framework does not exist

124+ QFile f(wizardEnabledPath());

125+ f.open(QFile::WriteOnly);

126+ }

123 m_fsWatcher.addPath(wizardEnabledPath());

127 m_fsWatcher.addPath(wizardEnabledPath());

124 Q_EMIT wizardEnabledChanged();

128 Q_EMIT wizardEnabledChanged();

125 Q_EMIT isUpdateChanged();

129 Q_EMIT isUpdateChanged();

qml/Stage/WindowResizeArea.qml+1−1

@@ -101,7 +101,7 @@ MouseArea {

101 state = WindowStateStorage.WindowStateNormal;

102 }

103 windowStateStorage.saveState(root.windowId, state & ~WindowStateStorage.WindowStateMinimized); // clear the minimized bit when saving

104− // do not store window sizes if they are zero. this happens in staged mode

104+ // do not store window sizes if they are zero. this happens in staged mode

105 if ( priv.normalWidth && priv.normalHeight ) {

106 windowStateStorage.saveGeometry(root.windowId, Qt.rect(priv.normalX, priv.normalY, priv.normalWidth, priv.normalHeight));

107 }