[arch-commits] Commit in (22 files)
Antonio Rojas
arojas at archlinux.org
Thu Dec 12 12:35:14 UTC 2019
Date: Thursday, December 12, 2019 @ 12:35:11
Author: arojas
Revision: 537357
Qt 5.14 rebuild
Added:
deepin-file-manager/trunk/deepin-file-manager-qt-5.14.patch
deepin-qt5integration/trunk/deepin-qt5integration-qt5.14.patch
Modified:
calibre/trunk/PKGBUILD
deepin-dock/trunk/PKGBUILD
deepin-file-manager/trunk/PKGBUILD
deepin-kwin/trunk/PKGBUILD
deepin-qt-dbus-factory/trunk/PKGBUILD
deepin-qt5dxcb-plugin/trunk/PKGBUILD
deepin-qt5integration/trunk/PKGBUILD
dtkwidget/trunk/PKGBUILD
dtkwm/trunk/PKGBUILD
fcitx-qt5/trunk/PKGBUILD
gammaray/trunk/PKGBUILD
gcin/trunk/PKGBUILD
googlemaps/trunk/PKGBUILD
libqtxdg/trunk/PKGBUILD
lmms/trunk/PKGBUILD
lxqt-qtplugin/trunk/PKGBUILD
qt5-styleplugins/trunk/PKGBUILD
qt5ct/trunk/PKGBUILD
skrooge/trunk/PKGBUILD
telegram-desktop/trunk/PKGBUILD
----------------------------------------------------------------+
calibre/trunk/PKGBUILD | 2
deepin-dock/trunk/PKGBUILD | 2
deepin-file-manager/trunk/PKGBUILD | 10 +++-
deepin-file-manager/trunk/deepin-file-manager-qt-5.14.patch | 22 +++++++++
deepin-kwin/trunk/PKGBUILD | 2
deepin-qt-dbus-factory/trunk/PKGBUILD | 2
deepin-qt5dxcb-plugin/trunk/PKGBUILD | 2
deepin-qt5integration/trunk/PKGBUILD | 9 ++-
deepin-qt5integration/trunk/deepin-qt5integration-qt5.14.patch | 23 ++++++++++
dtkwidget/trunk/PKGBUILD | 2
dtkwm/trunk/PKGBUILD | 2
fcitx-qt5/trunk/PKGBUILD | 2
gammaray/trunk/PKGBUILD | 13 ++++-
gcin/trunk/PKGBUILD | 2
googlemaps/trunk/PKGBUILD | 2
libqtxdg/trunk/PKGBUILD | 2
lmms/trunk/PKGBUILD | 2
lxqt-qtplugin/trunk/PKGBUILD | 2
qt5-styleplugins/trunk/PKGBUILD | 2
qt5ct/trunk/PKGBUILD | 2
skrooge/trunk/PKGBUILD | 2
telegram-desktop/trunk/PKGBUILD | 2
22 files changed, 85 insertions(+), 26 deletions(-)
Modified: calibre/trunk/PKGBUILD
===================================================================
--- calibre/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ calibre/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -9,7 +9,7 @@
pkgbase=calibre
pkgname=('calibre' 'calibre-common' 'calibre-python3')
pkgver=4.5.0
-pkgrel=1
+pkgrel=2
pkgdesc="Ebook management application"
arch=('x86_64')
url="https://calibre-ebook.com/"
Modified: deepin-dock/trunk/PKGBUILD
===================================================================
--- deepin-dock/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ deepin-dock/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -4,7 +4,7 @@
pkgname=deepin-dock
pkgver=5.0.0
-pkgrel=3
+pkgrel=4
pkgdesc='Deepin desktop-environment - dock module'
arch=('x86_64')
url="https://github.com/linuxdeepin/dde-dock"
Modified: deepin-file-manager/trunk/PKGBUILD
===================================================================
--- deepin-file-manager/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ deepin-file-manager/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -4,7 +4,7 @@
pkgname=deepin-file-manager
pkgver=5.0.0
-pkgrel=3
+pkgrel=4
epoch=1
pkgdesc='Deepin File Manager'
arch=('x86_64')
@@ -23,12 +23,16 @@
provides=('deepin-desktop')
conflicts=('deepin-desktop')
replaces=('deepin-desktop')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz")
-sha512sums=('045430f279417bb95ecbc55994207719f591e16ed0359ed337db797cf52ff1d7ec7d12d1c042e7837eaa9156c8dfe4f029f83b8ad567d2a9cc30552138b604ed')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz"
+ deepin-file-manager-qt-5.14.patch)
+sha512sums=('045430f279417bb95ecbc55994207719f591e16ed0359ed337db797cf52ff1d7ec7d12d1c042e7837eaa9156c8dfe4f029f83b8ad567d2a9cc30552138b604ed'
+ '04ee5dbd479e1fb7cc8e6371fd5c457e4f29ea373bc0058a4340db5397b0d47862c02fa1b23335ce6f2d259a935b9ebb5178f1f02dee585c92e849ec3366609d')
prepare() {
cd dde-file-manager-$pkgver
sed -i 's|systembusconf.path = /etc/dbus-1/system.d|systembusconf.path = /usr/share/dbus-1/system.d|' dde-file-manager-daemon/dde-file-manager-daemon.pro
+
+ patch -p1 -i ../deepin-file-manager-qt-5.14.patch # Fix build with Qt 5.14
}
build() {
Added: deepin-file-manager/trunk/deepin-file-manager-qt-5.14.patch
===================================================================
--- deepin-file-manager/trunk/deepin-file-manager-qt-5.14.patch (rev 0)
+++ deepin-file-manager/trunk/deepin-file-manager-qt-5.14.patch 2019-12-12 12:35:11 UTC (rev 537357)
@@ -0,0 +1,22 @@
+diff --git a/dde-file-manager-lib/shutil/dsqlitehandle.h b/dde-file-manager-lib/shutil/dsqlitehandle.h
+index ae7b5e94..ec0eed6e 100644
+--- a/dde-file-manager-lib/shutil/dsqlitehandle.h
++++ b/dde-file-manager-lib/shutil/dsqlitehandle.h
+@@ -21,7 +21,7 @@
+ #include <QtSql/QSqlDatabase>
+
+
+-
++#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
+ namespace std
+ {
+
+@@ -35,7 +35,7 @@ struct hash<QString>
+ };
+
+ }
+-
++#endif
+
+
+ class DSqliteHandle : public QObject
Modified: deepin-kwin/trunk/PKGBUILD
===================================================================
--- deepin-kwin/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ deepin-kwin/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -4,7 +4,7 @@
pkgname=deepin-kwin
pkgver=0.1.0
-pkgrel=4
+pkgrel=5
pkgdesc='KWin configures on DDE'
arch=('x86_64')
url="https://github.com/linuxdeepin/dde-kwin"
Modified: deepin-qt-dbus-factory/trunk/PKGBUILD
===================================================================
--- deepin-qt-dbus-factory/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ deepin-qt-dbus-factory/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -4,7 +4,7 @@
pkgname=deepin-qt-dbus-factory
pkgver=5.0.1
-pkgrel=3
+pkgrel=4
pkgdesc='A repository stores auto-generated Qt5 dbus code'
arch=('x86_64')
url="https://github.com/linuxdeepin/dde-qt-dbus-factory"
Modified: deepin-qt5dxcb-plugin/trunk/PKGBUILD
===================================================================
--- deepin-qt5dxcb-plugin/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ deepin-qt5dxcb-plugin/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -2,7 +2,7 @@
pkgname=deepin-qt5dxcb-plugin
pkgver=5.0.1
-pkgrel=3
+pkgrel=4
pkgdesc='Qt platform plugins for DDE'
arch=('x86_64')
url="https://github.com/linuxdeepin/qt5dxcb-plugin"
Modified: deepin-qt5integration/trunk/PKGBUILD
===================================================================
--- deepin-qt5integration/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ deepin-qt5integration/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -2,7 +2,7 @@
pkgname=deepin-qt5integration
pkgver=5.0.0
-pkgrel=4
+pkgrel=5
pkgdesc='Qt platform theme integration plugins for DDE'
arch=('x86_64')
url="https://github.com/linuxdeepin/qt5integration"
@@ -13,13 +13,16 @@
conflicts=('qt5dxcb-plugin')
groups=('deepin')
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz"
- deepin-qt5integration-qt5.13.patch)
+ deepin-qt5integration-qt5.13.patch
+ deepin-qt5integration-qt5.14.patch)
sha512sums=('bfaa0cf1ca1422da1e645e86275b290c186cb2e26264b3844afd77f31cdc2d1e4ac1b54bcc58a46b336534146865a0310b802f2477f7505f666aed76a2788f00'
- '345590b7fa94c84adc0c894df8c70931a46769f7af40edf1e5d3623a5327b344be48e17db10791c8f75bf626874f2f031ef221c1218c6b0d889eca3b883c0764')
+ '345590b7fa94c84adc0c894df8c70931a46769f7af40edf1e5d3623a5327b344be48e17db10791c8f75bf626874f2f031ef221c1218c6b0d889eca3b883c0764'
+ '90640c15a4a94dfd4fd90d219a1ff6872db15390ffb238bfcc1b199cb4a6909b27442360e9309cb3f531c33f1740d7e6e2e65f73f4f38b88e329b45a4020772a')
prepare() {
cd qt5integration-$pkgver
patch -p1 -i ../deepin-qt5integration-qt5.13.patch # Fix build with Qt 5.13
+ patch -p1 -i ../deepin-qt5integration-qt5.14.patch # Fix build with Qt 5.14
}
build() {
Added: deepin-qt5integration/trunk/deepin-qt5integration-qt5.14.patch
===================================================================
--- deepin-qt5integration/trunk/deepin-qt5integration-qt5.14.patch (rev 0)
+++ deepin-qt5integration/trunk/deepin-qt5integration-qt5.14.patch 2019-12-12 12:35:11 UTC (rev 537357)
@@ -0,0 +1,23 @@
+diff --git a/platformthemeplugin/qdeepintheme.cpp b/platformthemeplugin/qdeepintheme.cpp
+index e98487b..45e90bc 100644
+--- a/platformthemeplugin/qdeepintheme.cpp
++++ b/platformthemeplugin/qdeepintheme.cpp
+@@ -571,10 +571,18 @@ static bool updateScreenScaleFactors(DThemeSettings *s, const QByteArray &value,
+ }
+
+ QHighDpiScaling::updateHighDpiScaling();
++#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
+ qDebug() << QHighDpiScaling::logicalDpi();
++#else
++ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen());
++#endif
+ updateScaleLogcailDpi(s->scaleLogicalDpi());
+
++#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
+ qDebug() << QHighDpiScaling::logicalDpi();
++#else
++ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen());
++#endif
+
+ return true;
+ }
Modified: dtkwidget/trunk/PKGBUILD
===================================================================
--- dtkwidget/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ dtkwidget/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -4,7 +4,7 @@
pkgname=dtkwidget
pkgver=2.1.1
-pkgrel=3
+pkgrel=4
pkgdesc='Deepin graphical user interface library'
arch=('x86_64')
url="https://github.com/linuxdeepin/dtkwidget"
Modified: dtkwm/trunk/PKGBUILD
===================================================================
--- dtkwm/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ dtkwm/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -4,7 +4,7 @@
pkgname=dtkwm
pkgver=2.0.12
-pkgrel=3
+pkgrel=4
pkgdesc='Deepin Tool Kit Wm'
arch=('x86_64')
url="https://github.com/linuxdeepin/dtkwm"
Modified: fcitx-qt5/trunk/PKGBUILD
===================================================================
--- fcitx-qt5/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ fcitx-qt5/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -2,7 +2,7 @@
pkgname=fcitx-qt5
pkgver=1.2.4
-pkgrel=1
+pkgrel=2
pkgdesc="Qt5 IM Module for Fcitx"
arch=('x86_64')
url="https://github.com/fcitx/fcitx-qt5"
Modified: gammaray/trunk/PKGBUILD
===================================================================
--- gammaray/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ gammaray/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -2,7 +2,7 @@
pkgname=gammaray
pkgver=2.11.0
-pkgrel=3
+pkgrel=4
pkgdesc="A tool for examining the internals of a Qt application and to some extent also manipulate it"
arch=(x86_64)
url="https://www.kdab.com/gammaray/"
@@ -15,9 +15,13 @@
'qt5-connectivity: bluetooth plugin'
'qt5-script: script engine debugger plugin'
'kcoreaddons: KJob tracker plugin')
-source=(https://github.com/KDAB/GammaRay/releases/download/v$pkgver/gammaray-$pkgver.tar.gz{,.asc})
+source=(https://github.com/KDAB/GammaRay/releases/download/v$pkgver/gammaray-$pkgver.tar.gz{,.asc}
+ gammaray-qt-5.14.patch::"https://github.com/KDAB/GammaRay/commit/3bde5464.patch"
+ gammaray-qt-5.14b.patch::"https://github.com/KDAB/GammaRay/commit/7cd6950e.patch")
sha256sums=('ab0488d2178c532816d491ab361ac3d362590f0e63912f7198f34c1b582209ca'
- 'SKIP')
+ 'SKIP'
+ 'fcec0545414bc77dd3fc6a16be3e4a798d230a43a89fefeb138d32374600d2c2'
+ '05c01038cfd6319b3b1b67a5189c0cd346255d5690d84dff18224ff544b1c7d8')
validpgpkeys=(E86C000370B1B9E2A9191AD53DBFB6882C9358FB) # KDAB Products <info at kdab.com>
prepare() {
@@ -25,6 +29,9 @@
# Fix plugin install dir
sed -e 's|plugins/gammaray|lib/qt/plugins/gammaray|' -i $pkgname-$pkgver/CMakeLists.txt
+
+ patch -p1 -d $pkgname-$pkgver -i ../gammaray-qt-5.14.patch # Fix build with Qt 5.14
+ patch -p1 -d $pkgname-$pkgver -i ../gammaray-qt-5.14b.patch
}
build() {
Modified: gcin/trunk/PKGBUILD
===================================================================
--- gcin/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ gcin/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -6,7 +6,7 @@
pkgname=gcin
pkgver=2.8.9
-pkgrel=3
+pkgrel=4
pkgdesc='Input method server supporting various input methods'
url='https://hyperrate.com/dir.php?eid=67'
license=('LGPL')
Modified: googlemaps/trunk/PKGBUILD
===================================================================
--- googlemaps/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ googlemaps/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -3,7 +3,7 @@
pkgname=googlemaps
pkgver=20180602
_commit=54a357f9590d9cf011bf1713589f66bad65e00eb
-pkgrel=9
+pkgrel=10
pkgdesc='Google Maps plugin for QtLocation'
url='https://github.com/vladest/googlemaps'
license=('MIT')
Modified: libqtxdg/trunk/PKGBUILD
===================================================================
--- libqtxdg/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ libqtxdg/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -3,7 +3,7 @@
pkgname=libqtxdg
pkgver=3.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="Library providing freedesktop.org XDG specs implementations for Qt."
arch=("x86_64")
url="https://lxqt.org"
Modified: lmms/trunk/PKGBUILD
===================================================================
--- lmms/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ lmms/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -6,7 +6,7 @@
pkgname=lmms
pkgver=1.2.1
-pkgrel=2
+pkgrel=3
pkgdesc='The Linux MultiMedia Studio'
arch=('x86_64')
url="https://lmms.io"
Modified: lxqt-qtplugin/trunk/PKGBUILD
===================================================================
--- lxqt-qtplugin/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ lxqt-qtplugin/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -2,7 +2,7 @@
pkgname=lxqt-qtplugin
pkgver=0.14.0
-pkgrel=2
+pkgrel=3
pkgdesc="LXQt platform integration for Qt"
arch=("x86_64")
groups=("lxqt")
Modified: qt5-styleplugins/trunk/PKGBUILD
===================================================================
--- qt5-styleplugins/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ qt5-styleplugins/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -4,7 +4,7 @@
pkgver=5.0.0.20170311
_commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3
pkgdesc='Additional style plugins for Qt5'
-pkgrel=17
+pkgrel=18
arch=('x86_64')
url="https://github.com/qt/qtstyleplugins"
license=('LGPL')
Modified: qt5ct/trunk/PKGBUILD
===================================================================
--- qt5ct/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ qt5ct/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -4,7 +4,7 @@
pkgname=qt5ct
pkgver=0.41
-pkgrel=1
+pkgrel=2
pkgdesc="Qt5 Configuration Utility"
arch=(x86_64)
url="https://qt5ct.sourceforge.net"
Modified: skrooge/trunk/PKGBUILD
===================================================================
--- skrooge/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ skrooge/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -5,7 +5,7 @@
pkgname=skrooge
pkgver=2.21.1
-pkgrel=1
+pkgrel=2
pkgdesc="A personal finances manager for KDE"
arch=('x86_64')
url="https://skrooge.org/"
Modified: telegram-desktop/trunk/PKGBUILD
===================================================================
--- telegram-desktop/trunk/PKGBUILD 2019-12-12 12:27:52 UTC (rev 537356)
+++ telegram-desktop/trunk/PKGBUILD 2019-12-12 12:35:11 UTC (rev 537357)
@@ -6,7 +6,7 @@
pkgname=telegram-desktop
pkgver=1.8.15
-pkgrel=2
+pkgrel=3
pkgdesc='Official Telegram Desktop client'
arch=('x86_64')
url="https://desktop.telegram.org/"
More information about the arch-commits
mailing list