[arch-commits] Commit in qt5-webengine/repos/kde-unstable-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Thu Oct 24 19:35:56 UTC 2019
Date: Thursday, October 24, 2019 @ 19:35:54
Author: arojas
Revision: 365454
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
qt5-webengine/repos/kde-unstable-x86_64/PKGBUILD
(from rev 365453, qt5-webengine/kde-unstable/PKGBUILD)
qt5-webengine/repos/kde-unstable-x86_64/qt5-webengine-system-icu.patch
(from rev 365453, qt5-webengine/kde-unstable/qt5-webengine-system-icu.patch)
Deleted:
qt5-webengine/repos/kde-unstable-x86_64/PKGBUILD
qt5-webengine/repos/kde-unstable-x86_64/qt5-webengine-system-icu.patch
--------------------------------+
PKGBUILD | 103 ++++++++++++++++++---------------------
qt5-webengine-system-icu.patch | 64 ++++++++++++------------
2 files changed, 82 insertions(+), 85 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-24 19:35:40 UTC (rev 365453)
+++ PKGBUILD 2019-10-24 19:35:54 UTC (rev 365454)
@@ -1,53 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-webengine
-_qtver=5.14.0-beta1
-pkgver=${_qtver/-/}
-pkgrel=2
-arch=('x86_64')
-url='https://www.qt.io'
-license=('LGPL3' 'LGPL2.1' 'BSD')
-pkgdesc='Provides support for web applications using the Chromium browser project'
-depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss'
- 'libevent' 'snappy' 'nss' 'libxslt' 'minizip' 'ffmpeg' 're2' 'libvpx')
-makedepends=('python2' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler')
-groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
- qt5-webengine-linux-5.2.patch::"https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch?id=74e69da9"
- qt5-webengine-system-icu.patch)
-sha256sums=('4255e0a4f1510b6cae552f053b774659d93116cf17080ac003884c82dc00961c'
- '8deb3df43a379976bbdb1fa814e68b2ce0433043695efc694c11e47f67c51b6a'
- '057fcd43300931e438c6714d2d42516d45420b6e8ae513c901a599d49215796a')
-
-prepare() {
- mkdir -p build
-
- cd $_pkgfqn/src/3rdparty/chromium
- patch -p2 -i "$srcdir"/qt5-webengine-linux-5.2.patch # Fix build with recent kernel
- patch -p2 -i "$srcdir"/qt5-webengine-system-icu.patch # Fix build with system ICU
-}
-
-build() {
- cd build
-
- qmake ../${_pkgfqn} -- \
- -proprietary-codecs \
- -system-ffmpeg \
- -webp \
- -spellchecker \
- -webengine-icu
- make
-}
-
-package() {
- cd 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 -Dm644 "$srcdir"/${_pkgfqn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium
-}
Copied: qt5-webengine/repos/kde-unstable-x86_64/PKGBUILD (from rev 365453, qt5-webengine/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-24 19:35:54 UTC (rev 365454)
@@ -0,0 +1,50 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-webengine
+_qtver=5.14.0-beta2
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=('x86_64')
+url='https://www.qt.io'
+license=('LGPL3' 'LGPL2.1' 'BSD')
+pkgdesc='Provides support for web applications using the Chromium browser project'
+depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss'
+ 'libevent' 'snappy' 'nss' 'libxslt' 'minizip' 'ffmpeg' 're2' 'libvpx')
+makedepends=('python2' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
+source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qt5-webengine-system-icu.patch)
+sha256sums=('5f0cd5bebb82d1a8a79c0855e1ad28395eab2d649a88d3798fe37e36f4aa4466'
+ '057fcd43300931e438c6714d2d42516d45420b6e8ae513c901a599d49215796a')
+
+prepare() {
+ mkdir -p build
+
+ cd $_pkgfqn/src/3rdparty/chromium
+ patch -p2 -i "$srcdir"/qt5-webengine-system-icu.patch # Fix build with system ICU
+}
+
+build() {
+ cd build
+
+ qmake ../${_pkgfqn} -- \
+ -proprietary-codecs \
+ -system-ffmpeg \
+ -webp \
+ -spellchecker \
+ -webengine-icu
+ make
+}
+
+package() {
+ cd 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 -Dm644 "$srcdir"/${_pkgfqn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium
+}
Deleted: qt5-webengine-system-icu.patch
===================================================================
--- qt5-webengine-system-icu.patch 2019-10-24 19:35:40 UTC (rev 365453)
+++ qt5-webengine-system-icu.patch 2019-10-24 19:35:54 UTC (rev 365454)
@@ -1,32 +0,0 @@
-From 7bc2392c19118a80380c7661fb86c69022eb2b47 Mon Sep 17 00:00:00 2001
-From: Kirill Burtsev <kirill.burtsev at qt.io>
-Date: Fri, 23 Aug 2019 15:09:25 +0200
-Subject: [PATCH] Fix compilation with system ICU
-
-system_icu_config is missing default type for UCHAR_TYPE, that causes
-a mismatch of types all over Chromium. uint16_t is defined as a base type
-under linux in chromium/build/linux/unbundle/icu.gn.
-Necessary constructions were lost during recent refactorings,
-and seems to be restored in later chromium > 76.
-
-Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
----
-
-diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
-index be3c919..639f8fd 100644
---- a/chromium/third_party/icu/BUILD.gn
-+++ b/chromium/third_party/icu/BUILD.gn
-@@ -1175,6 +1175,12 @@
- "USING_SYSTEM_ICU=1",
- "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
- ]
-+
-+ if (is_win) {
-+ defines += [ "UCHAR_TYPE=wchar_t" ]
-+ } else {
-+ defines += [ "UCHAR_TYPE=uint16_t" ]
-+ }
- }
-
- if (use_system_icu) {
-
Copied: qt5-webengine/repos/kde-unstable-x86_64/qt5-webengine-system-icu.patch (from rev 365453, qt5-webengine/kde-unstable/qt5-webengine-system-icu.patch)
===================================================================
--- qt5-webengine-system-icu.patch (rev 0)
+++ qt5-webengine-system-icu.patch 2019-10-24 19:35:54 UTC (rev 365454)
@@ -0,0 +1,32 @@
+From 7bc2392c19118a80380c7661fb86c69022eb2b47 Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev at qt.io>
+Date: Fri, 23 Aug 2019 15:09:25 +0200
+Subject: [PATCH] Fix compilation with system ICU
+
+system_icu_config is missing default type for UCHAR_TYPE, that causes
+a mismatch of types all over Chromium. uint16_t is defined as a base type
+under linux in chromium/build/linux/unbundle/icu.gn.
+Necessary constructions were lost during recent refactorings,
+and seems to be restored in later chromium > 76.
+
+Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
+---
+
+diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
+index be3c919..639f8fd 100644
+--- a/chromium/third_party/icu/BUILD.gn
++++ b/chromium/third_party/icu/BUILD.gn
+@@ -1175,6 +1175,12 @@
+ "USING_SYSTEM_ICU=1",
+ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
+ ]
++
++ if (is_win) {
++ defines += [ "UCHAR_TYPE=wchar_t" ]
++ } else {
++ defines += [ "UCHAR_TYPE=uint16_t" ]
++ }
+ }
+
+ if (use_system_icu) {
+
More information about the arch-commits
mailing list