summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorValentin Hăloiu2016-12-30 04:30:43 +0200
committerValentin Hăloiu2016-12-30 04:30:43 +0200
commit929dcc8e0e38ef64e5528ea4c00a1e59b6fc9481 (patch)
tree5a73df160c56b232c7f6d6ffffc6f640c52e8346
parent4f10d9724a4a752cfedbed23c32f885f660a8fb2 (diff)
downloadaur-929dcc8e0e38ef64e5528ea4c00a1e59b6fc9481.tar.gz
Remove bug 55530 patch
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
2 files changed, 5 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5bbbc648672e..cb425f36508f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Oct 16 20:00:14 UTC 2016
+# Fri Dec 30 02:29:56 UTC 2016
pkgbase = qt5-base-git
pkgdesc = A cross-platform application and UI framework
- pkgver = 5.8.0.alpha1.r482.g9944a12
+ pkgver = 5.8.0.rc1.r1200.g6090c86bd6
pkgrel = 1
url = https://qt-project.org/
arch = i686
@@ -51,9 +51,7 @@ pkgbase = qt5-base-git
conflicts = qt5-base
conflicts = qtchooser
source = qt5-base::git://code.qt.io/qt/qtbase.git#branch=dev
- source = qtbug-55530.patch::https://github.com/qt/qtbase/commit/f71aa4813.patch
sha256sums = SKIP
- sha256sums = ea4758d296fc6af957f86858601b56829c2a04cf9adc5c4119810d341b865212
pkgname = qt5-base-git
diff --git a/PKGBUILD b/PKGBUILD
index 28a20c65763a..342c766f44c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=qt5-base
pkgname=$_pkgname-git
-pkgver=5.8.0.alpha1.r482.g9944a12
+pkgver=5.8.0.rc1.r1200.g6090c86bd6
pkgrel=1
arch=("i686" "x86_64")
url='https://qt-project.org/'
@@ -27,11 +27,9 @@ optdepends=('qt5-svg: to use SVG icon themes'
'gtk3: GTK platform plugin')
provides=("$_pkgname")
conflicts=("$_pkgname" "qtchooser")
-source=("$_pkgname::git://code.qt.io/qt/qtbase.git#branch=dev"
- qtbug-55530.patch::'https://github.com/qt/qtbase/commit/f71aa4813.patch')
+source=("$_pkgname::git://code.qt.io/qt/qtbase.git#branch=dev")
-sha256sums=('SKIP'
- 'ea4758d296fc6af957f86858601b56829c2a04cf9adc5c4119810d341b865212')
+sha256sums=('SKIP')
pkgver() {
cd "$srcdir/$_pkgname"
@@ -53,9 +51,6 @@ prepare() {
# Use python2 for Python 2.x
find . -name '*.py' -exec sed -i \
's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
-
- # Fix resolution of OPENSSL_LIBS
- patch -p1 -i ../qtbug-55530.patch
}
build() {