summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD18
2 files changed, 9 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a7bb60ff244..c96a00c1737 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qt5-base-nostatx
pkgdesc = A cross-platform application and UI framework
- pkgver = 5.12.1
- pkgrel = 2
+ pkgver = 5.12.2
+ pkgrel = 1
url = https://www.qt.io
arch = x86_64
groups = qt
@@ -50,14 +50,8 @@ pkgbase = qt5-base-nostatx
optdepends = freetds: MS SQL driver
optdepends = gtk3: GTK platform plugin
conflicts = qtchooser
- source = https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtbase-everywhere-src-5.12.1.tar.xz
- source = qt-delayed-highlight.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=f8f0f3ee
- source = qtbug-69310.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fcba9fa8
- source = qt5-base-nouveau-freeze.patch::http://code.qt.io/cgit/qt/qtbase.git/patch?id=97600d2c
- sha256sums = 533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049
- sha256sums = 0080b1e208090c729018db1ac224e5940d06a38b9c28c918a892b01f84a82cf9
- sha256sums = 2186ce7b8d6310ebc005da9b00dcc88388df3e8b83bff37230fa1bb9253c4970
- sha256sums = e0a7cdda2ebc403e2b3a62b3d104d2dd3f8b4e79d92395cf3c6419ebe6d8b19c
+ source = https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtbase-everywhere-src-5.12.2.tar.xz
+ sha256sums = 562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1
pkgname = qt5-base-nostatx
pkgdesc = A cross-platform application and UI framework
@@ -67,7 +61,7 @@ pkgname = qt5-base-nostatx
pkgname = qt5-xcb-private-headers-nostatx
pkgdesc = Private headers for Qt5 Xcb
groups =
- depends = qt5-base-nostatx=5.12.1
+ depends = qt5-base-nostatx=5.12.2
optdepends =
provides = qt5-xcb-private-headers
conflicts = qt5-xcb-private-headers
diff --git a/PKGBUILD b/PKGBUILD
index 94c9b0b7a12..85968612b90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,9 +14,9 @@
pkgbase=qt5-base-nostatx
_pkgbase=qt5-base
pkgname=(qt5-base-nostatx qt5-xcb-private-headers-nostatx)
-_qtver=5.12.1
+_qtver=5.12.2
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=('x86_64')
url='https://www.qt.io'
license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -37,14 +37,8 @@ optdepends=('qt5-svg: to use SVG icon themes'
conflicts=('qtchooser')
groups=('qt' 'qt5')
_pkgfqn="${_pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
- qt-delayed-highlight.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=f8f0f3ee
- qtbug-69310.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fcba9fa8"
- qt5-base-nouveau-freeze.patch::"http://code.qt.io/cgit/qt/qtbase.git/patch?id=97600d2c")
-sha256sums=('533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049'
- '0080b1e208090c729018db1ac224e5940d06a38b9c28c918a892b01f84a82cf9'
- '2186ce7b8d6310ebc005da9b00dcc88388df3e8b83bff37230fa1bb9253c4970'
- 'e0a7cdda2ebc403e2b3a62b3d104d2dd3f8b4e79d92395cf3c6419ebe6d8b19c')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1')
prepare() {
cd ${_pkgfqn}
@@ -55,10 +49,6 @@ prepare() {
mkspecs/common/gcc-base.conf
sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
mkspecs/common/g++-unix.conf
-
- patch -p1 -i ../qt-delayed-highlight.patch # https://codereview.qt-project.org/#/c/249881/
- patch -p1 -i ../qtbug-69310.patch # https://bugreports.qt.io/browse/QTBUG-69310
- patch -Rp1 -i ../qt5-base-nouveau-freeze.patch # Revert commit that causes freezes on nouveau https://bugreports.qt.io/browse/QTBUG-73691
}
build() {