[arch-commits] Commit in qt5-base/repos/extra-x86_64 (PKGBUILD)

[Antonio Rojas]

    Date: Thursday, September 5, 2019 @ 09:31:34
  Author: arojas
Revision: 361675

Fix merge fuckup

Modified:
  qt5-base/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-05 09:19:22 UTC (rev 361674)
+++ PKGBUILD	2019-09-05 09:31:34 UTC (rev 361675)
@@ -5,13 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.13.0
 pkgver=${_qtver/-/}
-<<<<<<< .mine
-pkgrel=2
-||||||| .r356453
-pkgrel=1
-=======
 pkgrel=7
->>>>>>> .r361627
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -32,17 +26,8 @@
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-<<<<<<< .mine
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
         qtbase-qxcbwindow.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117"
-        qtbug-76440.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=6d61b10")
-sha256sums=('20fbc7efa54ff7db9552a7a2cdf9047b80253c1933c834f35b0bc5c1ae021195')
-||||||| .r356453
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('20fbc7efa54ff7db9552a7a2cdf9047b80253c1933c834f35b0bc5c1ae021195')
-=======
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-        qtbase-qxcbwindow.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117"
         qtbase-zlib-compression.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=cbdc9a77"
         virtualbox-focus.patch)
 sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe'
@@ -49,7 +34,6 @@
             '51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646'
             '9300d8ab7abe4145e92eea75178a26ad3d5a71b0646665c3776ca2c375dd1233'
             '21c4acce7a789cd0e1e67aca76cf15f536ae8e30ef711a434cfe7ec377556f06')
->>>>>>> .r361627
 
 prepare() {
   cd ${_pkgfqn}
@@ -60,17 +44,10 @@
     mkspecs/common/gcc-base.conf
   sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
     mkspecs/common/g++-unix.conf
-<<<<<<< .mine
 
   patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze
-  patch -p1 -i ../qtbug-76440.patch # Fix crashes on multi-screen systems
-||||||| .r356453
-=======
-
-  patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze
   patch -p1 -i ../qtbase-zlib-compression.patch # Change the default compression back to zlib for backwards compatibility
   patch -p1 -i ../virtualbox-focus.patch # Fix virtualbox constantly stealing focus https://bugreports.qt.io/browse/QTBUG-76742
->>>>>>> .r361627
 }
 
 build() {
@@ -89,7 +66,7 @@
     -openssl-linked \
     -nomake examples \
     -no-rpath \
-#    -optimized-qmake \
+    -optimized-qmake \
     -dbus-linked \
     -system-harfbuzz \
     -journald \