luna/*: remove LuneOS UI aports

They have been unmaintained and didn't build for months now. Removing, so the new build infra structure can build all packages and we don't need to exclude this folder anymore like we are doing now. More information: <https://wiki.postmarketos.org/wiki/LuneOS_UI> [skip ci]
2018-10-27 16:57:43 +02:00 · 2018-10-27 16:57:43 +02:00 · 70496ed696
commit 70496ed696
parent 31386bfc02
123 changed files with 0 additions and 7088 deletions
--- a/luna/activitymanager/APKBUILD
+++ b/luna/activitymanager/APKBUILD
@ -1,30 +0,0 @@
-pkgname=activitymanager
-pkgver=124_git20160928
-pkgrel=2
-_commit=1e3e1f2a94bf57f9174b3e536b0b5c9b3a2b3d28
-pkgdesc="Open webOS component to manage all running activities"
-arch="all"
-url="https://github.com/webOS-ports/activitymanager"
-license="GPL-3.0+"
-depends="glib luna-service2 libressl db8 boost nyx-lib pmloglib"
-makedepends="cmake-modules-webos glib-dev luna-service2-dev libressl-dev db8-dev boost-dev nyx-lib-dev pmloglib-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/activitymanager/archive/$_commit.tar.gz compile.patch"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
-	mkdir -p "$srcdir"/build
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="7d552fce050f0acd24fbe97e470ecda697e2a13b41efc1cfb27cde6849ac5030d5200ca579ab459e11224292c22e72daa19e0ee115367309fe335f628513cd0a  activitymanager-1e3e1f2a94bf57f9174b3e536b0b5c9b3a2b3d28.tar.gz
-b5f56de1e3037730c85f348ee8da674ce3ac86a20614ac031fa412a3f0fc827ddc1ea459c069a1237eec8418167187b9ecb35dd2239a8f74289a93cf7a5f2e30  compile.patch"
--- a/luna/activitymanager/compile.patch
+++ b/luna/activitymanager/compile.patch
@ -1,44 +0,0 @@
-diff --git a/src/Activity.cpp b/src/Activity.cpp
-index b44f14f..01809e0 100644
--- a/src/Activity.cpp
-+++ b/src/Activity.cpp
-@@ -381,7 +381,7 @@ void Activity::ClearTrigger()
- 
- bool Activity::HasTrigger() const
- {
-	return m_trigger;
-+	return !!m_trigger;
- }
- 
- void Activity::Triggered(boost::shared_ptr<Trigger> trigger)
-@@ -417,7 +417,7 @@ boost::shared_ptr<Callback> Activity::GetCallback()
- 
- bool Activity::HasCallback() const
- {
-	return m_callback;
-+	return !!m_callback;
- }
- 
- void Activity::CallbackFailed(boost::shared_ptr<Callback> callback,
-@@ -983,7 +983,7 @@ boost::shared_ptr<PowerActivity> Activity::GetPowerActivity()
- 
- bool Activity::IsPowerActivity() const
- {
-	return m_powerActivity;
-+	return !!m_powerActivity;
- }
- 
- void Activity::PowerLockedNotification()
-diff --git a/src/MojoTriggerSubscription.cpp b/src/MojoTriggerSubscription.cpp
-index fada064..3fcd2a6 100644
--- a/src/MojoTriggerSubscription.cpp
-+++ b/src/MojoTriggerSubscription.cpp
-@@ -60,7 +60,7 @@ void MojoTriggerSubscription::Unsubscribe()
- 
- bool MojoTriggerSubscription::IsSubscribed() const
- {
-	return m_call;
-+	return !!m_call;
- }
- 
- void MojoTriggerSubscription::ProcessResponse(MojServiceMessage *msg,
--- a/luna/cmake-modules-webos/APKBUILD
+++ b/luna/cmake-modules-webos/APKBUILD
@ -1,28 +0,0 @@
-pkgname=cmake-modules-webos
-pkgver=19
-pkgrel=1
-pkgdesc="CMake modules needed to build Open webOS components"
-url="https://github.com/openwebos/cmake-modules-webos"
-arch="noarch"
-license="custom"
-depends="cmake"
-makedepends="cmake"
-source="$pkgname-$pkgver.tar.gz::https://github.com/openwebos/cmake-modules-webos/archive/submissions/19.tar.gz"
-options="!check"
-
-prepare() {
-	mkdir "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$srcdir"/$pkgname-submissions-$pkgver \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="a8ebf0e05002b34a6a7dcf0fc8ea309eed4820d2af1275bf7523946d237238ee784db420f17530b0f043e9eadfac5760158a096651df1b415c9ec954f955dace  cmake-modules-webos-19.tar.gz"
--- a/luna/configurator/APKBUILD
+++ b/luna/configurator/APKBUILD
@ -1,29 +0,0 @@
-pkgname=configurator
-pkgver=59_git20160928
-pkgrel=0
-_commit=45fb8458100a90fd7700a759c10836ead4760e20
-pkgdesc="Creates the database schema for webOS Applications"
-arch="all"
-url="https://github.com/webOS-ports/configurator"
-license="GPL-3.0+"
-depends="glib luna-service2 db8 json-c pmloglib"
-makedepends="cmake-modules-webos glib-dev luna-service2-dev db8-dev json-c-dev pmloglib-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/configurator/archive/$_commit.tar.gz"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
-	mkdir -p "$srcdir"/build
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="4e606ad97e509bc0b58b0d835c03ae4f54ed4c3874cd00483948e0d145e74aaa38421f8625da902b53616f2974ae1851eea9609c0c3bf58cf3c6addd69ad1d79  configurator-45fb8458100a90fd7700a759c10836ead4760e20.tar.gz"
--- a/luna/db8/APKBUILD
+++ b/luna/db8/APKBUILD
@ -1,34 +0,0 @@
-pkgname=db8
-pkgver=149_git20170911
-pkgrel=2
-_commit=6bb08a67b2374affc08ce8a6c8866a93f0983fb6
-pkgdesc="The no-SQL database for webOS"
-arch="all"
-url="https://github.com/webOS-ports/db8"
-license="GPL-3.0+"
-depends="glib luna-service2 pmloglib icu db boost leveldb"
-makedepends="cmake-modules-webos glib-dev luna-service2-dev pmloglib-dev icu-dev db-dev db-c++ boost-dev leveldb-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/db8/archive/$_commit.tar.gz
-remove-np-pthread.patch"
-options="!check"
-subpackages="$pkgname-dev"
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
-	mkdir -p "$srcdir"/build
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-	rm "$pkgdir"/usr/lib/db8/tests/dbgen
-	rmdir "$pkgdir"/usr/lib/db8/tests/
-}
-sha512sums="e62ae979ae287b73b04f914acc3074de089e12ca9de9e47f5ae05966d31ad76683fa8ba6335c1c5035a07e4e95ae02b7b9c670a8b93cc5656391344be7b4f707  db8-6bb08a67b2374affc08ce8a6c8866a93f0983fb6.tar.gz
-cf930a9dbcbcceb17dea47a5038551b7a21896da5caa56a50f26137c31c5fc27ac579f343298bb1bd72424b4b932d0e91b3585f02015e35dc1b2dabffa3bfb14  remove-np-pthread.patch"
--- a/luna/db8/remove-np-pthread.patch
+++ b/luna/db8/remove-np-pthread.patch
@ -1,140 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3162e89..a3af42f 100755
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -287,6 +287,6 @@ if (WEBOS_CONFIG_BUILD_TESTS)
- 
- endif()
- add_subdirectory(tool/dbgen)
-add_subdirectory(tool/sandwichmigrate)
-+#add_subdirectory(tool/sandwichmigrate)
- 
- add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure ${ctest_args})
-diff --git a/inc/core/MojOs.h b/inc/core/MojOs.h
-index c802f9f..57979c6 100755
--- a/inc/core/MojOs.h
-+++ b/inc/core/MojOs.h
-@@ -20,6 +20,8 @@
- #ifndef MOJOS_H_
- #define MOJOS_H_
- 
-+#include <fcntl.h>
-+
- #ifdef MOJ_HAVE_CTYPE_H
- #	include <ctype.h>
- #endif
-diff --git a/inc/core/MojUtil.h b/inc/core/MojUtil.h
-index 0a50b05..2019efc 100755
--- a/inc/core/MojUtil.h
-+++ b/inc/core/MojUtil.h
-@@ -56,7 +56,7 @@ template<class T>
- MojSize MojBinarySearch(T key, const T* array, MojSize numElems);
- 
- template<class T, class COMP>
-void MojQuickSort(T* array, MojSize numElems, const COMP& comp = COMP());
-+void MojQuickSort(T* array, MojSize numElems, const COMP& comp);
- template<class T>
- void MojQuickSort(T* array, MojSize numElems);
- 
-diff --git a/inc/core/internal/MojConfigLinux.h b/inc/core/internal/MojConfigLinux.h
-index 606de27..d9a6b97 100644
--- a/inc/core/internal/MojConfigLinux.h
-+++ b/inc/core/internal/MojConfigLinux.h
-@@ -25,8 +25,8 @@
- #define MOJ_USE_READDIR
- #define MOJ_USE_MEMRCHR
- #define MOJ_USE_GNU_STRERROR_R
-#define MOJ_USE_RANDOM_R
-#define MOJ_USE_SRANDOM_R
-+#define MOJ_USE_RANDOM
-+#define MOJ_USE_SRANDOM
- 
- #define MOJ_NEED_ATOMIC_INIT
- #define MOJ_NEED_ATOMIC_DESTROY
-diff --git a/inc/core/internal/MojOsInternal.h b/inc/core/internal/MojOsInternal.h
-index a44923b..c5d9286 100644
--- a/inc/core/internal/MojOsInternal.h
-+++ b/inc/core/internal/MojOsInternal.h
-@@ -58,20 +58,19 @@ inline MojErr MojErrno()
- }
- #endif /* MOJ_USE_ERRNO */
- 
-#ifdef MOJ_USE_GNU_STRERROR_R
-+#if 0
- inline const MojChar* MojStrError(int err, MojChar* buf, MojSize bufLen)
- {
- 	return strerror_r(err, buf, bufLen);
- }
- #endif /* MOJ_USE_GNU_STRERROR_R */
- 
-#ifdef MOJ_USE_POSIX_STRERROR_R
-+
- inline const MojChar* MojStrError(int err, MojChar* buf, MojSize bufLen)
- {
- 	strerror_r(err, buf, bufLen);
- 	return buf;
- }
-#endif /* MOJ_USE_POSIX_STRERROR_R */
- 
- #ifdef MOJ_NEED_DEBUGBREAK
- inline void MojDebugBreak()
-@@ -346,7 +345,7 @@ inline MojErr MojThreadYield()
- #ifdef __USE_GNU
- 	return (MojErr) pthread_yield();
- #else
- 	pthread_yield_np();
-+ 	sched_yield();
- 	return MojErrNone;
- #endif
- }
-diff --git a/inc/core/internal/MojUtilInternal.h b/inc/core/internal/MojUtilInternal.h
-index a7bd5a5..597ade4 100644
--- a/inc/core/internal/MojUtilInternal.h
-+++ b/inc/core/internal/MojUtilInternal.h
-@@ -165,7 +165,7 @@ void MojQuickSortImpl(T* array, MojSize left, MojSize right, const COMP& comp)
- }
- 
- template<class T, class COMP>
-inline void MojQuickSort(T* array, MojSize numElems, const COMP& comp = COMP())
-+inline void MojQuickSort(T* array, MojSize numElems, const COMP& comp)
- {
- 	return MojQuickSortImpl<T, COMP>(array, 0, numElems, comp);
- }
-diff --git a/inc/core/internal/MojVectorInternal.h b/inc/core/internal/MojVectorInternal.h
-index 94ae45a..ecbea9d 100644
--- a/inc/core/internal/MojVectorInternal.h
-+++ b/inc/core/internal/MojVectorInternal.h
-@@ -305,7 +305,7 @@ MojErr MojVector<T, EQ, COMP>::sort()
- 	if (size() > 1) {
- 		MojErr err = ensureWritable();
- 		MojErrCheck(err);
-		MojQuickSort<T, COMP>(m_begin, size());
-+		MojQuickSort<T, COMP>(m_begin, size(), COMP());
- 	}
- 	return MojErrNone;
- }
-diff --git a/src/core/MojLogEngine.cpp b/src/core/MojLogEngine.cpp
-index 3291d7e..5049694 100644
--- a/src/core/MojLogEngine.cpp
-+++ b/src/core/MojLogEngine.cpp
-@@ -20,6 +20,7 @@
- #include "core/MojLogEngine.h"
- #include "core/MojObject.h"
- #include "core/MojTime.h"
-+#include "core/MojOs.h"
- 
- #ifdef MOJ_HAVE_SYSLOG_H
- #	include "syslog.h"
-diff --git a/src/db-luna/BackendBuildRules.cmake b/src/db-luna/BackendBuildRules.cmake
-index 5b480b9..29bd32d 100644
--- a/src/db-luna/BackendBuildRules.cmake
-+++ b/src/db-luna/BackendBuildRules.cmake
-@@ -24,7 +24,7 @@
- # Optional variable:
- # DB_BACKEND_WRAPPER_CFLAGS     - compiller flags
- 
-set(WEBOS_DB8_BACKEND "sandwich" CACHE STRING "Backend(s) to use with DB8")
-+set(WEBOS_DB8_BACKEND "leveldb" CACHE STRING "Backend(s) to use with DB8")
- 
- foreach (backend ${WEBOS_DB8_BACKEND})
- 	message (STATUS "Use database frontend: ${backend}")
--- a/luna/enyo/APKBUILD
+++ b/luna/enyo/APKBUILD
@ -1,22 +0,0 @@
-pkgname=enyo
-pkgver=1.0_git20170811
-pkgrel=0
-_commit=6c4a64ddcf0b0f97cb1af58774c8f8b005540475
-pkgdesc="EnyoJS webapp framework"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends=""
-makedepends=""
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/enyo-1.0/archive/$_commit.tar.gz"
-builddir="$srcdir/$pkgname-1.0-$_commit"
-
-package() {
-	cd "$builddir"
-
-	install -d "$pkgdir"/usr/palm/frameworks/enyo/0.10/framework
-	cp -vrf ./framework/* "$pkgdir"/usr/palm/frameworks/enyo/0.10/framework
-
-	ln -vs 0.10 "$pkgdir"/usr/palm/frameworks/enyo/1.0
-}
-sha512sums="2a41b37dacd510222d610575cc568effd95e8aeaa146a8d343f6c0c00603fe770542c78c71a036d021ae1182b94d0a23ec565368f0a83f77b35f2deb811fc606  enyo-6c4a64ddcf0b0f97cb1af58774c8f8b005540475.tar.gz"
--- a/luna/lemon/APKBUILD
+++ b/luna/lemon/APKBUILD
@ -1,33 +0,0 @@
-pkgname=lemon
-pkgver=3.21
-pkgrel=1
-pkgdesc="The Lemon Parser Generator"
-arch="all"
-url="https://www.hwaci.com/sw/lemon"
-license="custom"
-depends=""
-makedepends=""
-source="lemon-$pkgver.c::https://www.sqlite.org/src/raw?ci=branch-$pkgver&filename=tool/lemon.c
-lempar-$pkgver.c::https://www.sqlite.org/src/raw?ci=branch-$pkgver&filename=tool/lempar.c"
-options="!check"
-
-
-build() {
-	cd "$srcdir"
-	gcc lemon-$pkgver.c -c -o lemon.o
-	gcc lemon.o -o lemon
-}
-
-package() {
-	cd "$srcdir"
-	install -d "$pkgdir"/usr/bin/
-	install -m 0755 lemon "$pkgdir"/usr/bin/
-
-	# FIXME: lempar.c should not be in /usr/bin/! Consider upstreaming a
-	# patch into sqlite, that makes lemon look for it in /usr/share/lemon:
-	# <https://aur.archlinux.org/cgit/aur.git/tree/lemon_share.diff?h=lemon>
-
-	install -m 0644 "$srcdir"/lempar-$pkgver.c "$pkgdir"/usr/bin/lempar.c
-}
-sha512sums="17c5210e856a6eeb195b9c8c68b83407b7085596dd48e8e55059d644725ff84fb56a5cf223530723b9a69382f619383b4035fe46588300e2e5776228429ec5d4  lemon-3.21.c
-cbf78b843fdebadebff498db803fce545e5c1cb3dcf76da4989513f1f970a2a192d3f775430a4ae81e89b41477a06a530f01c83641ca36949a7c24452b4fba13  lempar-3.21.c"
--- a/luna/libconnman-qt/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch
+++ b/luna/libconnman-qt/0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch
@ -1,50 +0,0 @@
-From 827b323ee9a6db04c1f5b644abea0ced2095096a Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Tue, 26 Jan 2016 18:56:42 +0100
-Subject: [PATCH] Don't use MeeGo as prefix in order to make this a common
- component
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
-Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
---
- plugin/plugin.cpp | 2 +-
- plugin/plugin.pro | 2 +-
- plugin/qmldir     | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugin/plugin.cpp b/plugin/plugin.cpp
-index a383482..451c95f 100644
--- a/plugin/plugin.cpp
-+++ b/plugin/plugin.cpp
-@@ -24,7 +24,7 @@
- class ConnmanPlugin: public QQmlExtensionPlugin
- {
-     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "MeeGo.Connman")
-+    Q_PLUGIN_METADATA(IID "Connman")
- 
- public:
-     void registerTypes(const char *uri);
-diff --git a/plugin/plugin.pro b/plugin/plugin.pro
-index c4f54cf..3763f57 100644
--- a/plugin/plugin.pro
-+++ b/plugin/plugin.pro
-@@ -17,7 +17,7 @@ LIBS += -l$$qtLibraryTarget(connman-$$TARGET_SUFFIX)
- QT += qml
- OTHER_FILES += plugin.json qmldirs
- 
-MODULENAME = MeeGo/Connman
-+MODULENAME = Connman
- TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME
- 
- target.path = $$TARGETPATH
-diff --git a/plugin/qmldir b/plugin/qmldir
-index 5db82b7..de56688 100644
--- a/plugin/qmldir
-+++ b/plugin/qmldir
-@@ -1,2 +1,2 @@
-module MeeGo.Connman
-+module Connman
- plugin ConnmanQtDeclarative
-- 
-2.11.0.windows.3
--- a/luna/libconnman-qt/APKBUILD
+++ b/luna/libconnman-qt/APKBUILD
@ -1,27 +0,0 @@
-pkgname=libconnman-qt
-pkgver=1.2.6
-pkgrel=0
-_commit=b2230677396fb27e3f8e47e4ce9792e578f5555c
-pkgdesc="QT interface to connman"
-arch="all"
-url="https://git.merproject.org/mer-core/libconnman-qt/"
-license="GPL-3.0+"
-depends="qt5-qtbase connman qt5-qtdeclarative qt5-qtquickcontrols2"
-makedepends="qt5-qtbase-dev connman-dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev"
-source="$pkgname-$pkgver.tar.gz::https://git.merproject.org/mer-core/libconnman-qt/repository/archive.tar.gz?ref=$pkgver
-0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch"
-builddir="$srcdir/$pkgname-$pkgver-$_commit"
-options="!check"
-subpackages="$pkgname-dev"
-
-build() {
-	qmake-qt5
-	make
-}
-
-package() {
-	cd "$builddir"
-	make install INSTALL_ROOT="$pkgdir"
-}
-sha512sums="1a2b4308a5827e6cc25d639f55bea18272bda92f0d9cc225498ac1778d52f5a67fdc7bdd69efba8d9910c7766029ff4ffc0c795ff56a740aa6a0c2772e4713ef  libconnman-qt-1.2.6.tar.gz
-fbd2335342526561445b2b98aac7f5f3c83e0a76be8d0141fc88e95cf016bca873741d05cd487ce43d2aac906656259a8b0d3c1d6ca50b568d57739a64777a62  0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch"
--- a/luna/libpbnjson/APKBUILD
+++ b/luna/libpbnjson/APKBUILD
@ -1,36 +0,0 @@
-pkgname=libpbnjson
-pkgver=2.9.1
-pkgrel=2
-pkgdesc="Palm's Better Native JSON library"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="uriparser"
-depends_dev="uriparser-dev glib-dev"
-makedepends="cmake-modules-webos glib-dev yajl-dev gperf gmp-dev uriparser-dev boost-dev sqlite-libs lemon"
-source="$pkgname-$pkgver.tar.gz::https://github.com/openwebos/libpbnjson/archive/versions/$pkgver.tar.gz
-	replace-bash-with-sh.patch"
-subpackages="$pkgname-dev"
-
-prepare() {
-	mkdir -p "$srcdir"/build
-	cd "$srcdir"/$pkgname-versions-$pkgver
-	patch -p1 < "$srcdir"/replace-bash-with-sh.patch
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$srcdir"/$pkgname-versions-$pkgver \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/ \
-		-DNO_LOGGING:BOOL=TRUE
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="febecef9ad5eaffdb32618bca68bdd3f0121ec34a436c8b0a82a8bc4d18f4b860771bb9ab8a1b3b22a30bf915b3a9ccba491c9c3c6b51537ef5510ef2dd953b3  libpbnjson-2.9.1.tar.gz
-1e434f7deeb11b6a03d8831289b7c60d54576a75eaac9e30dc990f0bf08debfc6f5dd45c722737f1d44b0b60d81553456a013deba03efe2c3962bbacd0da25d9  replace-bash-with-sh.patch"
--- a/luna/libpbnjson/replace-bash-with-sh.patch
+++ b/luna/libpbnjson/replace-bash-with-sh.patch
@ -1,24 +0,0 @@
-diff --git a/src/pbnjson_c/validation/apply_lemon.sh b/src/pbnjson_c/validation/apply_lemon.sh
-index 0d445cf..7f08034 100755
--- a/src/pbnjson_c/validation/apply_lemon.sh
-+++ b/src/pbnjson_c/validation/apply_lemon.sh
-@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!/bin/sh
- 
- # @@@LICENSE
- #
-@@ -34,13 +34,11 @@ token_keywords=`grep TOKEN $source_dir/schema_keywords.gperf | grep -o "TOKEN_${
- 
- if [ "$found_keywords" != "$all_keywords" ]; then
- 	echo >&2 "any_object_key doesn't contain all the keywords"
-	diff <(echo "$found_keywords") <(echo "$all_keywords")
- 	exit 1
- fi
- 
- if [ "$expected_tokens" != "$token_keywords" ]; then
- 	echo >&2 "schema_keywords.gperf doesn't contain all the keywords"
-	diff <(echo "$token_keywords") <(echo "$expected_tokens")
- 	exit 1
- fi
- 
--- a/luna/librolegen/APKBUILD
+++ b/luna/librolegen/APKBUILD
@ -1,40 +0,0 @@
-pkgname=librolegen
-pkgver=2.1.0_git20141026
-pkgrel=0
-pkgdesc="librolegen dynamically generates webOS system bus role files for webOS Javascript services"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends=""
-makedepends="cmake-modules-webos"
-_commit="b293a3f8b05f83b36b1b673c4e7dd1c18bfcf768"
-builddir="$srcdir/$pkgname-$_commit"
-
-# NOTE: Unlike the rest of the webOS ports repos, librolegen doesn't use 'master' as
-# their working branch, but 'webOS-ports/master'
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/librolegen/archive/$_commit.tar.gz
-	fix-fexists.patch"
-subpackages="$pkgname-dev"
-options="!check"
-
-prepare() {
-	default_prepare
-	# cmake does not allow in-source builds
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="937a18eff896db044fe4986d63f9a53745c31443c9bfad569b9f852e9d649bfef4a868ab357f2904132a15273be88444774a8938a64c98274dd49e828e17bb5d  librolegen-b293a3f8b05f83b36b1b673c4e7dd1c18bfcf768.tar.gz
-4aa60250ef7d01d3574fccf1427a399839d984e710782ad2753fbbbbfb5cfb652839be15a16e7b9ef11d595ecfad774ef0aed526413094694b0a5dd61969184c  fix-fexists.patch"
--- a/luna/librolegen/compile.patch
+++ b/luna/librolegen/compile.patch
@ -1,13 +0,0 @@
-diff --git a/src/rolegen.cpp.in b/src/rolegen.cpp.in
-index 3c2740f..eb68959 100755
--- a/src/rolegen.cpp.in
-+++ b/src/rolegen.cpp.in
-@@ -51,7 +51,7 @@ static bool isPrivilegedAppId(const char *appId)
- static bool fexists(string filename)
- {
-   ifstream ifile(filename.c_str());
-  return ifile;
-+  return ifile.good();
- }
- 
- static void checkDirStructure()
--- a/luna/librolegen/fix-fexists.patch
+++ b/luna/librolegen/fix-fexists.patch
@ -1,13 +0,0 @@
-diff --git a/src/rolegen.cpp.in b/src/rolegen.cpp.in
-index 3c2740f..eb68959 100755
--- a/src/rolegen.cpp.in
-+++ b/src/rolegen.cpp.in
-@@ -51,7 +51,7 @@ static bool isPrivilegedAppId(const char *appId)
- static bool fexists(string filename)
- {
-   ifstream ifile(filename.c_str());
-  return ifile;
-+  return ifile.good();
- }
- 
- static void checkDirStructure()
--- a/luna/libwebos-application/APKBUILD
+++ b/luna/libwebos-application/APKBUILD
@ -1,30 +0,0 @@
-pkgname=libwebos-application
-pkgver=3.0.0_git20140327
-pkgrel=0
-_commit=8d5ce985fec7a9fc5b514be306a74193b6139f5b
-pkgdesc="Implements lifecycle support for native webOS applications"
-arch="all"
-url="https://github.com/webOS-ports/luna-qml-launcher"
-license="GPL-3.0+"
-depends="glib luna-service2 libpbnjson"
-makedepends="cmake-modules-webos glib-dev luna-service2-dev libpbnjson-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/libwebos-application/archive/$_commit.tar.gz"
-options="!check"
-subpackages="$pkgname-dev"
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
-	mkdir -p "$srcdir"/build
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="0e0b6a92e5c85f71e01521d31771123186788e3a1ef0e9990e565cf940f34cd42147e02e9ec9636ad1df2e0da7ece416c48bc181c33d536d43a785e82232729c  libwebos-application-8d5ce985fec7a9fc5b514be306a74193b6139f5b.tar.gz"
--- a/luna/luna-app-browser/APKBUILD
+++ b/luna/luna-app-browser/APKBUILD
@ -1,35 +0,0 @@
-pkgname=luna-app-browser
-pkgver=8.0.0_git20171004
-pkgrel=2
-_commit=7e7a8f477039483c3a05f53a2eb980884560dc32
-pkgdesc="LuneOS web browser"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="qt5-qtquickcontrols2 qt5-qtquickcontrols qt5-qtwebengine"
-makedepends="cmake-modules-webos qt5-qtquickcontrols2-dev qt5-qtwebengine-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/org.webosports.app.browser/archive/$_commit.tar.gz
-fix-qtwebengine-private-includes.patch"
-builddir="$srcdir/org.webosports.app.browser-$_commit"
-
-build() {
-	mkdir -p "$srcdir"/build
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-
-	install -d "$pkgdir"/etc/palm/db/kinds
-	install -d "$pkgdir"/etc/palm/db/permissions
-	install -v -m644 "$builddir"/configuration/db/kinds/* "$pkgdir"/etc/palm/db/kinds
-	install -v -m644 "$builddir"/configuration/db/permissions/* "$pkgdir"/etc/palm/db/permissions
-}
-sha512sums="e12b6061bd36a87cf836415f99653c533edb3eb6f25947d983d03a21faad7de8874638923071842103373682c2060459a86eb895ac6e212156eaf9d01aa654f2  luna-app-browser-7e7a8f477039483c3a05f53a2eb980884560dc32.tar.gz
-1a764b7d091878c6702e7e24178907fc9b48512be4bcb334e1cba57c4aad26650806190bdd916d67a25c0e95bd69075ba6012eb984f9192f6af8c0e8e1555f47  fix-qtwebengine-private-includes.patch"
--- a/luna/luna-app-browser/fix-qtwebengine-private-includes.patch
+++ b/luna/luna-app-browser/fix-qtwebengine-private-includes.patch
@ -1,14 +0,0 @@
-diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
-index 36aef53..bb7b38c 100644
--- a/plugin/CMakeLists.txt
-+++ b/plugin/CMakeLists.txt
-@@ -1,4 +1,9 @@
-+set(QTWEBENGINE_REAL_PRIVATE_INCLUDES "/usr/include/QtWebEngine/${Qt5WebEngine_VERSION}")
-+set(QTWEBENGINE_REAL_PRIVATE_INCLUDES2 "/usr/include/QtWebEngine/${Qt5WebEngine_VERSION}/QtWebEngine")
-+
- include_directories(
-+        ${QTWEBENGINE_REAL_PRIVATE_INCLUDES}
-+        ${QTWEBENGINE_REAL_PRIVATE_INCLUDES2}
- 	${Qt5WebEngine_PRIVATE_INCLUDE_DIRS}
- 	${Qt5Quick_PRIVATE_INCLUDE_DIRS})
- 
--- a/luna/luna-app-services/APKBUILD
+++ b/luna/luna-app-services/APKBUILD
@ -1,78 +0,0 @@
-pkgname=luna-app-services
-pkgver=4.0.0_git20160804
-pkgrel=1
-_commit=9cbee99870d0edba0b30cb569514be16ccf1999c
-pkgdesc="Services used by coreapps."
-arch="all"
-url="https://github.com/webOS-ports/app-services"
-license="GPL-3.0+"
-depends="mojoservicelauncher"
-makedepends=""
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/app-services/archive/$_commit.tar.gz"
-options="!check"
-builddir="$srcdir/app-services-$_commit"
-
-package() {
-	cd "$builddir"
-	install -d "$pkgdir"/usr/palm/services
-	install -d "$pkgdir"/etc/palm/db/kinds
-	install -d "$pkgdir"/etc/palm/db/permissions
-	install -d "$pkgdir"/etc/palm/mediadb/kinds
-	install -d "$pkgdir"/etc/palm/mediadb/permissions
-	install -d "$pkgdir"/etc/palm/activities
-	install -d "$pkgdir"/etc/palm/filecache_types
-	install -d "$pkgdir"/usr/share/dbus-1/services
-	install -d "$pkgdir"/usr/share/dbus-1/system-services
-	install -d "$pkgdir"/usr/share/ls2/roles/pub
-	install -d "$pkgdir"/usr/share/ls2/roles/prv
-	install -d "$pkgdir"/usr/share/ls2/services/pub
-	install -d "$pkgdir"/usr/share/ls2/services/prv
-	install -d "$pkgdir"/usr/share/ls2/roles/pub
-	install -d "$pkgdir"/usr/share/ls2/roles/prv
-	install -d "$pkgdir"/usr/share/ls2-dev/services/pub
-	install -d "$pkgdir"/usr/share/ls2-dev/services/prv
-	install -d "$pkgdir"/usr/share/ls2-dev/roles/pub
-	install -d "$pkgdir"/usr/share/ls2-dev/roles/prv
-	install -d "$pkgdir"/var/palm/data/com.palm.appInstallService
-	install -d "$pkgdir"/usr/palm/public/accounts
-	install -d "$pkgdir"/etc/palm/tempdb/kinds
-	install -d "$pkgdir"/etc/palm/tempdb/permissions
-	install -d "$pkgdir"/etc/palm/event.d
-	install -d "$pkgdir"/etc/palm/init
-
-    for SERVICE in $(ls -d1 ./com.palm.service.*); do
-        SERVICE_DIR=$(basename $SERVICE)
-        install -d "$pkgdir"/usr/palm/services/$SERVICE_DIR/
-        cp -vrf $SERVICE/* "$pkgdir"/usr/palm/services/$SERVICE_DIR/
-        # Copy db8 kinds, permissions and activities
-        cp -vrf $SERVICE/db/kinds/* "$pkgdir"/etc/palm/db/kinds 2> /dev/null || true
-        cp -vrf $SERVICE/db/permissions/* "$pkgdir"/etc/palm/db/permissions 2> /dev/null || true
-        cp -vrf $SERVICE/activities/* "$pkgdir"/etc/palm/activities 2> /dev/null || true
-        cp -vrf $SERVICE/filecache_types/* "$pkgdir"/etc/palm/filecache_types 2> /dev/null || true
-        # Copy services and roles files
-        cp -vrf $SERVICE/files/sysbus/*.json "$pkgdir"/usr/share/ls2/roles/pub 2> /dev/null || true
-        cp -vrf $SERVICE/files/sysbus/*.json "$pkgdir"/usr/share/ls2/roles/prv 2> /dev/null || true
-        cp -vrf $SERVICE/files/sysbus/*.service "$pkgdir"/usr/share/ls2/services/prv 2> /dev/null || true
-    done
-
-	# install account services files in public service directory.
-	cp -vrf ./com.palm.service.accounts/files/sysbus/*.service "$pkgdir"/usr/share/ls2/services/pub 2> /dev/null || true
-
-	# install account service desktop credentials db kind 
-	cp -vrf ./com.palm.service.accounts/desktop/com.palm.account.credentials "$pkgdir"/etc/palm/db/kinds 2> /dev/null || true
-
-	# install account templates.
-	cp -vrf ./account-templates/palmprofile/com.palm.palmprofile "$pkgdir"/usr/palm/public/accounts
-
-	# install temp db kinds and permissions
-	cp -vrf com.palm.service.accounts/tempdb/kinds/* "$pkgdir"/etc/palm/tempdb/kinds/
-	cp -vrf com.palm.service.accounts/tempdb/permissions/* "$pkgdir"/etc/palm/tempdb/permissions
-
-	# install account service upstart files
-	install -m 644 com.palm.service.accounts/files/etc/event.d/createLocalAccount "$pkgdir"/etc/palm/event.d/
-	install -m 644 com.palm.service.accounts/files/etc/init/createLocalAccount.conf "$pkgdir"/etc/palm/init/
-
-	# create folder for contact linker plugins
-	mkdir -p "$pkgdir"/etc/palm/contact_linker_plugins
-}
-sha512sums="0ff50759de3c52546bad213be544771f821a0c4fa6fe20a4953693510ebde2b3897f9e1bcb7026e5c7e36de080fa600863faa170d206f93447ad50efd6f99105  luna-app-services-9cbee99870d0edba0b30cb569514be16ccf1999c.tar.gz"
--- a/luna/luna-applauncher/APKBUILD
+++ b/luna/luna-applauncher/APKBUILD
@ -1,20 +0,0 @@
-pkgname=luna-applauncher
-pkgver=0.90_git20171025
-pkgrel=0
-_commit=ada4aabfb5e0ffa127afab3957b4be2d84f76fe3
-pkgdesc="WebOS app launcher"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="enyo webos-underscore mojoloader webos-foundation"
-makedepends=""
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/$pkgname/archive/$_commit.tar.gz"
-builddir="$srcdir/$pkgname-$_commit"
-
-package() {
-	cd "$builddir"
-
-	install -d "$pkgdir"/usr/palm/applications/com.palm.launcher
-	cp -vrf * "$pkgdir"/usr/palm/applications/com.palm.launcher
-}
-sha512sums="8191af9fb94eddde0c39df42c570369aafcf04e6d89b6a1a3f40ca090c8bfd9281394f71aa34bcf222ecbbcc98e6769f8c58f0df64c73a97b657eda41f5010b5  luna-applauncher-ada4aabfb5e0ffa127afab3957b4be2d84f76fe3.tar.gz"
--- a/luna/luna-appmanager/APKBUILD
+++ b/luna/luna-appmanager/APKBUILD
@ -1,49 +0,0 @@
-pkgname=luna-appmanager
-pkgver=1.9.0_git20170911
-pkgrel=0
-_commit=a342cc9e2a8019c93ee13030c26a5cd0d5e4f24a
-pkgdesc="Component responsible for application management in LuneOS"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="luna-sysmgr-common luna-sysmgr-ipc qt5-qtbase serviceinstaller librolegen nyx-lib json-c glib luna-service2 pmloglib libpbnjson luna-prefs luna-sysmgr-ipc-messages libressl sqlite"
-makedepends="cmake-modules-webos luna-sysmgr-common-dev luna-sysmgr-ipc-dev qt5-qtbase-dev serviceinstaller librolegen-dev nyx-lib-dev json-c-dev glib-dev luna-service2-dev pmloglib-dev libpbnjson-dev luna-prefs-dev luna-sysmgr-ipc-messages luna-sysmgr-ipc-messages-dev libressl-dev sqlite-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-appmanager/archive/$_commit.tar.gz
-compile.patch"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	#cmake does not allow in-source builds
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-
-	appmgrsrc="$srcdir"/$pkgname-a342cc9e2a8019c93ee13030c26a5cd0d5e4f24a
-
-	mkdir -p "$pkgdir"/usr/share/ls2/roles/prv/
-	cp "$appmgrsrc"/service/luna-appmanager.json.prv "$pkgdir"/usr/share/ls2/roles/prv/luna-appmanager.json
-	mkdir -p "$pkgdir"/usr/share/ls2/roles/pub/
-	cp "$appmgrsrc"/service/luna-appmanager.json.pub "$pkgdir"/usr/share/ls2/roles/pub/luna-appmanager.json
-
-	mkdir -p "$pkgdir"/usr/share/ls2/system-services/
-	cp "$appmgrsrc"/service/luna-appmanager.service.prv "$pkgdir"/usr/share/ls2/system-services/luna-appmanager.service
-	
-	mkdir -p "$pkgdir"/usr/share/ls2/services/
-	cp "$appmgrsrc"/service/luna-appmanager.service.pub "$pkgdir"/usr/share/ls2/services/luna-appmanager.service
-
-}
-sha512sums="04cc2f72a999bdec058fe87135ba01101b79cc0974102f7221cd57028f695cc342789add5fe7fa7c5660fc97fdefff1d02f31b4a9af4014022c8d9483b8a59b7  luna-appmanager-a342cc9e2a8019c93ee13030c26a5cd0d5e4f24a.tar.gz
-0b48db80fb3f4dc683004bfff927577c8b2c258d735d6706406fd931456d3d01b03638635a60e1f5360d00a9439a7be7056f46d86453c06685fcb067a7d20c70  compile.patch"
--- a/luna/luna-appmanager/compile.patch
+++ b/luna/luna-appmanager/compile.patch
@ -1,128 +0,0 @@
-diff --git a/Src/Main.cpp b/Src/Main.cpp
-index 8894f52..3eca6c4 100644
--- a/Src/Main.cpp
-+++ b/Src/Main.cpp
-@@ -79,7 +79,7 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
-extern void malloc_stats(void);
-+//extern void malloc_stats(void);
- #ifdef __cplusplus
- };
- #endif
-@@ -336,7 +336,7 @@ static gboolean mallocStatsCb(gpointer data)
- 	fflush(stderr);
- 	fprintf(stderr, "\nMALLOC STATS FOR PROCESS: \"%s\" (PID: %d) AT [%ld.%ld] %s", process_name, my_pid, ts.tv_sec, ts.tv_nsec, ctime_r(&cur_time, buf));
- 	fflush(stderr);
-	malloc_stats();
-+	//malloc_stats();
- 	fprintf(stderr, "\n\n");
- 	fflush(stderr);
- 	fsync(STDERR_FILENO);
-diff --git a/Src/base/application/ApplicationInstaller.cpp b/Src/base/application/ApplicationInstaller.cpp
-index 937ca82..ec215ad 100644
--- a/Src/base/application/ApplicationInstaller.cpp
-+++ b/Src/base/application/ApplicationInstaller.cpp
-@@ -2766,7 +2766,7 @@ bool ApplicationInstaller::cbQueryInstallCapacity(LSHandle* lshandle,LSMessage *
- 		goto Done;
- 	}
- 
-	size = strtouq(strsize.c_str(),NULL,10);
-+	size = strtoul(strsize.c_str(),NULL,10);
- 	
- 	if (size == 0)
- 	{
-@@ -2780,7 +2780,7 @@ bool ApplicationInstaller::cbQueryInstallCapacity(LSHandle* lshandle,LSMessage *
- 	}
- 	else
- 	{
-		ucSize = strtouq(strucsize.c_str(),NULL,10);
-+		ucSize = strtoul(strucsize.c_str(),NULL,10);
- 	}
- 		
- 	queryCapacityResult = ApplicationInstaller::instance()->lunasvcQueryInstallCapacity(packageId, size, ucSize, spaceNeeded);
-diff --git a/Src/base/application/ApplicationManager.cpp b/Src/base/application/ApplicationManager.cpp
-index c360ec8..8acd373 100644
--- a/Src/base/application/ApplicationManager.cpp
-+++ b/Src/base/application/ApplicationManager.cpp
-@@ -691,7 +691,7 @@ void ApplicationManager::createOrUpdatePackageManifest(PackageDescription* packa
- 						packageDesc->setPackageSize(ApplicationInstaller::getSizeOfPackageOnFsGenerateManifest("", packageDesc, NULL));
- 					} else {
- 						// set the size that's found
-						uint64_t packageSize = strtouq(packageSizeStr.c_str(), NULL, 10);
-+						uint64_t packageSize = strtoul(packageSizeStr.c_str(), NULL, 10);
- 						g_debug("%s: [MANIFESTS]: manifest for %s blocksize = %s found total size = %llu...setting on package desc",__PRETTY_FUNCTION__, packageDesc->id().c_str(), bsizeStr.c_str(), packageSize);
- 						packageDesc->setPackageSize(packageSize);
- 					}
-diff --git a/Src/base/application/CmdResourceHandlers.cpp b/Src/base/application/CmdResourceHandlers.cpp
-index 2bd105c..758f370 100644
--- a/Src/base/application/CmdResourceHandlers.cpp
-+++ b/Src/base/application/CmdResourceHandlers.cpp
-@@ -39,6 +39,7 @@ RedirectHandler::RedirectHandler(const std::string& urlRe, const std::string& ap
- 	if (!urlRe.empty() && 0 == regcomp(&m_urlReg, urlRe.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB)) {
- 	}
- 	else {
-+		m_regexValid = false;
- 		::memset(&m_urlReg, 0, sizeof(m_urlReg));
- 	}
- }
-@@ -50,6 +51,7 @@ RedirectHandler::RedirectHandler(const std::string& urlRe, const std::string& ap
- 	if (!urlRe.empty() && 0 == regcomp(&m_urlReg, urlRe.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB)) {
- 	}
- 	else {
-+		m_regexValid = false;
- 		::memset(&m_urlReg, 0, sizeof(m_urlReg));
- 	}
- }
-@@ -65,8 +67,10 @@ RedirectHandler::RedirectHandler(const RedirectHandler& c)
- 	m_verbs = c.m_verbs;
- 	
- 	if (!m_urlRe.empty() && 0 == regcomp(&m_urlReg, m_urlRe.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB)) {
-+		m_regexValid = true;	
- 	}
- 	else {
-+		m_regexValid = false;
- 		::memset(&m_urlReg, 0, sizeof(m_urlReg));
- 	}
- 	
-@@ -89,8 +93,10 @@ RedirectHandler& RedirectHandler::operator=(const RedirectHandler& c)
- 	m_verbs = c.m_verbs;
- 	
- 	if (!m_urlRe.empty() && 0 == regcomp(&m_urlReg, m_urlRe.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB)) {
-+		m_regexValid = true;
- 	}
- 	else {
-+		m_regexValid = false;
- 		::memset(&m_urlReg, 0, sizeof(m_urlReg));
- 	}
- 	
-@@ -99,6 +105,7 @@ RedirectHandler& RedirectHandler::operator=(const RedirectHandler& c)
- 
- RedirectHandler::RedirectHandler() : m_valid(false), m_schemeForm(false), m_index(0)
- {
-+	m_regexValid = false;
- 	::memset(&m_urlReg, 0, sizeof(m_urlReg));
- }
- 
-@@ -126,7 +133,7 @@ bool RedirectHandler::matches(const std::string& url) const
-  */
- bool RedirectHandler::reValid() const
- {
-	return m_urlReg.buffer != NULL;
-+	return m_regexValid;
- }
- 
- bool RedirectHandler::addVerb(const std::string& verb,const std::string& jsonizedParams)
-diff --git a/Src/base/application/CmdResourceHandlers.h b/Src/base/application/CmdResourceHandlers.h
-index e6bf3a7..ae48e81 100644
--- a/Src/base/application/CmdResourceHandlers.h
-+++ b/Src/base/application/CmdResourceHandlers.h
-@@ -94,6 +94,7 @@ class RedirectHandler
- 		regex_t m_urlReg; ///< The compiled URL regular expression
- 		bool	m_valid;
- 		bool	m_schemeForm;
-+		bool m_regexValid = true;
- 		std::string m_tag;
- 		uint32_t m_index;
- 		std::map<std::string,std::string>	m_verbs;				// < Verb , json-ized string of parameters >
--- a/luna/luna-core-apps/APKBUILD
+++ b/luna/luna-core-apps/APKBUILD
@ -1,41 +0,0 @@
-pkgname=luna-core-apps
-pkgver=1.0.5_git20170804
-pkgrel=1
-_commit=da721460474039a2412dc6f47a2e8464e38fc6fd
-pkgdesc="The new webOS UI of the webOS ports project."
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="luna-webappmanager enyo luna-app-services"
-makedepends=""
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/core-apps/archive/$_commit.tar.gz"
-builddir="$srcdir/core-apps-$_commit"
-
-package() {
-	cd "$builddir"
-
-	install -d "$pkgdir"/usr/palm/applications
-	install -d "$pkgdir"/etc/palm/db/kinds
-	install -d "$pkgdir"/etc/palm/db/permissions
-	install -d "$pkgdir"/etc/palm/activities
-
-	for COREAPPS in $(ls -d1 ./com.palm.app*); do
-		COREAPPS_DIR=$(basename $COREAPPS)
-		install -d "$pkgdir"/usr/palm/applications/$COREAPPS_DIR/
-		cp -vrf $COREAPPS/* "$pkgdir"/usr/palm/applications/$COREAPPS_DIR/
-
-		if [ -d $COREAPPS/configuration/db/kinds ]; then
-			install -v -m 644 $COREAPPS/configuration/db/kinds/* "$pkgdir"/etc/palm/db/kinds
-		fi
-
-		if [ -d $COREAPPS/configuration/db/permissions ]; then
-			install -v -m 644 $COREAPPS/configuration/db/permissions/* "$pkgdir"/etc/palm/db/permissions
-		fi
-
-		if [ -d $COREAPPS/configuration/activities ]; then
-			cp -vrf $COREAPPS/configuration/activities/* "$pkgdir"/etc/palm/activities/
-		fi
-	done
-}
-
-sha512sums="0e0f93ec7cce52cb0b7d3e90b177da69ef0d8d8bb2b8629cf861f5de914cf3300198f4000b69e5dd7e8f55feb1c8e4344793f0a8b2764dd143bb80a000f92e2e  luna-core-apps-da721460474039a2412dc6f47a2e8464e38fc6fd.tar.gz"
--- a/luna/luna-firstuse/APKBUILD
+++ b/luna/luna-firstuse/APKBUILD
@ -1,30 +0,0 @@
-pkgname=luna-firstuse
-pkgver=7.0.0_git20171102
-pkgrel=1
-_commit=5acfe2bd0c1b3435ed0cbf9b021945202d0d2f86
-pkgdesc="LuneOS first use application"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="qt5-qtquickcontrols2 qt5-qtquickcontrols"
-makedepends="cmake-modules-webos qt5-qtquickcontrols2-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/org.webosports.app.firstuse/archive/$_commit.tar.gz
-locale.patch"
-builddir="$srcdir/org.webosports.app.firstuse-$_commit"
-
-build() {
-	mkdir -p "$srcdir"/build
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="7d335910482e7cbba2798cfb62df73158ca178f2b663812d25e89d29606352898d8be40e7fb1fc44118b7f1f6763cd48d00353c489c660dcbce681fa696f0de7  luna-firstuse-5acfe2bd0c1b3435ed0cbf9b021945202d0d2f86.tar.gz
-d7e5a2b96dd6da82cd695ca88181d429ed6166a28f89f8dc6f69d41c4a095e0cb4b5dcaa4494f73c45be6a74aaa81bbe7dd28d719affc332856975b90ed36837  locale.patch"
--- a/luna/luna-firstuse/locale.patch
+++ b/luna/luna-firstuse/locale.patch
@ -1,17 +0,0 @@
-diff --git a/qml/LocalePage.qml b/qml/LocalePage.qml
-index 68249d2..1967525 100644
--- a/qml/LocalePage.qml
-+++ b/qml/LocalePage.qml
-@@ -79,6 +79,12 @@ BasePage {
-                         currentLocale = response.locale;
-                         console.log("Current locale " + JSON.stringify(currentLocale));
-                     }
-+                    else {
-+                        currentLocale = {
-+                            languageCode: 'un',
-+                            countryCode: 'un'
-+                        }
-+                    }
- 
-                     // now we can fetch all possible values and setup our model
-                     service.call("luna://com.palm.systemservice/getPreferenceValues", JSON.stringify({key: "locale"}), fetchLocalesSuccess, fetchLocalesFailure);
--- a/luna/luna-init/APKBUILD
+++ b/luna/luna-init/APKBUILD
@ -1,41 +0,0 @@
-pkgname=luna-init
-pkgver=5.0.0_git20171117
-pkgrel=2
-_commit=5fff640fb0b9f3e973c13d1620889b2da4c11766
-pkgdesc="Initialization and font setup files used by luna-sysmgr."
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="postmarketos-artwork-wallpapers"
-makedepends="cmake-modules-webos python2 py2-tz"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-init/archive/$_commit.tar.gz"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
-	mkdir -p "$srcdir"/build
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	# The cmake install file doesn't install everything in the right spot.
-	make DESTDIR="$pkgdir" install
-
-	install -d "$pkgdir"/etc/palm
-	install -v -m 644 "$builddir"/files/conf/locale.txt "$pkgdir"/etc/palm
-	install -v -m 644 "$builddir"/files/conf/defaultPreferences.txt "$pkgdir"/etc/palm
-	install -v -m 644 "$builddir"/src/mccInfo.json "$pkgdir"/etc/palm
-	install -v -m 644 "$builddir"/files/conf/default-dock-positions.json "$pkgdir"/etc/palm
-	install -v -m 644 "$builddir"/files/conf/default-launcher-page-layout.json "$pkgdir"/etc/palm
-	install -v -m 644 "$builddir"/files/conf/locale.txt "$pkgdir"/etc/palm
-
-	install -d "$pkgdir"/media/internal/wallpapers
-	ln -s -v /usr/share/wallpapers/postmarketos.jpg "$pkgdir"/media/internal/wallpapers/LuneOS.jpg
-}
-sha512sums="9278b53e8358230e0979d314958a02ada6d68a68b97e253d81ffc5132901cf7aa033c8d908530cbf36c422a161a3f80cc70f1ddb3e0e4b3fae86183c39d10b95  luna-init-5fff640fb0b9f3e973c13d1620889b2da4c11766.tar.gz"
--- a/luna/luna-next-cardshell/APKBUILD
+++ b/luna/luna-next-cardshell/APKBUILD
@ -1,32 +0,0 @@
-pkgname=luna-next-cardshell
-pkgver=4.4.0_git20171115
-pkgrel=0
-_commit=77659074d7f82732766904c413cbece0501f399c
-pkgdesc="The default shell used for luna-next."
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="luna-next qt5-qtbase qt5-qtdeclarative qt5-qtmultimedia"
-makedepends="cmake-modules-webos"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-next-cardshell/archive/$_commit.tar.gz"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="352fae17e397ee6377cc198235e41fb51e0fd88476176405adcc421a5f56d4573ddaaa24ffaa15f22568f71b7e93d545dc305a4588cfbc5edfa154f3b427cdb6  luna-next-cardshell-77659074d7f82732766904c413cbece0501f399c.tar.gz"
--- a/luna/luna-next/APKBUILD
+++ b/luna/luna-next/APKBUILD
@ -1,38 +0,0 @@
-pkgname=luna-next
-pkgver=2.6.0_git20170922
-pkgrel=0
-_commit=428a337f922691b00534f041193ee7dca8defcc2
-pkgdesc="The new webOS UI of the webOS ports project."
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="qt5-qtbase qt5-qtdeclarative qt5-qtwayland luna-prefs luna-sysmgr-common json-c nyx-lib luna-prefs"
-makedepends="extra-cmake-modules cmake-modules-webos qt5-qtbase-dev qt5-qtdeclarative-dev wayland-dev qt5-qtwayland-dev json-c-dev luna-sysmgr-common-dev nyx-lib-dev luna-prefs-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-next/archive/$_commit.tar.gz
-	remove-systemd-harddep.patch compile.patch"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Debug \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DKDE_INSTALL_LIBDIR=lib \
-		-DKDE_INSTALL_LIBEXECDIR=lib \
-		-DWEBOS_INSTALL_ROOT=/ \
-		-DOE_QMAKE_PATH_QML=/usr/lib/qt5/qml/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="37147471d8ea99321558aa8a824a76a6bc23d85cea666ea2c789585e7d398e46312da7488f2019826912addd28ae796552438f9a103ac6fec6572407ce6efb9b  luna-next-428a337f922691b00534f041193ee7dca8defcc2.tar.gz
-f6dc58db48bdd1ec4126245aaeb3cf364dfb761cf0aae172ff19eda885fe0601c249fcfc5e89c1cbfb91e857d5c57bac24495bab62a4c03dff7711e7dad2a9f8  remove-systemd-harddep.patch
-f749ed8a4b2ebd2f8baea6772888772cd9769a71fab667c6bb76338324a4692a9adaa3f6aae04199af74286d00b045c3c7c9cc0c57a293b8fdf04e5af75dca71  compile.patch"
--- a/luna/luna-next/compile.patch
+++ b/luna/luna-next/compile.patch
@ -1,46 +0,0 @@
-diff --git a/src/main.cpp b/src/main.cpp
-index d20eca4..6e87dee 100644
--- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -20,7 +20,6 @@
- 
- #include <string.h>
- #include <errno.h>
-#include <error.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <sys/types.h>
-diff --git a/plugins/compositor/CMakeLists.txt b/plugins/compositor/CMakeLists.txt
-index dae2cb3..fe80c4c 100644
--- a/plugins/compositor/CMakeLists.txt
-+++ b/plugins/compositor/CMakeLists.txt
-@@ -1,10 +1,14 @@
- add_definitions(-DQT_COMPOSITOR_QUICK)
- 
-+#Qt5WaylandCompositor's private include dirs includes *other* private include dirs, but not it's own.
-+set(QTWAYLAND_REAL_PRIVATE_INCLUDES "/usr/include/QtWaylandCompositor/${Qt5WaylandCompositor_VERSION}")
-+
- include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${CMAKE_CURRENT_BINARY_DIR}
-     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
-     ${Qt5WaylandCompositor_PRIVATE_INCLUDE_DIRS}
-+    ${QTWAYLAND_REAL_PRIVATE_INCLUDES}
-     ${WAYLAND_SERVER_INCLUDE_DIRS}
-     ${CMAKE_CURRENT_SOURCE_DIR}/compositor)
- 
-diff --git a/plugins/compositor/compositor.cpp b/plugins/compositor/compositor.cpp
-index 4e437ea..d174c5d 100644
--- a/plugins/compositor/compositor.cpp
-+++ b/plugins/compositor/compositor.cpp
-@@ -246,6 +246,10 @@ void Compositor::onSurfaceDestroyed()
-     }
- }
- 
-+void Compositor::onSurfaceAboutToBeDestroyed(QWaylandSurface *surface) 
-+{
-+}
-+
- void Compositor::onSurfaceRaised()
- {
-     QtWayland::ExtendedSurface *extSurface = qobject_cast<QtWayland::ExtendedSurface*>(sender());
--- a/luna/luna-next/remove-systemd-harddep.patch
+++ b/luna/luna-next/remove-systemd-harddep.patch
@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d803418..1c6a9ea 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,7 +52,7 @@ pkg_check_modules(GLESV2 glesv2 REQUIRED)
- pkg_check_modules(WAYLAND_CLIENT wayland-client REQUIRED)
- pkg_check_modules(WAYLAND_SERVER wayland-server REQUIRED)
- 
-pkg_check_modules(SYSTEMD libsystemd REQUIRED)
-+pkg_check_modules(SYSTEMD libsystemd OPTIONAL)
- pkg_check_modules(GLIB2 glib-2.0 REQUIRED)
- pkg_check_modules(LUNA_SYSMGR_COMMON LunaSysMgrCommon REQUIRED)
- pkg_check_modules(LUNA_SYSMGR_IPC_MESSAGES LunaSysMgrIpcMessages REQUIRED)
-diff --git a/src/main.cpp b/src/main.cpp
-index d20eca4..0bb47f2 100644
--- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -33,7 +33,6 @@
- 
- #include <glib.h>
- 
-#include <systemd/sd-daemon.h>
- #include <Settings.h>
- 
- #include "shellapplication.h"
-@@ -132,7 +131,6 @@ int main(int argc, char *argv[])
-     if (!app.create(shellName))
-         exit(1);
- 
-    sd_notify(0, "READY=1");
- 
-     return app.exec();
- }
--- a/luna/luna-prefs/APKBUILD
+++ b/luna/luna-prefs/APKBUILD
@ -1,35 +0,0 @@
-pkgname=luna-prefs
-pkgver=7.0.0_git20141219
-pkgrel=0
-_commit=620394a1c4bd5b0c0ec0a7ee15aa5e8aa8c6d957
-pkgdesc="Retrieves system preferences values set and used by webOS"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="glib sqlite nyx-lib json-c luna-service2 pmloglib"
-makedepends="cmake-modules-webos glib-dev json-c-dev sqlite-dev pmloglib-dev nyx-lib-dev pmloglib-dev luna-service2-dev"
-depends_dev="json-c-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-prefs/archive/$_commit.tar.gz"
-subpackages="$pkgname-dev"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="ed514077b776f6a0901fc13e101ee1bccac05304d1b2bc56de6fd43558bd51587e049c2fd79618fc4190c4c2b92d2c591cb0ae2d7dfd89351a21f217ca2adcb1  luna-prefs-620394a1c4bd5b0c0ec0a7ee15aa5e8aa8c6d957.tar.gz"
--- a/luna/luna-qml-launcher/APKBUILD
+++ b/luna/luna-qml-launcher/APKBUILD
@ -1,30 +0,0 @@
-pkgname=luna-qml-launcher
-pkgver=5.0.0_git20171102
-pkgrel=1
-_commit=aacef1d20c9c3656db4ecff949f23231120f8449
-pkgdesc="Launcher for Lune OS based QML applications"
-arch="all"
-url="https://github.com/webOS-ports/luna-qml-launcher"
-license="GPL-3.0+"
-depends="qt5-qtwebengine qt5-qtquickcontrols2 luna-service2 luna-sysmgr-common glib libwebos-application json-c"
-makedepends="cmake-modules-webos qt5-qtwebengine-dev qt5-qtquickcontrols2-dev luna-sysmgr-common-dev glib-dev luna-service2-dev libwebos-application-dev json-c-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-qml-launcher/archive/$_commit.tar.gz"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
-	mkdir -p "$srcdir"/build
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/ \
-		-DOE_QMAKE_PATH_QML=/usr/lib/qt5/qml/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="3f2ad84e0b1804741165bd67ebf54577961020e75e98a6072a85b728973d3a9a7e5774f6c804fc71a21f625b1dc0808cc9e21b93dd1a4ef7674f5a7820a4dd7f  luna-qml-launcher-aacef1d20c9c3656db4ecff949f23231120f8449.tar.gz"
--- a/luna/luna-service2/APKBUILD
+++ b/luna/luna-service2/APKBUILD
@ -1,43 +0,0 @@
-pkgname=luna-service2
-pkgver=3.2.0_git20170505
-pkgrel=1
-_commit=1e2e1a53c089003da333609946dddf063244ee34
-pkgdesc="Open webOS Luna System Bus library, daemon, and utilities"
-arch="all"
-url="https://github.com/webOS-ports/luna-service2"
-license="GPL-3.0+"
-depends="glib pmloglib libpbnjson"
-makedepends="cmake-modules-webos glib-dev libpbnjson-dev pmloglib-dev"
-depends_dev="glib-dev libpbnjson-dev pmloglib-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-service2/archive/$_commit.tar.gz
-		remove-systemd-harddep.patch remove-malloc-debug.patch ls-private.conf ls-public.conf"
-subpackages="$pkgname-dev"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/ \
-		-DMALLOC_DEBUG=1
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-	cp "$srcdir"/ls-private.conf "$pkgdir"/etc/luna-service2/ls-private.conf
-	cp "$srcdir"/ls-public.conf "$pkgdir"/etc/luna-service2/ls-public.conf
-}
-sha512sums="862b04ad58a786b7ce810a9864a2580addd4d9757c1d8825f86f5a817a75daa83d360d4c3ceb26e512e868ba2379ba11e049e79fac84411f6758257cbe71909d  luna-service2-1e2e1a53c089003da333609946dddf063244ee34.tar.gz
-c8223795eebd9b0e7037f1ba130d6b4e58496483e886a50a76ed79ef61ed76ebc729f8d031ae9110d80f1ef029e4c8f9529edb483608bdc4aafb39a1bb5e8562  remove-systemd-harddep.patch
-2d35d056c445d25dc970fc176d1326fb93c682ebff0501a79ed2b41d5eda7fde36be0bed96e34776f234c59a95b1e29889e0ba5bec48c321e091f93db0220700  remove-malloc-debug.patch
-a440cb959109c0315cdb0fbe36ec358510d9699de246326d2019957f0de36f521bd88102432f94dc2dc8de45534810a935b9a1f91e9c220044b3aa4c61635a28  ls-private.conf
-0c3b03949a6f78d7bbdb3fedea2c797cda478b5a58057693dc258487c9d7c75a818f5202bd8f28f51d4cfb0ab7431f7be49667026cd4442be425b3e525c0fde5  ls-public.conf"
--- a/luna/luna-service2/ls-private.conf
+++ b/luna/luna-service2/ls-private.conf
@ -1,46 +0,0 @@
-# @@@LICENSE
-#
-#      Copyright (c) 2008-2013 LG Electronics, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# LICENSE@@@
-
-[General]
-LocalSocketDirectory=/var/run/ls2
-PidDirectory=/var/run/ls2
-LogServiceStatus=false
-ConnectTimeout=20000
-
-[Watchdog]
-Timeout=60
-FailureMode=noop
-
-[Dynamic Services]
-Directories=/usr/share/dbus-1/system-services
-VolatileDirectories=/var/palm/ls2/services/prv;/var/palm/ls2-dev/services/prv;/usr/share/ls2/services/prv;/usr/share/ls2-dev/services/prv;/usr/share/ls2/system-services/
-LaunchTimeout=300000
-
-[Security]
-Enabled=false
-Directories=/usr/share/ls2/roles/prv
-VolatileDirectories=/var/palm/ls2/roles/prv;/var/palm/ls2-dev/roles/prv
-MonitorExePath=/usr/sbin/ls-monitor
-MonitorPubExePath=/usr/bin/ls-monitor-pub
-SysMgrExePath=/usr/bin/LunaSysMgr
-WebAppMgrExePath=/usr/lib/qt5/libexec/QtWebEngineProcess
-WebAppMgr2ExePath=/usr/sbin/luna-qml-launcher
-JsServiceExePath=run-js-service
-MojoAppExePath=mojo-app
-MojoAppsAllowAllOutboundByDefault=true
-AllowNullOutboundByDefault=true
--- a/luna/luna-service2/ls-public.conf
+++ b/luna/luna-service2/ls-public.conf
@ -1,46 +0,0 @@
-# @@@LICENSE
-#
-#      Copyright (c) 2008-2013 LG Electronics, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# LICENSE@@@
-
-[General]
-LocalSocketDirectory=/var/run/ls2
-PidDirectory=/var/run/ls2
-LogServiceStatus=false
-ConnectTimeout=20000
-
-[Watchdog]
-Timeout=60
-FailureMode=noop
-
-[Dynamic Services]
-Directories=/usr/share/dbus-1/services
-VolatileDirectories=/var/palm/ls2/services/pub;/var/palm/ls2-dev/services/pub;/usr/share/ls2/services/pub;/usr/share/ls2-dev/services/pub
-LaunchTimeout=300000
-
-[Security]
-Enabled=false
-Directories=/usr/share/ls2/roles/pub
-VolatileDirectories=/var/palm/ls2/roles/pub;/var/palm/ls2-dev/roles/pub
-MonitorExePath=/usr/sbin/ls-monitor
-MonitorPubExePath=/usr/bin/ls-monitor-pub
-SysMgrExePath=/usr/bin/LunaSysMgr
-WebAppMgrExePath=/usr/lib/qt5/libexec/QtWebEngineProcess
-WebAppMgr2ExePath=/usr/sbin/luna-qml-launcher
-JsServiceExePath=run-js-service
-MojoAppExePath=mojo-app
-MojoAppsAllowAllOutboundByDefault=true
-AllowNullOutboundByDefault=true
--- a/luna/luna-service2/remove-malloc-debug.patch
+++ b/luna/luna-service2/remove-malloc-debug.patch
@ -1,80 +0,0 @@
-diff --git a/src/libluna-service2/base.c b/src/libluna-service2/base.c
-index 8ee0d36..fb79753 100644
--- a/src/libluna-service2/base.c
-+++ b/src/libluna-service2/base.c
-@@ -169,7 +169,7 @@ LSDebugLogIncoming(const char *where, _LSTransportMessage *message)
- }
- 
- #ifdef LSHANDLE_CHECK
-inline void
-+void
- _lshandle_validate(LSHandle *sh)
- {
-     if (sh && sh->history.magic_state_num != LSHANDLE_MAGIC_STATE_VALID)
-diff --git a/src/libluna-service2/base.h b/src/libluna-service2/base.h
-index 4d56c1f..9e57940 100644
--- a/src/libluna-service2/base.h
-+++ b/src/libluna-service2/base.h
-@@ -87,7 +87,7 @@ do {                                                                \
- 
- #define LSHANDLE_VALIDATE(sh) _lshandle_validate(sh)
- 
-inline void _lshandle_validate(LSHandle *sh);
-+void _lshandle_validate(LSHandle *sh);
- 
- #define LSHANDLE_GET_RETURN_ADDR() (__builtin_return_address(0))
- #define LSHANDLE_POISON(sh) memset(sh, 0xFF, offsetof(LSHandle, history))
-diff --git a/src/libluna-service2/debug_methods.h b/src/libluna-service2/debug_methods.h
-index 4c98ca9..3fab3a9 100644
--- a/src/libluna-service2/debug_methods.h
-+++ b/src/libluna-service2/debug_methods.h
-@@ -24,7 +24,6 @@
- #include "base.h"
- 
- #define SUBSCRIPTION_DEBUG
-#define MALLOC_DEBUG
- #define INTROSPECTION_DEBUG
- 
- #ifdef SUBSCRIPTION_DEBUG
-diff --git a/src/libluna-service2/transport.c b/src/libluna-service2/transport.c
-index 9802ad3..f12f060 100644
--- a/src/libluna-service2/transport.c
-+++ b/src/libluna-service2/transport.c
-@@ -5291,7 +5291,7 @@ error:
-  * @retval  false otherwise
-  *******************************************************************************
-  */
-inline bool
-+bool
- _LSTransportIsHub(void)
- {
-     return s_is_hub;
-diff --git a/src/libluna-service2/transport.h b/src/libluna-service2/transport.h
-index 5b5e491..23cb899 100644
--- a/src/libluna-service2/transport.h
-+++ b/src/libluna-service2/transport.h
-@@ -186,7 +186,7 @@ void _LSTransportAddInitialWatches(_LSTransport *transport, GMainContext *contex
- _LSTransportType _LSTransportGetTransportType(const _LSTransport *transport);
- bool _LSTransportGetPrivileged(const _LSTransport *tansport);
- 
-inline bool _LSTransportIsHub(void);
-+bool _LSTransportIsHub(void);
- 
- bool LSTransportSend(_LSTransport *transport, const char *service_name, const char *category, const char *method, const char *payload, const char* applicationId, LSMessageToken *token, LSError *lserror);
- bool _LSTransportSendReply(const _LSTransportMessage *message, const char *payload, LSError *lserror);
-diff --git a/src/libluna-service2/transport_message.h b/src/libluna-service2/transport_message.h
-index d5ef0ba..d2986ef 100644
--- a/src/libluna-service2/transport_message.h
-+++ b/src/libluna-service2/transport_message.h
-@@ -29,9 +29,10 @@
- #ifdef LUNA_SERVICE_UNIT_TEST
- #define INLINE
- #else
-#define INLINE inline
-+#define INLINE
- #endif
- 
-+
- /**
-  * @addtogroup LunaServiceTransportMessage
-  *
--- a/luna/luna-service2/remove-systemd-harddep.patch
+++ b/luna/luna-service2/remove-systemd-harddep.patch
@ -1,64 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d004c9f..3ea9779 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,10 +44,6 @@ pkg_check_modules(PMLOGLIB REQUIRED PmLogLib>=3.0.2)
- include_directories(${PMLOGLIB_INCLUDE_DIRS})
- webos_add_compiler_flags(ALL ${PMLOGLIB_CFLAGS_OTHER})
- 
-pkg_check_modules(SYSTEMD_DAEMON REQUIRED libsystemd)
-include_directories(${SYSTEMD_DAEMON_INCLUDE_DIRS})
-webos_add_compiler_flags(ALL ${SYSTEMD_DAEMON_CFLAGS_OTHER})
-
- include(webOS/LegacyDefines)
- 
- set(LS2_PERMS "")
-diff --git a/src/ls-hubd/CMakeLists.txt b/src/ls-hubd/CMakeLists.txt
-index 9bea8cb..d91f800 100644
--- a/src/ls-hubd/CMakeLists.txt
-+++ b/src/ls-hubd/CMakeLists.txt
-@@ -35,7 +35,7 @@ add_definitions(-DDEFAULT_LOCAL_SOCKET_DIR="${WEBOS_INSTALL_RUNTIMEINFODIR}/ls2"
- add_library(ls-hublib STATIC ${HUB_SOURCE_FILES})
- 
- add_executable(ls-hubd hub.c)
-target_link_libraries(ls-hubd ls-hublib ${CMAKE_PROJECT_NAME} ${PMLOGLIB_LDFLAGS} ${SYSTEMD_DAEMON_LDFLAGS})
-+target_link_libraries(ls-hubd ls-hublib ${CMAKE_PROJECT_NAME} ${PMLOGLIB_LDFLAGS})
- webos_build_daemon(NAME ls-hubd LAUNCH ${CMAKE_SOURCE_DIR}/files/launch/ ${LS2_RESTRICTED})
- 
- if (WEBOS_CONFIG_BUILD_TESTS)
-diff --git a/src/ls-hubd/hub.c b/src/ls-hubd/hub.c
-index 78b56e8..7fc3112 100644
--- a/src/ls-hubd/hub.c
-+++ b/src/ls-hubd/hub.c
-@@ -30,7 +30,6 @@
- #include <libgen.h>
- #include <glib.h>
- #include <pbnjson.h>
-#include <systemd/sd-daemon.h>
- 
- #include "hub.h"
- #include "conf.h"
-@@ -4487,11 +4486,6 @@ int main(int argc, char *argv[])
-             LOG_LS_ERROR(MSGID_LSHUB_UPSTART_ERROR, 0, "Unable to emit upstart event");
-         }
-     }
-
-    if (getenv("NOTIFY_SOCKET") != NULL)
-    {
-        sd_notify(0, "READY=1");
-    }
- #endif
- 
-     if (boot_file_name)
-diff --git a/src/ls-hubd/test/CMakeLists.txt b/src/ls-hubd/test/CMakeLists.txt
-index 3d06cc4..d51893b 100644
--- a/src/ls-hubd/test/CMakeLists.txt
-+++ b/src/ls-hubd/test/CMakeLists.txt
-@@ -31,6 +31,6 @@ add_definitions(-DUNIT_TESTS)
- 
- foreach (TEST ${UNIT_TEST_SOURCES})
-     add_executable(${TEST} ${TEST}.c ../hub.c ../security.c)
-    target_link_libraries(${TEST} ls-hublib ${CMAKE_PROJECT_NAME} ${TESTLIBNAME} ${PMLOGLIB_LDFLAGS} ${SYSTEMD_DAEMON_LDFLAGS})
-+    target_link_libraries(${TEST} ls-hublib ${CMAKE_PROJECT_NAME} ${TESTLIBNAME} ${PMLOGLIB_LDFLAGS})
-     add_test(${TEST} ${TEST})
- endforeach ()
--- a/luna/luna-sysmgr-common/APKBUILD
+++ b/luna/luna-sysmgr-common/APKBUILD
@ -1,36 +0,0 @@
-pkgname=luna-sysmgr-common
-pkgver=1.0.2_git20160628
-pkgrel=0
-_commit=c583bebb8d7fb8381a071730c5c636e95bf851fb
-pkgdesc="Provides header files and source code common to luna-sysmgr and webappmanager"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="luna-sysmgr-ipc luna-sysmgr-ipc-messages luna-prefs nyx-lib luna-service2 pmloglib libpbnjson"
-makedepends="cmake-modules-webos qt5-qtbase-dev luna-sysmgr-ipc-dev luna-sysmgr-ipc-messages luna-sysmgr-ipc-messages-dev luna-prefs-dev nyx-lib-dev luna-service2-dev json-c-dev pmloglib-dev libpbnjson-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-sysmgr-common/archive/$_commit.tar.gz
-	compile.patch"
-subpackages="$pkgname-dev"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="b8e4e72db36063fae472c38dfcb6e0d1cb3e10617fb80a56a54f495fac19102ece92c94b8bd5d499603f02d24b954aa185e906b034afe108f0566ffe6b4be794  luna-sysmgr-common-c583bebb8d7fb8381a071730c5c636e95bf851fb.tar.gz
-a682ac698055424d94f40c994a6d9a36b802f8dc604c94244722a3b466e7ec365870b7f6ef600df2d1719d397f2763c4cfb6fd6fe42c31fbdb48f3a0db1a0af6  compile.patch"
--- a/luna/luna-sysmgr-common/compile.patch
+++ b/luna/luna-sysmgr-common/compile.patch
@ -1,13 +0,0 @@
-diff --git a/Src/base/Logging.cpp b/Src/base/Logging.cpp
-index b529da3..d8ec623 100644
--- a/Src/base/Logging.cpp
-+++ b/Src/base/Logging.cpp
-@@ -35,6 +35,8 @@
- #include "MutexLocker.h"
- #include "Settings.h"
- 
-+typedef time_t __time_t;
-+
- static GStaticMutex s_mutex       = G_STATIC_MUTEX_INIT;
- static bool         s_initialized = false;
- static GHashTable*  s_channelHash = 0;
--- a/luna/luna-sysmgr-ipc-messages/APKBUILD
+++ b/luna/luna-sysmgr-ipc-messages/APKBUILD
@ -1,36 +0,0 @@
-pkgname=luna-sysmgr-ipc-messages
-pkgver=2.0.0_git20121220
-pkgrel=0
-_commit=ecca30313037c6f8edced00f1cf98c1f594a4007
-pkgdesc="Provides message definitions for the IPC provided by luna-sysmgr."
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends=""
-makedepends="cmake-modules-webos"
-source="$pkgname-$_commit.tar.gz::https://github.com/openwebos/luna-sysmgr-ipc-messages/archive/$_commit.tar.gz
-	mkpkgconfig.patch"
-subpackages="$pkgname-dev"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="84985fe0fa0fc78937b2cbc56250e664fef5652fa8c11b3c0aa99945461c570e6a5387d2488f5d57210d9071359e93b1e9e6e4f06fdf062c230ef8a2f7ce4a21  luna-sysmgr-ipc-messages-ecca30313037c6f8edced00f1cf98c1f594a4007.tar.gz
-d0c4a39449216adc792665c05dd2e11be6e75cf95bf04444c357006be31505b1550f3b276a9a58edb90b4ed5bbafe3b5a0e0dba4586b8794971f353d4a2a4c00  mkpkgconfig.patch"
--- a/luna/luna-sysmgr-ipc-messages/mkpkgconfig.patch
+++ b/luna/luna-sysmgr-ipc-messages/mkpkgconfig.patch
@ -1,50 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8bfa9e5..e9f63ed 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,11 +18,13 @@
- 
- cmake_minimum_required(VERSION 2.8.7)
- 
-project(luna-sysmgr-ipc-messages NONE)
-+project(LunaSysMgrIpcMessages NONE)
- 
- include(webOS/webOS)
- webos_modules_init(1 0 0 QUALIFIER RC2)
- webos_component(2 0 0)
- 
-+webos_build_pkgconfig()
-+
- # install headers in /usr/include/sysmgr-ipc
- install(DIRECTORY include/public/messages/ DESTINATION ${WEBOS_INSTALL_INCLUDEDIR}/sysmgr-ipc)
-diff --git a/files/pkgconfig/LunaSysMgrIpcMessages.pc.in b/files/pkgconfig/LunaSysMgrIpcMessages.pc.in
-new file mode 100644
-index 0000000..315d51b
--- /dev/null
-+++ b/files/pkgconfig/LunaSysMgrIpcMessages.pc.in
-@@ -0,0 +1,25 @@
-+# @@@LICENSE
-+#
-+# Copyright (c) 2012-2013 LG Electronics, Inc.
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+# http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
-+#
-+# LICENSE@@@
-+
-+libdir=@WEBOS_INSTALL_LIBDIR@
-+includedir=@WEBOS_INSTALL_INCLUDEDIR@/sysmgr-ipc
-+
-+Name: luna-sysmgr-ipc-messages
-+Description: @WEBOS_PROJECT_SUMMARY@
-+Version: @WEBOS_COMPONENT_VERSION@
-+Cflags: -I${includedir}
--- a/luna/luna-sysmgr-ipc/APKBUILD
+++ b/luna/luna-sysmgr-ipc/APKBUILD
@ -1,36 +0,0 @@
-pkgname=luna-sysmgr-ipc
-pkgver=2.0.0_git20121029
-pkgrel=0
-_commit=b51360839d2241717eae5fe8f9d360f68da267db
-pkgdesc="Provides headers for the IPC library used by luna-sysmgr"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="glib"
-makedepends="cmake-modules-webos glib-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-sysmgr-ipc/archive/$_commit.tar.gz
-	 remove-np-pthread.patch"
-subpackages="$pkgname-dev"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="5c72eb88cfc27883ad4d1fea764b244c147c3f192d42bdc9df00833b041181f3fae5a45e6bb33fcfff8547b3e5934dcc3523749730db8a378c2e567d520a5ac4  luna-sysmgr-ipc-b51360839d2241717eae5fe8f9d360f68da267db.tar.gz
-0ef0e57540d07abd7de97fb6f66ce202d753fa2285f93b80e29bc0d8d9774b9b6b66d11d7ff7cd685eaca2f3c4fcadbd9eb9761725b00cfc0975838a6a69f5a8  remove-np-pthread.patch"
--- a/luna/luna-sysmgr-ipc/remove-np-pthread.patch
+++ b/luna/luna-sysmgr-ipc/remove-np-pthread.patch
@ -1,62 +0,0 @@
-diff --git a/src/ipc/PIpcBuffer.cpp b/src/ipc/PIpcBuffer.cpp
-index 6b8bfc6..4a9a96e 100644
--- a/src/ipc/PIpcBuffer.cpp
-+++ b/src/ipc/PIpcBuffer.cpp
-@@ -94,7 +94,7 @@ PIpcBuffer* PIpcBuffer::create(int size)
- 	pthread_mutexattr_t attr;
- 	pthread_mutexattr_init (&attr);
- 	pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
-	pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP);
-+	pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST);
- 
- 	// initialize the buffer lock mutex
- 	pthread_mutex_t* mutex = (pthread_mutex_t*) &h->mutex;
-@@ -320,7 +320,7 @@ bool PIpcBuffer::trylock(pthread_mutex_t* mutex, int& lockCount)
- 	//printf("PIpcBuffer::trylock: %d, %p, %d\n", m_key, mutex, ret);
- 	if (ret != 0) {
- 		if (ret == EOWNERDEAD)
-			pthread_mutex_consistent_np(mutex);
-+			pthread_mutex_consistent(mutex);
- 		else if (ret == EBUSY) {
- 			return false;
- 		}
-@@ -347,7 +347,7 @@ bool PIpcBuffer::lock(pthread_mutex_t* mutex, int& lockCount)
- 	//printf("PIpcBuffer::lock: %d, %p, %d\n", m_key, mutex, ret);
- 	if (ret != 0) {
- 		if (ret == EOWNERDEAD)
-			pthread_mutex_consistent_np(mutex);
-+			pthread_mutex_consistent(mutex);
- 		else {
- 			g_critical("%s: %s", __PRETTY_FUNCTION__, strerror(ret));
- 			return false;
-diff --git a/src/ipc/PIpcMutex.cpp b/src/ipc/PIpcMutex.cpp
-index a80efed..c1c1c54 100644
--- a/src/ipc/PIpcMutex.cpp
-+++ b/src/ipc/PIpcMutex.cpp
-@@ -72,7 +72,7 @@ PIpcMutex* PIpcMutex::create()
- 	pthread_mutexattr_t attr;
- 	pthread_mutexattr_init (&attr);
- 	pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
-	pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP);
-+	pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST);
- 
- 	pthread_mutex_t* mutex = (pthread_mutex_t*) &m->m_data->mutex;
- 	pthread_mutex_init(mutex, &attr);
-@@ -124,7 +124,7 @@ bool PIpcMutex::lock()
- 	int ret = pthread_mutex_lock(mutex);
- 	if (ret != 0) {
- 		if (ret == EOWNERDEAD)
-			pthread_mutex_consistent_np(mutex);
-+			pthread_mutex_consistent(mutex);
- 		else {
- 			g_critical("%s: %s", __PRETTY_FUNCTION__, strerror(ret));
- 			return false;
-@@ -146,7 +146,7 @@ bool PIpcMutex::tryLock()
- 	int ret = pthread_mutex_trylock(mutex);
- 	if (ret != 0) {
- 		if (ret == EOWNERDEAD)
-			pthread_mutex_consistent_np(mutex);
-+			pthread_mutex_consistent(mutex);
- 		else if (ret == EBUSY)
- 			return false;
- 		else {
--- a/luna/luna-sysmgr/APKBUILD
+++ b/luna/luna-sysmgr/APKBUILD
@ -1,75 +0,0 @@
-pkgname=luna-sysmgr
-pkgver=0.912_git20171117
-pkgrel=0
-_commit=514a3d4f4d104cb9d306772f3f5e804c018be738
-pkgdesc="webOS System Manager"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="luna-sysmgr-common luna-sysmgr-ipc qt5-qtsensors qt5-qtbase serviceinstaller librolegen nyx-lib json-c libressl glib luna-service2 uriparser pmloglib libpbnjson luna-prefs"
-makedepends="cmake-modules-webos pmloglib-dev qt5-qtbase-dev luna-sysmgr-ipc-messages-dev  luna-sysmgr-common-dev luna-sysmgr-ipc-dev librolegen-dev qt5-qtsensors-dev json-c-dev libressl-dev glib-dev libpbnjson-dev serviceinstaller luna-service2-dev nyx-lib-dev luna-prefs-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-sysmgr/archive/$_commit.tar.gz
-	compile.patch"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-
-	sysmgrsrc="$srcdir"/$pkgname-514a3d4f4d104cb9d306772f3f5e804c018be738	
-
-	#TODO: we don't package kinds, and we have to for this service to work properly.
-
-	#sysmgr, unlike every other component so far, doesn't use cmake to install it's static files.
-
-	mkdir -p "$pkgdir"/usr/palm/sounds
- 	cp -f "$sysmgrsrc"/sounds/* "$pkgdir"/usr/palm/sounds
-
-	mkdir -p "$pkgdir"/usr/share/ls2/roles/prv/
-	cp "$sysmgrsrc"/service/com.palm.luna.json.prv "$pkgdir"/usr/share/ls2/roles/prv/com.palm.luna.json
-	mkdir -p "$pkgdir"/usr/share/ls2/roles/pub/
-	cp "$sysmgrsrc"/service/com.palm.luna.json.pub "$pkgdir"/usr/share/ls2/roles/pub/com.palm.luna.json
-
-	mkdir -p "$pkgdir"/usr/share/ls2/system-services/
-	cp "$sysmgrsrc"/service/com.palm.luna.service.prv "$pkgdir"/usr/share/ls2/system-services/com.palm.luna.service
-	
-	mkdir -p "$pkgdir"/usr/share/ls2/services/
-	cp "$sysmgrsrc"/service/com.palm.luna.service.pub "$pkgdir"/usr/share/ls2/services/com.palm.luna.service
-
-	mkdir -p "$pkgdir"/etc/palm/pubsub_handlers
-	cp -f "$sysmgrsrc"/service/com.palm.appinstaller.pubsub "$pkgdir"/etc/palm/pubsub_handlers/com.palm.appinstaller
-
-	cp -f "$sysmgrsrc"/conf/default-exhibition-apps.json "$pkgdir"/etc/palm/default-exhibition-apps.json
-	cp -f "$sysmgrsrc"/conf/luna.conf "$pkgdir"/etc/palm/luna.conf
-	cp -f "$sysmgrsrc"/conf/localization.schema  "$pkgdir"/etc/palm/localization.schema
-	cp -f "$sysmgrsrc"/conf/launcher-conf.orderly "$pkgdir"/etc/palm/localization.schema
-	cp -f "$sysmgrsrc"/conf/launcher-conf.schema "$pkgdir"/etc/palm/localization.schema
-
-	mkdir -p "$pkgdir"/usr/lib/luna/customization
-	cp -f "$sysmgrsrc"/conf/default-exhibition-apps.json "$pkgdir"/usr/lib/luna/customization/default-exhibition-apps.json
-
-	mkdir -p "$pkgdir"/etc/palm/schemas
-	cp -rf "$sysmgrsrc"/conf/*.schema "$pkgdir"/etc/palm/schemas
-
-	mkdir -p "$pkgdir"/usr/palm/sysmgr/images
-	cp -fr "$sysmgrsrc"/images/* "$pkgdir"/usr/palm/sysmgr/images
-
-	mkdir -p "$pkgdir"/usr/palm/sysmgr/low-memory
-	cp -frad "$sysmgrsrc"/low-memory/* "$pkgdir"/usr/palm/sysmgr/low-memory
-}
-sha512sums="9bdde8c9ed05986816b0afc76565ded065aec279ffbdeeac70827f01988ab6034676496dbd5955ee4cfc33e889758ee109ab143e43c542cfb5b95dbaa9fbd722  luna-sysmgr-514a3d4f4d104cb9d306772f3f5e804c018be738.tar.gz
-d8a12b66e450262f7dd41b9d8d90ad3d6acfc345ea00599d7e16054d93a47d151a83871923ac586dade1513cef571b96dc69e404ab9a26ad8befb54453f608d8  compile.patch"
--- a/luna/luna-sysmgr/compile.patch
+++ b/luna/luna-sysmgr/compile.patch
@ -1,27 +0,0 @@
-diff --git a/Src/Main.cpp b/Src/Main.cpp
-index 3ac9027..bf2f895 100644
--- a/Src/Main.cpp
-+++ b/Src/Main.cpp
-@@ -75,14 +75,6 @@
- */
- 
- 
-//#define PRINT_MALLOC_STATS
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern void malloc_stats(void);
-#ifdef __cplusplus
-};
-#endif
- 
- static gchar* s_uiStr = NULL;
- static gchar* s_appToLaunchStr = NULL;
-@@ -336,7 +328,6 @@ static gboolean mallocStatsCb(gpointer data)
- 	fflush(stderr);
- 	fprintf(stderr, "\nMALLOC STATS FOR PROCESS: \"%s\" (PID: %d) AT [%ld.%ld] %s", process_name, my_pid, ts.tv_sec, ts.tv_nsec, ctime_r(&cur_time, buf));
- 	fflush(stderr);
-	malloc_stats();
- 	fprintf(stderr, "\n\n");
- 	fflush(stderr);
- 	fsync(STDERR_FILENO);
--- a/luna/luna-sysservice/APKBUILD
+++ b/luna/luna-sysservice/APKBUILD
@ -1,34 +0,0 @@
-pkgname=luna-sysservice
-pkgver=4.0.0_git20160926
-pkgrel=0
-_commit=3e52044fc17511842e86fd05a0588fd015e28b3b
-pkgdesc="Provides image manipulation, preference, timezone and ringtone services for webOS components."
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="qt5-qtbase glib libxml2 sqlite json-c libpbnjson luna-service2 uriparser nyx-lib"
-makedepends="cmake-modules-webos pmloglib-dev qt5-qtbase-dev libxml2-dev glib-dev sqlite-dev json-c-dev libpbnjson-dev luna-service2-dev uriparser-dev nyx-lib-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-sysservice/archive/$_commit.tar.gz
-compile.patch"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$srcdir"/$pkgname-3e52044fc17511842e86fd05a0588fd015e28b3b \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="a1532f13df7d80abe22f89b8e582b4473165d3d02c8c6c6c043d190a278ffee64b599eb9d26250ba77b4f5153124b8f16727127c8d368209fa2d732c50823f58  luna-sysservice-3e52044fc17511842e86fd05a0588fd015e28b3b.tar.gz
-b822c26c542f7255d4dbc5a183aca18d3601c36e9218a579ea088eaf7dbe611fb349d08f43a21871231ada7db2825aaef9da21c7d17120c18e8276d73d9fdcbc  compile.patch"
--- a/luna/luna-sysservice/compile.patch
+++ b/luna/luna-sysservice/compile.patch
@ -1,25 +0,0 @@
-diff --git a/Src/BackupManager.cpp b/Src/BackupManager.cpp
-index 2b34936..f90239f 100644
--- a/Src/BackupManager.cpp
-+++ b/Src/BackupManager.cpp
-@@ -19,6 +19,7 @@
- #include <string>
- 
- //for basename()...
-+#include <libgen.h>
- #include <string.h>
- #include <map>
- #include "BackupManager.h"
-diff --git a/Src/BroadcastTimeHandler.cpp b/Src/BroadcastTimeHandler.cpp
-index a65f96a..4a75856 100644
--- a/Src/BroadcastTimeHandler.cpp
-+++ b/Src/BroadcastTimeHandler.cpp
-@@ -163,7 +163,7 @@ namespace {
- 
-         localTm.tm_isdst = -1; // mktime should lookup TZ rules
- 
-        return timelocal(&localTm);
-+        return mktime(&localTm);
-     }
- 
-     time_t toTimeT(const pbnjson::JValue &value)
--- a/luna/luna-systemui/APKBUILD
+++ b/luna/luna-systemui/APKBUILD
@ -1,20 +0,0 @@
-pkgname=luna-systemui
-pkgver=1.02_git20170904
-pkgrel=0
-_commit=c67aeffa8957919b3d78bdd6483f64c3ef6206d3
-pkgdesc="WebOS power menu and other system ui"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="enyo"
-makedepends=""
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/$pkgname/archive/$_commit.tar.gz"
-builddir="$srcdir/$pkgname-$_commit"
-
-package() {
-	cd "$builddir"
-
-	install -d "$pkgdir"/usr/palm/applications/com.palm.systemui
-	cp -vrf * "$pkgdir"/usr/palm/applications/com.palm.systemui
-}
-sha512sums="058e2d6be1826bf016b7da9003525dfe87691d95c89bac969dec0f4f5c90bfb07910d91678f577514208c67822512d15b890b641cb69929c53796abdb22d4ac3  luna-systemui-c67aeffa8957919b3d78bdd6483f64c3ef6206d3.tar.gz"
--- a/luna/luna-temp-ofono-bluetooth/APKBUILD
+++ b/luna/luna-temp-ofono-bluetooth/APKBUILD
@ -1,20 +0,0 @@
-pkgname=luna-temp-ofono-bluetooth
-pkgver=0.0.1_git20171118
-pkgrel=0
-_commit=305b2c8e2c4c5870fc737a0d2809799d5c58a2e1
-pkgdesc="Temporary package for ofono/bluetooth mocking."
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends=""
-makedepends=""
-source="luneos-components-$_commit.tar.gz::https://github.com/webOS-ports/luneos-components/archive/$_commit.tar.gz"
-builddir="$srcdir/luneos-components-$_commit"
-
-package() {
-	cd "$builddir"
-	install -d "$pkgdir"/usr/lib/qt5/qml/LuneOS
-	cp -rv "$builddir"/test/imports/LuneOS/Bluetooth "$pkgdir"/usr/lib/qt5/qml/LuneOS
-	cp -rv "$builddir"/test/imports/MeeGo "$pkgdir"/usr/lib/qt5/qml/
-}
-sha512sums="a44031e07efabe46ec33beb4630ee264b8f5a136de060a56499b72403d7ff97648f84ea15ae96602d5e35dacabf33f609b0b72a84a896c66b001496dda1a5354  luneos-components-305b2c8e2c4c5870fc737a0d2809799d5c58a2e1.tar.gz"
--- a/luna/luna-webappmanager/APKBUILD
+++ b/luna/luna-webappmanager/APKBUILD
@ -1,34 +0,0 @@
-pkgname=luna-webappmanager
-pkgver=8.0.0_git20170908
-pkgrel=3
-_commit=89e9c3e2437c21dcdaced17c7b5df5cc41efd051
-pkgdesc="Component responsible for application management in LuneOS"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="glib luna-service2 libpbnjson luna-sysmgr-common luna-prefs qt5-qtbase qt5-qtquickcontrols2 qt5-qtdeclarative qt5-qtwebengine qt5-qtwebchannel libconnman-qt"
-makedepends="cmake-modules-webos glib-dev luna-service2-dev libpbnjson-dev luna-sysmgr-common-dev luna-prefs-dev qt5-qtbase-dev qt5-qtquickcontrols2-dev qt5-qtdeclarative-dev qt5-qtwebengine-dev qt5-qtwebchannel-dev libconnman-qt-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luna-webappmanager/archive/$_commit.tar.gz
-remove-systemd.patch
-fix-qtwebengine-private-includes.patch
-tryFix.patch"
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
-	mkdir -p "$srcdir"/build
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="12968da4d41954bfb046c161fe15442b3f7a14eaa69a2dedfbfaa0e0af279253c01b7cc5309b42a36af2bfe02545d9ad0f9ac8e1e0a637c28ceec0784951f91b  luna-webappmanager-89e9c3e2437c21dcdaced17c7b5df5cc41efd051.tar.gz
-f322799db601cae8fb3e552d495d616927dad45d2381aa1790c83da1afccc4b15713120342975ebe98e9b333e8f4983020d459d91963d87570095cc7c48e00d2  remove-systemd.patch
-0a4be526403734f5b9b9c8b80c1ef56bded3ccd48927801cdc8887deaef5bb4aaeccac987c3bd5c17394a18b6755fe8edf0768575eec377049dfb30182f36514  fix-qtwebengine-private-includes.patch
-c3c21d3781b5cd96c61e9033bc989d29d342d7a30c1c3e645b2b3cddab13f111523c65591eef505b66159ff9193a92869e15e32d50a99f66411c39c7614ea2ef  tryFix.patch"
--- a/luna/luna-webappmanager/fix-qtwebengine-private-includes.patch
+++ b/luna/luna-webappmanager/fix-qtwebengine-private-includes.patch
@ -1,15 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ae27484..e488487 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,4 +1,10 @@
-+
-+set(QTWEBENGINE_REAL_PRIVATE_INCLUDES "/usr/include/QtWebEngine/${Qt5WebEngine_VERSION}")
-+set(QTWEBENGINE_REAL_PRIVATE_INCLUDES2 "/usr/include/QtWebEngine/${Qt5WebEngine_VERSION}/QtWebEngine")
-+MESSAGE( STATUS "CMAKE_BINARY_DIR:         " ${QTWEBENGINE_REAL_PRIVATE_INCLUDES} )
- include_directories(
-+    ${QTWEBENGINE_REAL_PRIVATE_INCLUDES}
-+    ${QTWEBENGINE_REAL_PRIVATE_INCLUDES2}
-     ${Qt5WebEngine_PRIVATE_INCLUDE_DIRS}
-     ${Qt5WebChannel_PRIVATE_INCLUDE_DIRS}
-     ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
--- a/luna/luna-webappmanager/remove-systemd.patch
+++ b/luna/luna-webappmanager/remove-systemd.patch
@ -1,35 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 23d7631..1163299 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,7 @@ find_package(PkgConfig "0.22" REQUIRED)
- 
- pkg_check_modules(GLIB2 glib-2.0 REQUIRED)
- pkg_check_modules(LS2 luna-service2 REQUIRED)
-pkg_check_modules(SYSTEMD libsystemd REQUIRED)
-+pkg_check_modules(SYSTEMD libsystemd OPTIONAL)
- pkg_check_modules(PBNJSON_C pbnjson_c REQUIRED)
- pkg_check_modules(LUNA_SYSMGR_COMMON LunaSysMgrCommon REQUIRED)
- pkg_check_modules(LUNA_PREFS luna-prefs REQUIRED)
-diff --git a/src/main.cpp b/src/main.cpp
-index c79782d..fe48ae4 100644
--- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -21,7 +21,6 @@
- #include <QtGlobal>
- 
- #include <glib.h>
-#include <systemd/sd-daemon.h>
- 
- #include <LocalePreferences.h>
- 
-@@ -140,9 +139,6 @@ int main(int argc, char **argv)
-     LocalePreferences::instance();
-     luna::SystemTime::instance();
- 
-    if (option_systemd)
-        sd_notify(0, "READY=1");
-
-     webAppManager.exec();
- 
- cleanup:
--- a/luna/luna-webappmanager/tryFix.patch
+++ b/luna/luna-webappmanager/tryFix.patch
@ -1,12 +0,0 @@
-diff --git a/src/qml/ApplicationContainer.qml b/src/qml/ApplicationContainer.qml
-index 3d5f332..f90f5d4 100644
--- a/src/qml/ApplicationContainer.qml
-+++ b/src/qml/ApplicationContainer.qml
-@@ -127,7 +127,6 @@ Flickable {
-             backgroundColor: (webAppWindow.windowType === "dashboard" || webAppWindow.windowType === "popupalert") ? "transparent": "white"
- 
-             userScripts: webAppWindow.userScripts;
-            devicePixelRatio: webAppWindow.devicePixelRatio
- 
-             onJavaScriptConsoleMessage: console.warn("CONSOLE JS: " + message);
- 
--- a/luna/luneos-components/APKBUILD
+++ b/luna/luneos-components/APKBUILD
@ -1,30 +0,0 @@
-pkgname=luneos-components
-pkgver=0.0.1_git20171118
-pkgrel=0
-_commit=305b2c8e2c4c5870fc737a0d2809799d5c58a2e1
-pkgdesc="LuneOS styled QtQuick Controls"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="qt5-qtbase luna-service2 qt5-qtgraphicaleffects qt5-qtdeclarative qt5-qtquickcontrols2 glib pmloglib"
-makedepends="cmake-modules-webos qt5-qtbase-dev qt5-qtdeclarative-dev glib-dev qt5-qtquickcontrols2-dev luna-service2-dev pmloglib-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/luneos-components/archive/$_commit.tar.gz"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	export QMAKE_CXXFLAGS=" -isystem /usr/include/glib-2.0 -isystem /usr/lib/glib-2.0/include "
-	qmake-qt5 "$builddir"
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make install INSTALL_ROOT="$pkgdir"
-}
-sha512sums="a44031e07efabe46ec33beb4630ee264b8f5a136de060a56499b72403d7ff97648f84ea15ae96602d5e35dacabf33f609b0b72a84a896c66b001496dda1a5354  luneos-components-305b2c8e2c4c5870fc737a0d2809799d5c58a2e1.tar.gz"
--- a/luna/mojoloader/APKBUILD
+++ b/luna/mojoloader/APKBUILD
@ -1,21 +0,0 @@
-pkgname=mojoloader
-pkgver=1.1_git20161005
-pkgrel=0
-_commit=4eec67e2c941ab416aaced46c604c2ff3747c2fd
-pkgdesc="Javascript framework to handle loading webOS modules from browser or Node.JS"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends=""
-makedepends=""
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/mojoloader/archive/$_commit.tar.gz"
-builddir="$srcdir/$pkgname-$_commit"
-
-package() {
-	cd "$builddir"
-
-	install -d "$pkgdir"/usr/palm/frameworks
-	cp -vf ./mojoloader.js "$pkgdir"/usr/palm/frameworks/
-}
-
-sha512sums="046edea14d5b7d2a9ffd5cf1710722ffba90ebf8c14ccbed5927502603785f30c3d67ba7741aac91f21cda03b682cd40066e3583eb411e75150c6093bb78a3a5  mojoloader-4eec67e2c941ab416aaced46c604c2ff3747c2fd.tar.gz"
--- a/luna/mojoservice-frameworks/APKBUILD
+++ b/luna/mojoservice-frameworks/APKBUILD
@ -1,27 +0,0 @@
-pkgname=mojoservice-frameworks
-pkgver=1.0.0_git20140708
-pkgrel=0
-_commit=0baa0cd1bcd7c2182718a4927efcff9dbf901812
-pkgdesc="Webos core services javascript frameworks"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends=""
-makedepends=""
-source="$pkgname-$_commit.tar.gz::https://github.com/webos-ports/mojoservice-frameworks/archive/$_commit.tar.gz"
-builddir="$srcdir/mojoservice-frameworks-$_commit"
-
-package() {
-	cd "$builddir"
-
-	install -d "$pkgdir"/usr/palm/frameworks
-
-	for FRAMEWORK in $(ls -d1 ./mojoservice*); do
-		FRAMEWORK_DIR=$(basename $FRAMEWORK)
-		install -d "$pkgdir"/usr/palm/frameworks/$FRAMEWORK_DIR/version/1.0/
-		cp -vrf $FRAMEWORK/* "$pkgdir"/usr/palm/frameworks/$FRAMEWORK_DIR/version/1.0/
-		# remove test and jasminetest dirs
-		rm -vrf ${D}${webos_frameworksdir}/$FRAMEWORK_DIR/version/1.0/*test
-	done
-}
-sha512sums="1f7d65997ad388ecbfbf7ef60bdd97bc7fae9326699e07967aaf919d42a272369f354a2342ca91da4ab7b1edc310e2c528874309fa3bf0c42ff9032368d1eac7  mojoservice-frameworks-0baa0cd1bcd7c2182718a4927efcff9dbf901812.tar.gz"
--- a/luna/mojoservicelauncher/APKBUILD
+++ b/luna/mojoservicelauncher/APKBUILD
@ -1,29 +0,0 @@
-pkgname=mojoservicelauncher
-pkgver=0.0.1_git20160806
-pkgrel=2
-_commit=d7407a69e5acd1ac132ae25964e4db93b7685beb
-pkgdesc="OpenWebOS component to launch JavaScript services"
-arch="all"
-url="https://github.com/webOS-ports/mojoservicelauncher"
-license="GPL-3.0+"
-depends="libpbnjson boost nodejs mojoloader nodejs-module-webos-dynaload nodejs-module-webos-pmlog nodejs-module-webos-sysbus webos-loadable-frameworks webos-underscore mojoservice-frameworks webos-foundation"
-makedepends="cmake-modules-webos boost-dev libpbnjson-dev boost-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/mojoservicelauncher/archive/$_commit.tar.gz"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
-	mkdir -p "$srcdir"/build
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="3a07a952da5157ebbd2bd4f55ac5ba09979fb8160ca4ce4d76b67d06262fb3704349b170b6a1c78909c3edc326c01538d2c89b6a3873dee9a86dba7fcf0ad5b4  mojoservicelauncher-d7407a69e5acd1ac132ae25964e4db93b7685beb.tar.gz"
--- a/luna/nodejs-module-webos-dynaload/APKBUILD
+++ b/luna/nodejs-module-webos-dynaload/APKBUILD
@ -1,30 +0,0 @@
-pkgname=nodejs-module-webos-dynaload
-pkgver=14.0.0_git20160531
-pkgrel=3
-_commit=4eedb88e6eea69c88d30f5519d91113419cb7e71
-pkgdesc="mojo library loader for node. Provides 'webos' node module."
-arch="all"
-url="https://github.com/webOS-ports/nodejs-module-webos-dynaload"
-license="GPL-3.0+"
-depends="boost nodejs nodejs-npm"
-makedepends="cmake-modules-webos boost-dev nodejs-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/webOS-ports/nodejs-module-webos-dynaload/archive/$_commit.tar.gz"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
-	# This package provides a cmake file, but it isn't useful on Alpine, as alpine doesn't package
-	# the pkgconfig files required to compile native node modules with the cmake script as written.
-	# So, we just use node-gyp instead.
-
-	cd "$builddir"
-	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp configure
-	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp build
-}
-
-package() {
-	install -d "$pkgdir"/usr/lib/node
-	install -m755 "$builddir"/build/Release/webos.node "$pkgdir"/usr/lib/node
-}
-
-sha512sums="3667e0d9ff3168c46f8407eda27b65a56dd36967774b7f443234ed89edd4ed9d9dae060ddfec0a39edb21d9093972f46850693f36f8751c3a2fa1cfc769139f8  nodejs-module-webos-dynaload-14.0.0_git20160531.tar.gz"
--- a/luna/nodejs-module-webos-pmlog/APKBUILD
+++ b/luna/nodejs-module-webos-pmlog/APKBUILD
@ -1,44 +0,0 @@
-pkgname=nodejs-module-webos-pmlog
-pkgver=18.0.0_git20150424
-pkgrel=1
-_commit=ca359ed90389c5be085e7eac0548236312743d6a
-pkgdesc="Library to allow nodejs code to talk to palm pmloglib."
-arch="all"
-url="https://github.com/webOS-ports/nodejs-module-webos-pmlog"
-license="GPL-3.0+"
-depends="pmloglib nodejs nodejs-npm"
-
-# vim is in makedepends because it provides xxd
-makedepends="cmake-modules-webos pmloglib-dev nodejs-dev vim python"
-source="$pkgname-$pkgver.tar.gz::https://github.com/webOS-ports/nodejs-module-webos-pmlog/archive/$_commit.tar.gz"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare	
-
-	# pmloglib.js is tranformed into a c-style header so that it can be interpreted/run within
-	# the native node module.
-	cd "$builddir"/src
-	xxd -i pmloglib.js > pmloglib.js.h
-}
-
-build() {
-	# This package provides a cmake file, but it isn't useful on Alpine, as alpine doesn't package
-	# the pkgconfig files required to compile native node modules with the cmake script as written.
-	# So, we just use node-gyp instead.
-
-	cd "$builddir"
-	export CFLAGS=$(pkg-config --cflags PmLogLib)
-	export CXXFLAGS=$(pkg-config --cflags PmLogLib)
-	export LDFLAGS=$(pkg-config --libs PmLogLib)
-	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp configure
-	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp build
-}
-
-package() {
-	install -d "$pkgdir"/usr/lib/node
-	install -m755 "$builddir"/build/Release/pmloglib.node "$pkgdir"/usr/lib/node
-}
-
-sha512sums="4356da2fa5b93b4a8573123d07ea8cd3717a408a531134953f08763ae7173350ace55b634171dd5bcfcef683d1e9b8e2cb3b73a6cf841d42846ae5c374be1e88  nodejs-module-webos-pmlog-18.0.0_git20150424.tar.gz"
--- a/luna/nodejs-module-webos-sysbus/APKBUILD
+++ b/luna/nodejs-module-webos-sysbus/APKBUILD
@ -1,34 +0,0 @@
-pkgname=nodejs-module-webos-sysbus
-pkgver=31.0.0_git20160531
-pkgrel=1
-_commit=3a77f999b78b2f686e370ec0030097665d358169
-pkgdesc="Library to allow nodejs code to talk to palm sysbus."
-arch="all"
-url="https://github.com/webOS-ports/nodejs-module-webos-sysbus"
-license="GPL-3.0+"
-depends="luna-service2 glib nodejs nodejs-npm"
-makedepends="cmake-modules-webos glib-dev luna-service2-dev nodejs-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/webOS-ports/nodejs-module-webos-sysbus/archive/$_commit.tar.gz"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
-	# This package provides a cmake file, but it isn't useful on Alpine, as alpine doesn't package
-	# the pkgconfig files required to compile native node modules with the cmake script as written.
-	# So, we just use node-gyp instead.
-
-	cd "$builddir"
-	export CFLAGS=$(pkg-config --cflags luna-service2)
-	export CXXFLAGS=$(pkg-config --cflags luna-service2)
-	export LDFLAGS=$(pkg-config --libs luna-service2)	
-	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp configure
-	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp build
-}
-
-package() {
-	install -d "$pkgdir"/usr/lib/node
-	install -m755 "$builddir"/build/Release/webos-sysbus.node "$pkgdir"/usr/lib/node
-	install -m644 "$builddir"/src/palmbus.js "$pkgdir"/usr/lib/node
-}
-
-sha512sums="03ffdde3ce6a3ac1f72e71b0caae47d7f298b4e5a296ae0dea6627d90bc91eb30b250173d3a69fa40e6112dac408f27fda2d2418d37baa4865807197e1112ea8  nodejs-module-webos-sysbus-31.0.0_git20160531.tar.gz"
--- a/luna/nyx-lib/APKBUILD
+++ b/luna/nyx-lib/APKBUILD
@ -1,37 +0,0 @@
-pkgname=nyx-lib
-pkgver=5.8.0_git20160914
-pkgrel=0
-_commit=2892791512ca37b655695f6ef811b5a4602ffb4b
-pkgdesc="Open webOS Platform Portability Layer"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends="glib"
-depends_dev="glib-dev"
-makedepends="cmake-modules-webos glib-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/webOS-ports/nyx-lib/archive/$_commit.tar.gz 
-	addstdint.patch"
-subpackages="$pkgname-dev"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$builddir" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="4e2978067d19872d44c7c6fe7b10e3c32dcf575904aa4dd6bab487145cd30ee5f321ff8bc6ea68259ef4c0d4f5fcda885db5d2c48de6c050da83c1a6f50c0421  nyx-lib-2892791512ca37b655695f6ef811b5a4602ffb4b.tar.gz
-b5f3a777ffd7f8d305217a04f6a3b55302ff66601c647e054a84bfbaec53ca43182e69a03cc53d88ffe4d0567ff3422561b85d3fdcab4e7b2454941205c42e17  addstdint.patch"
--- a/luna/nyx-lib/addstdint.patch
+++ b/luna/nyx-lib/addstdint.patch
@ -1,12 +0,0 @@
-diff --git a/include/public/nyx/module/nyx_log.h b/include/public/nyx/module/nyx_log.h
-index f8ed475..f87cd28 100644
--- a/include/public/nyx/module/nyx_log.h
-+++ b/include/public/nyx/module/nyx_log.h
-@@ -25,6 +25,7 @@
- #define _NYX_LOG_H_
- 
- #include <stdarg.h>
-+#include <stdint.h>
- #include <nyx/common/nyx_macros.h>
- 
- /*
--- a/luna/nyx-lib/compile.patch
+++ b/luna/nyx-lib/compile.patch
@ -1,12 +0,0 @@
-diff --git a/include/public/nyx/module/nyx_log.h b/include/public/nyx/module/nyx_log.h
-index f8ed475..f87cd28 100644
--- a/include/public/nyx/module/nyx_log.h
-+++ b/include/public/nyx/module/nyx_log.h
-@@ -25,6 +25,7 @@
- #define _NYX_LOG_H_
- 
- #include <stdarg.h>
-+#include <stdint.h>
- #include <nyx/common/nyx_macros.h>
- 
- /*
--- a/luna/pmloglib/APKBUILD
+++ b/luna/pmloglib/APKBUILD
@ -1,31 +0,0 @@
-pkgname=pmloglib
-pkgver=3.2.0
-pkgrel=2
-pkgdesc="The Open webOS logging library"
-arch="all"
-url="http://webos-ports.org"
-license="GPL-3.0+"
-depends=""
-makedepends="cmake-modules-webos glib-dev libpbnjson-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/openwebos/pmloglib/archive/versions/3.2.0.tar.gz"
-subpackages="$pkgname-dev"
-options="!check"
-
-prepare() {
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd "$srcdir"/build
-	cmake "$srcdir"/$pkgname-versions-$pkgver \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWEBOS_INSTALL_ROOT=/
-	make
-}
-
-package() {
-	cd "$srcdir"/build
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="ca8f1ffcfa3a366e677e7e80d6e8f8c8bbeefbf5cccb05b6e8cb2f7e307aeccbcda257ade0d55d4ce6ba6457d7681267d04c53e2f19f5647f8dcb1b56f100678  pmloglib-.tar.gz"
--- a/luna/postmarketos-ui-luna/APKBUILD
+++ b/luna/postmarketos-ui-luna/APKBUILD
@ -1,42 +0,0 @@
-# Moved to aports/luna, because it is broken. When LuneOS UI works again, this
-# should be moved back to aports/main, so it appears in "pmbootstrap init".
-pkgname=postmarketos-ui-luna
-pkgver=1
-pkgrel=2
-pkgdesc="(Wayland) webOS UI, ported from the LuneOS project (broken: #1459)"
-url="https://wiki.postmarketos.org/wiki/LuneOS_UI"
-arch="noarch"
-license="GPL3+"
-depends="activitymanager
-configurator
-db8
-enyo
-luna-app-browser
-luna-app-services
-luna-applauncher
-luna-appmanager
-luna-core-apps
-luna-firstuse
-luna-init
-luna-next
-luna-next-cardshell
-luna-qml-launcher
-luna-sysmgr
-luna-sysservice
-luna-systemui
-luna-temp-ofono-bluetooth
-luna-webappmanager
-luneos-components
-mesa
-mojoloader
-xkeyboard-config"
-makedepends=""
-subpackages=""
-source="start_luna.sh"
-options="!check"
-
-package() {
-	install -D -m755 "$srcdir"/start_luna.sh \
-		"$pkgdir"/usr/bin/start_luna.sh
-}
-sha512sums="a0e9018ceaabb4da16bac70b7b4aa704924a483e166f3f04df6b46a98b449798b8bafb851154ca1bf14438da3381699434933d4f0866dc680fe52fd6a7dd5bd6  start_luna.sh"
--- a/luna/postmarketos-ui-luna/start_luna.sh
+++ b/luna/postmarketos-ui-luna/start_luna.sh
@ -1,36 +0,0 @@
-#!/bin/sh
-
-#The sleeps are in here to avoid some races.
-# TODO: Set up openrc service files to make startup faster & more reliable
-
-# This also causes issues on first boot - configurator needs to be re-run with
-# luna-send -n 1 'luna://com.palm.configurator/run' '{"types":["dbkinds","dbpermissions","activities"]}'
-# after first-use ends. After running that, you may need to reboot and re-run start_luna
-
-
-/usr/sbin/ls-hubd --conf /etc/luna-service2/ls-private.conf 2>&1 | logger -t 'ls-hubd-private' &
-sleep 1
-/usr/sbin/ls-hubd --public --conf /etc/luna-service2/ls-public.conf 2>&1 | logger -t 'ls-hubd-public' &
-sleep 1
-MOJODB_ENGINE=leveldb mojodb-luna -c /etc/palm/db8/maindb.conf 2>&1 | logger -t 'mojodb-maindb' &
-MOJODB_ENGINE=leveldb mojodb-luna -c /etc/palm/db8/mediadb.conf 2>&1 | logger -t 'mojodb-mediadb' &
-MOJODB_ENGINE=leveldb mojodb-luna -c /etc/palm/db8/tempdb.conf 2>&1 | logger -t 'mojodb-tempdb' &
-sleep 1
-luna-send -n 1 'luna://com.palm.configurator/run' '{"types":["dbkinds","dbpermissions"]}'
-sleep 1
-luna-prefs-service -d 2>&1 | logger -t 'luna-prefs-service' &
-sleep 1
-activitymanager 2>&1 | logger -t 'activitymanager' &
-sleep 1
-LunaSysMgr -l debug 2>&1 | logger -t 'LunaSysMgr' &
-sleep 1
-LunaSysService -l debug 2>&1 | logger -t 'LunaSysService' &
-sleep 1
-export QT_QPA_PLATFORM=eglfs
-export QT_QPA_EGLFS_DISABLE_INPUT=1
-luna-next -plugin evdevmouse:/dev/input/event2 -plugin evdevkeyboard:/dev/input/event1 2>&1 | logger -t 'luna-next' &
-sleep 5
-export QT_QPA_PLATFORM=wayland
-LunaAppManager -t -c -u luna 2>&1 | logger -t 'LunaAppManager' &
-sleep 1
-LunaWebAppManager --verbose --allow-file-access-from-files 2>&1 | logger -t 'LunaWebAppManager'
--- a/luna/qt5-qtwebengine/APKBUILD
+++ b/luna/qt5-qtwebengine/APKBUILD
@ -1,149 +0,0 @@
-# This aport is broken, the patches don't apply with QT 5.10.1 anymore.
-# See <https://gitlab.com/postmarketOS/pmbootstrap/issues/1459>
-pkgname=qt5-qtwebengine
-pkgver=5.10.1
-pkgrel=0
-arch="all"
-url='http://qt-project.org/'
-license="GPL3 LGPL3 FDL custom"
-pkgdesc='Provides communication between JS/HTML and Qt apps'
-depends="qt5-qtbase qt5-qtquickcontrols2 python2 fontconfig dbus-x11 libcap libdrm libxcomposite libxcursor libxi libxrandr libxscrnsaver libxtst alsa-lib ffmpeg libwebp opus icu-libs libevent libexecinfo qt5-qtwebchannel libjpeg-turbo libintl gettext dbus libpbnjson luna-service2"
-makedepends="qt5-qtbase-dev qt5-qtquickcontrols2-dev python2-dev bison flex gperf fontconfig-dev mesa-dev libcap-dev libdrm-dev libxcomposite-dev libxcursor-dev libxi-dev libxrandr-dev libxscrnsaver-dev libxtst-dev alsa-lib-dev ffmpeg-dev ffmpeg-libs jsoncpp-dev ninja libwebp-dev opus-dev icu-dev libevent-dev bsd-compat-headers libexecinfo-dev git qt5-qtwebchannel-dev libjpeg-turbo-dev gzip libintl gettext-dev yasm dbus-dev libpbnjson-dev luna-service2-dev binutils-gold"
-builddir="$srcdir/${pkgname/qt5-/}-everywhere-src-$pkgver"
-source="http://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${pkgname/qt5-/}-everywhere-src-$pkgver.tar.xz
-patches-musl/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
-patches-musl/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
-patches-musl/0002-chromium-Force-host-toolchain-configuration.patch
-patches-musl/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
-patches-musl/0003-chromium-workaround-for-too-long-.rps-file-name.patch
-patches-musl/0003-Include-dependency-to-QCoreApplication-translate.patch
-patches-musl/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
-patches-musl/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
-patches-musl/0006-chromium-musl-include-fcntl.h-for-loff_t.patch
-patches-musl/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
-patches-musl/0008-chromium-musl-linux-glibc-make-the-distinction.patch
-patches-musl/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
-patches-musl/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
-patches-musl/0011-chromium-musl-Match-syscalls-to-match-musl.patch
-patches-musl/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
-patches-musl/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch
-patches-musl/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
-patches-musl/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
-patches-musl/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
-patches-musl/gn_bootstrap.patch
-patches-musl/no_execinfo.patch
-patches-musl/yasm_intl.patch
-patches-musl/renderthread-mallinfo.patch
-patches-musl/no-pvalloc.patch
-use-ozone.patch
-patches-luna/0001-Add-PalmServiceBridge-to-WebEngine.patch
-patches-luna/0002-PalmServiceBridge-adapt-to-Chromium-53-code-base.patch
-patches-luna/0003-WebContents-provide-additional-features-from-window..patch
-patches-luna/0004-Store-the-additional-window-features-related-to-Lune.patch
-patches-luna/0005-WindowFeatures-Chrome-lower-the-minimum-height-to-5.patch
-patches-luna/0006-Enable-password-echo.patch
-patches-luna/0007-storage-browser-quota-workaround-for-crash-on-cache-.patch
-patches-luna/0008-html.css-themeWin.css-Add-Prelude-as-default-font-in.patch
-patches-luna/0010-Update-additional-params-from-Chromium-53-56.patch
-patches-luna/0011-Fix-WebGL2-Textures.patch
-patches-luna/0002-WebEngineView-provide-additionnal-features-from-wind.patch
-patches-luna/0003-WebEngineNewViewRequest-provide-the-requested-URL-as.patch
-patches-luna/0004-Implement-Sync-IPC-messaging-through-qt.webChannelTr.patch
-patches-luna/0005-Make-properties-for-some-settings-for-PalmBridgeServ.patch
-patches-luna/0006-WebEngineSettings-Add-a-standardFontFamily-property-.patch
-patches-luna/0007-WebEngineSettings-add-also-Serif-Fixed-and-Cursive-f.patch
-patches-luna/0008-Store-the-additional-window-features-required-by-the.patch
-patches-luna/0009-QQuickWebEngineNewViewRequest-use-initialTargetUrl-f.patch
-patches-luna/0010-WebEngineNewViewRequest-add-possibility-to-get-reque.patch
-patches-luna/0011-GetScreenInfo-use-default-screen-when-no-window-is-a.patch
-patches-luna/0012-Enable-password-echo.patch
-patches-luna/0013-Implement-RequestQuotePermission.patch
-patches-luna/0014-WebEngineView-re-introduce-devicePixelRatio-property.patch
-patches-luna/0015-WebEngineView-add-extraContextMenuEntriesComponent-p.patch
-patches-luna/0016-Fix-build-for-Qt5.9.patch
-patches-luna/0017-gn_generator-fix-debug-build.patch
-patches-luna/0018-Add-LuneOS-specific-switches.patch
-"
-subpackages="$pkgname-dev $pkgname-doc"
-
-prepare() {
-	for i in "$startdir"/patches*; do
-		ln -sv "$i" "$srcdir/$(basename "$i")"
-	done
-	default_prepare
-	mkdir -p "$srcdir"/build
-}
-
-build() {
-	cd $srcdir/build
-
-	export QT_CONFIG=system-ffmpeg
-	qmake-qt5 CONFIG+="use_gold_linker" WEBENGINE_CONFIG+="use_system_ffmpeg use_gold_linker" "$srcdir"/${pkgname/qt5-/}-everywhere-src-$pkgver
-	make
-}
-
-package() {
-	cd $srcdir/build
-
-	make INSTALL_ROOT="$pkgdir" install
-
-	# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "$pkgdir/usr/lib" -type f -name '*.prl' \
-		-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-	install -d "$pkgdir"/usr/share/licenses
-	ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-}
-sha512sums="dc1b15eb857cb9ff3ef98a2f90cfec8c40429eea292bbed6a323cf1c4b044f3b73efaf51833fe8d9ca2ecc4f99d7092590a1a34248a9ab14fa5a38d4335f4925  qtwebengine-everywhere-src-5.10.1.tar.xz
-32648dcd9e389b52cf65f5085e72c35afe48a97285b549096cd6f561fdf39bb37372b464e9ebcba95611244b29fc76b63c76d805152edd2f2678d1a812429a50  0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
-18a1a30e9a5d7e67b1e94cfde1930685cbf80fb1e54c3c0fb5255ddf19cba6d9b8d5f1b681b1c755aa41111b2f1c05c8557caa11715b0506f6b3cdb9d7474423  0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
-351000898b7e5495dea555bd728d88be4c01e473892f001bf9cfe248fae443333be70778a309b20be3eb83b7bcd952d7fb62acfe0d61b01cf7e7dadfb8cc78ff  0002-chromium-Force-host-toolchain-configuration.patch
-f1ef72db8c1b8a84f8e62a2999d15e61cb648e1f973fd17a9b84e4aed4e46f296ce796e52b5938d7ea43bdd3b03318c3aab109f1570927dc7e649f41d7981479  0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
-4bcda52bec2e39911425af03b16826d37fec73f412aeb0ce828221bb3b0e3e703f711a88d1612f30aabd570b1055c58e202d14b49a5d805842a23a4981b6def1  0003-chromium-workaround-for-too-long-.rps-file-name.patch
-d924461cdeaea9a44c431f07f1703070e006e42b67bb12aa1bc99908c529f0d979e212bfbc99f4747f875cd3056bcdf7133d003e8775407e648f9ff37132b2cd  0003-Include-dependency-to-QCoreApplication-translate.patch
-5ef75ac7b5e576bea362a0d94d495df6698d7b4544f8bef87cd2e7e57cfaab74b8698ae46f6d3544f5f2efdc416936407052eee79fb51c1b0a106ea3a2196dac  0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
-bd2696ab829376e3f77e74abad3b12e26e109961bf630ee1a1dac5435d3f0d20d638a38401f605ccb5b0b6cf039406590778d894ada322c3f01232e362695ba2  0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
-62dd7ed3803299a56f007da3f7dfaf655afd41c54427d6457a8aa5d34cd339a906280c199d1246099291973ea27376123d2a7f57f9cae1c6efccb085120bd2c4  0006-chromium-musl-include-fcntl.h-for-loff_t.patch
-f1b7c634a8f955bda4e6f98dd758444a482b9d3d638dc7afb1d182159a4fd1a281f845a2ab3f378737e78a44033d537e270e8e5bd425705d2cb98829f6eab237  0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
-30016e498a2c30acb53695093b9d5607ef500d10c63501c632a18fe6424d99f84c2bbae8e87d9774cc2000ddecf951c4bf20c6f1ff4716ed80f5c624a91445d3  0008-chromium-musl-linux-glibc-make-the-distinction.patch
-0d0778fa41507167d583f270c4b40a9331b900b13dce21aa76af31f43b11bff6fdaaaa91cdd33d4e8d093ea9c0826ecdd39658e1e86acadba2caa2ded83c6b87  0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
-f0d7ba14c32e09cd6a7a44e641f28d800ed66ca87c8126ff77065332c1965848ce2390adbd60a2b56b597ede21afc06b288877c09ea82edec29ffef5c54dc4bf  0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
-3f9c6ef70a1e16d7c22d71c228bcce62594e54262a969bf9b12648e01c1c27fdae0631ae386c77bf692143996e00ade849effa2808179ef4ebb988dc8179ad8f  0011-chromium-musl-Match-syscalls-to-match-musl.patch
-f69fae2cbe9869560e90888b2cb5727c8fa9b460665a9148a46653c288bf782f791ffde008aadb04fa9ae92445fe7c307c371ca7004753812ff1f848d5cd25f9  0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
-e0a4d0acc501bbdd2dc6eb37b1824c3d0833e53708f4a6e6fcfaeb27b181bde0cd726b03ec33de1b8dcb8fc5f650706842acbb6ef70381fc8dbb9a1fbb751b60  0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch
-bd27b1f0ab41b6edc2579e00d2155335d6b662424f682bf3183d1abb27b1266b75a79e63f3708317b90e29f22b0a2f2c660d5587b08512fc981d32b78be07ac9  0014-chromium-musl-Adjust-default-pthread-stack-size.patch
-2a8c70dbffab9f2c15cc862e795a762578ba363db6ac7d43d97ce2d8a0f43c8ce0a7c77b8fe9b0010a924d99a304e97f6b29cb969009cd2bcdc5dbe0caceed43  0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
-ebff27bc19476fad4cbbb619d74bb0cc9d63cf82245dc5c53352df423aa7096844e1b0ee8156d77796b001496ea850bfa0faf4f1278a369a394a3501f62c49f2  0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
-07ef6db227cf80683960a4e00e307980bd7b911ca4614d477a77b318a2e2d649cb39563b1f9feb3abea78d6d603d88762160c52f83f4204f90512bf6efb685d9  gn_bootstrap.patch
-45919a5e90db8e32d5a5c121a49927652f726cc4206e1e7af830376e634769012162cb8915b9acde7971d111b095496c50b9c69ca32a41bf09ca0cab66bef88a  no_execinfo.patch
-f6c17aa2c8136ca13b51d0b3819435819bcaaf65ea42b6d66460ae08e14a0d75560d938480dfe07ea07f146384476cfa86674921eabd6ab8a3d691d2b93ed0fc  yasm_intl.patch
-ca12618013458ebabc4f84b7458fb0a58629aebca8745ffe96122131fadfa72b17c9351a4b35a4542cd2132b5dbba4fb3b60b52e3c47a853f87eec7c22e9aea2  renderthread-mallinfo.patch
-bfa7c934c8c300d706cf36e9584a3411f814d1764af928603f55c0e14c9bfef95dd7c357ac686d72d29d46224b782a9e86870acdb140f4eeeb79a4a60f976656  no-pvalloc.patch
-9ff66a603807aec4ebc5df7d94155b2c8085039c69a79bd90553b5bedc6799dd7898fd856998a02f6deb15772a657cc06aa4d97b55f6a3665061027f624881ea  use-ozone.patch
-9efad8cc7be70f0687ffee585b3e943c76e576d8121a14c79a16e96586301cfd464056bea1bfc58298f7eaa89839af5af5c5f5d629843ad2182d27820d496043  0001-Add-PalmServiceBridge-to-WebEngine.patch
-64443e6e078744803ebf34adbb3cbe8cf0ad1becbbfafefc1f882cb12ee71ff401ced826a509f91b151cb739ef9947b6cc6f39c278bb8f6418a8396fe7d8968c  0002-PalmServiceBridge-adapt-to-Chromium-53-code-base.patch
-8eca1df605f5ef69883b03135058306f877615a7d64802be016a747e784984a27121d88e38583d0ff22d514c2e655bafc1fdefc24ff4829741fab9d3b632ee4f  0003-WebContents-provide-additional-features-from-window..patch
-addc34766f68eb058c3d67ab23daf58345238ed12dc47ce69e3ef1337a582538d1c5bb2f718aef8f76967f6b3d9cc3967a30c278af52a33bc0fac3dd3daeb091  0004-Store-the-additional-window-features-related-to-Lune.patch
-fa6ef473a91acc0e2e492943d7e3b29d06ac3ad8c016eca8205972dc6193455bade5b6af7ffc13e8d96184dc01d320dcab579c9ded2966592e4db0cf8b067448  0005-WindowFeatures-Chrome-lower-the-minimum-height-to-5.patch
-4fc58fa6f3ccb37fdbc7205cfade90c86da739e5dfad24b59c17e0db233d1ddede70d41e8314e222e432684e7d766c00ff984a4d41aea176c08d3e9f50750a12  0006-Enable-password-echo.patch
-cfc24127f132cd3fa67f45372e93d9d7c0497ab08d7c99bf7fdfc65078216d8c3fd31bcaf32b19e9835fd1c0d635ff28140c8bba170c6ca636c56e31656c30a0  0007-storage-browser-quota-workaround-for-crash-on-cache-.patch
-1df2db6b4259c211005984cf13dcdadd848ae14c15f20fcdfba4c1e07abac5478817f00023bbec81569f82229ef0c3e0237b9d0adee8ba20e1b74275a68c67bf  0008-html.css-themeWin.css-Add-Prelude-as-default-font-in.patch
-db11d1f5316c15d1f49a33f2576587fd7cc274594fd52a1e33713678f5fdcd57954380d74ff1048cd9136bc39c8809c0d06eb0f3bc7d53ce6b0f70631b16e8ec  0010-Update-additional-params-from-Chromium-53-56.patch
-b57de7c7f05ddd5c3f7ad9c3cc864cc88022f53cf92e9a558a00215c536b48bece104520575f8fef303c48d3718d5831a0806b6a094e9cc93c65112c9b7963cf  0011-Fix-WebGL2-Textures.patch
-6fd1c34d8eef5e8b4d9f7800ac2d00599e6d2afa63df602a7b9ad11a809ef827ef0c2c3f00ee81eee8cea1f5e2e8bb3fcb773902e5ad7ae60b70dc486bc6d6fc  0002-WebEngineView-provide-additionnal-features-from-wind.patch
-cd105f87db6f802ba2503471df295d80441845e3f21c60b72d098b21dd13b502373bab5e89a1d7730ada00cda573c69d824ca82314e199f12fc1d0e3fea737f0  0003-WebEngineNewViewRequest-provide-the-requested-URL-as.patch
-6c66c8d52dfb02f5eeb5f63f4287e21ae8e2ae82d4384ad5db4b5e5f7da1b812d2bd6c37c2cba53ac4bbbde5f98f5062c9fce56922af0d5032366b4f23ed0e88  0004-Implement-Sync-IPC-messaging-through-qt.webChannelTr.patch
-cdb7fb29857c166c428bbf912dacc22d4f83d9719fb5079931b92ad891c9d23574dd0d0c0c205c8e2ced918e21b0dae5e7ded983323285f542b09495645e72ae  0005-Make-properties-for-some-settings-for-PalmBridgeServ.patch
-af6586db207b5cf25737c043b410f7a4081a393662425b91c58f69ac618920188d26886a32c60b7d57ca48a55975b8ee4cbe2483adad409f56e7f85453683fc2  0006-WebEngineSettings-Add-a-standardFontFamily-property-.patch
-42b1c524b1f0dec96f1d280d754314a6ced21ab3790e438b4e65dfd1cdabb64fd7e8e0eb9bfdafb955acf8f1c71d4c300a66ff1733591489288d56805a14c749  0007-WebEngineSettings-add-also-Serif-Fixed-and-Cursive-f.patch
-61fc952d385520494c61d6df8f72ae2f5331fda9f760dc0da2e069495c767b04dc381fc93b08bb4795c1cf817dc92809930ce83cf4f248d65fa596499028a624  0008-Store-the-additional-window-features-required-by-the.patch
-88e6394a02065ce14b472791d53897b0792c7f69959b316575f509ae3f7ba02d9feffb6fd17e63bca7f748631b19ac968351b51db4015b91e68840fafbab9861  0009-QQuickWebEngineNewViewRequest-use-initialTargetUrl-f.patch
-c202c74d12565bca7099e06c114ae81f57d1e99c9b7bfa3d0e645c8b870bbdadbc6e346bb2ee63aad172d7c50b76905e0de2b6ef0f4452dabf2cd0c7d4043d0e  0010-WebEngineNewViewRequest-add-possibility-to-get-reque.patch
-dcfc529c44d84db9f794bb3876e13c60c03f51997537541029e499837a07d1e3c162201337305ce5a7b92fff4a0f610b2460156e0510ab64a5e4e61ea95afa73  0011-GetScreenInfo-use-default-screen-when-no-window-is-a.patch
-baf4f2c86c94d2c4531b621999b02840e27f542e431296555cba33fbc7a8762bcb346cd629e4883731d25d425072198de626d1c6d1010ad0e40929b17a5f9022  0012-Enable-password-echo.patch
-5a4dca4d5289b8d1fc5a2108721a5be8a8d3997a92055cfac9e9f6466c913f00ef2388d2b11d593bd77ddcb4eb0432268ccc1ba89a3bbaff71e4a8a0cde5614b  0013-Implement-RequestQuotePermission.patch
-0921c6a20124bdbace7003551772adf4155792a7cb4ba49af80963345d2470320066c279e79e46d22bedbb34eaec9c66b6c5f03ea22e3ae230779ebd5c7f1c58  0014-WebEngineView-re-introduce-devicePixelRatio-property.patch
-c29e6b5c455fb77b06a8c368300115b3f458d860c2d9d42fc4c0e6940fa6433afa27b40742d5e416464ca55ca90ce3f6f21c89e2c238d7facd6381ef3e9bcc1b  0015-WebEngineView-add-extraContextMenuEntriesComponent-p.patch
-314686a8938bc56c04e74f0b2ef3e8acaa9899bae4c58107ddd14eaa2698f29976a102dfb43519e4a050a9410559564fa454bd1226f12d758ae3b7401c53b92b  0016-Fix-build-for-Qt5.9.patch
-5c4d944e37205e6b5c462055ad398eed2a1b71d263051a580c68c6c76c826b1dee7dbf383dcdb9334b7634292d6ae1a5f323a6a307be65db6426de554744f78d  0017-gn_generator-fix-debug-build.patch
-f6a3747af295361b2542a258026b510fbd65196fd9108bb5b596a01e24366a3384fa0bf6f7bd44146ac0db3e58250510641c5be0ae1502c571761ff81f60d2c8  0018-Add-LuneOS-specific-switches.patch"
--- a/luna/qt5-qtwebengine/patches-luna/0001-Add-PalmServiceBridge-to-WebEngine.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0001-Add-PalmServiceBridge-to-WebEngine.patch
--- a/luna/qt5-qtwebengine/patches-luna/0002-PalmServiceBridge-adapt-to-Chromium-53-code-base.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0002-PalmServiceBridge-adapt-to-Chromium-53-code-base.patch
@ -1,316 +0,0 @@
-From 66b5e193f3fc4d1bdc579b1051dc76aa90d3b61e Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Sun, 16 Jul 2017 11:09:09 +0000
-Subject: [PATCH 02/10] PalmServiceBridge: adapt to Chromium 53 code base
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- .../Source/bindings/modules/v8/generated.gni       |  2 +
- .../WebKit/Source/modules/webos/BUILD.gn           | 14 +++++++
- .../WebKit/Source/modules/webos/LunaServiceMgr.cpp |  4 +-
- .../Source/modules/webos/PalmServiceBridge.cpp     | 43 +++++++---------------
- .../Source/modules/webos/PalmServiceBridge.h       | 36 +++++++++---------
- .../Source/modules/webos/PalmServiceBridge.idl     |  5 ++-
- 6 files changed, 52 insertions(+), 52 deletions(-)
-
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/bindings/modules/v8/generated.gni b/src/3rdparty/chromium/third_party/WebKit/Source/bindings/modules/v8/generated.gni
-index 0d8f27d..db9b850 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/bindings/modules/v8/generated.gni
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/bindings/modules/v8/generated.gni
-@@ -46,6 +46,8 @@ bindings_modules_generated_union_type_files = [
-   "$bindings_modules_v8_output_dir/RenderingContext.h",
-   "$bindings_modules_v8_output_dir/RequestOrUSVString.cpp",
-   "$bindings_modules_v8_output_dir/RequestOrUSVString.h",
-+  "$bindings_modules_v8_output_dir/ServiceCallback.cpp",
-+  "$bindings_modules_v8_output_dir/ServiceCallback.h",
-   "$bindings_modules_v8_output_dir/ServiceWorkerOrMessagePort.cpp",
-   "$bindings_modules_v8_output_dir/ServiceWorkerOrMessagePort.h",
-   "$bindings_modules_v8_output_dir/StringOrArrayBufferOrNFCMessage.cpp",
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/BUILD.gn b/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/BUILD.gn
-index effd211..2da4492 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/BUILD.gn
-@@ -1,6 +1,11 @@
- # Copyright 2017 Herman van Hazendonk. All rights reserved.
- 
- import("//third_party/WebKit/Source/modules/modules.gni")
-+import("//build/config/linux/pkg_config.gni")
-+
-+pkg_config("ls2") {
-+  packages = [ "luna-service2", "glib-2.0" ]
-+}  
- 
- blink_modules_sources("webos") {
-   sources = [
-@@ -10,4 +15,13 @@ blink_modules_sources("webos") {
-     "PalmServiceBridge.cpp",
-     "PalmServiceBridge.h",
-   ]
-+   
-+  public_configs = [
-+    ":ls2",
-+  ]
-+  
-+  libs = [
-+    "PmLogLib",   
-+  ]
-+
- }
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/LunaServiceMgr.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/LunaServiceMgr.cpp
-index 55feab8..f4b9f60 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/LunaServiceMgr.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/LunaServiceMgr.cpp
-@@ -1,5 +1,3 @@
-#include "config.h"
-
- #include "base/message_loop/message_loop.h"
- #include "base/bind.h"
- 
-@@ -49,7 +47,7 @@ void GMainContextIterate()
-     base::MessageLoop *pCurrentMsgLoop = base::MessageLoop::current();
-     if( doIterateNext && pCurrentMsgLoop )
-     {
-        pCurrentMsgLoop->PostDelayedTask(FROM_HERE, base::Bind(&GMainContextIterate), base::TimeDelta::FromMilliseconds(100));
-+        pCurrentMsgLoop->task_runner()->PostDelayedTask(FROM_HERE, base::Bind(&GMainContextIterate), base::TimeDelta::FromMilliseconds(100));
-     }
- }
- 
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.cpp
-index 22c160e..b6ece79 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.cpp
-@@ -1,4 +1,3 @@
-#include "config.h"
- #include "PalmServiceBridge.h"
- #include "Logging.h"
- 
-@@ -6,7 +5,6 @@
- #include "core/events/Event.h"
- #include "core/dom/ExceptionCode.h"
- #include "core/frame/Frame.h"
-#include "platform/Logging.h"
- #include "core/page/Page.h"
- #include "core/frame/Settings.h"
- #include <wtf/text/WTFString.h>
-@@ -15,7 +13,6 @@
- #include "bindings/core/v8/ScriptState.h"
- #include "bindings/core/v8/V8Binding.h"
- #include "bindings/core/v8/ExceptionState.h"
-#include <wtf/RefCountedLeakCounter.h>
- 
- #include <map>
- #include <set>
-@@ -28,10 +25,6 @@ namespace blink {
- typedef std::set<PalmServiceBridge*> ServicesSet;
- typedef std::map<Document*, ServicesSet*> ServicesSetMap;
- 
-#ifndef NDEBUG
-static WTF::RefCountedLeakCounter serviceBridgeCounter("PalmServiceBridge");
-#endif
-
- static ServicesSetMap* servicesByDocument()
- {
-     static ServicesSetMap map;
-@@ -41,7 +34,7 @@ static ServicesSetMap* servicesByDocument()
- int PalmServiceBridge::numHandlesForUrl(const char* appId)
- {
-     for (ServicesSetMap::iterator setIt = servicesByDocument()->begin(); setIt != servicesByDocument()->end(); ++setIt) {
-        if (!strcmp(appId, setIt->first->url().string().utf8().data()))
-+        if (!strcmp(appId, setIt->first->url().getString().utf8().data()))
-             return setIt->second->size();
-     }
- 
-@@ -52,7 +45,7 @@ void PalmServiceBridge::handlesForUrl(const char* appId, std::list<PalmServiceBr
- {
-     outHandles.clear();
-     for (ServicesSetMap::iterator setIt = servicesByDocument()->begin(); setIt != servicesByDocument()->end(); ++setIt) {
-        if (!strcmp(appId, setIt->first->url().string().utf8().data())) {
-+        if (!strcmp(appId, setIt->first->url().getString().utf8().data())) {
-             ServicesSet* set = setIt->second;
- 
-             for (ServicesSet::iterator s = set->begin(); s != set->end(); ++s)
-@@ -102,6 +95,7 @@ static void removeFromServicesByDocument(Document* doc, PalmServiceBridge* svc)
- 
- PalmServiceBridge::PalmServiceBridge(ExecutionContext* context, bool subscribe)
-     : ActiveDOMObject(context),
-+      ActiveScriptWrappable(this),
-       m_canceled(false),
-       m_subscribed(subscribe),
-       m_inServiceCallback(false),
-@@ -115,9 +109,6 @@ PalmServiceBridge::PalmServiceBridge(ExecutionContext* context, bool subscribe)
- 
-     addToServicesByDocument(document(), this);
- 
-#ifndef NDEBUG
-    serviceBridgeCounter.increment();
-#endif
-     Frame *frame = document()->frame();
-     Settings* settings = document()->settings();
-     if (settings != 0 && document()->page()->mainFrame() == frame) {
-@@ -161,15 +152,11 @@ PalmServiceBridge::~PalmServiceBridge()
-     if (m_scriptState)
-         m_scriptState->clear();
- 
-    if (executionContext() && document())
-+    if (getExecutionContext() && document())
-         removeFromServicesByDocument(document(), this);
- 
-     if (m_identifier)
-         free(m_identifier);
-
-#ifndef NDEBUG
-    serviceBridgeCounter.decrement();
-#endif
- }
- 
- void PalmServiceBridge::detachServices(Document* doc)
-@@ -247,7 +234,7 @@ void PalmServiceBridge::serviceResponse(const char* body)
-     ScriptState *pScriptState = m_scriptState->get();
-     v8::Isolate *isolateCurrent = pScriptState->isolate();
-     v8::HandleScope handleScope(isolateCurrent);
-    v8::Handle<v8::Value> cbValue = m_callbackScriptValue.v8ValueUnsafe();
-+    v8::Handle<v8::Value> cbValue = m_callbackScriptValue.v8ValueFor(pScriptState);
-     if (!cbValue.IsEmpty() && cbValue->IsFunction()) {
-         v8::Handle<v8::Function> cbFctV8 = cbValue.As<v8::Function>();
-         v8::Handle<v8::Value> argv[1];
-@@ -273,28 +260,24 @@ void PalmServiceBridge::cancel()
-     }
- }
- 
-void PalmServiceBridge::stop()
-+void PalmServiceBridge::contextDestroyed()
- {
-    DEBUG("PalmServiceBridge[%p]: stopping ... (identifier %s privileged %d subscribed %d)",
-        this, m_identifier, m_isPrivileged, m_subscribed);
-
-     cancel();
- }
- 
-bool PalmServiceBridge::canSuspend() const
-+bool PalmServiceBridge::hasPendingActivity() const
- {
-    return false;
-+    return m_canceled == false && getExecutionContext() && !getExecutionContext()->activeDOMObjectsAreStopped();
- }
- 
-void PalmServiceBridge::contextDestroyed()
-+Document* PalmServiceBridge::document() const
- {
-    ActiveDOMObject::contextDestroyed();
-+    ASSERT(getExecutionContext()->isDocument());
-+    return static_cast<Document*>(getExecutionContext());
- }
- 
-Document* PalmServiceBridge::document() const
-+DEFINE_TRACE(PalmServiceBridge)
- {
-    ASSERT(executionContext()->isDocument());
-    return static_cast<Document*>(executionContext());
-+    ActiveDOMObject::trace(visitor);
- }
-
- } // namespace blink
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.h b/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.h
-index 4984a09..46b6440 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.h
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.h
-@@ -6,12 +6,11 @@
- #include "bindings/core/v8/ScriptWrappable.h"
- #include "bindings/core/v8/V8Binding.h"
- #include "bindings/core/v8/ScriptValue.h"
-+#include "bindings/modules/v8/ServiceCallback.h"
- #include "core/events/Event.h"
- #include "core/events/EventListener.h"
- #include "core/events/EventTarget.h"
- #include "LunaServiceMgr.h"
-#include <wtf/OwnPtr.h>
-#include "wtf/PassOwnPtr.h"
- 
- // #include <heap/Strong.h>
- // #include <heap/StrongInlines.h>
-@@ -25,14 +24,17 @@ namespace blink {
- class Document;
- 
- 
-class PalmServiceBridge : public RefCounted<PalmServiceBridge>,
-+class PalmServiceBridge : public GarbageCollectedFinalized<PalmServiceBridge>, 
-                           public LunaServiceManagerListener,
-                          public ActiveDOMObject, public ScriptWrappable {
-+                          public ActiveDOMObject,
-+                          public ScriptWrappable, public ActiveScriptWrappable {
-     DEFINE_WRAPPERTYPEINFO();
-+    USING_GARBAGE_COLLECTED_MIXIN(PalmServiceBridge)
-+    WTF_MAKE_NONCOPYABLE(PalmServiceBridge);
-     public:
-        static PassRefPtr<PalmServiceBridge> create(ExecutionContext* context, bool subscribe = false)
-+        static PalmServiceBridge *create(ExecutionContext* context, bool subscribe = false)
-         {
-            return adoptRef(new PalmServiceBridge(context, subscribe));
-+            return new PalmServiceBridge(context, subscribe);
-         }
- 
-         bool init(Document*, bool subscribed = false);
-@@ -53,28 +55,28 @@ class PalmServiceBridge : public RefCounted<PalmServiceBridge>,
-         int call(const String& uri, const String& payload, ExceptionState&);
-         void cancel();
- 
-        void setOnservicecallback(ScriptValue& cbScriptValue) {
-            m_callbackScriptValue = cbScriptValue;
-            if (m_scriptState) {
-                m_scriptState->clear();
-            }
-            m_scriptState = adoptPtr(new ScriptStateProtectingContext(cbScriptValue.scriptState()));
-+        void setOnservicecallback(ScriptState *&cbState, ServiceCallback *cbValue) {
-+            m_callbackScriptValue = ScriptValue::from(cbState, cbValue->v8Value(cbState->isolate()));
-+            m_scriptState.reset(new ScriptStateProtectingContext(cbState));
-         }
-        ScriptValue onservicecallback() const { return m_callbackScriptValue; }
-+        ScriptWrappable *onservicecallback(ScriptState *cbState) const { return nullptr; }
- 
-         // callback from LunaServiceManagerListener
-         virtual void serviceResponse(const char* body);
- 
-         Document* document() const;
- 
-        // ActiveDOMObject:
-+        // ContextLifecycleObserver:
-         virtual void contextDestroyed();
-        virtual bool canSuspend() const;
-        virtual void stop();
-+
-+        // ActiveScriptWrappable.
-+        bool hasPendingActivity() const final;
-+
-+    DECLARE_VIRTUAL_TRACE();
- 
-     private:
-         ScriptValue m_callbackScriptValue;
-        OwnPtr<ScriptStateProtectingContext> m_scriptState;
-+        std::unique_ptr<ScriptStateProtectingContext> m_scriptState;
- 
-         bool m_canceled;
-         bool m_subscribed;
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.idl b/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.idl
-index 43e1fdd..fc808d0 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.idl
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/modules/webos/PalmServiceBridge.idl
-@@ -2,7 +2,8 @@ callback ServiceCallback = void (DOMString message);
- 
- [
-     Exposed=(Window,Worker),
-    ActiveDOMObject,
-+    ActiveScriptWrappable,
-+    DependentLifetime,
-     Constructor,
-     ConstructorCallWith=ExecutionContext
- ] interface PalmServiceBridge {
-@@ -10,5 +11,5 @@ callback ServiceCallback = void (DOMString message);
-     [RaisesException] unsigned long call(DOMString method, DOMString url);
-     void cancel();
- 
-    attribute ServiceCallback onservicecallback;
-+    [CallWith=ScriptState] attribute ServiceCallback onservicecallback;
- };
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0002-WebEngineView-provide-additionnal-features-from-wind.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0002-WebEngineView-provide-additionnal-features-from-wind.patch
@ -1,221 +0,0 @@
-From 6b2af4e2c792469a15f53e6dd115357490a2b92a Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Mon, 28 Sep 2015 20:19:14 +0200
-Subject: [PATCH 02/18] WebEngineView: provide additionnal features from
- window.open on the Qt side
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/core/web_contents_adapter_client.h              |  2 +-
- src/core/web_contents_delegate_qt.cpp               | 17 ++++++++++++-----
- src/core/web_contents_delegate_qt.h                 |  4 ++--
- src/webengine/api/qquickwebenginenewviewrequest.cpp |  5 +++++
- src/webengine/api/qquickwebenginenewviewrequest_p.h |  5 +++++
- src/webengine/api/qquickwebengineview.cpp           |  3 ++-
- src/webengine/api/qquickwebengineview_p_p.h         |  2 +-
- src/webenginewidgets/api/qwebenginepage.cpp         |  3 ++-
- src/webenginewidgets/api/qwebenginepage_p.h         |  2 +-
- 9 files changed, 31 insertions(+), 12 deletions(-)
-
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index e1fb3dc..ad62397 100644
--- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -330,7 +330,7 @@ public:
-     virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString()) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-    virtual void adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect & initialGeometry, const QUrl &targetUrl) = 0;
-+    virtual void adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect & initialGeometry, const QUrl &targetUrl, const QStringList &additionalFeatures) = 0;
-     virtual bool isBeingAdopted() = 0;
-     virtual void close() = 0;
-     virtual void windowCloseRejected() = 0;
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 86366ab..68d5abc 100644
--- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -102,7 +102,8 @@ content::WebContents *WebContentsDelegateQt::OpenURLFromTab(content::WebContents
- {
-     content::WebContents *target = source;
-     if (params.disposition != WindowOpenDisposition::CURRENT_TAB) {
-        QSharedPointer<WebContentsAdapter> targetAdapter = createWindow(0, params.disposition, gfx::Rect(), params.user_gesture);
-+        std::vector<base::string16> additional_features;
-+        QSharedPointer<WebContentsAdapter> targetAdapter = createWindow(0, params.disposition, gfx::Rect(), params.user_gesture, additional_features);
-         if (targetAdapter)
-             target = targetAdapter->webContents();
-     }
-@@ -158,10 +159,10 @@ bool WebContentsDelegateQt::ShouldPreserveAbortedURLs(content::WebContents *sour
-     return false;
- }
- 
-void WebContentsDelegateQt::AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked)
-+void WebContentsDelegateQt::AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked, std::vector<base::string16> additional_features)
- {
-     Q_UNUSED(source)
-    QWeakPointer<WebContentsAdapter> newAdapter = createWindow(new_contents, disposition, initial_pos, user_gesture);
-+    QWeakPointer<WebContentsAdapter> newAdapter = createWindow(new_contents, disposition, initial_pos, user_gesture, additional_features);
-     if (was_blocked)
-         *was_blocked = !newAdapter;
- }
-@@ -423,11 +424,17 @@ void WebContentsDelegateQt::overrideWebPreferences(content::WebContents *, conte
-     m_viewClient->webEngineSettings()->overrideWebPreferences(webPreferences);
- }
- 
-QWeakPointer<WebContentsAdapter> WebContentsDelegateQt::createWindow(content::WebContents *new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture)
-+QWeakPointer<WebContentsAdapter> WebContentsDelegateQt::createWindow(content::WebContents *new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, std::vector<base::string16> additional_features)
- {
-     QSharedPointer<WebContentsAdapter> newAdapter = QSharedPointer<WebContentsAdapter>::create(new_contents);
- 
-    m_viewClient->adoptNewWindow(newAdapter, static_cast<WebContentsAdapterClient::WindowOpenDisposition>(disposition), user_gesture, toQt(initial_pos), m_initialTargetUrl);
-+    QStringList additionalFeaturesStringList;
-+    std::vector<base::string16>::const_iterator iter;
-+    for( iter = additional_features.begin(); iter != additional_features.end(); iter++ )
-+    {
-+        additionalFeaturesStringList << toQt(*iter);
-+    }
-+    m_viewClient->adoptNewWindow(newAdapter, static_cast<WebContentsAdapterClient::WindowOpenDisposition>(disposition), user_gesture, toQt(initial_pos), m_initialTargetUrl, additionalFeaturesStringList);
- 
-     // If the client didn't reference the adapter, it will be deleted now, and the weak pointer zeroed.
-     return newAdapter;
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 913bf35..a8db7b7 100644
--- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -99,7 +99,7 @@ public:
-     // WebContentsDelegate overrides
-     content::WebContents *OpenURLFromTab(content::WebContents *source, const content::OpenURLParams &params) override;
-     void NavigationStateChanged(content::WebContents* source, content::InvalidateTypes changed_flags) override;
-    void AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked) override;
-+    void AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked, std::vector<base::string16> additional_features) override;
-     void CloseContents(content::WebContents *source) override;
-     void LoadProgressChanged(content::WebContents* source, double progress) override;
-     void HandleKeyboardEvent(content::WebContents *source, const content::NativeWebKeyboardEvent &event) override;
-@@ -148,7 +148,7 @@ public:
-     const SavePageInfo &savePageInfo() { return m_savePageInfo; }
- 
- private:
-    QWeakPointer<WebContentsAdapter> createWindow(content::WebContents *new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture);
-+    QWeakPointer<WebContentsAdapter> createWindow(content::WebContents *new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, std::vector<base::string16> additional_features);
- 
-     WebContentsAdapterClient *m_viewClient;
-     QString m_lastSearchedString;
-diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webengine/api/qquickwebenginenewviewrequest.cpp
-index 0af943d..99e3794 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest.cpp
-+++ b/src/webengine/api/qquickwebenginenewviewrequest.cpp
-@@ -92,6 +92,11 @@ bool QQuickWebEngineNewViewRequest::isUserInitiated() const
-     return m_isUserInitiated;
- }
- 
-+const QStringList &QQuickWebEngineNewViewRequest::additionalFeatures() const
-+{
-+    return m_additionalFeatures;
-+}
-+
- /*!
-     \qmlmethod WebEngineNewViewRequest::openIn(WebEngineView view)
- 
-diff --git a/src/webengine/api/qquickwebenginenewviewrequest_p.h b/src/webengine/api/qquickwebenginenewviewrequest_p.h
-index 9cc0f29..304c6c0 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest_p.h
-+++ b/src/webengine/api/qquickwebenginenewviewrequest_p.h
-@@ -54,6 +54,8 @@
- #include "qtwebengineglobal_p.h"
- #include "qquickwebengineview_p.h"
- 
-+#include <QStringList>
-+
- namespace QtWebEngineCore {
- class WebContentsAdapter;
- }
-@@ -65,12 +67,14 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineNewViewRequest : public QObject
-     Q_PROPERTY(QQuickWebEngineView::NewViewDestination destination READ destination CONSTANT FINAL)
-     Q_PROPERTY(QUrl requestedUrl READ requestedUrl CONSTANT REVISION 1 FINAL)
-     Q_PROPERTY(bool userInitiated READ isUserInitiated CONSTANT FINAL)
-+    Q_PROPERTY(QStringList additionalFeatures READ additionalFeatures CONSTANT FINAL)
- public:
-     ~QQuickWebEngineNewViewRequest();
- 
-     QQuickWebEngineView::NewViewDestination destination() const;
-     QUrl requestedUrl() const;
-     bool isUserInitiated() const;
-+    const QStringList &additionalFeatures() const;
-     Q_INVOKABLE void openIn(QQuickWebEngineView *view);
- 
- private:
-@@ -80,6 +84,7 @@ private:
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter> m_adapter;
-     QUrl m_requestedUrl;
-     friend class QQuickWebEngineView;
-+    QStringList m_additionalFeatures;
-     friend class QQuickWebEngineViewPrivate;
- };
- 
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index ae75b7f..c8e9e51 100644
--- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -588,7 +588,7 @@ void QQuickWebEngineViewPrivate::unhandledKeyEvent(QKeyEvent *event)
-         q->window()->sendEvent(q->parentItem(), event);
- }
- 
-void QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &, const QUrl &targetUrl)
-+void QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &, const QUrl &targetUrl, const QStringList &additionalFeaturesStringList)
- {
-     Q_Q(QQuickWebEngineView);
-     QQuickWebEngineNewViewRequest request;
-@@ -597,6 +597,7 @@ void QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapte
-     request.m_adapter = newWebContents;
-     request.m_isUserInitiated = userGesture;
-     request.m_requestedUrl = targetUrl;
-+    request.m_additionalFeatures = additionalFeaturesStringList;
- 
-     switch (disposition) {
-     case WebContentsAdapterClient::NewForegroundTabDisposition:
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index f6f638e..41178e0 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -109,7 +109,7 @@ public:
-     virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString()) Q_DECL_OVERRIDE;
-     virtual void focusContainer() Q_DECL_OVERRIDE;
-     virtual void unhandledKeyEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
-    virtual void adoptNewWindow(QSharedPointer<QtWebEngineCore::WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &, const QUrl &targetUrl) Q_DECL_OVERRIDE;
-+    virtual void adoptNewWindow(QSharedPointer<QtWebEngineCore::WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &, const QUrl &targetUrl, const QStringList &additionalFeatures) Q_DECL_OVERRIDE;
-     virtual bool isBeingAdopted() Q_DECL_OVERRIDE;
-     virtual void close() Q_DECL_OVERRIDE;
-     virtual void windowCloseRejected() Q_DECL_OVERRIDE;
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index 5145612..db9baca 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -399,11 +399,12 @@ void QWebEnginePagePrivate::unhandledKeyEvent(QKeyEvent *event)
-         QGuiApplication::sendEvent(view->parentWidget(), event);
- }
- 
-void QWebEnginePagePrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &initialGeometry, const QUrl &targetUrl)
-+void QWebEnginePagePrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &initialGeometry, const QUrl &targetUrl, const QStringList &additionalFeatures)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(userGesture);
-     Q_UNUSED(targetUrl);
-+    Q_UNUSED(additionalFeatures);
- 
-     QWebEnginePage *newPage = q->createWindow(toWindowType(disposition));
-     if (!newPage)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index ec84f05..2426e2c 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -100,7 +100,7 @@ public:
-     virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString()) Q_DECL_OVERRIDE;
-     virtual void focusContainer() Q_DECL_OVERRIDE;
-     virtual void unhandledKeyEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
-    virtual void adoptNewWindow(QSharedPointer<QtWebEngineCore::WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &initialGeometry, const QUrl &targetUrl) Q_DECL_OVERRIDE;
-+    virtual void adoptNewWindow(QSharedPointer<QtWebEngineCore::WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &initialGeometry, const QUrl &targetUrl, const QStringList &additionalFeatures) Q_DECL_OVERRIDE;
-     void adoptNewWindowImpl(QWebEnginePage *newPage,
-             const QSharedPointer<QtWebEngineCore::WebContentsAdapter> &newWebContents,
-             const QRect &initialGeometry);
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0003-WebContents-provide-additional-features-from-window..patch
+++ b/luna/qt5-qtwebengine/patches-luna/0003-WebContents-provide-additional-features-from-window..patch
@ -1,114 +0,0 @@
-From 26439d820f1e976932185cbf9e1b377e2a7a96b7 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Sun, 27 Sep 2015 21:39:56 +0200
-Subject: [PATCH 03/10] WebContents: provide additional features from
- window.open to the client side
-
-* Also, parse these features in a way that take into account JSON values.
-* Also redirect calls to old AddNewContent to the new API, with empty additional features.
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- .../browser/web_contents/web_contents_impl.cc      |  2 +-
- .../content/public/browser/web_contents_delegate.h | 21 ++++++++++++++++++-
- .../WebKit/Source/core/page/WindowFeatures.cpp     | 24 +++++++++++++++++++---
- 3 files changed, 42 insertions(+), 5 deletions(-)
-
-diff --git a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-index c7df36d..5eed7db 100644
--- a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-+++ b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-@@ -2163,7 +2163,7 @@ void WebContentsImpl::CreateNewWindow(
-       gfx::Rect initial_rect;
-       delegate_->AddNewContents(
-           this, new_contents, params.disposition, initial_rect,
-          params.user_gesture, &was_blocked);
-+          params.user_gesture, &was_blocked, params.additional_features);
-     }
-     if (!was_blocked) {
-       OpenURLParams open_params(params.target_url, params.referrer,
-diff --git a/src/3rdparty/chromium/content/public/browser/web_contents_delegate.h b/src/3rdparty/chromium/content/public/browser/web_contents_delegate.h
-index 2beb83c..aec4195 100644
--- a/src/3rdparty/chromium/content/public/browser/web_contents_delegate.h
-+++ b/src/3rdparty/chromium/content/public/browser/web_contents_delegate.h
-@@ -118,7 +118,26 @@ class CONTENT_EXPORT WebContentsDelegate {
-                               WindowOpenDisposition disposition,
-                               const gfx::Rect& initial_rect,
-                               bool user_gesture,
-                              bool* was_blocked) {}
-+                              bool* was_blocked) {
-+      std::vector<base::string16> additional_features;
-+      AddNewContents(source,new_contents,disposition,initial_rect,user_gesture,was_blocked, additional_features);
-+  }
-+
-+  // Creates a new tab with the already-created WebContents 'new_contents'.
-+  // The window for the added contents should be reparented correctly when this
-+  // method returns.  If |disposition| is NEW_POPUP, |initial_rect| should hold
-+  // the initial position. If |was_blocked| is non-NULL, then |*was_blocked|
-+  // will be set to true if the popup gets blocked, and left unchanged
-+  // otherwise.
-+  virtual void AddNewContents(WebContents* source,
-+                              WebContents* new_contents,
-+                              WindowOpenDisposition disposition,
-+                              const gfx::Rect& initial_rect,
-+                              bool user_gesture,
-+                              bool* was_blocked,
-+                              std::vector<base::string16> additional_features) {
-+      AddNewContents(source,new_contents,disposition,initial_rect,user_gesture,was_blocked);
-+  }
- 
-   // Selects the specified contents, bringing its container to the front.
-   virtual void ActivateContents(WebContents* contents) {}
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/core/page/WindowFeatures.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/core/page/WindowFeatures.cpp
-index f1d78f9..82614af 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/core/page/WindowFeatures.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/page/WindowFeatures.cpp
-@@ -89,7 +89,7 @@ WindowFeatures::WindowFeatures(const String& features)
- 
-     // skip to first separator
-     while (i < length && !isWindowFeaturesSeparator(buffer[i]))
-      i++;
-+        i++;
-     keyEnd = i;
- 
-     SECURITY_DCHECK(i <= length);
-@@ -115,8 +115,24 @@ WindowFeatures::WindowFeatures(const String& features)
-     SECURITY_DCHECK(i <= length);
- 
-     // skip to first separator
-    while (i < length && !isWindowFeaturesSeparator(buffer[i]))
-      i++;
-+    if (i < length && buffer[i] == '{') {
-+        // json value: go to the matching '}'
-+        int unmatchedBraceCount = 0;
-+        while (i < length) {
-+            if (buffer[i] == '{')
-+                unmatchedBraceCount++;
-+            else if (buffer[i] == '}')
-+                unmatchedBraceCount--;
-+            i++;
-+            if (unmatchedBraceCount <= 0)
-+                break;
-+        }
-+    }
-+    else {
-+        // classic case: skip to first separator
-+        while (i < length && !isWindowFeaturesSeparator(buffer[i]))
-+          i++;
-+    }
-     valueEnd = i;
- 
-     SECURITY_DCHECK(i <= length);
-@@ -166,6 +182,8 @@ void WindowFeatures::setWindowFeature(const String& keyString,
-     fullscreen = value;
-   } else if (keyString == "scrollbars") {
-     scrollbarsVisible = value;
-+  } else if (keyString == "attributes") {
-+    additionalFeatures.append(keyString+"="+valueString);
-   } else if (keyString == "noopener") {
-     noopener = true;
-   } else if (value == 1) {
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0003-WebEngineNewViewRequest-provide-the-requested-URL-as.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0003-WebEngineNewViewRequest-provide-the-requested-URL-as.patch
@ -1,54 +0,0 @@
-From f3eee55890c8a639c38244391936c8cb2a4a0479 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Mon, 28 Sep 2015 20:19:49 +0200
-Subject: [PATCH 03/18] WebEngineNewViewRequest: provide the requested URL as a
- property
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/webengine/api/qquickwebenginenewviewrequest.cpp | 8 ++++++++
- src/webengine/api/qquickwebenginenewviewrequest_p.h | 2 ++
- 2 files changed, 10 insertions(+)
-
-diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webengine/api/qquickwebenginenewviewrequest.cpp
-index 99e3794..a369889 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest.cpp
-+++ b/src/webengine/api/qquickwebenginenewviewrequest.cpp
-@@ -97,6 +97,14 @@ const QStringList &QQuickWebEngineNewViewRequest::additionalFeatures() const
-     return m_additionalFeatures;
- }
- 
-+QUrl QQuickWebEngineNewViewRequest::url() const
-+{
-+    if (!m_adapter) {
-+        return m_adapter->activeUrl();
-+    }
-+    return QUrl();
-+}
-+
- /*!
-     \qmlmethod WebEngineNewViewRequest::openIn(WebEngineView view)
- 
-diff --git a/src/webengine/api/qquickwebenginenewviewrequest_p.h b/src/webengine/api/qquickwebenginenewviewrequest_p.h
-index 304c6c0..591e983 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest_p.h
-+++ b/src/webengine/api/qquickwebenginenewviewrequest_p.h
-@@ -68,6 +68,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineNewViewRequest : public QObject
-     Q_PROPERTY(QUrl requestedUrl READ requestedUrl CONSTANT REVISION 1 FINAL)
-     Q_PROPERTY(bool userInitiated READ isUserInitiated CONSTANT FINAL)
-     Q_PROPERTY(QStringList additionalFeatures READ additionalFeatures CONSTANT FINAL)
-+    Q_PROPERTY(QUrl url READ url)
- public:
-     ~QQuickWebEngineNewViewRequest();
- 
-@@ -76,6 +77,7 @@ public:
-     bool isUserInitiated() const;
-     const QStringList &additionalFeatures() const;
-     Q_INVOKABLE void openIn(QQuickWebEngineView *view);
-+    QUrl url() const;
- 
- private:
-     QQuickWebEngineNewViewRequest();
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0004-Implement-Sync-IPC-messaging-through-qt.webChannelTr.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0004-Implement-Sync-IPC-messaging-through-qt.webChannelTr.patch
@ -1,152 +0,0 @@
-From 8a722631f3b59bee898e73aad299d9950bb70844 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Wed, 30 Sep 2015 19:48:02 +0200
-Subject: [PATCH 04/18] Implement Sync IPC messaging through
- qt.webChannelTransport.sendSync
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/core/common/qt_messages.h                      |  2 ++
- src/core/renderer/web_channel_ipc_transport.cpp    | 42 +++++++++++++++++++++-
- .../web_channel_ipc_transport_host.cpp             | 17 ++++++++-
- .../renderer_host/web_channel_ipc_transport_host.h |  3 ++
- 4 files changed, 62 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/common/qt_messages.h b/src/core/common/qt_messages.h
-index d998db2..62642cd 100644
--- a/src/core/common/qt_messages.h
-+++ b/src/core/common/qt_messages.h
-@@ -69,6 +69,8 @@ IPC_MESSAGE_ROUTED0(RenderViewObserverHostQt_DidFirstVisuallyNonEmptyLayout)
- 
- IPC_MESSAGE_ROUTED1(WebChannelIPCTransportHost_SendMessage, std::vector<char> /*binaryJSON*/)
- 
-+IPC_SYNC_MESSAGE_ROUTED1_1(WebChannelIPCTransportHost_SendMessageSync, std::vector<char> /*binaryJSON*/, std::vector<char> /*binaryJSON*/)
-+
- //-----------------------------------------------------------------------------
- // Misc messages
- // These are messages sent from the renderer to the browser process.
-diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp
-index 161d6f4..18f6b31 100644
--- a/src/core/renderer/web_channel_ipc_transport.cpp
-+++ b/src/core/renderer/web_channel_ipc_transport.cpp
-@@ -89,6 +89,44 @@ private:
-         renderView->Send(new WebChannelIPCTransportHost_SendMessage(renderView->GetRoutingID(), std::vector<char>(rawData, rawData + size)));
-     }
- 
-+    void NativeQtSendMessageSync(gin::Arguments *args)
-+    {
-+        content::RenderView *renderView = GetRenderView(args->isolate());
-+        if (!renderView || args->Length() != 1)
-+            return;
-+        v8::Handle<v8::Value> val;
-+        args->GetNext(&val);
-+        if (!val->IsString() && !val->IsStringObject())
-+            return;
-+        v8::String::Utf8Value utf8(val->ToString());
-+
-+        QByteArray valueData(*utf8, utf8.length());
-+        QJsonParseError error;
-+        QJsonDocument doc = QJsonDocument::fromJson(valueData, &error);
-+        if (error.error != QJsonParseError::NoError)
-+            qWarning("%s %d: Parsing error: %s",__FILE__, __LINE__, qPrintable(error.errorString()));
-+        int size = 0;
-+        const char *rawData = doc.rawData(&size);
-+
-+        std::vector<char> replyData;
-+        WebChannelIPCTransportHost_SendMessageSync *message = new WebChannelIPCTransportHost_SendMessageSync(renderView->GetRoutingID(), std::vector<char>(rawData, rawData + size), &replyData);
-+        // Enable the UI thread in browser to receive messages.
-+        message->EnableMessagePumping();
-+        renderView->Send(message);
-+
-+        QJsonDocument docReply = QJsonDocument::fromRawData(replyData.data(), replyData.size(), QJsonDocument::BypassValidation);
-+        Q_ASSERT(docReply.isObject());
-+        QByteArray jsonReply = docReply.toJson(QJsonDocument::Compact);
-+
-+        v8::Isolate *isolate = v8::Isolate::GetCurrent();
-+        v8::Handle<v8::Object> replyObject(v8::Object::New(isolate));
-+        replyObject->ForceSet(v8::String::NewFromUtf8(isolate, "data")
-+                           , v8::String::NewFromUtf8(isolate, jsonReply.constData(), v8::String::kNormalString, jsonReply.size())
-+                           , v8::PropertyAttribute(v8::ReadOnly | v8::DontDelete));
-+
-+        args->Return(replyObject);
-+    }
-+
-     DISALLOW_COPY_AND_ASSIGN(WebChannelTransport);
- };
- 
-@@ -135,7 +173,9 @@ void WebChannelTransport::Uninstall(blink::WebFrame *frame, uint worldId)
- 
- gin::ObjectTemplateBuilder WebChannelTransport::GetObjectTemplateBuilder(v8::Isolate *isolate)
- {
-    return gin::Wrappable<WebChannelTransport>::GetObjectTemplateBuilder(isolate).SetMethod("send", &WebChannelTransport::NativeQtSendMessage);
-+    return gin::Wrappable<WebChannelTransport>::GetObjectTemplateBuilder(isolate)
-+                       .SetMethod("send", &WebChannelTransport::NativeQtSendMessage)
-+                       .SetMethod("sendSync", &WebChannelTransport::NativeQtSendMessageSync);
- }
- 
- content::RenderView *WebChannelTransport::GetRenderView(v8::Isolate *isolate)
-diff --git a/src/core/renderer_host/web_channel_ipc_transport_host.cpp b/src/core/renderer_host/web_channel_ipc_transport_host.cpp
-index aef16f0..7d0cfb0 100644
--- a/src/core/renderer_host/web_channel_ipc_transport_host.cpp
-+++ b/src/core/renderer_host/web_channel_ipc_transport_host.cpp
-@@ -53,6 +53,7 @@ WebChannelIPCTransportHost::WebChannelIPCTransportHost(content::WebContents *con
-     : QWebChannelAbstractTransport(parent)
-     , content::WebContentsObserver(contents)
-     , m_worldId(worldId)
-+    ,_mWaitingReply(0)
- {
-     Send(new WebChannelIPCTransport_Install(routing_id(), m_worldId));
- }
-@@ -82,7 +83,14 @@ void WebChannelIPCTransportHost::sendMessage(const QJsonObject &message)
-     QJsonDocument doc(message);
-     int size = 0;
-     const char *rawData = doc.rawData(&size);
-    Send(new WebChannelIPCTransport_Message(routing_id(), std::vector<char>(rawData, rawData + size), m_worldId));
-+    if (_mWaitingReply) {
-+        WebChannelIPCTransportHost_SendMessageSync::WriteReplyParams(_mWaitingReply, std::vector<char>(rawData, rawData + size));
-+        Send(_mWaitingReply);
-+        _mWaitingReply = 0;
-+    }
-+    else {
-+        Send(new WebChannelIPCTransport_Message(routing_id(), std::vector<char>(rawData, rawData + size), m_worldId));
-+    }
- }
- 
- void WebChannelIPCTransportHost::onWebChannelMessage(const std::vector<char> &message)
-@@ -92,11 +100,18 @@ void WebChannelIPCTransportHost::onWebChannelMessage(const std::vector<char> &me
-     Q_EMIT messageReceived(doc.object(), this);
- }
- 
-+void WebChannelIPCTransportHost::onWebChannelMessageSync(const std::vector<char> &message, IPC::Message *reply)
-+{
-+    _mWaitingReply = reply;
-+    onWebChannelMessage(message);
-+}
-+
- bool WebChannelIPCTransportHost::OnMessageReceived(const IPC::Message &message)
- {
-     bool handled = true;
-     IPC_BEGIN_MESSAGE_MAP(WebChannelIPCTransportHost, message)
-         IPC_MESSAGE_HANDLER(WebChannelIPCTransportHost_SendMessage, onWebChannelMessage)
-+        IPC_MESSAGE_HANDLER_DELAY_REPLY(WebChannelIPCTransportHost_SendMessageSync, onWebChannelMessageSync)
-         IPC_MESSAGE_UNHANDLED(handled = false)
-     IPC_END_MESSAGE_MAP()
-     return handled;
-diff --git a/src/core/renderer_host/web_channel_ipc_transport_host.h b/src/core/renderer_host/web_channel_ipc_transport_host.h
-index aa40647..bfb0523 100644
--- a/src/core/renderer_host/web_channel_ipc_transport_host.h
-+++ b/src/core/renderer_host/web_channel_ipc_transport_host.h
-@@ -70,7 +70,10 @@ public:
- private:
-     bool OnMessageReceived(const IPC::Message& message) override;
-     void onWebChannelMessage(const std::vector<char> &message);
-+    void onWebChannelMessageSync(const std::vector<char> &message, IPC::Message *reply);
-+
-     uint m_worldId;
-+    IPC::Message *_mWaitingReply;
- };
- 
- } // namespace
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0004-Store-the-additional-window-features-related-to-Lune.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0004-Store-the-additional-window-features-related-to-Lune.patch
@ -1,71 +0,0 @@
-From 7d6b6e9bae5f26dda876e4b5b465994fff7d3b5d Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Tue, 20 Oct 2015 20:33:24 +0200
-Subject: [PATCH 04/10] Store the additional window features related to LuneOS
- in the WebContentsView object
-
- - additional_features (from window.open parameter)
- - initial target URL
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- chromium/content/browser/web_contents/web_contents_impl.cc | 8 +++++++-
- chromium/content/browser/web_contents/web_contents_view.h  | 8 ++++++++
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-index 5eed7db..228b62a 100644
--- a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-+++ b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-@@ -2136,6 +2136,11 @@ void WebContentsImpl::CreateNewWindow(
-     if (!is_guest) {
-       WebContentsView* new_view = new_contents->view_.get();
- 
-+      // set the additional features required by the LuneOS app
-+      // (ideally this information should be propagated using the IPC messaging)
-+      new_view->setWindowAdditionalFeatures(params.additional_features);
-+      new_view->setInitialTargetURL(params.target_url);
-+
-       // TODO(brettw): It seems bogus that we have to call this function on the
-       // newly created object and give it one of its own member variables.
-       new_view->CreateViewForWidget(
-@@ -2249,8 +2254,9 @@ void WebContentsImpl::ShowCreatedWindow(int process_id,
-       contents->ResumeLoadingCreatedWebContents();
- 
-     if (delegate) {
-+      std::vector<base::string16> additional_features = contents->view_.get()->getWindowAdditionalFeatures();
-       delegate->AddNewContents(
-          this, contents, disposition, initial_rect, user_gesture, NULL);
-+          this, contents, disposition, initial_rect, user_gesture, NULL, additional_features);
-     }
-   }
- }
-diff --git a/src/3rdparty/chromium/content/browser/web_contents/web_contents_view.h b/src/3rdparty/chromium/content/browser/web_contents/web_contents_view.h
-index e4401f8..aa2f791 100644
--- a/src/3rdparty/chromium/content/browser/web_contents/web_contents_view.h
-+++ b/src/3rdparty/chromium/content/browser/web_contents/web_contents_view.h
-@@ -13,6 +13,7 @@
- #include "ui/gfx/geometry/rect.h"
- #include "ui/gfx/geometry/size.h"
- #include "ui/gfx/native_widget_types.h"
-+#include "url/gurl.h"
- 
- namespace content {
- class RenderViewHost;
-@@ -131,6 +132,13 @@ class WebContentsView {
-   virtual bool IsEventTracking() const = 0;
-   virtual void CloseTabAfterEventTracking() = 0;
- #endif
-+
-+  // Add accessors to set/get the window additional features wanted by the LuneOS apps
-+  // The actual implementation is done in web_contents_view_qt.h
-+  virtual void setWindowAdditionalFeatures(const std::vector<base::string16> &additional_features) {}
-+  virtual std::vector<base::string16> getWindowAdditionalFeatures() {}
-+  virtual void setInitialTargetURL(const GURL &initialURL) {}
-+  virtual GURL getInitialTargetURL() {}
- };
- 
- }  // namespace content
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0005-Make-properties-for-some-settings-for-PalmBridgeServ.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0005-Make-properties-for-some-settings-for-PalmBridgeServ.patch
@ -1,202 +0,0 @@
-From c6c3c2e0a787eb7245fb807ab37b82a0076d215c Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Wed, 30 Sep 2015 23:37:44 +0200
-Subject: [PATCH 05/18] Make properties for some settings for PalmBridgeService
- management
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/core/web_engine_settings.cpp              | 19 +++++++++++++
- src/core/web_engine_settings.h                |  8 +++++-
- src/webengine/api/qquickwebenginesettings.cpp | 39 +++++++++++++++++++++++++++
- src/webengine/api/qquickwebenginesettings_p.h | 12 +++++++++
- 4 files changed, 77 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
-index 0079e02..7d7af2d 100644
--- a/src/core/web_engine_settings.cpp
-+++ b/src/core/web_engine_settings.cpp
-@@ -228,6 +228,19 @@ QString WebEngineSettings::defaultTextEncoding() const
-     return m_defaultEncoding.isEmpty()? parentSettings->defaultTextEncoding() : m_defaultEncoding;
- }
- 
-+void WebEngineSettings::setLuneOSIdentifier(const QString &identifier)
-+{
-+    m_luneOSIdentifier = identifier;
-+    scheduleApplyRecursively();
-+}
-+
-+QString WebEngineSettings::luneOSIdentifier() const
-+{
-+    if (!parentSettings)
-+        return m_luneOSIdentifier;
-+    return m_luneOSIdentifier.isEmpty()? parentSettings->luneOSIdentifier() : m_luneOSIdentifier;
-+}
-+
- void WebEngineSettings::initDefaults(bool offTheRecord)
- {
-     if (s_defaultAttributes.isEmpty()) {
-@@ -267,6 +280,8 @@ void WebEngineSettings::initDefaults(bool offTheRecord)
-         s_defaultAttributes.insert(PrintElementBackgrounds, true);
-         s_defaultAttributes.insert(AllowRunningInsecureContent, allowRunningInsecureContent);
-         s_defaultAttributes.insert(AllowGeolocationOnInsecureOrigins, false);
-+        s_defaultAttributes.insert(PalmServiceBridgeEnabled, false);
-+        s_defaultAttributes.insert(LuneOSPrivileged, false);
-     }
-     if (offTheRecord)
-         m_attributes.insert(LocalStorageEnabled, false);
-@@ -299,6 +314,8 @@ void WebEngineSettings::initDefaults(bool offTheRecord)
-         s_defaultFontSizes.insert(DefaultFontSize, 16);
-     }
- 
-+    m_luneOSIdentifier = "";
-+
-     m_defaultEncoding = QStringLiteral("ISO-8859-1");
- }
- 
-@@ -352,6 +369,8 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p
-     prefs->should_print_backgrounds = testAttribute(PrintElementBackgrounds);
-     prefs->allow_running_insecure_content = testAttribute(AllowRunningInsecureContent);
-     prefs->allow_geolocation_on_insecure_origins = testAttribute(AllowGeolocationOnInsecureOrigins);
-+    prefs->luneosPriviledged = testAttribute(LuneOSPrivileged);
-+    prefs->luneosAppIdentifier = luneOSIdentifier().toStdString();
- 
-     // Fonts settings.
-     prefs->standard_font_family_map[content::kCommonScript] = toString16(fontFamily(StandardFont));
-diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
-index 4b0ce7b..3a3a8d1 100644
--- a/src/core/web_engine_settings.h
-+++ b/src/core/web_engine_settings.h
-@@ -83,7 +83,9 @@ public:
-         FocusOnNavigationEnabled,
-         PrintElementBackgrounds,
-         AllowRunningInsecureContent,
-        AllowGeolocationOnInsecureOrigins
-+        AllowGeolocationOnInsecureOrigins,
-+        PalmServiceBridgeEnabled,
-+        LuneOSPrivileged
-     };
- 
-     // Must match the values from the public API in qwebenginesettings.h.
-@@ -127,6 +129,9 @@ public:
-     void setDefaultTextEncoding(const QString &encoding);
-     QString defaultTextEncoding() const;
- 
-+    void setLuneOSIdentifier(const QString &identifier);
-+    QString luneOSIdentifier() const;
-+
-     void initDefaults(bool offTheRecord = false);
-     void scheduleApply();
- 
-@@ -142,6 +147,7 @@ private:
-     QHash<FontFamily, QString> m_fontFamilies;
-     QHash<FontSize, int> m_fontSizes;
-     QString m_defaultEncoding;
-+    QString m_luneOSIdentifier;
-     QScopedPointer<content::WebPreferences> webPreferences;
-     QScopedPointer<BatchTimer> m_batchTimer;
- 
-diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
-index ff25413..bcc5326 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
-+++ b/src/webengine/api/qquickwebenginesettings.cpp
-@@ -376,6 +376,21 @@ QString QQuickWebEngineSettings::defaultTextEncoding() const
-     return d_ptr->defaultTextEncoding();
- }
- 
-+bool QQuickWebEngineSettings::palmServiceBridgeEnabled() const
-+{
-+    return d_ptr->testAttribute(WebEngineSettings::PalmServiceBridgeEnabled);
-+}
-+
-+bool QQuickWebEngineSettings::luneOSPrivileged() const
-+{
-+    return d_ptr->testAttribute(WebEngineSettings::LuneOSPrivileged);
-+}
-+
-+QString QQuickWebEngineSettings::luneOSIdentifier() const
-+{
-+    return d_ptr->luneOSIdentifier();
-+}
-+
- void QQuickWebEngineSettings::setAutoLoadImages(bool on)
- {
-     bool wasOn = d_ptr->testAttribute(WebEngineSettings::AutoLoadImages);
-@@ -564,6 +579,30 @@ void QQuickWebEngineSettings::setAllowGeolocationOnInsecureOrigins(bool on)
-         Q_EMIT allowGeolocationOnInsecureOriginsChanged();
- }
- 
-+void QQuickWebEngineSettings::setPalmServiceBridgeEnabled(bool on)
-+{
-+    bool wasOn = d_ptr->testAttribute(WebEngineSettings::PalmServiceBridgeEnabled);
-+    d_ptr->setAttribute(WebEngineSettings::PalmServiceBridgeEnabled, on);
-+    if (wasOn != on)
-+        Q_EMIT palmServiceBridgeEnabledChanged();
-+}
-+
-+void QQuickWebEngineSettings::setLuneOSPrivileged(bool on)
-+{
-+    bool wasOn = d_ptr->testAttribute(WebEngineSettings::LuneOSPrivileged);
-+    d_ptr->setAttribute(WebEngineSettings::LuneOSPrivileged, on);
-+    if (wasOn != on)
-+        Q_EMIT luneOSPrivilegedChanged();
-+}
-+
-+void QQuickWebEngineSettings::setLuneOSIdentifier(QString identifier)
-+{
-+    const QString oldLuneOSIdentifier = d_ptr->luneOSIdentifier();
-+    d_ptr->setLuneOSIdentifier(identifier);
-+    if (oldLuneOSIdentifier.compare(identifier))
-+        Q_EMIT luneOSIdentifierChanged();
-+}
-+
- void QQuickWebEngineSettings::setParentSettings(QQuickWebEngineSettings *parentSettings)
- {
-     d_ptr->setParentSettings(parentSettings->d_ptr.data());
-diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h
-index 10217c6..4893b34 100644
--- a/src/webengine/api/qquickwebenginesettings_p.h
-+++ b/src/webengine/api/qquickwebenginesettings_p.h
-@@ -86,6 +86,9 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject {
-     Q_PROPERTY(bool printElementBackgrounds READ printElementBackgrounds WRITE setPrintElementBackgrounds NOTIFY printElementBackgroundsChanged REVISION 3 FINAL)
-     Q_PROPERTY(bool allowRunningInsecureContent READ allowRunningInsecureContent WRITE setAllowRunningInsecureContent NOTIFY allowRunningInsecureContentChanged REVISION 3 FINAL)
-     Q_PROPERTY(bool allowGeolocationOnInsecureOrigins READ allowGeolocationOnInsecureOrigins WRITE setAllowGeolocationOnInsecureOrigins NOTIFY allowGeolocationOnInsecureOriginsChanged REVISION 4 FINAL)
-+    Q_PROPERTY(bool palmServiceBridgeEnabled READ palmServiceBridgeEnabled WRITE setPalmServiceBridgeEnabled NOTIFY palmServiceBridgeEnabledChanged)
-+    Q_PROPERTY(bool luneOSPrivileged READ luneOSPrivileged WRITE setLuneOSPrivileged NOTIFY luneOSPrivilegedChanged)
-+    Q_PROPERTY(QString luneOSIdentifier READ luneOSIdentifier WRITE setLuneOSIdentifier NOTIFY luneOSIdentifierChanged)
- 
- public:
-     ~QQuickWebEngineSettings();
-@@ -113,6 +116,9 @@ public:
-     bool printElementBackgrounds() const;
-     bool allowRunningInsecureContent() const;
-     bool allowGeolocationOnInsecureOrigins() const;
-+    bool palmServiceBridgeEnabled() const;
-+    bool luneOSPrivileged() const;
-+    QString luneOSIdentifier() const;
- 
-     void setAutoLoadImages(bool on);
-     void setJavascriptEnabled(bool on);
-@@ -137,6 +143,9 @@ public:
-     void setPrintElementBackgrounds(bool on);
-     void setAllowRunningInsecureContent(bool on);
-     void setAllowGeolocationOnInsecureOrigins(bool on);
-+    void setPalmServiceBridgeEnabled(bool on);
-+    void setLuneOSPrivileged(bool on);
-+    void setLuneOSIdentifier(QString identifier);
- 
- signals:
-     void autoLoadImagesChanged();
-@@ -162,6 +171,9 @@ signals:
-     Q_REVISION(3) void printElementBackgroundsChanged();
-     Q_REVISION(3) void allowRunningInsecureContentChanged();
-     Q_REVISION(4) void allowGeolocationOnInsecureOriginsChanged();
-+    void palmServiceBridgeEnabledChanged();
-+    void luneOSPrivilegedChanged();
-+    void luneOSIdentifierChanged();
- 
- private:
-     explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = 0);
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0005-WindowFeatures-Chrome-lower-the-minimum-height-to-5.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0005-WindowFeatures-Chrome-lower-the-minimum-height-to-5.patch
@ -1,43 +0,0 @@
-From 3b5a306323787c3e7b2bf33f9063e1d933527a27 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Wed, 28 Oct 2015 22:14:42 +0100
-Subject: [PATCH 05/10] WindowFeatures, Chrome: lower the minimum height to 5
-
-* In case the height is expressed in GridUnits, it means it won't be possible to create a window with a height lower than 5gu.
-* Chrome: lower minimum height to 5
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- chromium/third_party/WebKit/Source/core/page/ChromeClient.h     | 2 +-
- chromium/third_party/WebKit/Source/core/page/WindowFeatures.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/core/page/ChromeClient.h b/src/3rdparty/chromium/third_party/WebKit/Source/core/page/ChromeClient.h
-index 9ec4b22..19dce1f 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/core/page/ChromeClient.h
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/page/ChromeClient.h
-@@ -288,7 +288,7 @@ class CORE_EXPORT ChromeClient : public HostWindow {
-   virtual bool requestPointerLock(LocalFrame*) { return false; }
-   virtual void requestPointerUnlock(LocalFrame*) {}
- 
-  virtual IntSize minimumWindowSize() const { return IntSize(100, 100); }
-+  virtual IntSize minimumWindowSize() const { return IntSize(100, 5); }
- 
-   virtual bool isChromeClientImpl() const { return false; }
- 
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/core/page/WindowFeatures.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/core/page/WindowFeatures.cpp
-index 82614af..7ede5b6 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/core/page/WindowFeatures.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/page/WindowFeatures.cpp
-@@ -220,7 +220,7 @@ WindowFeatures::WindowFeatures(const String& dialogFeaturesString,
-   width = intFeature(features, "dialogwidth", 100, screenAvailableRect.width(),
-                      620);
-   // default here came from frame size of dialog in MacIE
-  height = intFeature(features, "dialogheight", 100,
-+  height = intFeature(features, "dialogheight", 5,
-                       screenAvailableRect.height(), 450);
- 
-   x = intFeature(features, "dialogleft", screenAvailableRect.x(),
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0006-Enable-password-echo.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0006-Enable-password-echo.patch
@ -1,25 +0,0 @@
-From 12f0346614ed11ad9f1444c5c01218ccfe3e0790 Mon Sep 17 00:00:00 2001
-From: Herrie <Github.com@herrie.org>
-Date: Wed, 2 Mar 2016 16:13:07 +0100
-Subject: [PATCH 06/10] Enable password echo
-
---
- chromium/third_party/WebKit/Source/core/frame/Settings.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/core/frame/Settings.in b/src/3rdparty/chromium/third_party/WebKit/Source/core/frame/Settings.in
-index 5a50982..9789d19 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/core/frame/Settings.in
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/frame/Settings.in
-@@ -29,7 +29,7 @@ defaultTextEncodingName type=String
- # Do not hide chars typed in password fields immediately, but let the last char stay
- # visible for N seconds, configured by the passwordEchoDurationInSeconds setting
- # FIXME: Enable automatically if passwordEchoDurationInSeconds is set to a positive value.
-passwordEchoEnabled initial=false
-+passwordEchoEnabled initial=true
- 
- # Configure how long the last char should say visible in seconds.
- passwordEchoDurationInSeconds type=double, initial=1
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0006-WebEngineSettings-Add-a-standardFontFamily-property-.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0006-WebEngineSettings-Add-a-standardFontFamily-property-.patch
@ -1,82 +0,0 @@
-From 6cc5bc3e008c48ca1ecfea640d84f11ccbfe7775 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Sat, 17 Oct 2015 21:09:29 +0200
-Subject: [PATCH 06/18] WebEngineSettings: Add a "standardFontFamily" property
- to be able to setup Prelude
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/webengine/api/qquickwebenginesettings.cpp | 13 +++++++++++++
- src/webengine/api/qquickwebenginesettings_p.h |  4 ++++
- 2 files changed, 17 insertions(+)
-
-diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
-index bcc5326..c0f1227 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
-+++ b/src/webengine/api/qquickwebenginesettings.cpp
-@@ -391,6 +391,11 @@ QString QQuickWebEngineSettings::luneOSIdentifier() const
-     return d_ptr->luneOSIdentifier();
- }
- 
-+QString QQuickWebEngineSettings::standardFontFamily() const
-+{
-+    return d_ptr->fontFamily(WebEngineSettings::StandardFont);;
-+}
-+
- void QQuickWebEngineSettings::setAutoLoadImages(bool on)
- {
-     bool wasOn = d_ptr->testAttribute(WebEngineSettings::AutoLoadImages);
-@@ -603,6 +608,14 @@ void QQuickWebEngineSettings::setLuneOSIdentifier(QString identifier)
-         Q_EMIT luneOSIdentifierChanged();
- }
- 
-+void QQuickWebEngineSettings::setStandardFontFamily(QString fontFamily)
-+{
-+    const QString oldStandardFontFamily = d_ptr->fontFamily(WebEngineSettings::StandardFont);
-+    d_ptr->setFontFamily(WebEngineSettings::StandardFont, fontFamily);
-+    if (oldStandardFontFamily.compare(fontFamily))
-+        Q_EMIT standardFontFamilyChanged();
-+}
-+
- void QQuickWebEngineSettings::setParentSettings(QQuickWebEngineSettings *parentSettings)
- {
-     d_ptr->setParentSettings(parentSettings->d_ptr.data());
-diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h
-index 4893b34..8b5cf49 100644
--- a/src/webengine/api/qquickwebenginesettings_p.h
-+++ b/src/webengine/api/qquickwebenginesettings_p.h
-@@ -89,6 +89,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject {
-     Q_PROPERTY(bool palmServiceBridgeEnabled READ palmServiceBridgeEnabled WRITE setPalmServiceBridgeEnabled NOTIFY palmServiceBridgeEnabledChanged)
-     Q_PROPERTY(bool luneOSPrivileged READ luneOSPrivileged WRITE setLuneOSPrivileged NOTIFY luneOSPrivilegedChanged)
-     Q_PROPERTY(QString luneOSIdentifier READ luneOSIdentifier WRITE setLuneOSIdentifier NOTIFY luneOSIdentifierChanged)
-+    Q_PROPERTY(QString standardFontFamily READ standardFontFamily WRITE setStandardFontFamily NOTIFY standardFontFamilyChanged)
- 
- public:
-     ~QQuickWebEngineSettings();
-@@ -119,6 +120,7 @@ public:
-     bool palmServiceBridgeEnabled() const;
-     bool luneOSPrivileged() const;
-     QString luneOSIdentifier() const;
-+    QString standardFontFamily() const;
- 
-     void setAutoLoadImages(bool on);
-     void setJavascriptEnabled(bool on);
-@@ -146,6 +148,7 @@ public:
-     void setPalmServiceBridgeEnabled(bool on);
-     void setLuneOSPrivileged(bool on);
-     void setLuneOSIdentifier(QString identifier);
-+    void setStandardFontFamily(QString fontFamily);
- 
- signals:
-     void autoLoadImagesChanged();
-@@ -174,6 +177,7 @@ signals:
-     void palmServiceBridgeEnabledChanged();
-     void luneOSPrivilegedChanged();
-     void luneOSIdentifierChanged();
-+    void standardFontFamilyChanged();
- 
- private:
-     explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = 0);
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0007-WebEngineSettings-add-also-Serif-Fixed-and-Cursive-f.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0007-WebEngineSettings-add-also-Serif-Fixed-and-Cursive-f.patch
@ -1,147 +0,0 @@
-From f9f47062768dbd6f4a131f630ceb6ad83ab9c0e5 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Sat, 17 Oct 2015 22:13:32 +0200
-Subject: [PATCH 07/18] WebEngineSettings: add also Serif, Fixed and Cursive
- font settings, and font size for normal and fixed fonts.
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/webengine/api/qquickwebenginesettings.cpp | 62 ++++++++++++++++++++++++++-
- src/webengine/api/qquickwebenginesettings_p.h | 20 +++++++++
- 2 files changed, 81 insertions(+), 1 deletion(-)
-
-diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
-index c0f1227..22adb28 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
-+++ b/src/webengine/api/qquickwebenginesettings.cpp
-@@ -393,7 +393,27 @@ QString QQuickWebEngineSettings::luneOSIdentifier() const
- 
- QString QQuickWebEngineSettings::standardFontFamily() const
- {
-    return d_ptr->fontFamily(WebEngineSettings::StandardFont);;
-+    return d_ptr->fontFamily(WebEngineSettings::StandardFont);
-+}
-+QString QQuickWebEngineSettings::fixedFontFamily() const
-+{
-+    return d_ptr->fontFamily(WebEngineSettings::FixedFont);
-+}
-+QString QQuickWebEngineSettings::serifFontFamily() const
-+{
-+    return d_ptr->fontFamily(WebEngineSettings::SerifFont);
-+}
-+QString QQuickWebEngineSettings::cursiveFontFamily() const
-+{
-+    return d_ptr->fontFamily(WebEngineSettings::CursiveFont);
-+}
-+int QQuickWebEngineSettings::defaultFontSize() const
-+{
-+    return d_ptr->fontSize(WebEngineSettings::DefaultFontSize);
-+}
-+int QQuickWebEngineSettings::defaultFixedFontSize() const
-+{
-+    return d_ptr->fontSize(WebEngineSettings::DefaultFixedFontSize);
- }
- 
- void QQuickWebEngineSettings::setAutoLoadImages(bool on)
-@@ -616,6 +636,46 @@ void QQuickWebEngineSettings::setStandardFontFamily(QString fontFamily)
-         Q_EMIT standardFontFamilyChanged();
- }
- 
-+void QQuickWebEngineSettings::setFixedFontFamily(QString fontFamily)
-+{
-+    const QString oldFixedFontFamily = d_ptr->fontFamily(WebEngineSettings::FixedFont);
-+    d_ptr->setFontFamily(WebEngineSettings::FixedFont, fontFamily);
-+    if (oldFixedFontFamily.compare(fontFamily))
-+        Q_EMIT fixedFontFamilyChanged();
-+}
-+
-+void QQuickWebEngineSettings::setSerifFontFamily(QString fontFamily)
-+{
-+    const QString oldSerifFontFamily = d_ptr->fontFamily(WebEngineSettings::SerifFont);
-+    d_ptr->setFontFamily(WebEngineSettings::SerifFont, fontFamily);
-+    if (oldSerifFontFamily.compare(fontFamily))
-+        Q_EMIT serifFontFamilyChanged();
-+}
-+
-+void QQuickWebEngineSettings::setCursiveFontFamily(QString fontFamily)
-+{
-+    const QString oldCursiveFontFamily = d_ptr->fontFamily(WebEngineSettings::CursiveFont);
-+    d_ptr->setFontFamily(WebEngineSettings::CursiveFont, fontFamily);
-+    if (oldCursiveFontFamily.compare(fontFamily))
-+        Q_EMIT standardFontFamilyChanged();
-+}
-+
-+void QQuickWebEngineSettings::setDefaultFontSize(int fontSize)
-+{
-+    const int oldDefaultFontSize = d_ptr->fontSize(WebEngineSettings::DefaultFontSize);
-+    d_ptr->setFontSize(WebEngineSettings::DefaultFontSize, fontSize);
-+    if (oldDefaultFontSize!= fontSize)
-+        Q_EMIT defaultFontSizeChanged();
-+}
-+
-+void QQuickWebEngineSettings::setDefaultFixedFontSize(int fontSize)
-+{
-+    const int oldDefaultFixedFontSize = d_ptr->fontSize(WebEngineSettings::DefaultFixedFontSize);
-+    d_ptr->setFontSize(WebEngineSettings::DefaultFixedFontSize, fontSize);
-+    if (oldDefaultFixedFontSize != fontSize)
-+        Q_EMIT defaultFixedFontSizeChanged();
-+}
-+
- void QQuickWebEngineSettings::setParentSettings(QQuickWebEngineSettings *parentSettings)
- {
-     d_ptr->setParentSettings(parentSettings->d_ptr.data());
-diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h
-index 8b5cf49..e793089 100644
--- a/src/webengine/api/qquickwebenginesettings_p.h
-+++ b/src/webengine/api/qquickwebenginesettings_p.h
-@@ -90,6 +90,11 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject {
-     Q_PROPERTY(bool luneOSPrivileged READ luneOSPrivileged WRITE setLuneOSPrivileged NOTIFY luneOSPrivilegedChanged)
-     Q_PROPERTY(QString luneOSIdentifier READ luneOSIdentifier WRITE setLuneOSIdentifier NOTIFY luneOSIdentifierChanged)
-     Q_PROPERTY(QString standardFontFamily READ standardFontFamily WRITE setStandardFontFamily NOTIFY standardFontFamilyChanged)
-+    Q_PROPERTY(QString fixedFontFamily READ standardFontFamily WRITE setFixedFontFamily NOTIFY fixedFontFamilyChanged)
-+    Q_PROPERTY(QString serifFontFamily READ standardFontFamily WRITE setSerifFontFamily NOTIFY serifFontFamilyChanged)
-+    Q_PROPERTY(QString cursiveFontFamily READ standardFontFamily WRITE setCursiveFontFamily NOTIFY cursiveFontFamilyChanged)
-+    Q_PROPERTY(int defaultFontSize READ defaultFontSize WRITE setDefaultFontSize NOTIFY defaultFontSizeChanged)
-+    Q_PROPERTY(int defaultFixedFontSize READ defaultFixedFontSize WRITE setDefaultFixedFontSize NOTIFY defaultFixedFontSizeChanged)
- 
- public:
-     ~QQuickWebEngineSettings();
-@@ -121,6 +126,11 @@ public:
-     bool luneOSPrivileged() const;
-     QString luneOSIdentifier() const;
-     QString standardFontFamily() const;
-+    QString fixedFontFamily() const;
-+    QString serifFontFamily() const;
-+    QString cursiveFontFamily() const;
-+    int defaultFontSize() const;
-+    int defaultFixedFontSize() const;
- 
-     void setAutoLoadImages(bool on);
-     void setJavascriptEnabled(bool on);
-@@ -149,6 +159,11 @@ public:
-     void setLuneOSPrivileged(bool on);
-     void setLuneOSIdentifier(QString identifier);
-     void setStandardFontFamily(QString fontFamily);
-+    void setFixedFontFamily(QString fontFamily);
-+    void setSerifFontFamily(QString fontFamily);
-+    void setCursiveFontFamily(QString fontFamily);
-+    void setDefaultFontSize(int fontSize);
-+    void setDefaultFixedFontSize(int fontSize);
- 
- signals:
-     void autoLoadImagesChanged();
-@@ -178,6 +193,11 @@ signals:
-     void luneOSPrivilegedChanged();
-     void luneOSIdentifierChanged();
-     void standardFontFamilyChanged();
-+    void fixedFontFamilyChanged();
-+    void serifFontFamilyChanged();
-+    void cursiveFontFamilyChanged();
-+    void defaultFontSizeChanged();
-+    void defaultFixedFontSizeChanged();
- 
- private:
-     explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = 0);
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0007-storage-browser-quota-workaround-for-crash-on-cache-.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0007-storage-browser-quota-workaround-for-crash-on-cache-.patch
@ -1,47 +0,0 @@
-From ffa591aa664fc8620ca387afa041a0a65b0339c6 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Tue, 10 May 2016 17:37:37 +0000
-Subject: [PATCH 07/10] storage browser quota: workaround for crash on cache
- update
-
-When using GCC 5.3.0, we get a crash on the statement:
-"int64* usage = &cached_usage_by_host_[host][origin]"
-Apparently adding implicitely a new (GURL,int64) pair in
-the host cache results in incorrect code on armv7.
-This fix adds the pair more smoothly, step-by-step. The
-resulting binary code isn't faulty anymore.
-
-This could be related to the following bug:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69841
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- chromium/storage/browser/quota/client_usage_tracker.cc | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/storage/browser/quota/client_usage_tracker.cc b/src/3rdparty/chromium/storage/browser/quota/client_usage_tracker.cc
-index c9c46f6..c4e9585 100644
--- a/src/3rdparty/chromium/storage/browser/quota/client_usage_tracker.cc
-+++ b/src/3rdparty/chromium/storage/browser/quota/client_usage_tracker.cc
-@@ -358,7 +358,17 @@ void ClientUsageTracker::AddCachedOrigin(const GURL& origin,
-   DCHECK(IsUsageCacheEnabledForOrigin(origin));
- 
-   std::string host = net::GetHostOrSpecFromURL(origin);
-  int64_t* usage = &cached_usage_by_host_[host][origin];
-+
-+  UsageMap& cached_usage_for_host = cached_usage_by_host_[host];
-+  UsageMap::iterator found = cached_usage_for_host.find(origin);
-+  if (found == cached_usage_for_host.end()) {
-+      // try to add it smoothly
-+      std::pair<GURL, int64_t> newPair(origin,0);
-+      cached_usage_for_host.insert(newPair);
-+  }
-+  int64_t* usage = &(cached_usage_for_host[origin]);
-+
-+  //int64* usage = &cached_usage_by_host_[host][origin];
-   int64_t delta = new_usage - *usage;
-   *usage = new_usage;
-   if (delta) {
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0008-Store-the-additional-window-features-required-by-the.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0008-Store-the-additional-window-features-required-by-the.patch
@ -1,36 +0,0 @@
-From da88508d7cafe1f77c273c8c098eb310124a20f7 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Sun, 18 Oct 2015 21:17:32 +0200
-Subject: [PATCH 08/18] Store the additional window features required by the
- LuneOS apps in the WebContentsViewQt object
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/core/web_contents_view_qt.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/core/web_contents_view_qt.h b/src/core/web_contents_view_qt.h
-index 5db4e28..5f19b84 100644
--- a/src/core/web_contents_view_qt.h
-+++ b/src/core/web_contents_view_qt.h
-@@ -71,6 +71,9 @@ public:
-     void initialize(WebContentsAdapterClient* client);
-     WebContentsAdapterClient *client() { return m_client; }
- 
-+    virtual void setWindowAdditionalFeatures(const std::vector<base::string16> &additional_features) Q_DECL_OVERRIDE { m_additional_features = additional_features; }
-+    virtual std::vector<base::string16> getWindowAdditionalFeatures() Q_DECL_OVERRIDE { return m_additional_features; }
-+
-     content::RenderWidgetHostViewBase *CreateViewForWidget(content::RenderWidgetHost* render_widget_host, bool is_guest_view_hack) override;
- 
-     void CreateView(const gfx::Size& initial_size, gfx::NativeView context) override;
-@@ -132,6 +135,7 @@ private:
-     WebContentsAdapterClient *m_client;
-     WebContentsAdapterClient *m_factoryClient;
-     bool m_allowOtherViews;
-+    std::vector<base::string16> m_additional_features;
- };
- 
- } // namespace QtWebEngineCore
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0008-html.css-themeWin.css-Add-Prelude-as-default-font-in.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0008-html.css-themeWin.css-Add-Prelude-as-default-font-in.patch
@ -1,59 +0,0 @@
-From a710d3f2da3e80f153325bbb385a7e8789a7fea7 Mon Sep 17 00:00:00 2001
-From: Herrie <Github.com@herrie.org>
-Date: Wed, 29 Jun 2016 13:52:09 +0200
-Subject: [PATCH 08/10] html.css & themeWin.css: Add Prelude as default font
- instead of monospace
-
-Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
---
- chromium/third_party/WebKit/Source/core/css/html.css     | 6 ++++--
- chromium/third_party/WebKit/Source/core/css/themeWin.css | 2 +-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/core/css/html.css b/src/3rdparty/chromium/third_party/WebKit/Source/core/css/html.css
-index 586eef8..8860768 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/core/css/html.css
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/css/html.css
-@@ -56,7 +56,8 @@ script {
- 
- body {
-     display: block;
-    margin: 8px
-+    margin: 8px;
-+    font-family: Prelude;
- }
- 
- body:-webkit-full-page-media {
-@@ -399,6 +400,7 @@ input, textarea, keygen, select, button {
-     margin: 0__qem;
-     font: -webkit-small-control;
-     text-rendering: auto; /* FIXME: Remove when tabs work with optimizeLegibility. */
-+    font-family: Prelude;
-     color: initial;
-     letter-spacing: normal;
-     word-spacing: normal;
-@@ -921,7 +923,7 @@ i, cite, em, var, address, dfn {
- }
- 
- tt, code, kbd, samp {
-    font-family: monospace
-+    font-family: monospace;
- }
- 
- pre, xmp, plaintext, listing {
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/core/css/themeWin.css b/src/3rdparty/chromium/third_party/WebKit/Source/core/css/themeWin.css
-index 43cf9e1..1ac5fba 100644
--- a/src/3rdparty/chromium/third_party/WebKit/Source/core/css/themeWin.css
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/css/themeWin.css
-@@ -114,7 +114,7 @@ select[size][multiple] {
- }
- 
- textarea {
-    font-family: monospace;
-+    font-family: Prelude;
-     /* Same as native_theme_base. */
-     border-color: #a9a9a9;
- }
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0009-QQuickWebEngineNewViewRequest-use-initialTargetUrl-f.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0009-QQuickWebEngineNewViewRequest-use-initialTargetUrl-f.patch
@ -1,97 +0,0 @@
-From 65b63fdd3da0a11126c4fedc9f7d1c87f422707d Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Tue, 20 Oct 2015 20:32:08 +0200
-Subject: [PATCH 09/18] QQuickWebEngineNewViewRequest: use initialTargetUrl for
- url()
-
-The initial target url is stored in the WebContentsView when the window creation is requested.
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/core/web_contents_adapter.cpp                   | 11 +++++++++++
- src/core/web_contents_adapter.h                     |  1 +
- src/core/web_contents_view_qt.h                     |  4 ++++
- src/webengine/api/qquickwebenginenewviewrequest.cpp |  4 ++--
- 4 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 9c78d67..3761599 100644
--- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -655,6 +655,17 @@ QUrl WebContentsAdapter::iconUrl() const
-     return QUrl();
- }
- 
-+QUrl WebContentsAdapter::initialTargetUrl() const
-+{
-+    Q_D(const WebContentsAdapter);
-+    content::WebContentsView *contentsView = static_cast<content::WebContentsImpl*>(d->webContents.get())->GetView();
-+    if (contentsView) {
-+        return toQt(contentsView->getInitialTargetURL());
-+    }
-+
-+    return QUrl();
-+}
-+
- QString WebContentsAdapter::pageTitle() const
- {
-     Q_D(const WebContentsAdapter);
-diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
-index 46c8d26..bf5c969 100644
--- a/src/core/web_contents_adapter.h
-+++ b/src/core/web_contents_adapter.h
-@@ -94,6 +94,7 @@ public:
-     QString pageTitle() const;
-     QString selectedText() const;
-     QUrl iconUrl() const;
-+    QUrl initialTargetUrl() const;
- 
-     void undo();
-     void redo();
-diff --git a/src/core/web_contents_view_qt.h b/src/core/web_contents_view_qt.h
-index 5f19b84..181b735 100644
--- a/src/core/web_contents_view_qt.h
-+++ b/src/core/web_contents_view_qt.h
-@@ -45,6 +45,7 @@
- #include "content/browser/web_contents/web_contents_view.h"
- #include "content/public/browser/render_view_host.h"
- #include "content/public/browser/render_widget_host.h"
-+#include "url/gurl.h"
- 
- #include "qtwebenginecoreglobal_p.h"
- #include "render_widget_host_view_qt.h"
-@@ -73,6 +74,8 @@ public:
- 
-     virtual void setWindowAdditionalFeatures(const std::vector<base::string16> &additional_features) Q_DECL_OVERRIDE { m_additional_features = additional_features; }
-     virtual std::vector<base::string16> getWindowAdditionalFeatures() Q_DECL_OVERRIDE { return m_additional_features; }
-+    virtual void setInitialTargetURL(const GURL &initialURL) Q_DECL_OVERRIDE { m_initialURL = initialURL; }
-+    virtual GURL getInitialTargetURL() Q_DECL_OVERRIDE { return m_initialURL; }
- 
-     content::RenderWidgetHostViewBase *CreateViewForWidget(content::RenderWidgetHost* render_widget_host, bool is_guest_view_hack) override;
- 
-@@ -131,6 +134,7 @@ public:
- #endif // defined(OS_MACOSX)
- 
- private:
-+    GURL m_initialURL;
-     content::WebContents *m_webContents;
-     WebContentsAdapterClient *m_client;
-     WebContentsAdapterClient *m_factoryClient;
-diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webengine/api/qquickwebenginenewviewrequest.cpp
-index a369889..2272aa1 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest.cpp
-+++ b/src/webengine/api/qquickwebenginenewviewrequest.cpp
-@@ -99,8 +99,8 @@ const QStringList &QQuickWebEngineNewViewRequest::additionalFeatures() const
- 
- QUrl QQuickWebEngineNewViewRequest::url() const
- {
-    if (!m_adapter) {
-        return m_adapter->activeUrl();
-+    if (m_adapter) {
-+        return m_adapter->initialTargetUrl();
-     }
-     return QUrl();
- }
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0010-Update-additional-params-from-Chromium-53-56.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0010-Update-additional-params-from-Chromium-53-56.patch
@ -1,141 +0,0 @@
-From 1a5e631c99d55da3fa3e3d2e469d4ab95a5af5eb Mon Sep 17 00:00:00 2001
-From: Herrie <github.com@herrie.org>
-Date: Fri, 25 Aug 2017 21:12:16 +0200
-Subject: [PATCH 10/10] Update additional params from Chromium 53->56
-
---
- .../content/browser/web_contents/web_contents_impl.cc     |  8 ++++++--
- .../content/public/common/common_param_traits_macros.h    |  1 +
- .../third_party/WebKit/public/web/WebWindowFeatures.h     | 15 +++++++++++----
- .../WebKit/public/web/WindowFeaturesStructTraits.cpp      |  2 ++
- .../WebKit/public/web/WindowFeaturesStructTraits.h        |  4 ++++
- .../third_party/WebKit/public/web/window_features.mojom   |  2 ++
- 6 files changed, 26 insertions(+), 6 deletions(-)
-
-diff --git a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-index 228b62a..c1a74a8 100644
--- a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-+++ b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-@@ -2094,6 +2094,10 @@ void WebContentsImpl::CreateNewWindow(
-       rfh->Init();
-     return;
-   }
-+  
-+  std::vector<base::string16> additional_features;
-+  for (auto webStr : params.features.additionalFeatures)
-+    additional_features.push_back(webStr);
- 
-   // Create the new web contents. This will automatically create the new
-   // WebContentsView. In the future, we may want to create the view separately.
-@@ -2138,7 +2142,7 @@ void WebContentsImpl::CreateNewWindow(
- 
-       // set the additional features required by the LuneOS app
-       // (ideally this information should be propagated using the IPC messaging)
-      new_view->setWindowAdditionalFeatures(params.additional_features);
-+      new_view->setWindowAdditionalFeatures(additional_features);
-       new_view->setInitialTargetURL(params.target_url);
- 
-       // TODO(brettw): It seems bogus that we have to call this function on the
-@@ -2168,7 +2172,7 @@ void WebContentsImpl::CreateNewWindow(
-       gfx::Rect initial_rect;
-       delegate_->AddNewContents(
-           this, new_contents, params.disposition, initial_rect,
-          params.user_gesture, &was_blocked, params.additional_features);
-+          params.user_gesture, &was_blocked, additional_features);
-     }
-     if (!was_blocked) {
-       OpenURLParams open_params(params.target_url, params.referrer,
-diff --git a/src/3rdparty/chromium/content/public/common/common_param_traits_macros.h b/src/3rdparty/chromium/content/public/common/common_param_traits_macros.h
-index c4568af..457fd2d 100644
--- a/src/3rdparty/chromium/content/public/common/common_param_traits_macros.h
-+++ b/src/3rdparty/chromium/content/public/common/common_param_traits_macros.h
-@@ -267,6 +267,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::WebWindowFeatures)
-   IPC_STRUCT_TRAITS_MEMBER(resizable)
-   IPC_STRUCT_TRAITS_MEMBER(fullscreen)
-   IPC_STRUCT_TRAITS_MEMBER(dialog)
-+  IPC_STRUCT_TRAITS_MEMBER(additionalFeatures)
- IPC_STRUCT_TRAITS_END()
- 
- IPC_ENUM_TRAITS_MAX_VALUE(ui::AXEvent, ui::AX_EVENT_LAST)
-diff --git a/src/3rdparty/chromium/third_party/WebKit/public/web/WebWindowFeatures.h b/src/3rdparty/chromium/third_party/WebKit/public/web/WebWindowFeatures.h
-index a1f6743..7c11a7d 100644
--- a/src/3rdparty/chromium/third_party/WebKit/public/web/WebWindowFeatures.h
-+++ b/src/3rdparty/chromium/third_party/WebKit/public/web/WebWindowFeatures.h
-@@ -60,7 +60,7 @@ struct WebWindowFeatures {
- 
-   bool fullscreen;
-   bool dialog;
-  WebVector<WebString> additionalFeatures;
-+  std::vector<base::string16> additionalFeatures;
- 
-   WebWindowFeatures()
-       : x(0),
-@@ -97,8 +97,15 @@ struct WebWindowFeatures {
-         scrollbarsVisible(f.scrollbarsVisible),
-         resizable(f.resizable),
-         fullscreen(f.fullscreen),
-        dialog(f.dialog),
-        additionalFeatures(f.additionalFeatures) {}
-+        dialog(f.dialog) 
-+    {
-+        for(auto str: f.additionalFeatures) {
-+            str.ensure16Bit();
-+            base::string16 destStr((const base::char16*)str.characters16(), str.length());
-+            
-+            additionalFeatures.push_back(destStr);
-+        }
-+    }
- 
-   operator WindowFeatures() const {
-     WindowFeatures result;
-@@ -119,7 +126,7 @@ struct WebWindowFeatures {
-     result.fullscreen = fullscreen;
-     result.dialog = dialog;
-     for (size_t i = 0; i < additionalFeatures.size(); ++i)
-      result.additionalFeatures.append(additionalFeatures[i]);
-+      result.additionalFeatures.append(WTF::String(additionalFeatures[i].data(), additionalFeatures[i].length()));
-     return result;
-   }
- #endif
-diff --git a/src/3rdparty/chromium/third_party/WebKit/public/web/WindowFeaturesStructTraits.cpp b/src/3rdparty/chromium/third_party/WebKit/public/web/WindowFeaturesStructTraits.cpp
-index 69dce5b..d4b83fc 100644
--- a/src/3rdparty/chromium/third_party/WebKit/public/web/WindowFeaturesStructTraits.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/public/web/WindowFeaturesStructTraits.cpp
-@@ -27,6 +27,8 @@ bool StructTraits<::blink::mojom::WindowFeaturesDataView,
-   out->resizable = data.resizable();
-   out->fullscreen = data.fullscreen();
-   out->dialog = data.dialog();
-+  
-+  data.ReadAdditionalfeatures(&out->additionalFeatures);
-   return true;
- }
- 
-diff --git a/src/3rdparty/chromium/third_party/WebKit/public/web/WindowFeaturesStructTraits.h b/src/3rdparty/chromium/third_party/WebKit/public/web/WindowFeaturesStructTraits.h
-index ca776ed..405fb498 100644
--- a/src/3rdparty/chromium/third_party/WebKit/public/web/WindowFeaturesStructTraits.h
-+++ b/src/3rdparty/chromium/third_party/WebKit/public/web/WindowFeaturesStructTraits.h
-@@ -65,6 +65,10 @@ struct StructTraits<::blink::mojom::WindowFeaturesDataView,
-     return features.dialog;
-   }
- 
-+  static std::vector<base::string16> additionalFeatures(const ::blink::WebWindowFeatures& features) {
-+    return features.additionalFeatures;
-+  }
-+
-   static bool Read(::blink::mojom::WindowFeaturesDataView,
-                    ::blink::WebWindowFeatures* out);
- };
-diff --git a/src/3rdparty/chromium/third_party/WebKit/public/web/window_features.mojom b/src/3rdparty/chromium/third_party/WebKit/public/web/window_features.mojom
-index a26b8a3..cb21f15 100644
--- a/src/3rdparty/chromium/third_party/WebKit/public/web/window_features.mojom
-+++ b/src/3rdparty/chromium/third_party/WebKit/public/web/window_features.mojom
-@@ -30,4 +30,6 @@ struct WindowFeatures {
-     // NOTE: WebWindowFeatures::additionalFeatures is not mirrored by this
-     // mojom struct as it's never used by the browser and therefore doesn't need
-     // to be sent.
-+	// ... but webOS/LuneOS apps need that to send additional info to the OS
-+    array<string> additionalFeatures;
- };
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0010-WebEngineNewViewRequest-add-possibility-to-get-reque.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0010-WebEngineNewViewRequest-add-possibility-to-get-reque.patch
@ -1,81 +0,0 @@
-From 84363df1cb1891d532c010fa5ac3d3ec56045428 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Wed, 28 Oct 2015 20:17:02 +0100
-Subject: [PATCH 10/18] WebEngineNewViewRequest: add possibility to get
- requested window geometry
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/webengine/api/qquickwebenginenewviewrequest.cpp | 5 +++++
- src/webengine/api/qquickwebenginenewviewrequest_p.h | 3 +++
- src/webengine/api/qquickwebengineview.cpp           | 3 ++-
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webengine/api/qquickwebenginenewviewrequest.cpp
-index 2272aa1..394064d 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest.cpp
-+++ b/src/webengine/api/qquickwebenginenewviewrequest.cpp
-@@ -105,6 +105,11 @@ QUrl QQuickWebEngineNewViewRequest::url() const
-     return QUrl();
- }
- 
-+QRect QQuickWebEngineNewViewRequest::requestedGeometry() const
-+{
-+    return m_requestedGeometry;
-+}
-+
- /*!
-     \qmlmethod WebEngineNewViewRequest::openIn(WebEngineView view)
- 
-diff --git a/src/webengine/api/qquickwebenginenewviewrequest_p.h b/src/webengine/api/qquickwebenginenewviewrequest_p.h
-index 591e983..68f9255 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest_p.h
-+++ b/src/webengine/api/qquickwebenginenewviewrequest_p.h
-@@ -69,6 +69,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineNewViewRequest : public QObject
-     Q_PROPERTY(bool userInitiated READ isUserInitiated CONSTANT FINAL)
-     Q_PROPERTY(QStringList additionalFeatures READ additionalFeatures CONSTANT FINAL)
-     Q_PROPERTY(QUrl url READ url)
-+    Q_PROPERTY(QRect requestedGeometry READ requestedGeometry CONSTANT FINAL)
- public:
-     ~QQuickWebEngineNewViewRequest();
- 
-@@ -78,6 +79,7 @@ public:
-     const QStringList &additionalFeatures() const;
-     Q_INVOKABLE void openIn(QQuickWebEngineView *view);
-     QUrl url() const;
-+    QRect requestedGeometry() const;
- 
- private:
-     QQuickWebEngineNewViewRequest();
-@@ -86,6 +88,7 @@ private:
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter> m_adapter;
-     QUrl m_requestedUrl;
-     friend class QQuickWebEngineView;
-+    QRect m_requestedGeometry;
-     QStringList m_additionalFeatures;
-     friend class QQuickWebEngineViewPrivate;
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index c8e9e51..2805240 100644
--- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -588,7 +588,7 @@ void QQuickWebEngineViewPrivate::unhandledKeyEvent(QKeyEvent *event)
-         q->window()->sendEvent(q->parentItem(), event);
- }
- 
-void QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &, const QUrl &targetUrl, const QStringList &additionalFeaturesStringList)
-+void QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &requestedGeometry, const QStringList &additionalFeaturesStringList)
- {
-     Q_Q(QQuickWebEngineView);
-     QQuickWebEngineNewViewRequest request;
-@@ -598,6 +598,7 @@ void QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapte
-     request.m_isUserInitiated = userGesture;
-     request.m_requestedUrl = targetUrl;
-     request.m_additionalFeatures = additionalFeaturesStringList;
-+    request.m_requestedGeometry = requestedGeometry;
- 
-     switch (disposition) {
-     case WebContentsAdapterClient::NewForegroundTabDisposition:
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0011-Fix-WebGL2-Textures.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0011-Fix-WebGL2-Textures.patch
@ -1,23 +0,0 @@
-diff --git a/src/3rdparty/chromium/gpu/command_buffer/service/texture_manager.cc b/src/3rdparty/chromium/gpu/command_buffer/service/texture_manager.cc
-index dd7d59c..dcdd8ba 100644
--- a/src/3rdparty/chromium/gpu/command_buffer/service/texture_manager.cc
-+++ b/src/3rdparty/chromium/gpu/command_buffer/service/texture_manager.cc
-@@ -1910,11 +1910,13 @@ bool TextureManager::Initialize() {
-   default_textures_[kCubeMap] = CreateDefaultAndBlackTextures(
-       GL_TEXTURE_CUBE_MAP, &black_texture_ids_[kCubeMap]);
- 
-  if (feature_info_->IsWebGL2OrES3Context()) {
-    default_textures_[kTexture3D] = CreateDefaultAndBlackTextures(
-        GL_TEXTURE_3D, &black_texture_ids_[kTexture3D]);
-    default_textures_[kTexture2DArray] = CreateDefaultAndBlackTextures(
-        GL_TEXTURE_2D_ARRAY, &black_texture_ids_[kTexture2DArray]);
-+  if (feature_info_->gl_version_info().is_es3_capable) {
-+      if (feature_info_->IsWebGL2OrES3Context()) {
-+        default_textures_[kTexture3D] = CreateDefaultAndBlackTextures(
-+            GL_TEXTURE_3D, &black_texture_ids_[kTexture3D]);
-+        default_textures_[kTexture2DArray] = CreateDefaultAndBlackTextures(
-+            GL_TEXTURE_2D_ARRAY, &black_texture_ids_[kTexture2DArray]);
-+      }
-   }
- 
-   if (feature_info_->feature_flags().oes_egl_image_external ||
--- a/luna/qt5-qtwebengine/patches-luna/0011-GetScreenInfo-use-default-screen-when-no-window-is-a.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0011-GetScreenInfo-use-default-screen-when-no-window-is-a.patch
@ -1,34 +0,0 @@
-From d96b765b61661e88ece6229baa09cde04fe9ba61 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Sat, 31 Oct 2015 16:04:01 +0100
-Subject: [PATCH 11/18] GetScreenInfo: use default screen when no window is
- available
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/core/render_widget_host_view_qt.cpp | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
-index 958ff91..5105214 100644
--- a/src/core/render_widget_host_view_qt.cpp
-+++ b/src/core/render_widget_host_view_qt.cpp
-@@ -711,9 +711,12 @@ void RenderWidgetHostViewQt::OnSwapCompositorFrame(uint32_t output_surface_id, c
- void RenderWidgetHostViewQt::GetScreenInfo(content::ScreenInfo* results)
- {
-     QWindow* window = m_delegate->window();
-    if (!window)
-        return;
-    GetScreenInfoFromNativeWindow(window, results);
-+    if( window ) {
-+        GetScreenInfoFromNativeWindow(window, results);
-+    }
-+    else {
-+        GetDefaultScreenInfo(results);
-+    }
- 
-     // Support experimental.viewport.devicePixelRatio
-     results->device_scale_factor *= dpiScale();
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0012-Enable-password-echo.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0012-Enable-password-echo.patch
@ -1,25 +0,0 @@
-From 4b95efa1aaf55f3123000addb52963630a35194e Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Mon, 15 Aug 2016 09:26:04 +0000
-Subject: [PATCH 12/18] Enable password echo
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/core/web_engine_settings.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
-index 7d7af2d..a163fb5 100644
--- a/src/core/web_engine_settings.cpp
-+++ b/src/core/web_engine_settings.cpp
-@@ -341,6 +341,7 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p
-     // Override for now
-     prefs->touch_enabled = isTouchEventsAPIEnabled();
-     prefs->device_supports_touch = isTouchScreenAvailable();
-+    prefs->password_echo_enabled = true;
-     if (prefs->viewport_enabled) {
-         // We should enable viewport and viewport-meta together, but since 5.7 we
-         // no longer have a command-line flag for viewport-meta.
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0013-Implement-RequestQuotePermission.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0013-Implement-RequestQuotePermission.patch
@ -1,35 +0,0 @@
-From 1c2d6d5507e49812a3e26763c651bca8c8df989e Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Thu, 29 Sep 2016 18:40:37 +0000
-Subject: [PATCH 13/18] Implement RequestQuotePermission
-
-Allows 64MB for local URL, and 5MB otherwise.
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/core/content_browser_client_qt.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
-index d446d8f..2e8a87f 100644
--- a/src/core/content_browser_client_qt.cpp
-+++ b/src/core/content_browser_client_qt.cpp
-@@ -377,9 +377,13 @@ class QuotaPermissionContextQt : public content::QuotaPermissionContext {
- public:
-     void RequestQuotaPermission(const content::StorageQuotaParams &params, int render_process_id, const PermissionCallback &callback) override
-     {
-        Q_UNUSED(params);
-         Q_UNUSED(render_process_id);
-        callback.Run(QUOTA_PERMISSION_RESPONSE_DISALLOW);
-+        if((params.origin_url.SchemeIsFile() && params.requested_size < 64*1024*1024) ||  // local URL: 64MB
-+            params.requested_size < 5*1024*1024) {                                        // remote URL: 5MB
-+            callback.Run(QUOTA_PERMISSION_RESPONSE_ALLOW);
-+        } else {
-+            callback.Run(QUOTA_PERMISSION_RESPONSE_DISALLOW);
-+        }
-     }
- };
- 
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0014-WebEngineView-re-introduce-devicePixelRatio-property.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0014-WebEngineView-re-introduce-devicePixelRatio-property.patch
@ -1,74 +0,0 @@
-From 023512168cf0a9ddf6443a847c13b6b467f648bf Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Sat, 22 Jul 2017 09:09:31 +0000
-Subject: [PATCH 14/18] WebEngineView: re-introduce devicePixelRatio property
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/webengine/api/qquickwebengineview.cpp | 20 ++++++++++++++++++++
- src/webengine/api/qquickwebengineview_p.h |  4 ++++
- 2 files changed, 24 insertions(+)
-
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 2805240..f1e1b6e 100644
--- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -1059,6 +1059,26 @@ void QQuickWebEngineViewPrivate::setProfile(QQuickWebEngineProfile *profile)
-     }
- }
- 
-+qreal QQuickWebEngineView::devicePixelRatio() const
-+{
-+    Q_D(const QQuickWebEngineView);
-+    return d->devicePixelRatio;
-+}
-+
-+void QQuickWebEngineView::setDevicePixelRatio(qreal devicePixelRatio)
-+{
-+    Q_D(QQuickWebEngineView);
-+    // Valid range is [1, inf)
-+    devicePixelRatio = qMax(qreal(1.0), devicePixelRatio);
-+    if (d->devicePixelRatio == devicePixelRatio)
-+        return;
-+    d->setDevicePixelRatio(devicePixelRatio);
-+    if (!d->adapter)
-+        return;
-+    d->adapter->dpiScaleChanged();
-+    Q_EMIT devicePixelRatioChanged();
-+}
-+
- #ifdef ENABLE_QML_TESTSUPPORT_API
- QQuickWebEngineTestSupport *QQuickWebEngineView::testSupport() const
- {
-diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
-index 8112c76..2d6f101 100644
--- a/src/webengine/api/qquickwebengineview_p.h
-+++ b/src/webengine/api/qquickwebengineview_p.h
-@@ -121,6 +121,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
-     Q_PROPERTY(bool audioMuted READ isAudioMuted WRITE setAudioMuted NOTIFY audioMutedChanged FINAL REVISION 3)
-     Q_PROPERTY(bool recentlyAudible READ recentlyAudible NOTIFY recentlyAudibleChanged FINAL REVISION 3)
-     Q_PROPERTY(uint webChannelWorld READ webChannelWorld WRITE setWebChannelWorld NOTIFY webChannelWorldChanged REVISION 3 FINAL)
-+    Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged REVISION 4)
- 
- #ifdef ENABLE_QML_TESTSUPPORT_API
-     Q_PROPERTY(QQuickWebEngineTestSupport *testSupport READ testSupport WRITE setTestSupport NOTIFY testSupportChanged FINAL)
-@@ -448,6 +449,8 @@ public:
-     bool isAudioMuted() const;
-     void setAudioMuted(bool muted);
-     bool recentlyAudible() const;
-+    qreal devicePixelRatio() const;
-+    void setDevicePixelRatio(qreal);
- 
- #ifdef ENABLE_QML_TESTSUPPORT_API
-     QQuickWebEngineTestSupport *testSupport() const;
-@@ -510,6 +513,7 @@ Q_SIGNALS:
-     Q_REVISION(4) void colorDialogRequested(QQuickWebEngineColorDialogRequest *request);
-     Q_REVISION(4) void fileDialogRequested(QQuickWebEngineFileDialogRequest *request);
-     Q_REVISION(4) void formValidationMessageRequested(QQuickWebEngineFormValidationMessageRequest *request);
-+    Q_REVISION(4) void devicePixelRatioChanged();
-     Q_REVISION(5) void pdfPrintingFinished(const QString &filePath, bool success);
- 
- #ifdef ENABLE_QML_TESTSUPPORT_API
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0015-WebEngineView-add-extraContextMenuEntriesComponent-p.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0015-WebEngineView-add-extraContextMenuEntriesComponent-p.patch
@ -1,72 +0,0 @@
-From 53ae66357e6e3ae0e6247cbe193cb32abbca9ae1 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Sat, 22 Jul 2017 09:41:45 +0000
-Subject: [PATCH 15/18] WebEngineView: add extraContextMenuEntriesComponent
- property
-
-Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
---
- src/webengine/api/qquickwebengineview.cpp | 16 ++++++++++++++++
- src/webengine/api/qquickwebengineview_p.h |  5 +++++
- 2 files changed, 21 insertions(+)
-
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index f1e1b6e..8fdf30a 100644
--- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -1079,6 +1079,22 @@ void QQuickWebEngineView::setDevicePixelRatio(qreal devicePixelRatio)
-     Q_EMIT devicePixelRatioChanged();
- }
- 
-+void QQuickWebEngineView::setExtraContextMenuEntriesComponent(QQmlComponent *contextMenuExtras)
-+{
-+    Q_D(QQuickWebEngineView);
-+    if (d->contextMenuExtraItems == contextMenuExtras)
-+        return;
-+    d->contextMenuExtraItems = contextMenuExtras;
-+    Q_EMIT extraContextMenuEntriesComponentChanged();
-+}
-+
-+QQmlComponent *QQuickWebEngineView::extraContextMenuEntriesComponent() const
-+{
-+    Q_D(const QQuickWebEngineView);
-+    return d->contextMenuExtraItems;
-+}
-+
-+
- #ifdef ENABLE_QML_TESTSUPPORT_API
- QQuickWebEngineTestSupport *QQuickWebEngineView::testSupport() const
- {
-diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
-index 2d6f101..d068eb9 100644
--- a/src/webengine/api/qquickwebengineview_p.h
-+++ b/src/webengine/api/qquickwebengineview_p.h
-@@ -122,6 +122,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
-     Q_PROPERTY(bool recentlyAudible READ recentlyAudible NOTIFY recentlyAudibleChanged FINAL REVISION 3)
-     Q_PROPERTY(uint webChannelWorld READ webChannelWorld WRITE setWebChannelWorld NOTIFY webChannelWorldChanged REVISION 3 FINAL)
-     Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged REVISION 4)
-+    Q_PROPERTY(QQmlComponent *extraContextMenuEntriesComponent READ extraContextMenuEntriesComponent WRITE setExtraContextMenuEntriesComponent NOTIFY extraContextMenuEntriesComponentChanged REVISION 4)
- 
- #ifdef ENABLE_QML_TESTSUPPORT_API
-     Q_PROPERTY(QQuickWebEngineTestSupport *testSupport READ testSupport WRITE setTestSupport NOTIFY testSupportChanged FINAL)
-@@ -452,6 +453,9 @@ public:
-     qreal devicePixelRatio() const;
-     void setDevicePixelRatio(qreal);
- 
-+    QQmlComponent *extraContextMenuEntriesComponent() const;
-+    void setExtraContextMenuEntriesComponent(QQmlComponent *);
-+
- #ifdef ENABLE_QML_TESTSUPPORT_API
-     QQuickWebEngineTestSupport *testSupport() const;
-     void setTestSupport(QQuickWebEngineTestSupport *testSupport);
-@@ -514,6 +518,7 @@ Q_SIGNALS:
-     Q_REVISION(4) void fileDialogRequested(QQuickWebEngineFileDialogRequest *request);
-     Q_REVISION(4) void formValidationMessageRequested(QQuickWebEngineFormValidationMessageRequest *request);
-     Q_REVISION(4) void devicePixelRatioChanged();
-+    Q_REVISION(4) void extraContextMenuEntriesComponentChanged();
-     Q_REVISION(5) void pdfPrintingFinished(const QString &filePath, bool success);
- 
- #ifdef ENABLE_QML_TESTSUPPORT_API
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0016-Fix-build-for-Qt5.9.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0016-Fix-build-for-Qt5.9.patch
@ -1,47 +0,0 @@
-From fb88489ccd170c86fbcffd22d8ea4644cbdc40ed Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Thu, 31 Aug 2017 17:26:47 +0000
-Subject: [PATCH 16/18] Fix build for Qt5.9
-
---
- src/core/render_widget_host_view_qt.cpp   | 3 ++-
- src/webengine/api/qquickwebengineview.cpp | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
-index 5105214..fea7313 100644
--- a/src/core/render_widget_host_view_qt.cpp
-+++ b/src/core/render_widget_host_view_qt.cpp
-@@ -43,6 +43,7 @@
- #include "browser_accessibility_manager_qt.h"
- #include "browser_accessibility_qt.h"
- #include "chromium_overrides.h"
-+#include "web_contents_view_qt.h"
- #include "delegated_frame_node.h"
- #include "qtwebenginecoreglobal_p.h"
- #include "render_widget_host_view_qt_delegate.h"
-@@ -715,7 +716,7 @@ void RenderWidgetHostViewQt::GetScreenInfo(content::ScreenInfo* results)
-         GetScreenInfoFromNativeWindow(window, results);
-     }
-     else {
-        GetDefaultScreenInfo(results);
-+        content::WebContentsView::GetDefaultScreenInfo(results);
-     }
- 
-     // Support experimental.viewport.devicePixelRatio
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 8fdf30a..bf64956 100644
--- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -588,7 +588,7 @@ void QQuickWebEngineViewPrivate::unhandledKeyEvent(QKeyEvent *event)
-         q->window()->sendEvent(q->parentItem(), event);
- }
- 
-void QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &requestedGeometry, const QStringList &additionalFeaturesStringList)
-+void QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &requestedGeometry, const QUrl &targetUrl, const QStringList &additionalFeaturesStringList)
- {
-     Q_Q(QQuickWebEngineView);
-     QQuickWebEngineNewViewRequest request;
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0017-gn_generator-fix-debug-build.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0017-gn_generator-fix-debug-build.patch
@ -1,30 +0,0 @@
-From 8696f304f1ef598301029baffdf4e8abdcb90fe3 Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Wed, 30 Aug 2017 17:23:26 +0000
-Subject: [PATCH 18/18] gn_generator: fix debug build
-
-Remove a duplicate CFLALGS value that contains spaces and
-which will cause issues when interpreted by gn.
---
- mkspecs/features/gn_generator.prf | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf
-index b2b7491..24561b8 100644
--- a/mkspecs/features/gn_generator.prf
-+++ b/mkspecs/features/gn_generator.prf
-@@ -19,6 +19,11 @@ defineReplace(filter_flag_values) {
-         # the architecture itself.
-         return("")
-     }
-+    contains(value_to_check, ".*-g -feliminate-unused-debug-types.*") {
-+        # in debug mode, eliminate this spurious value, which contains spaces and will not be interpreted
-+        # correctly by gn.
-+        return("")
-+    }
-     return($$value_to_check)
- }
- 
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-luna/0018-Add-LuneOS-specific-switches.patch
+++ b/luna/qt5-qtwebengine/patches-luna/0018-Add-LuneOS-specific-switches.patch
@ -1,38 +0,0 @@
-From 6943ba674949088b3db6830e58f748d1780885bf Mon Sep 17 00:00:00 2001
-From: Christophe Chapuis <chris.chapuis@gmail.com>
-Date: Thu, 7 Sep 2017 17:32:59 +0000
-Subject: [PATCH] Add LuneOS specific switches
-
-* Disable some sandbox capabilities, which are incompatible with our (old) kernels
-* Disable OpenGL ES 3, as Qt's shared context uses OpenGL ES 2
-* Enable flash/widevine plugins
---
- src/core/web_engine_context.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
-index 9d993b7..7f0382f 100644
--- a/src/core/web_engine_context.cpp
-+++ b/src/core/web_engine_context.cpp
-@@ -324,6 +324,18 @@ WebEngineContext::WebEngineContext()
-     // Enabled on OS X and Linux but currently not working. It worked in 5.7 on OS X.
-     parsedCommandLine->AppendSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
- 
-+    //// LuneOS specific
-+    // Disable some sandbox capabilities, which are incompatible with our (old) kernels
-+    parsedCommandLine->AppendSwitch(switches::kDisableNamespaceSandbox);
-+    parsedCommandLine->AppendSwitch(switches::kDisableSeccompFilterSandbox);
-+    // Disable OpenGL ES 3, as Qt's shared context uses OpenGL ES 2
-+    parsedCommandLine->AppendSwitch(switches::kDisableES3GLContext);
-+    // Add switches to enable flash/widevine plugins
-+    parsedCommandLine->AppendSwitchASCII("ppapi-flash-path", "/usr/lib/chromium/libpepflashplayer.so");
-+    parsedCommandLine->AppendSwitchASCII("ppapi-flash-version", "26.0.0.151");
-+    parsedCommandLine->AppendSwitchASCII(switches::kRegisterPepperPlugins, "/usr/lib/chromium/libwidevinecdmadapter.so;application/x-ppapi-widevine-cdm");
-+    //// End of LuneOS specific
-+
- #if defined(Q_OS_MACOS)
-     // Accelerated decoding currently does not work on macOS due to issues with OpenGL Rectangle
-     // texture support. See QTBUG-60002.
-- 
-2.7.4
-
--- a/luna/qt5-qtwebengine/patches-musl/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
+++ b/luna/qt5-qtwebengine/patches-musl/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
@ -1,63 +0,0 @@
-From d559da6ab0834aeb7307008015b6232e586fea00 Mon Sep 17 00:00:00 2001
-From: Cleiton Bueno <cleitonrbueno@gmail.com>
-Date: Thu, 24 Dec 2015 12:46:58 -0200
-Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
- qtwebengine compile
-
-Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-index 6d926378be..738d3fdedf 100644
--- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-+++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
-@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
-   // tell libjpeg where to write the next data
-   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
-   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
-  return 1;
-+  return TRUE;
- }
- 
- // Cleans up the JpegEncoderState to prepare for returning in the final form.
-@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-   cinfo.data_precision = 8;
- 
-   jpeg_set_defaults(&cinfo);
-  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
-+  jpeg_set_quality(&cinfo, quality, TRUE);  // quality here is 0-100
- 
-   // set up the destination manager
-   jpeg_destination_mgr destmgr;
-@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-   JpegEncoderState state(output);
-   cinfo.client_data = &state;
- 
-  jpeg_start_compress(&cinfo, 1);
-+  jpeg_start_compress(&cinfo, TRUE);
- 
-   // feed it the rows, doing necessary conversions for the color format
- #ifdef JCS_EXTENSIONS
-@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
- //   set to a positive value if TRUE is returned. A FALSE return should only
- //   be used when I/O suspension is desired."
- boolean FillInputBuffer(j_decompress_ptr cinfo) {
-  return false;
-+  return FALSE;
- }
- 
- // Skip data in the buffer. Since we have all the data at once, this operation
-@@ -488,8 +488,8 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
-   cinfo.client_data = &state;
- 
-   // fill the file metadata into our buffer
-  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
-    return false;
-+  if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
-+    return FALSE;
- 
-   // we want to always get RGB data out
-   switch (cinfo.jpeg_color_space) {
--- a/luna/qt5-qtwebengine/patches-musl/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ b/luna/qt5-qtwebengine/patches-musl/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
@ -1,30 +0,0 @@
-From 96746f09947cc36f6c9fc8631bc6a6e7f59efe24 Mon Sep 17 00:00:00 2001
-From: Frieder Schrempf <frieder.schrempf@online.de>
-Date: Mon, 1 Dec 2014 14:34:40 +0000
-Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- mkspecs/features/functions.prf | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
-index 56894e58..ef418a4c 100644
--- a/mkspecs/features/functions.prf
-+++ b/mkspecs/features/functions.prf
-@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) {
-       return(false)
-     }
-     gcc:!clang:!isGCCVersionSupported(): return(false)
-+  } else:linux-oe-g++* {
-+    !gcc:!clang {
-+      skipBuild("Qt WebEngine on Linux requires clang or GCC.")
-+      return(false)
-+    }
-+    gcc:!clang:!isGCCVersionSupported(): return(false)
-   } else:win32 {
-     winrt {
-       skipBuild("WinRT is not supported.")
--- a/luna/qt5-qtwebengine/patches-musl/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
+++ b/luna/qt5-qtwebengine/patches-musl/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
@ -1,23 +0,0 @@
-From 06e9e7844ffa2b6985e5fa7a1c475c8a54ca252a Mon Sep 17 00:00:00 2001
-From: Cleiton Bueno <cleitonrbueno@gmail.com>
-Date: Fri, 25 Dec 2015 18:16:05 -0200
-Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
-
-Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
---
- src/webengine/api/qquickwebengineview_p_p.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index 19ecf5e1..f6f638ee 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -59,6 +59,8 @@
- #include <QString>
- #include <QtCore/qcompilerdetection.h>
- #include <QtGui/qaccessibleobject.h>
-+#include <QColor>
-+
- 
- namespace QtWebEngineCore {
- class WebContentsAdapter;
--- a/luna/qt5-qtwebengine/patches-musl/0002-chromium-Force-host-toolchain-configuration.patch
+++ b/luna/qt5-qtwebengine/patches-musl/0002-chromium-Force-host-toolchain-configuration.patch
@ -1,40 +0,0 @@
-From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 15 Mar 2017 13:53:28 +0200
-Subject: [PATCH] chromium: Force host toolchain configuration
-
-Force gcc/g++ to be used for parts using host toolchain, since
-the option(host_build) does not work in yocto builds.
-
-Upstream-Status: Inappropriate [OE specific]
-Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- chromium/tools/gn/bootstrap/bootstrap.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
-index 43d252b43e..e58347848e 100755
--- a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
-+++ b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
-@@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options):
-     ld = os.environ.get('LD', 'link.exe')
-     ar = os.environ.get('AR', 'lib.exe')
-   else:
-    cc = os.environ.get('CC', 'cc')
-    cxx = os.environ.get('CXX', 'c++')
-+    cc = os.environ.get('CC_host', 'gcc')
-+    cxx = os.environ.get('CXX_host', 'g++')
-     ld = cxx
-    ar = os.environ.get('AR', 'ar')
-+    ar = os.environ.get('AR_host', 'ar')
- 
-  cflags = os.environ.get('CFLAGS', '').split()
-  cflags_cc = os.environ.get('CXXFLAGS', '').split()
-  ldflags = os.environ.get('LDFLAGS', '').split()
-+  cflags = os.environ.get('CFLAGS_host', '').split()
-+  cflags_cc = os.environ.get('CXXFLAGS_host', '').split()
-+  ldflags = os.environ.get('LDFLAGS_host', '').split()
-   include_dirs = [root_gen_dir, SRC_ROOT]
-   libs = []
- 
--- a/luna/qt5-qtwebengine/patches-musl/0003-Include-dependency-to-QCoreApplication-translate.patch
+++ b/luna/qt5-qtwebengine/patches-musl/0003-Include-dependency-to-QCoreApplication-translate.patch
@ -1,23 +0,0 @@
-From bfd5e19fea1315d10b3217acaf92dfc32018ad03 Mon Sep 17 00:00:00 2001
-From: Cleiton Bueno <cleitonrbueno@gmail.com>
-Date: Thu, 24 Dec 2015 15:59:51 -0200
-Subject: [PATCH] Include dependency to QCoreApplication::translate()
-
-Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
---
- src/core/media_capture_devices_dispatcher.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
-index c378c327..1d33d956 100644
--- a/src/core/media_capture_devices_dispatcher.h
-+++ b/src/core/media_capture_devices_dispatcher.h
-@@ -45,6 +45,8 @@
- #include <list>
- #include <map>
- 
-+#include <QCoreApplication>
-+
- #include "web_contents_adapter_client.h"
- 
- #include "base/callback.h"
--- a/luna/qt5-qtwebengine/patches-musl/0003-chromium-workaround-for-too-long-.rps-file-name.patch
+++ b/luna/qt5-qtwebengine/patches-musl/0003-chromium-workaround-for-too-long-.rps-file-name.patch
@ -1,42 +0,0 @@
-From 5c31bc4a7ae6133fe4cb60fa71465c6706a071c8 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Thu, 30 Mar 2017 11:37:24 +0300
-Subject: [PATCH] chromium: workaround for too long .rps file name
-
-Ninja may fail when the build directory is too long:
-
-ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
-interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
-6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
-.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
-le.rsp): Unable to create file. File name too long
-
-Task-number: QTBUG-59769
-Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
---
- chromium/tools/gn/ninja_action_target_writer.cc | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc b/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc
-index a5bc6cd526..5cefbfe77c 100644
--- a/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc
-+++ b/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc
-@@ -115,9 +115,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
-     // strictly necessary for regular one-shot actions, but it's easier to
-     // just always define unique_name.
-     std::string rspfile = custom_rule_name;
-+
-+    //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
-+    //please note ".$unique_name" is not used at the moment
-+    int pos = 0;
-+    std::string delimiter("_");
-+    while (rspfile.length() > 251 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
-+        rspfile = rspfile.substr(0,pos);
-+
-     if (!target_->sources().empty())
-       rspfile += ".$unique_name";
-     rspfile += ".rsp";
-+
-     out_ << "  rspfile = " << rspfile << std::endl;
- 
-     // Response file contents.
--- a/Show more
+++ b/Show more