Merge branch 'xenial_-_mir26' into xenial

ubports · Dec 28, 2017 · 99be424 · 99be424
2 parents 6164829 + 9be809d
commit 99be424
Show file tree

Hide file tree

Showing 14 changed files with 498 additions and 359 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,65 @@
+pipeline {
+  agent any
+  stages {
+    stage('Build source') {
+      steps {
+        sh '/usr/bin/build-source.sh'
+        stash(name: 'source', includes: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,*.buildinfo,lintian.txt')
+        cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
+      }
+    }
+    stage('Build binary - armhf') {
+      steps {
+        parallel(
+          "Build binary - armhf": {
+            node(label: 'arm64') {
+              cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
+              unstash 'source'
+              sh '''export architecture="armhf"
+build-binary.sh'''
+              stash(includes: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,*.buildinfo,lintian.txt', name: 'build-armhf')
+              cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
+            }
+
+
+          },
+          "Build binary - arm64": {
+            node(label: 'arm64') {
+              cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
+              unstash 'source'
+              sh '''export architecture="arm64"
+    build-binary.sh'''
+              stash(includes: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,*.buildinfo,lintian.txt', name: 'build-arm64')
+              cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
+            }
+          },
+          "Build binary - amd64": {
+            node(label: 'amd64') {
+              cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
+              unstash 'source'
+              sh '''export architecture="amd64"
+    build-binary.sh'''
+              stash(includes: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,*.buildinfo,lintian.txt', name: 'build-amd64')
+              cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
+            }
+          }
+        )
+      }
+    }
+    stage('Results') {
+      steps {
+        cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
+        unstash 'build-armhf'
+        unstash 'build-arm64'
+        unstash 'build-amd64'
+        archiveArtifacts(artifacts: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,*.buildinfo', fingerprint: true, onlyIfSuccessful: true)
+        sh '''/usr/bin/build-repo.sh'''
+      }
+    }
+    stage('Cleanup') {
+      steps {
+        cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
+      }
+    }
+  }
+}
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+webbrowser-app (0.24+ubports) xenial; urgency=medium
+
+  * Imported to UBports
+
+ -- UBports auto importer <infra@ubports.com>  Wed, 02 Aug 2017 01:02:48 +0200
+
 webbrowser-app (0.23+17.04.20170321-0ubuntu1) zesty; urgency=medium
 
   [ Andrew Hayzen ]
@@ -165,7 +171,18 @@ webbrowser-app (0.23+16.10.20160928-0ubuntu1) yakkety; urgency=medium
 
  -- Olivier Tilloy <olivier.tilloy@canonical.com>  Wed, 28 Sep 2016 08:25:12 +0000
 
-webbrowser-app (0.23+16.10.20160825-0ubuntu1) yakkety; urgency=medium
+webbrowser-app (0.23+15.04.20170125.1-0ubuntu1) vivid; urgency=medium
+
+  * Replace chromium version in UA overrides at runtime,
+    not at build time (LP: #1599695)
+  * Complete overhaul of UA overrides.
+  * Add UA overrides for Google+ (LP: #1656310)
+  * Add a UA override for Ebay (LP: #1575780)
+  * Add a UA override for appear.in (LP: #1659288)
+
+ -- Olivier Tilloy <olivier.tilloy@canonical.com>  Wed, 25 Jan 2017 13:27:55 +0000
+
+webbrowser-app (0.23+15.04.20160825-0ubuntu1) vivid; urgency=medium
 
   [ Florian Boucault ]
   * Load images needed at startup asynchronously.

diff --git a/debian/control b/debian/control
@@ -25,6 +25,7 @@ Build-Depends: apparmor:native,
                qt5-default,
                qtbase5-dev (>= 5.4),
                qtbase5-dev-tools,
+               qtbase5-private-dev,
                qtdeclarative5-dev,
                qtdeclarative5-ubuntu-ui-extras0.2,
                qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3),
@@ -47,7 +48,7 @@ Depends: ${misc:Depends},
          libqt5sql5-sqlite,
          qml-module-qt-labs-folderlistmodel,
          qml-module-qt-labs-settings,
-         qml-module-qtquick2 (>= 5.5),
+         qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-layouts,
          qml-module-qtquick-window2 (>= 5.3),
          qml-module-qtsysteminfo,
@@ -74,7 +75,7 @@ Depends: ${misc:Depends},
          fonts-liberation,
          liboxideqt-qmlplugin (>= 1.19),
          libqt5sql5-sqlite,
-         qml-module-qtquick2 (>= 5.5),
+         qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-window2 (>= 5.3),
          qml-module-ubuntu-onlineaccounts,
          qml-module-ubuntu-web (= ${binary:Version}),

diff --git a/debian/source/format b/debian/source/format
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -24,11 +24,13 @@ set(COMMONLIB_SRC
     mime-database.cpp
     session-storage.cpp
     single-instance-manager.cpp
+    qquickshortcut.cpp
 )
 
 add_library(${COMMONLIB} STATIC ${COMMONLIB_SRC})
 
-include_directories(${LIBAPPARMOR_INCLUDE_DIRS})
+include_directories(${LIBAPPARMOR_INCLUDE_DIRS}
+                    ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 target_link_libraries(${COMMONLIB}
     Qt5::Core
     Qt5::Gui

diff --git a/src/app/browserapplication.cpp b/src/app/browserapplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -38,6 +38,7 @@
 #include "favicon-fetcher.h"
 #include "meminfo.h"
 #include "mime-database.h"
+#include "qquickshortcut_p.h"
 #include "session-storage.h"
 
 BrowserApplication::BrowserApplication(int& argc, char** argv)
@@ -175,6 +176,7 @@ bool BrowserApplication::initialize(const QString& qmlFileSubPath
     qmlRegisterSingletonType<MemInfo>(uri, 0, 1, "MemInfo", MemInfo_singleton_factory);
     qmlRegisterSingletonType<MimeDatabase>(uri, 0, 1, "MimeDatabase", MimeDatabase_singleton_factory);
     qmlRegisterType<SessionStorage>(uri, 0, 1, "SessionStorage");
+    qmlRegisterType<QQuickShortcut>(uri, 0, 1, "Shortcut");
 
     m_engine = new QQmlEngine;
     connect(m_engine, SIGNAL(quit()), SLOT(quit()));