[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2020-12-19 Thread Felix Yan via arch-commits
Date: Saturday, December 19, 2020 @ 08:18:22
  Author: felixonmars
Revision: 404569

upgpkg: qt5-base 5.15.2-2: icu 68.2 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-19 08:12:42 UTC (rev 404568)
+++ PKGBUILD2020-12-19 08:18:22 UTC (rev 404569)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.15.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2020-10-02 Thread Antonio Rojas via arch-commits
Date: Friday, October 2, 2020 @ 21:47:15
  Author: arojas
Revision: 397122

Fix SIGTRAP with gdb (FS#68080)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-02 21:22:24 UTC (rev 397121)
+++ PKGBUILD2020-10-02 21:47:15 UTC (rev 397122)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.15.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -30,10 +30,12 @@
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
  qt5-base-cflags.patch
- 
qtbug-86604.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=65243ad7;)
+ 
qtbug-86604.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=65243ad7;
+ 
qtbug-86319.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=a8203235;)
 sha256sums=('33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c'
 'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
-'840242a2fdbafa86454c7d3805fcc69e8ae0f2e7db75ea5aa7f90cfef65825a4')
+'840242a2fdbafa86454c7d3805fcc69e8ae0f2e7db75ea5aa7f90cfef65825a4'
+'71eb078f77bf222d459bb393a88fbd9af8ebe07774974c63ec8911a063a0f3f1')
 
 prepare() {
   cd ${_pkgfqn}
@@ -40,6 +42,7 @@
 
   patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
   patch -p1 -i ../qtbug-86604.patch # Fix multiscreen issues in Plasma
+  patch -p1 -i ../qtbug-86319.patch # Fix SIGTRAP with gdb
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2020-10-01 Thread Antonio Rojas via arch-commits
Date: Thursday, October 1, 2020 @ 14:17:17
  Author: arojas
Revision: 397026

Fix multiscreen issues in Plasma (FS#67892)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-01 10:01:15 UTC (rev 397025)
+++ PKGBUILD2020-10-01 14:17:17 UTC (rev 397026)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.15.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -29,14 +29,17 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
- qt5-base-cflags.patch)
+ qt5-base-cflags.patch
+ 
qtbug-86604.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=65243ad7;)
 sha256sums=('33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c'
-'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
+'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
+'840242a2fdbafa86454c7d3805fcc69e8ae0f2e7db75ea5aa7f90cfef65825a4')
 
 prepare() {
   cd ${_pkgfqn}
 
   patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
+  patch -p1 -i ../qtbug-86604.patch # Fix multiscreen issues in Plasma
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2020-08-27 Thread Antonio Rojas via arch-commits
Date: Thursday, August 27, 2020 @ 22:22:58
  Author: arojas
Revision: 394813

Don't strip binaries with qmake's make generator

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-27 22:12:24 UTC (rev 394812)
+++ PKGBUILD2020-08-27 22:22:58 UTC (rev 394813)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.15.0
 pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -72,7 +72,8 @@
 -journald \
 -no-mimetype-database \
 -no-use-gold-linker \
--reduce-relocations
+-reduce-relocations \
+-no-strip
   make
 }
 


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2020-07-03 Thread Antonio Rojas via arch-commits
Date: Friday, July 3, 2020 @ 11:09:20
  Author: arojas
Revision: 390784

Fix deadlocks in some applications

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-03 10:56:31 UTC (rev 390783)
+++ PKGBUILD2020-07-03 11:09:20 UTC (rev 390784)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.15.0
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -32,12 +32,14 @@
 
"qt5-base-QTBUG-82910.patch::https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=54aa63be9b74e8de72db9efbe6809ab1a97b29a7;
  qt5-base-cflags.patch
  qtbug-74252.patch
- 
qtbug-78966.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=777f2a1c;)
+ 
qtbug-78966.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=777f2a1c;
+ 
qtbug-84619.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9d2b474b;)
 sha256sums=('9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5'
 'abb94453c9fe54fde4811bc5475b88796c8db1f5cd75ddc68918aff20139b1aa'
 'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
 '0c489d2faedd35670232a2c028c5c78a606ab81bb6f40f58e3cfe2bc6b6ac3b2'
-'d7d58b2cadd6e79c3dfb69da664ecac9c95a78d6e142cb8687fce68e24a10776')
+'d7d58b2cadd6e79c3dfb69da664ecac9c95a78d6e142cb8687fce68e24a10776'
+'eec8234c7e4d5bb583f39f2cf735536be350296b93af8b469260424ad7ccdb04')
 
 prepare() {
   cd ${_pkgfqn}
@@ -45,6 +47,7 @@
   patch -p1 -i ../qt5-base-QTBUG-82910.patch # 
https://codereview.qt-project.org/c/qt/qtbase/+/299182
   patch -p1 -i ../qtbug-74252.patch # Fix displaying custom icons
   patch -p1 -i ../qtbug-78966.patch # Fix QToolButton menus on multi-screen 
systems
+  patch -p1 -i ../qtbug-84619.patch # Fix deadlock
   patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
 }
 


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2020-06-11 Thread Antonio Rojas via arch-commits
Date: Thursday, June 11, 2020 @ 22:11:31
  Author: arojas
Revision: 389041

Fix QToolButton menus on multi-screen systems (FS#66973)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-11 22:11:27 UTC (rev 389040)
+++ PKGBUILD2020-06-11 22:11:31 UTC (rev 389041)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.15.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -31,11 +31,13 @@
 
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 
"qt5-base-QTBUG-82910.patch::https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=54aa63be9b74e8de72db9efbe6809ab1a97b29a7;
  qt5-base-cflags.patch
- qtbug-74252.patch)
+ qtbug-74252.patch
+ 
qtbug-78966.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=777f2a1c;)
 sha256sums=('9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5'
 'abb94453c9fe54fde4811bc5475b88796c8db1f5cd75ddc68918aff20139b1aa'
 'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
-'0c489d2faedd35670232a2c028c5c78a606ab81bb6f40f58e3cfe2bc6b6ac3b2')
+'0c489d2faedd35670232a2c028c5c78a606ab81bb6f40f58e3cfe2bc6b6ac3b2'
+'d7d58b2cadd6e79c3dfb69da664ecac9c95a78d6e142cb8687fce68e24a10776')
 
 prepare() {
   cd ${_pkgfqn}
@@ -42,6 +44,7 @@
 
   patch -p1 -i ../qt5-base-QTBUG-82910.patch # 
https://codereview.qt-project.org/c/qt/qtbase/+/299182
   patch -p1 -i ../qtbug-74252.patch # Fix displaying custom icons
+  patch -p1 -i ../qtbug-78966.patch # Fix QToolButton menus on multi-screen 
systems
   patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
 }
 


[arch-commits] Commit in qt5-base/trunk (PKGBUILD qtbug-74252.patch)

2020-06-04 Thread Antonio Rojas via arch-commits
Date: Thursday, June 4, 2020 @ 14:01:56
  Author: arojas
Revision: 388279

Fix displaying custom icons (FS#61074)

Added:
  qt5-base/trunk/qtbug-74252.patch
Modified:
  qt5-base/trunk/PKGBUILD

---+
 PKGBUILD  |9 ++--
 qtbug-74252.patch |  106 
 2 files changed, 112 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-04 13:38:14 UTC (rev 388278)
+++ PKGBUILD2020-06-04 14:01:56 UTC (rev 388279)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.15.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -30,15 +30,18 @@
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 
"qt5-base-QTBUG-82910.patch::https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=54aa63be9b74e8de72db9efbe6809ab1a97b29a7;
- qt5-base-cflags.patch)
+ qt5-base-cflags.patch
+ qtbug-74252.patch)
 sha256sums=('9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5'
 'abb94453c9fe54fde4811bc5475b88796c8db1f5cd75ddc68918aff20139b1aa'
-'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
+'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
+'0c489d2faedd35670232a2c028c5c78a606ab81bb6f40f58e3cfe2bc6b6ac3b2')
 
 prepare() {
   cd ${_pkgfqn}
 
   patch -p1 -i ../qt5-base-QTBUG-82910.patch # 
https://codereview.qt-project.org/c/qt/qtbase/+/299182
+  patch -p1 -i ../qtbug-74252.patch # Fix displaying custom icons
   patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
 }
 

Added: qtbug-74252.patch
===
--- qtbug-74252.patch   (rev 0)
+++ qtbug-74252.patch   2020-06-04 14:01:56 UTC (rev 388279)
@@ -0,0 +1,106 @@
+From add92a551cf601b5c9e074046326f95ccc38062e Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Sat, 23 May 2020 01:35:18 +0200
+Subject: [PATCH] Do not fully initialize QIconLoader when setting the fallback
+ theme
+
+We need this because without this patch you get bugs both
+if you call QIcon::setFallbackThemeName before creating the QGuiApplication and
+if you call QIcon::setFallbackThemeName after creating QGuiApplication
+
+Why do you get a bug if you call QIconLoader::setFallbackThemeName
+before creating the QGuiApplication:
+ * QIcon::setFallbackThemeName calls QIconLoader::instance
+ * QIconLoader::instance calls QIconLoader::ensureInitialized
+ * QIconLoader::ensureInitialized calls systemThemeName
+ * systemThemeName asks the current QPlatformTheme for its
+   QPlatformTheme::SystemIconThemeName
+ * But since we're calling this before creating the QGuiApplication
+   there is no current QPlatformTheme yet, so systemThemeName
+   is set to empty, which is obviously not what we want
+
+Why do you get a bug if you call QIconLoader::setFallbackThemeName
+after creating the QGuiApplication:
+ * QGuiApplicationPrivate::init calls
+   QGuiApplicationPrivate::createPlatformIntegration
+ * QGuiApplicationPrivate::createPlatformIntegration sets the
+   current QPlatformTheme and at the end of the very same function
+   uses QIcon::fromTheme
+ * Since we haven't called QIconLoader::setFallbackThemeName yet
+   there is at least one icon lookup that doesn't take
+   the fallback theme we would like to have into account
+
+This patch makes it so calling QIconLoader::setFallbackThemeName
+before creating the QGuiApplication works.
+
+The only thing we want to do from QIcon::setFallbackThemeName is set
+the internal m_userFallbackTheme, it doesn't care about doing
+further initialization of QIconLoader, if it's done, great it's done,
+if it is not initialized yet, great it will be initialized later
+when someone actually tries to use the QIconloader.
+
+So it's OK for ensureInitialized() to return early if there is no
+platform theme yet, because it will be called again later.
+
+Pick-to: 5.12
+Pick-to: 5.15
+Fixes: QTBUG-74252
+Change-Id: I65268fc3d3d0bd282d76c76cf75e495bcc9d1a30
+Done-with: Albert Astals Cid 
+Reviewed-by: Albert Astals Cid 
+Reviewed-by: Shawn Rutledge 
+---
+ src/gui/image/qicon.cpp   |  3 +++
+ src/gui/image/qiconloader.cpp | 15 ---
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
+index 36f499711e9..91da21c477d 100644
+--- a/src/gui/image/qicon.cpp
 b/src/gui/image/qicon.cpp
+@@ -1238,6 +1238,9 @@ QString QIcon::fallbackThemeName()
+ themeSearchPath() containing an index.theme
+ file describing its contents.
+ 
++\note This should be done before creating \l QGuiApplication, to ensure
++correct initialization.
++
+ 

[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2020-05-21 Thread Felix Yan via arch-commits
Date: Thursday, May 21, 2020 @ 07:03:13
  Author: felixonmars
Revision: 387354

upgpkg: qt5-base 5.14.2-3

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-21 05:28:12 UTC (rev 387353)
+++ PKGBUILD2020-05-21 07:03:13 UTC (rev 387354)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.14.2
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -29,13 +29,16 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+
"qt5-base-QTBUG-82910.patch::https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=54aa63be9b74e8de72db9efbe6809ab1a97b29a7;
  qt5-base-cflags.patch)
 sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
+'abb94453c9fe54fde4811bc5475b88796c8db1f5cd75ddc68918aff20139b1aa'
 'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
 
 prepare() {
   cd ${_pkgfqn}
 
+  patch -p1 -i ../qt5-base-QTBUG-82910.patch # 
https://codereview.qt-project.org/c/qt/qtbase/+/299182
   patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
 }
 


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2020-04-27 Thread Evangelos Foutras via arch-commits
Date: Monday, April 27, 2020 @ 10:30:34
  Author: foutrelis
Revision: 381693

icu 67.1 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-27 10:25:00 UTC (rev 381692)
+++ PKGBUILD2020-04-27 10:30:34 UTC (rev 381693)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.14.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD qt5-base-cflags.patch)

2020-03-30 Thread Antonio Rojas via arch-commits
Date: Monday, March 30, 2020 @ 11:41:15
  Author: arojas
Revision: 378721

Preserve upstream default flags if C(XX)FLAGS is empty

Modified:
  qt5-base/trunk/PKGBUILD
  qt5-base/trunk/qt5-base-cflags.patch

---+
 PKGBUILD  |2 +-
 qt5-base-cflags.patch |   29 +
 2 files changed, 18 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-30 11:22:52 UTC (rev 378720)
+++ PKGBUILD2020-03-30 11:41:15 UTC (rev 378721)
@@ -31,7 +31,7 @@
 
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
  qt5-base-cflags.patch)
 sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
-'6912a6485eac657afe6dc227d5f7dbf32dfeca6eb2674929bc291ba26e329efb')
+'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
 
 prepare() {
   cd ${_pkgfqn}

Modified: qt5-base-cflags.patch
===
--- qt5-base-cflags.patch   2020-03-30 11:22:52 UTC (rev 378720)
+++ qt5-base-cflags.patch   2020-03-30 11:41:15 UTC (rev 378721)
@@ -1,19 +1,20 @@
 diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..e0b30df4f5 100644
+index a493cd5984..41342f5020 100644
 --- a/mkspecs/common/g++-unix.conf
 +++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,5 @@
+@@ -10,5 +10,6 @@
  
  include(g++-base.conf)
  
 -QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS))
++SYSTEM_LDFLAGS = $$(LDFLAGS)
++!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { 
QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
  QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
 diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..156686b391 100644
+index 1f919d270a..7ef6046326 100644
 --- a/mkspecs/common/gcc-base.conf
 +++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,9 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
  QMAKE_CFLAGS_DEPS  += -M
  QMAKE_CFLAGS_WARN_ON   += -Wall -Wextra
  QMAKE_CFLAGS_WARN_OFF  += -w
@@ -20,13 +21,15 @@
 -QMAKE_CFLAGS_RELEASE   += $$QMAKE_CFLAGS_OPTIMIZE
 -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
 -QMAKE_CFLAGS_DEBUG += -g
-+eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS))
-+eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS))
-+eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS))
++SYSTEM_CFLAGS = $$(CFLAGS)
++SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
++!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) 
$$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
++!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += 
$$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += 
$$QMAKE_CFLAGS_OPTIMIZE -g }
++!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) 
} else { QMAKE_CFLAGS_DEBUG += -g }
  QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
  QMAKE_CFLAGS_STATIC_LIB+= $$QMAKE_CFLAGS_PIC
  QMAKE_CFLAGS_APP   += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +59,9 @@ QMAKE_CXXFLAGS+= $$QMAKE_CFLAGS
+@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS+= $$QMAKE_CFLAGS
  QMAKE_CXXFLAGS_DEPS   += $$QMAKE_CFLAGS_DEPS
  QMAKE_CXXFLAGS_WARN_ON+= $$QMAKE_CFLAGS_WARN_ON
  QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
@@ -33,9 +36,11 @@
 -QMAKE_CXXFLAGS_RELEASE+= $$QMAKE_CFLAGS_RELEASE
 -QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
 -QMAKE_CXXFLAGS_DEBUG  += $$QMAKE_CFLAGS_DEBUG
-+eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS))
-+eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS))
-+eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS))
++SYSTEM_CXXFLAGS = $$(CXXFLAGS)
++SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
++!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) 
$$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
++!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += 
$$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += 
$$QMAKE_CFLAGS_OPTIMIZE -g }
++!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += 
$$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
  QMAKE_CXXFLAGS_SHLIB  += $$QMAKE_CFLAGS_SHLIB
  QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
  QMAKE_CXXFLAGS_APP+= $$QMAKE_CFLAGS_APP


[arch-commits] Commit in qt5-base/trunk (PKGBUILD qt5-base-cflags.patch)

2020-03-30 Thread Antonio Rojas via arch-commits
Date: Monday, March 30, 2020 @ 10:26:54
  Author: arojas
Revision: 378709

qmake: honor CPPFLAGS, distinguish between CFLAGS and CXXFLAGS

Modified:
  qt5-base/trunk/PKGBUILD
  qt5-base/trunk/qt5-base-cflags.patch

---+
 PKGBUILD  |4 ++--
 qt5-base-cflags.patch |   27 +--
 2 files changed, 23 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-30 10:10:13 UTC (rev 378708)
+++ PKGBUILD2020-03-30 10:26:54 UTC (rev 378709)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.14.1
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -31,7 +31,7 @@
 
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
  qt5-base-cflags.patch)
 sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
-'c70640499637314df68cc7a56519f0bf8b65dd808dd982c96c6f045bba993adf')
+'6912a6485eac657afe6dc227d5f7dbf32dfeca6eb2674929bc291ba26e329efb')
 
 prepare() {
   cd ${_pkgfqn}

Modified: qt5-base-cflags.patch
===
--- qt5-base-cflags.patch   2020-03-30 10:10:13 UTC (rev 378708)
+++ qt5-base-cflags.patch   2020-03-30 10:26:54 UTC (rev 378709)
@@ -1,5 +1,5 @@
 diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..79f2d2fff9 100644
+index a493cd5984..e0b30df4f5 100644
 --- a/mkspecs/common/g++-unix.conf
 +++ b/mkspecs/common/g++-unix.conf
 @@ -10,5 +10,5 @@
@@ -10,17 +10,32 @@
 +eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS))
  QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
 diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 4d82321cba..4a61fc9d25 100644
+index 1f919d270a..156686b391 100644
 --- a/mkspecs/common/gcc-base.conf
 +++ b/mkspecs/common/gcc-base.conf
-@@ -40,8 +40,8 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+@@ -40,9 +40,9 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
  QMAKE_CFLAGS_DEPS  += -M
  QMAKE_CFLAGS_WARN_ON   += -Wall -Wextra
  QMAKE_CFLAGS_WARN_OFF  += -w
 -QMAKE_CFLAGS_RELEASE   += $$QMAKE_CFLAGS_OPTIMIZE
 -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
-+eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS))
-+eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS))
- QMAKE_CFLAGS_DEBUG += -g
+-QMAKE_CFLAGS_DEBUG += -g
++eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS))
++eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS))
++eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS))
  QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
  QMAKE_CFLAGS_STATIC_LIB+= $$QMAKE_CFLAGS_PIC
+ QMAKE_CFLAGS_APP   += $$QMAKE_CFLAGS_PIC
+@@ -59,9 +59,9 @@ QMAKE_CXXFLAGS+= $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS   += $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON+= $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
+-QMAKE_CXXFLAGS_RELEASE+= $$QMAKE_CFLAGS_RELEASE
+-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
+-QMAKE_CXXFLAGS_DEBUG  += $$QMAKE_CFLAGS_DEBUG
++eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS))
++eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS))
++eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS))
+ QMAKE_CXXFLAGS_SHLIB  += $$QMAKE_CFLAGS_SHLIB
+ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
+ QMAKE_CXXFLAGS_APP+= $$QMAKE_CFLAGS_APP


[arch-commits] Commit in qt5-base/trunk (PKGBUILD qt5-base-cflags.patch)

2020-03-06 Thread Antonio Rojas via arch-commits
Date: Friday, March 6, 2020 @ 11:50:26
  Author: arojas
Revision: 376849

Improve qt5-base-cflags.patch as suggested by upstream

Modified:
  qt5-base/trunk/PKGBUILD
  qt5-base/trunk/qt5-base-cflags.patch

---+
 PKGBUILD  |2 +-
 qt5-base-cflags.patch |   12 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-06 11:40:56 UTC (rev 376848)
+++ PKGBUILD2020-03-06 11:50:26 UTC (rev 376849)
@@ -31,7 +31,7 @@
 
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
  qt5-base-cflags.patch)
 sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
-'7cbf56fd6076f0c193f06715d1dfdae61905504cb01bd907ac33cc487f48d8c6')
+'c70640499637314df68cc7a56519f0bf8b65dd808dd982c96c6f045bba993adf')
 
 prepare() {
   cd ${_pkgfqn}

Modified: qt5-base-cflags.patch
===
--- qt5-base-cflags.patch   2020-03-06 11:40:56 UTC (rev 376848)
+++ qt5-base-cflags.patch   2020-03-06 11:50:26 UTC (rev 376849)
@@ -2,27 +2,25 @@
 index a493cd5984..79f2d2fff9 100644
 --- a/mkspecs/common/g++-unix.conf
 +++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
+@@ -10,5 +10,5 @@
  
  include(g++-base.conf)
  
 -QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+ENV_LDFLAGS = $$(LDFLAGS)
-+QMAKE_LFLAGS_RELEASE   += $$split(ENV_LDFLAGS, " ")
++eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS))
  QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
 diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
 index 4d82321cba..4a61fc9d25 100644
 --- a/mkspecs/common/gcc-base.conf
 +++ b/mkspecs/common/gcc-base.conf
-@@ -40,8 +40,9 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+@@ -40,8 +40,8 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
  QMAKE_CFLAGS_DEPS  += -M
  QMAKE_CFLAGS_WARN_ON   += -Wall -Wextra
  QMAKE_CFLAGS_WARN_OFF  += -w
 -QMAKE_CFLAGS_RELEASE   += $$QMAKE_CFLAGS_OPTIMIZE
 -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
-+ENV_CFLAGS = $$(CFLAGS)
-+QMAKE_CFLAGS_RELEASE   += $$split(ENV_CFLAGS, " ")
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$split(ENV_CFLAGS, " ")
++eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS))
++eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS))
  QMAKE_CFLAGS_DEBUG += -g
  QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
  QMAKE_CFLAGS_STATIC_LIB+= $$QMAKE_CFLAGS_PIC


[arch-commits] Commit in qt5-base/trunk (PKGBUILD qt5-base-cflags.patch)

2020-03-05 Thread Antonio Rojas via arch-commits
Date: Friday, March 6, 2020 @ 07:11:51
  Author: arojas
Revision: 376829

Import CFLAGS in a way that doesn't break qtwebengine build. Disable 
-optimized-qmake, since the qmake build system interprets the env variables in 
gcc-base wrongly

Modified:
  qt5-base/trunk/PKGBUILD
  qt5-base/trunk/qt5-base-cflags.patch

---+
 PKGBUILD  |5 ++---
 qt5-base-cflags.patch |   12 +++-
 2 files changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-06 04:44:21 UTC (rev 376828)
+++ PKGBUILD2020-03-06 07:11:51 UTC (rev 376829)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.14.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -31,7 +31,7 @@
 
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
  qt5-base-cflags.patch)
 sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
-'3d6524381b2bbd35c9d85fe6d9f3e39be645e12658a810604dfe981633f78d8b')
+'7cbf56fd6076f0c193f06715d1dfdae61905504cb01bd907ac33cc487f48d8c6')
 
 prepare() {
   cd ${_pkgfqn}
@@ -55,7 +55,6 @@
 -openssl-linked \
 -nomake examples \
 -no-rpath \
--optimized-qmake \
 -dbus-linked \
 -system-harfbuzz \
 -journald \

Modified: qt5-base-cflags.patch
===
--- qt5-base-cflags.patch   2020-03-06 04:44:21 UTC (rev 376828)
+++ qt5-base-cflags.patch   2020-03-06 07:11:51 UTC (rev 376829)
@@ -2,25 +2,27 @@
 index a493cd5984..79f2d2fff9 100644
 --- a/mkspecs/common/g++-unix.conf
 +++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,5 @@
+@@ -10,5 +10,6 @@
  
  include(g++-base.conf)
  
 -QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+QMAKE_LFLAGS_RELEASE   += $$(LDFLAGS)
++ENV_LDFLAGS = $$(LDFLAGS)
++QMAKE_LFLAGS_RELEASE   += $$split(ENV_LDFLAGS, " ")
  QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
 diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
 index 4d82321cba..4a61fc9d25 100644
 --- a/mkspecs/common/gcc-base.conf
 +++ b/mkspecs/common/gcc-base.conf
-@@ -40,8 +40,8 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+@@ -40,8 +40,9 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
  QMAKE_CFLAGS_DEPS  += -M
  QMAKE_CFLAGS_WARN_ON   += -Wall -Wextra
  QMAKE_CFLAGS_WARN_OFF  += -w
 -QMAKE_CFLAGS_RELEASE   += $$QMAKE_CFLAGS_OPTIMIZE
 -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
-+QMAKE_CFLAGS_RELEASE   += $$QMAKE_CFLAGS_OPTIMIZE $$(CFLAGS)
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g $$(CFLAGS)
++ENV_CFLAGS = $$(CFLAGS)
++QMAKE_CFLAGS_RELEASE   += $$split(ENV_CFLAGS, " ")
++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$split(ENV_CFLAGS, " ")
  QMAKE_CFLAGS_DEBUG += -g
  QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
  QMAKE_CFLAGS_STATIC_LIB+= $$QMAKE_CFLAGS_PIC


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2020-02-11 Thread Antonio Rojas via arch-commits
Date: Tuesday, February 11, 2020 @ 21:52:36
  Author: arojas
Revision: 375426

Add perl dependency

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-11 21:49:52 UTC (rev 375425)
+++ PKGBUILD2020-02-11 21:52:36 UTC (rev 375426)
@@ -23,7 +23,8 @@
 'unixodbc: ODBC driver'
 'libfbclient: Firebird/iBase driver'
 'freetds: MS SQL driver'
-'gtk3: GTK platform plugin')
+'gtk3: GTK platform plugin'
+'perl: for fixqt4headers and syncqt')
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"


[arch-commits] Commit in qt5-base/trunk (PKGBUILD qt5-base-cflags.patch)

2020-02-10 Thread Antonio Rojas via arch-commits
Date: Monday, February 10, 2020 @ 21:59:00
  Author: arojas
Revision: 375252

Get system cflags for qmake at build time instead of hardcoding them in qt5-base

Added:
  qt5-base/trunk/qt5-base-cflags.patch
Modified:
  qt5-base/trunk/PKGBUILD

---+
 PKGBUILD  |   15 ++-
 qt5-base-cflags.patch |   26 ++
 2 files changed, 32 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-10 20:03:59 UTC (rev 375251)
+++ PKGBUILD2020-02-10 21:59:00 UTC (rev 375252)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.14.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -27,18 +27,15 @@
 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;)
-sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+ qt5-base-cflags.patch)
+sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
+'3d6524381b2bbd35c9d85fe6d9f3e39be645e12658a810604dfe981633f78d8b')
 
 prepare() {
   cd ${_pkgfqn}
 
-  # Build qmake using Arch {C,LD}FLAGS
-  # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
-  sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
-mkspecs/common/gcc-base.conf
-  sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
-mkspecs/common/g++-unix.conf
+  patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
 }
 
 build() {

Added: qt5-base-cflags.patch
===
--- qt5-base-cflags.patch   (rev 0)
+++ qt5-base-cflags.patch   2020-02-10 21:59:00 UTC (rev 375252)
@@ -0,0 +1,26 @@
+diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
+index a493cd5984..79f2d2fff9 100644
+--- a/mkspecs/common/g++-unix.conf
 b/mkspecs/common/g++-unix.conf
+@@ -10,5 +10,5 @@
+ 
+ include(g++-base.conf)
+ 
+-QMAKE_LFLAGS_RELEASE   += -Wl,-O1
++QMAKE_LFLAGS_RELEASE   += $$(LDFLAGS)
+ QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index 4d82321cba..4a61fc9d25 100644
+--- a/mkspecs/common/gcc-base.conf
 b/mkspecs/common/gcc-base.conf
+@@ -40,8 +40,8 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+ QMAKE_CFLAGS_DEPS  += -M
+ QMAKE_CFLAGS_WARN_ON   += -Wall -Wextra
+ QMAKE_CFLAGS_WARN_OFF  += -w
+-QMAKE_CFLAGS_RELEASE   += $$QMAKE_CFLAGS_OPTIMIZE
+-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
++QMAKE_CFLAGS_RELEASE   += $$QMAKE_CFLAGS_OPTIMIZE $$(CFLAGS)
++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g $$(CFLAGS)
+ QMAKE_CFLAGS_DEBUG += -g
+ QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
+ QMAKE_CFLAGS_STATIC_LIB+= $$QMAKE_CFLAGS_PIC


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2020-01-18 Thread Antonio Rojas via arch-commits
Date: Sunday, January 19, 2020 @ 00:10:01
  Author: arojas
Revision: 373689

Fix security issue

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-18 23:28:40 UTC (rev 373688)
+++ PKGBUILD2020-01-19 00:10:01 UTC (rev 373689)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.14.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -28,9 +28,11 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
- 
qtbug-80967.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=b31852c4;)
+ 
qtbug-80967.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=b31852c4;
+ 
qtbug-81272.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=e6f1fde2;)
 sha256sums=('4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463'
-'52504c98cfd226548973d82b9ceb69c7557ba13d189a3cb526b303dee740')
+'52504c98cfd226548973d82b9ceb69c7557ba13d189a3cb526b303dee740'
+'e93ca83adbf0becc0c78b7db8fed32eed123a62907fe0274e4d352aa169daad1')
 
 prepare() {
   cd ${_pkgfqn}
@@ -43,6 +45,7 @@
 mkspecs/common/g++-unix.conf
 
   patch -p1 -i ../qtbug-80967.patch # Fix font rendering regression
+  patch -p1 -i ../qtbug-81272.patch # 
https://bugreports.qt.io/browse/QTBUG-81272
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2020-01-17 Thread Antonio Rojas via arch-commits
Date: Friday, January 17, 2020 @ 10:35:56
  Author: arojas
Revision: 373611

Fix font rendering regression

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-17 09:49:08 UTC (rev 373610)
+++ PKGBUILD2020-01-17 10:35:56 UTC (rev 373611)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.14.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -27,8 +27,10 @@
 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;)
-sha256sums=('4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+ 
qtbug-80967.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=b31852c4;)
+sha256sums=('4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463'
+'52504c98cfd226548973d82b9ceb69c7557ba13d189a3cb526b303dee740')
 
 prepare() {
   cd ${_pkgfqn}
@@ -39,6 +41,8 @@
 mkspecs/common/gcc-base.conf
   sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
 mkspecs/common/g++-unix.conf
+
+  patch -p1 -i ../qtbug-80967.patch # Fix font rendering regression
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-11-18 Thread Antonio Rojas via arch-commits
Date: Monday, November 18, 2019 @ 21:46:51
  Author: arojas
Revision: 369419

Support postgresql 12

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-18 21:37:32 UTC (rev 369418)
+++ PKGBUILD2019-11-18 21:46:51 UTC (rev 369419)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.13.2
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -26,8 +26,10 @@
 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;)
-sha256sums=('26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+ 
qtbase-postgresql-12.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=14b61d48;)
+sha256sums=('26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121'
+'d3af93d23109fe59659e80e6c5b70b1e877a0680635eb919e74b4d79724db36b')
 
 prepare() {
   cd ${_pkgfqn}
@@ -38,6 +40,8 @@
 mkspecs/common/gcc-base.conf
   sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
 mkspecs/common/g++-unix.conf
+
+  patch -p1 -i ../qtbase-postgresql-12.patch # Add support for postgresql 12
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-11-11 Thread Felix Yan via arch-commits
Date: Monday, November 11, 2019 @ 22:53:15
  Author: felixonmars
Revision: 367797

icu 65.1 / poppler 0.82.0 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-11 22:43:46 UTC (rev 367796)
+++ PKGBUILD2019-11-11 22:53:15 UTC (rev 367797)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.13.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD qtbug-77364.patch)

2019-09-09 Thread Antonio Rojas via arch-commits
Date: Monday, September 9, 2019 @ 15:59:28
  Author: arojas
Revision: 362076

Fix keyboard input issues in webengine

Added:
  qt5-base/trunk/qtbug-77364.patch
Modified:
  qt5-base/trunk/PKGBUILD

---+
 PKGBUILD  |   10 +++---
 qtbug-77364.patch |   12 
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-09 08:51:32 UTC (rev 362075)
+++ PKGBUILD2019-09-09 15:59:28 UTC (rev 362076)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.13.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -26,8 +26,10 @@
 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;)
-sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+qtbug-77364.patch)
+sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab'
+'dc742814ab0c1b63da5916d96e3ef01fa96007c385ed033ae5b3a8cd8608c119')
 
 prepare() {
   cd ${_pkgfqn}
@@ -38,6 +40,8 @@
 mkspecs/common/gcc-base.conf
   sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
 mkspecs/common/g++-unix.conf
+
+  patch -p1 -i ../qtbug-77364.patch # Fix keyboard input in webengine
 }
 
 build() {

Added: qtbug-77364.patch
===
--- qtbug-77364.patch   (rev 0)
+++ qtbug-77364.patch   2019-09-09 15:59:28 UTC (rev 362076)
@@ -0,0 +1,12 @@
+diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
+index 04290a4ce1..27773d5762 100644
+--- a/src/widgets/kernel/qwidget.cpp
 b/src/widgets/kernel/qwidget.cpp
+@@ -6446,7 +6446,7 @@ void QWidget::setFocusProxy(QWidget * w)
+ 
+ if (changingAppFocusWidget) {
+ QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy();
+-QApplicationPrivate::focus_widget = newDeepestFocusProxy ? 
newDeepestFocusProxy : this;
++QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? 
newDeepestFocusProxy : this, Qt::NoFocusReason);
+ }
+ }


[arch-commits] Commit in qt5-base/trunk (PKGBUILD virtualbox-focus.patch)

2019-07-01 Thread Antonio Rojas via arch-commits
Date: Monday, July 1, 2019 @ 14:02:27
  Author: arojas
Revision: 357203

Further adjust timeout for FS#62999

Modified:
  qt5-base/trunk/PKGBUILD
  qt5-base/trunk/virtualbox-focus.patch

+
 PKGBUILD   |4 ++--
 virtualbox-focus.patch |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-01 13:27:41 UTC (rev 357202)
+++ PKGBUILD2019-07-01 14:02:27 UTC (rev 357203)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.13.0
 pkgver=${_qtver/-/}
-pkgrel=6
+pkgrel=7
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -33,7 +33,7 @@
 sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe'
 '51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646'
 '9300d8ab7abe4145e92eea75178a26ad3d5a71b0646665c3776ca2c375dd1233'
-'2c6444203cc6f0b96d3ba2752d26a20da78e98ff728ba930129724ba6006c2e9')
+'21c4acce7a789cd0e1e67aca76cf15f536ae8e30ef711a434cfe7ec377556f06')
 
 prepare() {
   cd ${_pkgfqn}

Modified: virtualbox-focus.patch
===
--- virtualbox-focus.patch  2019-07-01 13:27:41 UTC (rev 357202)
+++ virtualbox-focus.patch  2019-07-01 14:02:27 UTC (rev 357203)
@@ -7,7 +7,7 @@
  relayFocusToModalWindow();
  // Do not set the active window to nullptr if there is a FocusIn coming.
 -connection()->focusInTimer().start(400);
-+connection()->focusInTimer().start(200);
++connection()->focusInTimer().start(100);
  }
  
  struct QtMotifWmHints {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD virtualbox-focus.patch)

2019-06-30 Thread Antonio Rojas via arch-commits
Date: Sunday, June 30, 2019 @ 15:21:48
  Author: arojas
Revision: 357119

Safer patch

Modified:
  qt5-base/trunk/PKGBUILD
  qt5-base/trunk/virtualbox-focus.patch

+
 PKGBUILD   |4 ++--
 virtualbox-focus.patch |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-30 15:01:21 UTC (rev 357118)
+++ PKGBUILD2019-06-30 15:21:48 UTC (rev 357119)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.13.0
 pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=6
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -33,7 +33,7 @@
 sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe'
 '51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646'
 '9300d8ab7abe4145e92eea75178a26ad3d5a71b0646665c3776ca2c375dd1233'
-'1d889d04cecd1883d3dc3d1ffd2ce9db91e5f61a58c918d29871f764f5aad5cd')
+'2c6444203cc6f0b96d3ba2752d26a20da78e98ff728ba930129724ba6006c2e9')
 
 prepare() {
   cd ${_pkgfqn}

Modified: virtualbox-focus.patch
===
--- virtualbox-focus.patch  2019-06-30 15:01:21 UTC (rev 357118)
+++ virtualbox-focus.patch  2019-06-30 15:21:48 UTC (rev 357119)
@@ -7,7 +7,7 @@
  relayFocusToModalWindow();
  // Do not set the active window to nullptr if there is a FocusIn coming.
 -connection()->focusInTimer().start(400);
-+connection()->focusInTimer().start(0);
++connection()->focusInTimer().start(200);
  }
  
  struct QtMotifWmHints {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD virtualbox-focus.patch)

2019-06-30 Thread Antonio Rojas via arch-commits
Date: Sunday, June 30, 2019 @ 14:58:42
  Author: arojas
Revision: 357117

Fix the fix

Modified:
  qt5-base/trunk/PKGBUILD
  qt5-base/trunk/virtualbox-focus.patch

+
 PKGBUILD   |2 +-
 virtualbox-focus.patch |   13 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-30 14:43:02 UTC (rev 357116)
+++ PKGBUILD2019-06-30 14:58:42 UTC (rev 357117)
@@ -33,7 +33,7 @@
 sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe'
 '51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646'
 '9300d8ab7abe4145e92eea75178a26ad3d5a71b0646665c3776ca2c375dd1233'
-'bbd38c3bdad29b6978f5b5514f9d6fd7c109bc2b47fed86bafe22e7d4c77b532')
+'1d889d04cecd1883d3dc3d1ffd2ce9db91e5f61a58c918d29871f764f5aad5cd')
 
 prepare() {
   cd ${_pkgfqn}

Modified: virtualbox-focus.patch
===
--- virtualbox-focus.patch  2019-06-30 14:43:02 UTC (rev 357116)
+++ virtualbox-focus.patch  2019-06-30 14:58:42 UTC (rev 357117)
@@ -1,12 +1,13 @@
 diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp 
b/src/plugins/platforms/xcb/qxcbwindow.cpp
-index 9382488b74..d87713db40 100644
+index 9382488b74..1bf1ab268d 100644
 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp
 +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
-@@ -846,6 +846,7 @@ void QXcbWindow::doFocusIn()
- void QXcbWindow::doFocusOut()
- {
+@@ -848,7 +848,7 @@ void QXcbWindow::doFocusOut()
  connection()->setFocusWindow(nullptr);
-+QWindowSystemInterface::handleWindowActivated(nullptr, 
Qt::ActiveWindowFocusReason);
  relayFocusToModalWindow();
  // Do not set the active window to nullptr if there is a FocusIn coming.
- connection()->focusInTimer().start(400);
+-connection()->focusInTimer().start(400);
++connection()->focusInTimer().start(0);
+ }
+ 
+ struct QtMotifWmHints {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD virtualbox-focus.patch)

2019-06-30 Thread Antonio Rojas via arch-commits
Date: Sunday, June 30, 2019 @ 14:43:02
  Author: arojas
Revision: 357116

Fix focus issues with VirtualBox (FS#62999)

Added:
  qt5-base/trunk/virtualbox-focus.patch
Modified:
  qt5-base/trunk/PKGBUILD

+
 PKGBUILD   |9 ++---
 virtualbox-focus.patch |   12 
 2 files changed, 18 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-30 13:07:46 UTC (rev 357115)
+++ PKGBUILD2019-06-30 14:43:02 UTC (rev 357116)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.13.0
 pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -28,10 +28,12 @@
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
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;)
+
qtbase-zlib-compression.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=cbdc9a77;
+virtualbox-focus.patch)
 sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe'
 '51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646'
-'9300d8ab7abe4145e92eea75178a26ad3d5a71b0646665c3776ca2c375dd1233')
+'9300d8ab7abe4145e92eea75178a26ad3d5a71b0646665c3776ca2c375dd1233'
+'bbd38c3bdad29b6978f5b5514f9d6fd7c109bc2b47fed86bafe22e7d4c77b532')
 
 prepare() {
   cd ${_pkgfqn}
@@ -45,6 +47,7 @@
 
   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
 }
 
 build() {

Added: virtualbox-focus.patch
===
--- virtualbox-focus.patch  (rev 0)
+++ virtualbox-focus.patch  2019-06-30 14:43:02 UTC (rev 357116)
@@ -0,0 +1,12 @@
+diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp 
b/src/plugins/platforms/xcb/qxcbwindow.cpp
+index 9382488b74..d87713db40 100644
+--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
 b/src/plugins/platforms/xcb/qxcbwindow.cpp
+@@ -846,6 +846,7 @@ void QXcbWindow::doFocusIn()
+ void QXcbWindow::doFocusOut()
+ {
+ connection()->setFocusWindow(nullptr);
++QWindowSystemInterface::handleWindowActivated(nullptr, 
Qt::ActiveWindowFocusReason);
+ relayFocusToModalWindow();
+ // Do not set the active window to nullptr if there is a FocusIn coming.
+ connection()->focusInTimer().start(400);


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-06-21 Thread Antonio Rojas via arch-commits
Date: Friday, June 21, 2019 @ 08:56:29
  Author: arojas
Revision: 356668

Oops

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-21 08:45:44 UTC (rev 356667)
+++ PKGBUILD2019-06-21 08:56:29 UTC (rev 356668)
@@ -44,7 +44,7 @@
 mkspecs/common/g++-unix.conf
 
   patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze
-  patch -p1 -i ../qtbase-zlib-compression # Change the default compression 
back to zlib for backwards compatibility
+  patch -p1 -i ../qtbase-zlib-compression.patch # Change the default 
compression back to zlib for backwards compatibility
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-06-21 Thread Antonio Rojas via arch-commits
Date: Friday, June 21, 2019 @ 08:45:44
  Author: arojas
Revision: 356667

Change the default compression back to zlib for backwards compatibility

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-21 07:41:26 UTC (rev 35)
+++ PKGBUILD2019-06-21 08:45:44 UTC (rev 356667)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.13.0
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -27,9 +27,11 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
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-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;)
 sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe'
-'51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646')
+'51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646'
+'9300d8ab7abe4145e92eea75178a26ad3d5a71b0646665c3776ca2c375dd1233')
 
 prepare() {
   cd ${_pkgfqn}
@@ -42,6 +44,7 @@
 mkspecs/common/g++-unix.conf
 
   patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze
+  patch -p1 -i ../qtbase-zlib-compression # Change the default compression 
back to zlib for backwards compatibility
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-06-20 Thread Antonio Rojas via arch-commits
Date: Thursday, June 20, 2019 @ 08:30:01
  Author: arojas
Revision: 356589

Fix freeze on hybrid NVIDIA systems (FS#62949), for 5.13

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-20 07:51:12 UTC (rev 356588)
+++ PKGBUILD2019-06-20 08:30:01 UTC (rev 356589)
@@ -3,9 +3,9 @@
 
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.12.4
+_qtver=5.13.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -27,11 +27,9 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
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'
-'51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646'
-'0b0bfa3490098a3e195517b68d8b602f79be4170428f882e4a7583302d4be463')
+
qtbase-qxcbwindow.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117;)
+sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe'
+'51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646')
 
 prepare() {
   cd ${_pkgfqn}
@@ -44,7 +42,6 @@
 mkspecs/common/g++-unix.conf
 
   patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze
-  patch -p1 -i ../qtbug-76440.patch # Fix crashes on multi-screen systems
 }
 
 build() {
@@ -67,6 +64,7 @@
 -dbus-linked \
 -system-harfbuzz \
 -journald \
+-no-mimetype-database \
 -no-use-gold-linker \
 -reduce-relocations
   make


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-06-20 Thread Antonio Rojas via arch-commits
Date: Thursday, June 20, 2019 @ 07:50:53
  Author: arojas
Revision: 356587

Fix crash on multi-screen systems (FS#62942), fix freeze on hybrid NVIDIA 
systems (FS#62949)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-20 04:16:56 UTC (rev 356586)
+++ PKGBUILD2019-06-20 07:50:53 UTC (rev 356587)
@@ -3,7 +3,7 @@
 
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.13.0
+_qtver=5.12.4
 pkgver=${_qtver/-/}
 pkgrel=2
 arch=('x86_64')
@@ -26,8 +26,12 @@
 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;)
-sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe')
+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'
+'51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646'
+'0b0bfa3490098a3e195517b68d8b602f79be4170428f882e4a7583302d4be463')
 
 prepare() {
   cd ${_pkgfqn}
@@ -38,6 +42,9 @@
 mkspecs/common/gcc-base.conf
   sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
 mkspecs/common/g++-unix.conf
+
+  patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze
+  patch -p1 -i ../qtbug-76440.patch # Fix crashes on multi-screen systems
 }
 
 build() {
@@ -60,7 +67,6 @@
 -dbus-linked \
 -system-harfbuzz \
 -journald \
--no-mimetype-database \
 -no-use-gold-linker \
 -reduce-relocations
   make


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-06-19 Thread Antonio Rojas via arch-commits
Date: Wednesday, June 19, 2019 @ 16:54:31
  Author: arojas
Revision: 356571

Don't bundle mimetype database

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-19 16:14:26 UTC (rev 356570)
+++ PKGBUILD2019-06-19 16:54:31 UTC (rev 356571)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.13.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -60,6 +60,7 @@
 -dbus-linked \
 -system-harfbuzz \
 -journald \
+-no-mimetype-database \
 -no-use-gold-linker \
 -reduce-relocations
   make


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-04-24 Thread Antonio Rojas via arch-commits
Date: Wednesday, April 24, 2019 @ 06:34:03
  Author: arojas
Revision: 352045

Fix disappearing system tray icons (FS#62325)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-24 04:47:25 UTC (rev 352044)
+++ PKGBUILD2019-04-24 06:34:03 UTC (rev 352045)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.12.3
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -26,8 +26,10 @@
 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;)
-sha256sums=('fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+
qtbug-61898.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2947435d;)
+sha256sums=('fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701'
+'9339a016ac55cba18c494d45fe2ca8a53313ae0c525acd18e65fcab0d552d23b')
 
 prepare() {
   cd ${_pkgfqn}
@@ -38,6 +40,8 @@
 mkspecs/common/gcc-base.conf
   sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
 mkspecs/common/g++-unix.conf
+
+  patch -p1 -i ../qtbug-61898.patch # Fix disappearing system tray icons
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-04-05 Thread Felix Yan via arch-commits
Date: Friday, April 5, 2019 @ 12:29:19
  Author: felixonmars
Revision: 349881

icu 64.1 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-05 12:23:48 UTC (rev 349880)
+++ PKGBUILD2019-04-05 12:29:19 UTC (rev 349881)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.12.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-03-08 Thread Antonio Rojas via arch-commits
Date: Friday, March 8, 2019 @ 18:51:44
  Author: arojas
Revision: 347455

double-conversion 3.1.3 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-08 18:36:35 UTC (rev 347454)
+++ PKGBUILD2019-03-08 18:51:44 UTC (rev 347455)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.12.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-02-08 Thread Antonio Rojas via arch-commits
Date: Friday, February 8, 2019 @ 15:42:28
  Author: arojas
Revision: 345644

Revert commit that breaks nouveau (FS#61638)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-08 14:42:13 UTC (rev 345643)
+++ PKGBUILD2019-02-08 15:42:28 UTC (rev 345644)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.12.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -28,10 +28,12 @@
 _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;)
+
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')
+'2186ce7b8d6310ebc005da9b00dcc88388df3e8b83bff37230fa1bb9253c4970'
+'e0a7cdda2ebc403e2b3a62b3d104d2dd3f8b4e79d92395cf3c6419ebe6d8b19c')
 
 prepare() {
   cd ${_pkgfqn}
@@ -45,6 +47,7 @@
 
   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() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-01-29 Thread Felix Yan via arch-commits
Date: Tuesday, January 29, 2019 @ 19:55:58
  Author: felixonmars
Revision: 344926

add qt5-translations to optdepends

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-29 19:25:10 UTC (rev 344925)
+++ PKGBUILD2019-01-29 19:55:58 UTC (rev 344926)
@@ -16,6 +16,7 @@
 makedepends=('libfbclient' 'mariadb-libs' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
  'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers')
 optdepends=('qt5-svg: to use SVG icon themes'
+'qt5-translations: for some native UI translations'
 'postgresql-libs: PostgreSQL driver'
 'mariadb-libs: MariaDB driver'
 'unixodbc: ODBC driver'


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-01-16 Thread Felix Yan via arch-commits
Date: Wednesday, January 16, 2019 @ 14:20:51
  Author: felixonmars
Revision: 344234

MariaDB 10.3 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 14:17:24 UTC (rev 344233)
+++ PKGBUILD2019-01-16 14:20:51 UTC (rev 344234)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.12.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2019-01-07 Thread Antonio Rojas via arch-commits
Date: Monday, January 7, 2019 @ 18:40:54
  Author: arojas
Revision: 343080

Fix drag and drop regression (FS#61036)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-07 18:21:08 UTC (rev 343079)
+++ PKGBUILD2019-01-07 18:40:54 UTC (rev 343080)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.12.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -25,8 +25,10 @@
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;)
-sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+
qtbug-72844.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=52e0d9e2;)
+sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb'
+'afdea0787e1d8d4c2e7139770761aba4fe8268f50b7f5d715bdd850cc7017996')
 
 prepare() {
   cd ${_pkgfqn}
@@ -37,6 +39,8 @@
 mkspecs/common/gcc-base.conf
   sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
 mkspecs/common/g++-unix.conf
+
+  patch -p1 -i ../qtbug-72844.patch # Fix drag and drop regression
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-11-04 Thread Antonio Rojas via arch-commits
Date: Sunday, November 4, 2018 @ 13:22:47
  Author: arojas
Revision: 337817

Fix stutter when opening applications

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-04 13:08:23 UTC (rev 337816)
+++ PKGBUILD2018-11-04 13:22:47 UTC (rev 337817)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.11.2
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -25,8 +25,10 @@
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;)
-sha256sums=('6381e7c3468d5a1dcfe3683b29eeced192faa0f8a32434fec071a59b8bcd0107')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+
qt5-base-stutter.patch::"http://code.qt.io/cgit/qt/qtbase.git/patch/?id=d4e937a6;)
+sha256sums=('6381e7c3468d5a1dcfe3683b29eeced192faa0f8a32434fec071a59b8bcd0107'
+'8af697a9bcc3e30dc4465d2b44829553dc48dd29e34c35a885e7f3f65d017d3f')
 
 prepare() {
   cd ${_pkgfqn}
@@ -37,6 +39,8 @@
 mkspecs/common/gcc-base.conf
   sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
 mkspecs/common/g++-unix.conf
+
+  patch -p1 -i ../qt5-base-stutter.patch # 
https://bugreports.qt.io/browse/QTBUG-70760
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-10-22 Thread Evangelos Foutras via arch-commits
Date: Monday, October 22, 2018 @ 21:18:42
  Author: foutrelis
Revision: 337085

icu 63.1 / poppler 0.70.0 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-22 20:57:49 UTC (rev 337084)
+++ PKGBUILD2018-10-22 21:18:42 UTC (rev 337085)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.11.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD glibc-2.28.patch)

2018-09-09 Thread Antonio Rojas via arch-commits
Date: Sunday, September 9, 2018 @ 17:03:08
  Author: arojas
Revision: 334292

double-conversion 3.1.0 rebuild

Modified:
  qt5-base/trunk/PKGBUILD
Deleted:
  qt5-base/trunk/glibc-2.28.patch

--+
 PKGBUILD |   10 +-
 glibc-2.28.patch |   53 -
 2 files changed, 5 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-09 16:46:26 UTC (rev 334291)
+++ PKGBUILD2018-09-09 17:03:08 UTC (rev 334292)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.11.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -27,15 +27,15 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
-glibc-2.28.patch)
+
qt5-base-glibc-2.28.patch::"http://code.qt.io/cgit/qt/qtbase.git/patch?id=25feee4e;)
 sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46'
-'46fe59014d32862334b3f8bb81e02e84edc57bd5c465cde98cd9a05ccc343b9a')
+'2e594aadc8fe30267a02b8561d76d06198de418aaf606cd7e16a2ee62009bfec')
 
 prepare() {
   cd ${_pkgfqn}
 
-  # Work around build failure with glibc 2.28 (patch from Fedora)
-  patch -Np1 -i ../glibc-2.28.patch
+  # Fix build failure with glibc 2.28
+  patch -p1 -i ../qt5-base-glibc-2.28.patch
 
   # Build qmake using Arch {C,LD}FLAGS
   # This also sets default {C,CXX,LD}FLAGS for projects built using qmake

Deleted: glibc-2.28.patch
===
--- glibc-2.28.patch2018-09-09 16:46:26 UTC (rev 334291)
+++ glibc-2.28.patch2018-09-09 17:03:08 UTC (rev 334292)
@@ -1,53 +0,0 @@
-diff -up qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h.glibc 
qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h
 qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h.glibc   
2018-06-15 09:29:31.0 +0200
-+++ qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h 
2018-07-26 15:40:56.887961897 +0200
-@@ -72,7 +72,9 @@
- #include 
- #include 
- #include 
-+#if 0
- #include 
-+#endif
- #include 
- #include 
- 
-diff -up 
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp.glibc 
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp
 
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp.glibc
   2018-06-15 09:29:31.0 +0200
-+++ qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp 
2018-07-26 16:34:54.346840184 +0200
-@@ -50,7 +50,9 @@
- #include 
- #include  // for realpath()
- #include 
-+#if 0
- #include 
-+#endif
- #include 
- #include 
- #include 
-@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirector
- #  include 
- #  include 
- #  include 
-+#if 0
- #  include 
-+#endif
- 
- // in case linux/fs.h is too old and doesn't define it:
- #ifndef FICLONE
-@@ -105,13 +109,13 @@ extern "C" NSString *NSTemporaryDirector
- #undef SYS_renameat2
- #undef SYS_statx
- #undef STATX_BASIC_STATS
--#  else
--#if !QT_CONFIG(renameat2) && defined(SYS_renameat2)
-+#  else 
-+#if 0 && !QT_CONFIG(renameat2) && defined(SYS_renameat2)
- static int renameat2(int oldfd, const char *oldpath, int newfd, const char 
*newpath, unsigned flags)
- { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
- #endif
- 
--#if !QT_CONFIG(statx) && defined(SYS_statx)
-+#if 0 && !QT_CONFIG(statx) && defined(SYS_statx)
- static int statx(int dirfd, const char *pathname, int flag, unsigned mask, 
struct statx *statxbuf)
- { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
- #elif !QT_CONFIG(statx) && !defined(SYS_statx)


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-08-06 Thread Evangelos Foutras via arch-commits
Date: Monday, August 6, 2018 @ 18:13:20
  Author: foutrelis
Revision: 331026

Perl 5.28 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-06 18:05:16 UTC (rev 331025)
+++ PKGBUILD2018-08-06 18:13:20 UTC (rev 331026)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.11.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD glibc-2.28.patch)

2018-08-06 Thread Evangelos Foutras via arch-commits
Date: Monday, August 6, 2018 @ 18:05:16
  Author: foutrelis
Revision: 331025

Work around build failure with glibc 2.28

Added:
  qt5-base/trunk/glibc-2.28.patch
Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 glibc-2.28.patch |   53 +
 2 files changed, 60 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-06 17:52:26 UTC (rev 331024)
+++ PKGBUILD2018-08-06 18:05:16 UTC (rev 331025)
@@ -26,12 +26,17 @@
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;)
-sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+glibc-2.28.patch)
+sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46'
+'46fe59014d32862334b3f8bb81e02e84edc57bd5c465cde98cd9a05ccc343b9a')
 
 prepare() {
   cd ${_pkgfqn}
 
+  # Work around build failure with glibc 2.28 (patch from Fedora)
+  patch -Np1 -i ../glibc-2.28.patch
+
   # Build qmake using Arch {C,LD}FLAGS
   # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
   sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \

Added: glibc-2.28.patch
===
--- glibc-2.28.patch(rev 0)
+++ glibc-2.28.patch2018-08-06 18:05:16 UTC (rev 331025)
@@ -0,0 +1,53 @@
+diff -up qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h.glibc 
qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h
+--- qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h.glibc   
2018-06-15 09:29:31.0 +0200
 qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h 
2018-07-26 15:40:56.887961897 +0200
+@@ -72,7 +72,9 @@
+ #include 
+ #include 
+ #include 
++#if 0
+ #include 
++#endif
+ #include 
+ #include 
+ 
+diff -up 
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp.glibc 
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp
+--- 
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp.glibc
   2018-06-15 09:29:31.0 +0200
 qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp 
2018-07-26 16:34:54.346840184 +0200
+@@ -50,7 +50,9 @@
+ #include 
+ #include  // for realpath()
+ #include 
++#if 0
+ #include 
++#endif
+ #include 
+ #include 
+ #include 
+@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirector
+ #  include 
+ #  include 
+ #  include 
++#if 0
+ #  include 
++#endif
+ 
+ // in case linux/fs.h is too old and doesn't define it:
+ #ifndef FICLONE
+@@ -105,13 +109,13 @@ extern "C" NSString *NSTemporaryDirector
+ #undef SYS_renameat2
+ #undef SYS_statx
+ #undef STATX_BASIC_STATS
+-#  else
+-#if !QT_CONFIG(renameat2) && defined(SYS_renameat2)
++#  else 
++#if 0 && !QT_CONFIG(renameat2) && defined(SYS_renameat2)
+ static int renameat2(int oldfd, const char *oldpath, int newfd, const char 
*newpath, unsigned flags)
+ { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
+ #endif
+ 
+-#if !QT_CONFIG(statx) && defined(SYS_statx)
++#if 0 && !QT_CONFIG(statx) && defined(SYS_statx)
+ static int statx(int dirfd, const char *pathname, int flag, unsigned mask, 
struct statx *statxbuf)
+ { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
+ #elif !QT_CONFIG(statx) && !defined(SYS_statx)


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-07-07 Thread Antonio Rojas via arch-commits
Date: Saturday, July 7, 2018 @ 10:32:14
  Author: arojas
Revision: 328043

Add mesa dependency

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-07 07:18:10 UTC (rev 328042)
+++ PKGBUILD2018-07-07 10:32:14 UTC (rev 328043)
@@ -12,7 +12,7 @@
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework'
 depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 
'fontconfig' 'xdg-utils'
- 'shared-mime-info' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 
'xcb-util-image'
+ 'shared-mime-info' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 
'xcb-util-image' 'mesa'
  'tslib' 'libinput' 'libxkbcommon-x11' 'libproxy' 'libcups' 
'double-conversion')
 makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
  'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-05-29 Thread Antonio Rojas via arch-commits
Date: Tuesday, May 29, 2018 @ 22:52:54
  Author: arojas
Revision: 325133

Use python3

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-29 22:37:30 UTC (rev 325132)
+++ PKGBUILD2018-05-29 22:52:54 UTC (rev 325133)
@@ -41,10 +41,6 @@
   sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
 mkspecs/common/g++-unix.conf
 
-  # Use python2 for Python 2.x
-  find . -name '*.py' -exec sed -i \
-'s|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
-
   # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
   patch -p1 -i ../qt-private-includes.patch
 }
@@ -52,7 +48,7 @@
 build() {
   cd ${_pkgfqn}
 
-  PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \
+  ./configure -confirm-license -opensource -v \
 -prefix /usr \
 -docdir /usr/share/doc/qt \
 -headerdir /usr/include/qt \


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-04-27 Thread Antonio Rojas via arch-commits
Date: Friday, April 27, 2018 @ 17:02:54
  Author: arojas
Revision: 323070

Fix crashes in QSqlite

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-27 11:06:24 UTC (rev 323069)
+++ PKGBUILD2018-04-27 17:02:54 UTC (rev 323070)
@@ -6,13 +6,13 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.10.1
 pkgver=${_qtver/-/}
-pkgrel=7
+pkgrel=8
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework'
 depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 
'fontconfig' 'xdg-utils'
- 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 
'pcre2'
+ 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 
'pcre2' 'shared-mime-info'
  'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 
'double-conversion')
 makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
  'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers')
@@ -31,13 +31,15 @@
 qtbug-65478.patch
 
qheaderview-restore.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4a04eea4;
 
qtbug-66444.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9395f35c;
-
qtbug-66420.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fa091640;)
+
qtbug-66420.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fa091640;
+
qtbug-66816.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=e4e87a2e;)
 sha256sums=('d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969'
 '7161ea5747500dc9666f8d185f4b8e538799fc0aef574e577277747100ac4763'
 'b2e8cb06c60be7de31a984c4cfc9ab85c9e2d08c1a3d93136f193735b43600c6'
 '3a1016cbf8c3c4676e6fc406756ffa5a151ffe09153dfc0fa7ed3c16945b0ae5'
 '88766a7b73a03e1219800c8fdc56afbf23b15d16cc61c4d77547b1fd2404ea6e'
-'9e21893545f950132c9face1d502d32e746b2838d4e8c9075dcf3fa43981fcb2')
+'9e21893545f950132c9face1d502d32e746b2838d4e8c9075dcf3fa43981fcb2'
+'2e1ee522eb3503c1359286269eec09d02ca16381769035c3d3bc663b129580db')
 
 prepare() {
   cd ${_pkgfqn}
@@ -67,6 +69,8 @@
   patch -p1 -i ../qtbug-66444.patch
   # Fix white screen with Mesa 18 https://bugreports.qt.io/browse/QTBUG-66420
   patch -p1 -i ../qtbug-66420.patch
+  # Fix crashes in QSqlite http://bugreports.qt.io/browse/QTBUG-66816
+  patch -p1 -i ../qtbug-66816.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-03-27 Thread Evangelos Foutras via arch-commits
Date: Tuesday, March 27, 2018 @ 23:50:51
  Author: foutrelis
Revision: 320450

icu 61.1 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-27 23:43:29 UTC (rev 320449)
+++ PKGBUILD2018-03-27 23:50:51 UTC (rev 320450)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.10.1
 pkgver=${_qtver/-/}
-pkgrel=6
+pkgrel=7
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-03-21 Thread Antonio Rojas via arch-commits
Date: Wednesday, March 21, 2018 @ 17:14:59
  Author: arojas
Revision: 319767

Fix white screen with mesa 18

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-21 16:56:02 UTC (rev 319766)
+++ PKGBUILD2018-03-21 17:14:59 UTC (rev 319767)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.10.1
 pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=6
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -30,12 +30,14 @@
 revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch
 qtbug-65478.patch
 
qheaderview-restore.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4a04eea4;
-
qtbug-66444.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9395f35c;)
+
qtbug-66444.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9395f35c;
+
qtbug-66420.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fa091640;)
 sha256sums=('d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969'
 '7161ea5747500dc9666f8d185f4b8e538799fc0aef574e577277747100ac4763'
 'b2e8cb06c60be7de31a984c4cfc9ab85c9e2d08c1a3d93136f193735b43600c6'
 '3a1016cbf8c3c4676e6fc406756ffa5a151ffe09153dfc0fa7ed3c16945b0ae5'
-'88766a7b73a03e1219800c8fdc56afbf23b15d16cc61c4d77547b1fd2404ea6e')
+'88766a7b73a03e1219800c8fdc56afbf23b15d16cc61c4d77547b1fd2404ea6e'
+'9e21893545f950132c9face1d502d32e746b2838d4e8c9075dcf3fa43981fcb2')
 
 prepare() {
   cd ${_pkgfqn}
@@ -63,6 +65,8 @@
   patch -p1 -i ../qheaderview-restore.patch
   # Fix QHeaderView regression https://bugreports.qt.io/browse/QTBUG-66444
   patch -p1 -i ../qtbug-66444.patch
+  # Fix white screen with Mesa 18 https://bugreports.qt.io/browse/QTBUG-66420
+  patch -p1 -i ../qtbug-66420.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-03-12 Thread Antonio Rojas via arch-commits
Date: Monday, March 12, 2018 @ 19:03:32
  Author: arojas
Revision: 318763

Required headers have been moved back

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-12 16:47:31 UTC (rev 318762)
+++ PKGBUILD2018-03-12 19:03:32 UTC (rev 318763)
@@ -15,7 +15,7 @@
  'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 
'pcre2'
  'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 
'double-conversion')
 makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
- 'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-validation-layers')
+ 'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers')
 optdepends=('qt5-svg: to use SVG icon themes'
 'postgresql-libs: PostgreSQL driver'
 'libmariadbclient: MariaDB driver'


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-03-12 Thread Antonio Rojas via arch-commits
Date: Monday, March 12, 2018 @ 13:28:21
  Author: arojas
Revision: 318747

Fix yet another QHeaderView regression in 5.10.1 (FS#57802)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-12 10:28:10 UTC (rev 318746)
+++ PKGBUILD2018-03-12 13:28:21 UTC (rev 318747)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.10.1
 pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -15,7 +15,7 @@
  'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 
'pcre2'
  'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 
'double-conversion')
 makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
- 'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers')
+ 'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-validation-layers')
 optdepends=('qt5-svg: to use SVG icon themes'
 'postgresql-libs: PostgreSQL driver'
 'libmariadbclient: MariaDB driver'
@@ -29,11 +29,13 @@
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch
 qtbug-65478.patch
-
qheaderview-restore.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4a04eea4;)
+
qheaderview-restore.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4a04eea4;
+
qtbug-66444.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9395f35c;)
 sha256sums=('d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969'
 '7161ea5747500dc9666f8d185f4b8e538799fc0aef574e577277747100ac4763'
 'b2e8cb06c60be7de31a984c4cfc9ab85c9e2d08c1a3d93136f193735b43600c6'
-'3a1016cbf8c3c4676e6fc406756ffa5a151ffe09153dfc0fa7ed3c16945b0ae5')
+'3a1016cbf8c3c4676e6fc406756ffa5a151ffe09153dfc0fa7ed3c16945b0ae5'
+'88766a7b73a03e1219800c8fdc56afbf23b15d16cc61c4d77547b1fd2404ea6e')
 
 prepare() {
   cd ${_pkgfqn}
@@ -59,6 +61,8 @@
   patch -p1 -i ../qtbug-65478.patch
   # Fix restoring column status in kmail and ksysguard
   patch -p1 -i ../qheaderview-restore.patch
+  # Fix QHeaderView regression https://bugreports.qt.io/browse/QTBUG-66444
+  patch -p1 -i ../qtbug-66444.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-03-07 Thread Antonio Rojas via arch-commits
Date: Wednesday, March 7, 2018 @ 17:36:40
  Author: arojas
Revision: 317992

Fix restoring columns in kmail and ksysguard (FS#57617)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-07 16:52:53 UTC (rev 317991)
+++ PKGBUILD2018-03-07 17:36:40 UTC (rev 317992)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.10.1
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -28,10 +28,12 @@
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch
-qtbug-65478.patch)
+qtbug-65478.patch
+
qheaderview-restore.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4a04eea4;)
 sha256sums=('d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969'
 '7161ea5747500dc9666f8d185f4b8e538799fc0aef574e577277747100ac4763'
-'b2e8cb06c60be7de31a984c4cfc9ab85c9e2d08c1a3d93136f193735b43600c6')
+'b2e8cb06c60be7de31a984c4cfc9ab85c9e2d08c1a3d93136f193735b43600c6'
+'3a1016cbf8c3c4676e6fc406756ffa5a151ffe09153dfc0fa7ed3c16945b0ae5')
 
 prepare() {
   cd ${_pkgfqn}
@@ -55,6 +57,8 @@
   patch -Np1 -i ../revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch
   # Fix kexi crash at startup http://bugreports.qt.io/browse/QTBUG-65478
   patch -p1 -i ../qtbug-65478.patch
+  # Fix restoring column status in kmail and ksysguard
+  patch -p1 -i ../qheaderview-restore.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD qtbug-65478.patch)

2018-03-02 Thread Antonio Rojas via arch-commits
Date: Friday, March 2, 2018 @ 11:40:51
  Author: arojas
Revision: 317747

Fix kexi crash at startup (FS#57584)

Added:
  qt5-base/trunk/qtbug-65478.patch
Modified:
  qt5-base/trunk/PKGBUILD

---+
 PKGBUILD  |   10 +++---
 qtbug-65478.patch |   31 +++
 2 files changed, 38 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-02 10:27:13 UTC (rev 317746)
+++ PKGBUILD2018-03-02 11:40:51 UTC (rev 317747)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.10.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -27,9 +27,11 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
-revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch)
+revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch
+qtbug-65478.patch)
 sha256sums=('d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969'
-'7161ea5747500dc9666f8d185f4b8e538799fc0aef574e577277747100ac4763')
+'7161ea5747500dc9666f8d185f4b8e538799fc0aef574e577277747100ac4763'
+'b2e8cb06c60be7de31a984c4cfc9ab85c9e2d08c1a3d93136f193735b43600c6')
 
 prepare() {
   cd ${_pkgfqn}
@@ -51,6 +53,8 @@
   # Revert upstream commit which breaks some Deepin components (FS#57531)
   # https://bugreports.qt.io/browse/QTBUG-66226
   patch -Np1 -i ../revert-Set-sharedPainter-correctly-for-QGraphicsEffect.patch
+  # Fix kexi crash at startup http://bugreports.qt.io/browse/QTBUG-65478
+  patch -p1 -i ../qtbug-65478.patch
 }
 
 build() {

Added: qtbug-65478.patch
===
--- qtbug-65478.patch   (rev 0)
+++ qtbug-65478.patch   2018-03-02 11:40:51 UTC (rev 317747)
@@ -0,0 +1,31 @@
+From e8425f9e52c9df0ce0fbf122adff3ef6930f9961 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thorbj=C3=B8rn=20Lund=20Martsum?= 
+Date: Wed, 28 Feb 2018 09:23:54 +0100
+Subject: QHeaderView: Fix crash in layout about to change
+
+Before there was a risk looking up e.g index -1 if there
+were no visible sections in layoutAboutToChange.
+
+Change-Id: Ic911e4292e8e8c4892fef1c0f34cf7dccaad2bac
+Task-number: QTBUG-65478
+Reviewed-by: David Faure 
+---
+diff --git a/src/widgets/itemviews/qheaderview.cpp 
b/src/widgets/itemviews/qheaderview.cpp
+index 26d7c5472a..708b9b44ca 100644
+--- a/src/widgets/itemviews/qheaderview.cpp
 b/src/widgets/itemviews/qheaderview.cpp
+@@ -2163,9 +2163,11 @@ void QHeaderViewPrivate::_q_sectionsAboutToBeChanged()
+ layoutChangePersistentSections.clear();
+ layoutChangePersistentSections.reserve(std::min(10, 
sectionItems.count()));
+ // after layoutChanged another section can be last stretched section
+-if (stretchLastSection) {
++if (stretchLastSection && lastSectionLogicalIdx >= 0 && 
lastSectionLogicalIdx < sectionItems.count()) {
+ const int visual = visualIndex(lastSectionLogicalIdx);
+-sectionItems[visual].size = lastSectionSize;
++if (visual >= 0 && visual < sectionItems.size()) {
++sectionItems[visual].size = lastSectionSize;
++}
+ }
+ for (int i = 0; i < sectionItems.size(); ++i) {
+ auto s = sectionItems.at(i);
+


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-02-03 Thread Antonio Rojas via arch-commits
Date: Saturday, February 3, 2018 @ 19:50:34
  Author: arojas
Revision: 315824

Fix mouse wheel scrolling (FS#57356)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-03 19:32:50 UTC (rev 315823)
+++ PKGBUILD2018-02-03 19:50:34 UTC (rev 315824)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.10.0
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -27,9 +27,11 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
-
qtbug-65235.patch::"https://github.com/qt/qtbase/commit/79d78d81.patch;)
+qtbug-65235.patch::"https://github.com/qt/qtbase/commit/79d78d81.patch;
+
qtbug-59261.patch::"https://github.com/qt/qtbase/commit/d1960360.patch;)
 sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
-'32d71a129adad13fc90e2ec9b15d0a21d9dd3f02bd8094882b18e4451d39ffe7')
+'32d71a129adad13fc90e2ec9b15d0a21d9dd3f02bd8094882b18e4451d39ffe7'
+'91c89eb302316c32cbe5018ac92d8fcd96201eed3e6e11cb40f410f45cb17138')
 
 prepare() {
   cd ${_pkgfqn}
@@ -49,6 +51,7 @@
   sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i 
mkspecs/features/create_cmake.prf
 
   patch -p1 -i ../qtbug-65235.patch # 
https://bugreports.qt.io/browse/QTBUG-65235
+  patch -p1 -i ../qtbug-59261.patch # 
https://bugreports.qt.io/browse/QTBUG-59261
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-01-14 Thread Antonio Rojas via arch-commits
Date: Sunday, January 14, 2018 @ 19:52:31
  Author: arojas
Revision: 314785

Restore statx support

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-14 19:30:51 UTC (rev 314784)
+++ PKGBUILD2018-01-14 19:52:31 UTC (rev 314785)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.10.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -27,10 +27,8 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
-qt-no-statx.patch
 
qtbug-65235.patch::"https://github.com/qt/qtbase/commit/79d78d81.patch;)
 sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
-'5cd1d90622cc53609806a3ce0b2811b28f0e6e20eb835861de4492dddeef6e52'
 '32d71a129adad13fc90e2ec9b15d0a21d9dd3f02bd8094882b18e4451d39ffe7')
 
 prepare() {
@@ -50,9 +48,6 @@
   # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
   sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i 
mkspecs/features/create_cmake.prf
 
-  # Don't use the statx syscall https://bugs.archlinux.org/task/56289 
https://bugreports.qt.io/browse/QTBUG-64490
-  patch -p1 -i ../qt-no-statx.patch
-
   patch -p1 -i ../qtbug-65235.patch # 
https://bugreports.qt.io/browse/QTBUG-65235
 }
 


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2018-01-02 Thread Antonio Rojas via arch-commits
Date: Tuesday, January 2, 2018 @ 19:40:27
  Author: arojas
Revision: 313878

Fix sefault when xrandr is not available (FS#56928)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-02 14:56:02 UTC (rev 313877)
+++ PKGBUILD2018-01-02 19:40:27 UTC (rev 313878)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.10.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -27,9 +27,11 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
-qt-no-statx.patch)
+qt-no-statx.patch
+
qtbug-65235.patch::"https://github.com/qt/qtbase/commit/79d78d81.patch;)
 sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
-'5cd1d90622cc53609806a3ce0b2811b28f0e6e20eb835861de4492dddeef6e52')
+'5cd1d90622cc53609806a3ce0b2811b28f0e6e20eb835861de4492dddeef6e52'
+'32d71a129adad13fc90e2ec9b15d0a21d9dd3f02bd8094882b18e4451d39ffe7')
 
 prepare() {
   cd ${_pkgfqn}
@@ -50,6 +52,8 @@
 
   # Don't use the statx syscall https://bugs.archlinux.org/task/56289 
https://bugreports.qt.io/browse/QTBUG-64490
   patch -p1 -i ../qt-no-statx.patch
+
+  patch -p1 -i ../qtbug-65235.patch # 
https://bugreports.qt.io/browse/QTBUG-65235
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-11-12 Thread Felix Yan
Date: Sunday, November 12, 2017 @ 14:41:21
  Author: felixonmars
Revision: 309651

icu 60.1 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-12 14:31:56 UTC (rev 309650)
+++ PKGBUILD2017-11-12 14:41:21 UTC (rev 309651)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.9.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD emoji.diff)

2017-09-20 Thread Jan Steffens
Date: Wednesday, September 20, 2017 @ 09:41:43
  Author: heftig
Revision: 305902

5.9.1-5

Modified:
  qt5-base/trunk/PKGBUILD
Deleted:
  qt5-base/trunk/emoji.diff

+
 PKGBUILD   |7 ++-
 emoji.diff |   13 -
 2 files changed, 2 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-20 09:40:56 UTC (rev 305901)
+++ PKGBUILD2017-09-20 09:41:43 UTC (rev 305902)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.9.1
 pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -29,11 +29,10 @@
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 qtbug-61731.patch::"https://github.com/qt/qtbase/commit/386af91c.patch;
 
qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch;
-emoji.diff harmony-fix.diff)
+harmony-fix.diff)
 sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
 'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3'
 '5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3'
-'c103d811ecce25d076f4f3c5ec1e94f1eceb19a4c6818de00f9a22c5b36699bc'
 '8451c0a86e887492b706950ce533c616e687b790c54e86fb1f405dc2074737a3')
 
 prepare() {
@@ -57,8 +56,6 @@
   patch -p1 -i ../qtbug-61731.patch
   # Fix doc navigation
   patch -p1 -i ../qtcreatorbug-18448.patch
-  # Emoji!
-  patch -p1 -i ../emoji.diff
   # Freetype 2.8.1
   patch -p1 -i ../harmony-fix.diff
 }

Deleted: emoji.diff
===
--- emoji.diff  2017-09-20 09:40:56 UTC (rev 305901)
+++ emoji.diff  2017-09-20 09:41:43 UTC (rev 305902)
@@ -1,13 +0,0 @@
-diff -u -r 
qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
 
qtbase-opensource-src-5.9.1-emoji/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
 
qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
   2017-06-28 11:54:29.0 +0200
-+++ 
qtbase-opensource-src-5.9.1-emoji/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
 2017-09-15 12:19:03.581896442 +0200
-@@ -749,6 +749,9 @@
- FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
- }
- 
-+value.u.s = (const FcChar8 *)"emoji";
-+FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
-+
- FcConfigSubstitute(0, pattern, FcMatchPattern);
- FcDefaultSubstitute(pattern);
- 


[arch-commits] Commit in qt5-base/trunk (PKGBUILD emoji.diff harmony-fix.diff)

2017-09-20 Thread Jan Steffens
Date: Wednesday, September 20, 2017 @ 06:29:22
  Author: heftig
Revision: 305889

5.9.1-4

Added:
  qt5-base/trunk/emoji.diff
  qt5-base/trunk/harmony-fix.diff
Modified:
  qt5-base/trunk/PKGBUILD   (contents, properties)

--+
 PKGBUILD |   15 +++---
 emoji.diff   |   13 +
 harmony-fix.diff |   76 +
 3 files changed, 100 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-20 06:09:15 UTC (rev 305888)
+++ PKGBUILD2017-09-20 06:29:22 UTC (rev 305889)
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# $Id$
 # Maintainer: Felix Yan 
 # Contributor: Andrea Scarpino 
 
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.9.1
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -28,10 +28,13 @@
 _pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 qtbug-61731.patch::"https://github.com/qt/qtbase/commit/386af91c.patch;
-
qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch;)
+
qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch;
+emoji.diff harmony-fix.diff)
 sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
 'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3'
-'5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3')
+'5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3'
+'c103d811ecce25d076f4f3c5ec1e94f1eceb19a4c6818de00f9a22c5b36699bc'
+'8451c0a86e887492b706950ce533c616e687b790c54e86fb1f405dc2074737a3')
 
 prepare() {
   cd ${_pkgfqn}
@@ -54,6 +57,10 @@
   patch -p1 -i ../qtbug-61731.patch
   # Fix doc navigation
   patch -p1 -i ../qtcreatorbug-18448.patch
+  # Emoji!
+  patch -p1 -i ../emoji.diff
+  # Freetype 2.8.1
+  patch -p1 -i ../harmony-fix.diff
 }
 
 build() {


Property changes on: qt5-base/trunk/PKGBUILD
___
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: emoji.diff
===
--- emoji.diff  (rev 0)
+++ emoji.diff  2017-09-20 06:29:22 UTC (rev 305889)
@@ -0,0 +1,13 @@
+diff -u -r 
qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
 
qtbase-opensource-src-5.9.1-emoji/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+--- 
qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
   2017-06-28 11:54:29.0 +0200
 
qtbase-opensource-src-5.9.1-emoji/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
 2017-09-15 12:19:03.581896442 +0200
+@@ -749,6 +749,9 @@
+ FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
+ }
+ 
++value.u.s = (const FcChar8 *)"emoji";
++FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
++
+ FcConfigSubstitute(0, pattern, FcMatchPattern);
+ FcDefaultSubstitute(pattern);
+ 

Added: harmony-fix.diff
===
--- harmony-fix.diff(rev 0)
+++ harmony-fix.diff2017-09-20 06:29:22 UTC (rev 305889)
@@ -0,0 +1,76 @@
+diff -u -r 
qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
 
qtbase-opensource-src-5.9.1-ftharmony/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
+--- 
qtbase-opensource-src-5.9.1/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
  2017-06-28 11:54:29.0 +0200
 
qtbase-opensource-src-5.9.1-ftharmony/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
2017-09-19 21:31:27.803755180 +0200
+@@ -786,6 +786,7 @@
+ m_subPixelPositionCount = 4;
+ forceAutoHint = false;
+ stemDarkeningDriver = false;
++hasLcdRendering = false;
+ }
+ 
+ QFontEngineFT::~QFontEngineFT()
+@@ -909,6 +910,15 @@
+ }
+ #endif
+ 
++FT_Int amajor = 0, aminor = 0, apatch = 0;
++FT_Library_Version(qt_getFreetype(), , , );
++if (amajor > 2 || amajor == 2 && (aminor > 8 || aminor == 8 && apatch >= 
1))
++hasLcdRendering = true;
++#if defined(QT_USE_FREETYPE_LCDFILTER)
++else if (FT_Library_SetLcdFilter(qt_getFreetype(), FT_LCD_FILTER_NONE) == 
FT_Err_Ok)
++hasLcdRendering = true;
++#endif
++
+ fontDef.styleName = QString::fromUtf8(face->style_name);
+ 
+ if (!freetype->hbFace) {
+@@ -1165,21 +1175,19 @@
+ 
+ int glyph_buffer_size = 0;
+ QScopedArrayPointer 

[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-07-11 Thread Antonio Rojas
Date: Tuesday, July 11, 2017 @ 11:56:20
  Author: arojas
Revision: 300097

PIE rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-11 11:49:36 UTC (rev 300096)
+++ PKGBUILD2017-07-11 11:56:20 UTC (rev 300097)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.9.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-07-04 Thread Antonio Rojas
Date: Tuesday, July 4, 2017 @ 12:33:39
  Author: arojas
Revision: 299668

- Fix build of accessibility
- Fix navigation in offline docs (FS#54575)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-04 11:55:53 UTC (rev 299667)
+++ PKGBUILD2017-07-04 12:33:39 UTC (rev 299668)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.9.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -26,8 +26,12 @@
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;)
-sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+qtbug-61731.patch::"https://github.com/qt/qtbase/commit/386af91c.patch;
+
qtcreatorbug-18448.patch::"https://github.com/qt/qtbase/commit/2a9f678f.patch;)
+sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
+'b164a873894cfc783980e883082d2b22b5aab00166c6751f66e78d4c41c3e2e3'
+'5f878d144ac18097376dce154a411449cde181ddce2d93501114f890c9cdb1c3')
 
 prepare() {
   cd ${_pkgfqn}
@@ -45,6 +49,11 @@
 
   # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
   sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i 
mkspecs/features/create_cmake.prf
+
+  # Fix accessibility build 
+  patch -p1 -i ../qtbug-61731.patch
+  # Fix doc navigation
+  patch -p1 -i ../qtcreatorbug-18448.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-06-07 Thread Antonio Rojas
Date: Wednesday, June 7, 2017 @ 21:12:43
  Author: arojas
Revision: 298151

Backport some bug fixes

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-07 20:50:21 UTC (rev 298150)
+++ PKGBUILD2017-06-07 21:12:43 UTC (rev 298151)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.9.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -26,8 +26,12 @@
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;)
-sha256sums=('267eb2af1a203c087f2113f43b08014d0e2d2cb269295b8602d869a2fad5296c')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+qtbug-61140.patch::"https://github.com/qt/qtbase/commit/744fd39e.patch;
+
qtbug-60558.patch::"https://github.com/qt/qtbase/commit/f45c6c18.patch;)
+sha256sums=('267eb2af1a203c087f2113f43b08014d0e2d2cb269295b8602d869a2fad5296c'
+'a00d8a0284e0c774c00dc72277edc63579212476ec1d4ebb6246bfd1035e3e4a'
+'e9d5189baf7a1d8957bd5b00474732412377ac761128e99066aa3314626f7989')
 
 prepare() {
   cd ${_pkgfqn}
@@ -45,6 +49,11 @@
 
   # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
   sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i 
mkspecs/features/create_cmake.prf
+
+  # Don't destroy foreign windows
+  patch -p1 -i ../qtbug-61140.patch
+  # Fix crashes with QtCurve
+  patch -p1 -i ../qtbug-60558.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-05-31 Thread Evangelos Foutras
Date: Wednesday, May 31, 2017 @ 07:41:48
  Author: foutrelis
Revision: 296881

MariaDB 10.2.6 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-31 07:22:23 UTC (rev 296880)
+++ PKGBUILD2017-05-31 07:41:48 UTC (rev 296881)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=13.1
+pkgrel=14.1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-05-25 Thread Evangelos Foutras
Date: Friday, May 26, 2017 @ 02:05:24
  Author: foutrelis
Revision: 296637

MariaDB 10.2.6 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-26 01:29:26 UTC (rev 296636)
+++ PKGBUILD2017-05-26 02:05:24 UTC (rev 296637)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=12.1
+pkgrel=13.1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-05-25 Thread Antonio Rojas
Date: Thursday, May 25, 2017 @ 15:18:54
  Author: arojas
Revision: 296572

Rebuild i686 package against GCC 6 (FS#54185)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-25 13:58:42 UTC (rev 296571)
+++ PKGBUILD2017-05-25 15:18:54 UTC (rev 296572)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=12
+pkgrel=12.1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -32,10 +32,10 @@
 
plasma-crash-2.patch::https://github.com/qt/qtbase/commit/0874861b.patch
 
plasma-crash-3.patch::https://github.com/qt/qtbase/commit/baad82d2.patch)
 md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
- '160fde81fe882c4241f04634f53691ad'
- '078d8a051c06abf28451fd2cdb7f19ce'
- '92daaa3ebd7cf10ee725b963e44c95a7'
- '76ab122615f1ba2d68c83477f82e389e')
+ 'e9ab6de042b599638f506d2974598164'
+ '438f85a8ecc0f8c066dc0deb5961b6fa'
+ '763a796776f3f8bf46cd4a0ed13d4028'
+ 'ffacccebfc17dc5a87724d13cefe38e5')
 
 prepare() {
   cd ${_pkgfqn}


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-05-17 Thread Jan de Groot
Date: Wednesday, May 17, 2017 @ 10:27:34
  Author: jgc
Revision: 296203

upgpkg: qt5-base 5.8.0-12

OpenSSL 1.0 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-17 10:04:16 UTC (rev 296202)
+++ PKGBUILD2017-05-17 10:27:34 UTC (rev 296203)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=11
+pkgrel=12
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-04-25 Thread Evangelos Foutras
Date: Tuesday, April 25, 2017 @ 08:03:05
  Author: foutrelis
Revision: 294623

icu 59.1 / hunspell 1.6.0 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-25 07:52:22 UTC (rev 294622)
+++ PKGBUILD2017-04-25 08:03:05 UTC (rev 294623)
@@ -6,7 +6,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=10
+pkgrel=11
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-04-13 Thread Felix Yan
Date: Thursday, April 13, 2017 @ 14:58:21
  Author: felixonmars
Revision: 292691

upgpkg: qt5-base 5.8.0-10

Attempt to package qt5-xcb-private-headers along with qt5-base,
so we don't rely on a third-party repo to fetch the headers over git
and won't delay on new qt release.

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   26 +-
 1 file changed, 21 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-13 13:35:48 UTC (rev 292690)
+++ PKGBUILD2017-04-13 14:58:21 UTC (rev 292691)
@@ -2,10 +2,11 @@
 # Maintainer: Felix Yan 
 # Contributor: Andrea Scarpino 
 
-pkgname=qt5-base
+pkgbase=qt5-base
+pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=9
+pkgrel=10
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -24,7 +25,7 @@
 'gtk3: GTK platform plugin')
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+_pkgfqn="${pkgbase/5-/}-opensource-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 
qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch;
 
plasma-crash-1.patch::https://github.com/qt/qtbase/commit/3bd0fd8f.patch
@@ -91,12 +92,14 @@
   make
 }
 
-package() {
+package_qt5-base() {
+  pkgdesc='A cross-platform application and UI framework'
+
   cd ${_pkgfqn}
   make INSTALL_ROOT="${pkgdir}" install
 
   install -D -m644 LGPL_EXCEPTION.txt \
-"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+"${pkgdir}"/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
 
   # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
@@ -111,3 +114,16 @@
 ln -s /usr/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
   done
 }
+
+package_qt5-xcb-private-headers() {
+  pkgdesc='Private headers for Qt5 Xcb'
+
+  depends=("qt5-base=$pkgver")
+  optdepends=()
+  groups=()
+  conflicts=()
+
+  cd ${_pkgfqn}
+  install -d -m755 "$pkgdir"/usr/include/qtxcb-private
+  cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
+}


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-04-05 Thread Antonio Rojas
Date: Wednesday, April 5, 2017 @ 07:58:16
  Author: arojas
Revision: 292088

openssl-1.0 1.0.2.k-3 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-05 07:19:12 UTC (rev 292087)
+++ PKGBUILD2017-04-05 07:58:16 UTC (rev 292088)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-03-03 Thread Antonio Rojas
Date: Friday, March 3, 2017 @ 18:47:26
  Author: arojas
Revision: 289942

openssl 1.1 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-03 17:10:58 UTC (rev 289941)
+++ PKGBUILD2017-03-03 18:47:26 UTC (rev 289942)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -12,7 +12,7 @@
 pkgdesc='A cross-platform application and UI framework'
 depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 
'fontconfig'
  'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups') # 
'openssl-1.0'
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 
'openssl-1.0')
 makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
  'gtk3' 'libpulse' 'cups' 'freetds')
 optdepends=('qt5-svg: to use SVG icon themes'
@@ -65,8 +65,8 @@
   # FS#38796
   [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
 
-#  echo "QMAKE_CXXFLAGS += -I/usr/include/openssl-1.0" >> 
mkspecs/linux-g++/qmake.conf
-#  export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
+  echo "INCLUDEPATH += /usr/include/openssl-1.0" >> src/network/network.pro
+  export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
 
   PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \
 -prefix /usr \


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-03-03 Thread Antonio Rojas
Date: Friday, March 3, 2017 @ 16:00:04
  Author: arojas
Revision: 289933

tslib 1.6 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-03 14:58:42 UTC (rev 289932)
+++ PKGBUILD2017-03-03 16:00:04 UTC (rev 289933)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -12,7 +12,7 @@
 pkgdesc='A cross-platform application and UI framework'
 depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 
'fontconfig'
  'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 
'openssl-1.0')
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups') # 
'openssl-1.0'
 makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
  'gtk3' 'libpulse' 'cups' 'freetds')
 optdepends=('qt5-svg: to use SVG icon themes'
@@ -65,8 +65,8 @@
   # FS#38796
   [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
 
-  echo "QMAKE_CXXFLAGS += -I/usr/include/openssl-1.0" >> 
mkspecs/linux-g++/qmake.conf
-  export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
+#  echo "QMAKE_CXXFLAGS += -I/usr/include/openssl-1.0" >> 
mkspecs/linux-g++/qmake.conf
+#  export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
 
   PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \
 -prefix /usr \


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-03-02 Thread Antonio Rojas
Date: Thursday, March 2, 2017 @ 22:45:37
  Author: arojas
Revision: 289902

Build against openssl-1.0

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-02 22:32:17 UTC (rev 289901)
+++ PKGBUILD2017-03-02 22:45:37 UTC (rev 289902)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -12,7 +12,7 @@
 pkgdesc='A cross-platform application and UI framework'
 depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 
'fontconfig'
  'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups')
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 
'openssl-1.0')
 makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
  'gtk3' 'libpulse' 'cups' 'freetds')
 optdepends=('qt5-svg: to use SVG icon themes'
@@ -65,6 +65,9 @@
   # FS#38796
   [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
 
+  echo "QMAKE_CXXFLAGS += -I/usr/include/openssl-1.0" >> 
mkspecs/linux-g++/qmake.conf
+  export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
+
   PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \
 -prefix /usr \
 -docdir /usr/share/doc/qt \


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-02-09 Thread Antonio Rojas
Date: Thursday, February 9, 2017 @ 20:26:29
  Author: arojas
Revision: 288534

tslib 1.5 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-09 20:23:02 UTC (rev 288533)
+++ PKGBUILD2017-02-09 20:26:29 UTC (rev 288534)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-02-08 Thread Antonio Rojas
Date: Thursday, February 9, 2017 @ 07:47:04
  Author: arojas
Revision: 288276

Backport some fixes for Plasma taskbar crashes (FS#52907)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-09 02:42:07 UTC (rev 288275)
+++ PKGBUILD2017-02-09 07:47:04 UTC (rev 288276)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -26,9 +26,15 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
-
qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch;)
+
qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch;
+
plasma-crash-1.patch::https://github.com/qt/qtbase/commit/3bd0fd8f.patch
+
plasma-crash-2.patch::https://github.com/qt/qtbase/commit/0874861b.patch
+
plasma-crash-3.patch::https://github.com/qt/qtbase/commit/baad82d2.patch)
 md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
- '160fde81fe882c4241f04634f53691ad')
+ '160fde81fe882c4241f04634f53691ad'
+ '078d8a051c06abf28451fd2cdb7f19ce'
+ '92daaa3ebd7cf10ee725b963e44c95a7'
+ '76ab122615f1ba2d68c83477f82e389e')
 
 prepare() {
   cd ${_pkgfqn}
@@ -46,6 +52,11 @@
 
   # Fix logging to systemd journal
   patch -p1 -i ../qt5-base-journald.patch
+
+  # Fix some Plasma taskbar crashes https://bugs.kde.org/show_bug.cgi?id=342763
+  patch -p1 -i ../plasma-crash-1.patch
+  patch -p1 -i ../plasma-crash-2.patch
+  patch -p1 -i ../plasma-crash-3.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-02-03 Thread Antonio Rojas
Date: Friday, February 3, 2017 @ 15:52:14
  Author: arojas
Revision: 287985

tslib 1.4 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-03 15:38:13 UTC (rev 287984)
+++ PKGBUILD2017-02-03 15:52:14 UTC (rev 287985)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-01-28 Thread Antonio Rojas
Date: Saturday, January 28, 2017 @ 23:19:58
  Author: arojas
Revision: 287626

Fix logging to systemd journal (FS#52712)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-28 17:08:29 UTC (rev 287625)
+++ PKGBUILD2017-01-28 23:19:58 UTC (rev 287626)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -25,8 +25,10 @@
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;)
-md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+
qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch;)
+md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
+ '160fde81fe882c4241f04634f53691ad')
 
 prepare() {
   cd ${_pkgfqn}
@@ -41,6 +43,9 @@
   # Use python2 for Python 2.x
   find . -name '*.py' -exec sed -i \
 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
+
+  # Fix logging to systemd journal
+  patch -p1 -i ../qt5-base-journald.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-01-24 Thread Antonio Rojas
Date: Tuesday, January 24, 2017 @ 15:07:17
  Author: arojas
Revision: 287382

Redundant dependency

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-24 14:59:56 UTC (rev 287381)
+++ PKGBUILD2017-01-24 15:07:17 UTC (rev 287382)
@@ -13,7 +13,7 @@
 depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 
'fontconfig'
  'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
  'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups')
-makedepends=('mtdev' 'libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
+makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
  'gtk3' 'libpulse' 'cups' 'freetds')
 optdepends=('qt5-svg: to use SVG icon themes'
 'postgresql-libs: PostgreSQL driver'
@@ -21,7 +21,6 @@
 'unixodbc: ODBC driver'
 'libfbclient: Firebird/iBase driver'
 'freetds: MS SQL driver'
-'mtdev: evdev plugin'
 'gtk3: GTK platform plugin')
 conflicts=('qtchooser')
 groups=('qt' 'qt5')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2017-01-09 Thread Antonio Rojas
Date: Monday, January 9, 2017 @ 19:15:48
  Author: arojas
Revision: 285592

tslib 1.3 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-09 18:57:26 UTC (rev 285591)
+++ PKGBUILD2017-01-09 19:15:48 UTC (rev 285592)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.7.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-12-09 Thread Antonio Rojas
Date: Friday, December 9, 2016 @ 10:40:50
  Author: arojas
Revision: 282961

Fix file dialog crashes on GNOME/Wayland (FS#50013, FS#50706)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-09 08:33:50 UTC (rev 282960)
+++ PKGBUILD2016-12-09 10:40:50 UTC (rev 282961)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -32,7 +32,8 @@
 
qtbug-53237.patch::"https://github.com/qtproject/qtbase/commit/8e889378.patch;
 qtbug-49452.patch::"https://github.com/qt/qtbase/commit/6f423555.patch;
 
qtbase-memory-leak.patch::"https://github.com/qt/qtbase/commit/42283868.patch;
-
qtbug-49061.patch::"https://github.com/qt/qtbase/commit/494376f9.patch;)
+qtbug-49061.patch::"https://github.com/qt/qtbase/commit/494376f9.patch;
+
qtbug-55583.patch::"https://github.com/qt/qtbase/commit/84ea00d4.patch;)
 md5sums=('184f9460b40752d71b15b827260580c2'
  '462f079cd46f869def6858903a718bf5'
  'da4fd787ea877516397a027412e975e1'
@@ -39,7 +40,8 @@
  '981255fb1aea0d3c0b5c5f306fe374da'
  '646aea77ca90031c453a65ef61db55f9'
  '9842c327b091b360da7a4d90f5fdf4da'
- 'c86af27562bbbe05c3defd63d00130fd')
+ 'c86af27562bbbe05c3defd63d00130fd'
+ '7b11584d9ea1ccb6c419e9b9816dee63')
 
 prepare() {
   cd ${_pkgfqn}
@@ -73,6 +75,9 @@
 
   # Don't unload plugins in QPluginLoader 
https://bugreports.qt.io/browse/QTBUG-49061
   patch -p1 -i ../qtbug-49061.patch
+
+  # Fix file chooser segfault on gnome/wayland 
https://bugreports.qt.io/browse/QTBUG-55583
+  patch -p1 -i ../qtbug-55583.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-12-07 Thread Antonio Rojas
Date: Thursday, December 8, 2016 @ 07:47:17
  Author: arojas
Revision: 282935

Fix crash on plugin unloading (FS#52026)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-08 07:04:10 UTC (rev 282934)
+++ PKGBUILD2016-12-08 07:47:17 UTC (rev 282935)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -12,7 +12,7 @@
 pkgdesc='A cross-platform application and UI framework'
 depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'fontconfig'
  'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy')
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups')
 makedepends=('mtdev' 'libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
  'gtk3' 'libpulse' 'cups' 'freetds')
 optdepends=('qt5-svg: to use SVG icon themes'
@@ -31,13 +31,15 @@
 
qtbug-53071b.patch::"https://github.com/qtproject/qtbase/commit/cd25866f.patch;
 
qtbug-53237.patch::"https://github.com/qtproject/qtbase/commit/8e889378.patch;
 qtbug-49452.patch::"https://github.com/qt/qtbase/commit/6f423555.patch;
-
qtbase-memory-leak.patch::"https://github.com/qt/qtbase/commit/42283868.patch;)
+
qtbase-memory-leak.patch::"https://github.com/qt/qtbase/commit/42283868.patch;
+
qtbug-49061.patch::"https://github.com/qt/qtbase/commit/494376f9.patch;)
 md5sums=('184f9460b40752d71b15b827260580c2'
  '462f079cd46f869def6858903a718bf5'
  'da4fd787ea877516397a027412e975e1'
  '981255fb1aea0d3c0b5c5f306fe374da'
  '646aea77ca90031c453a65ef61db55f9'
- '9842c327b091b360da7a4d90f5fdf4da')
+ '9842c327b091b360da7a4d90f5fdf4da'
+ 'c86af27562bbbe05c3defd63d00130fd')
 
 prepare() {
   cd ${_pkgfqn}
@@ -68,6 +70,9 @@
 
   # Fix memory leak
   patch -p1 -i ../qtbase-memory-leak.patch
+
+  # Don't unload plugins in QPluginLoader 
https://bugreports.qt.io/browse/QTBUG-49061
+  patch -p1 -i ../qtbug-49061.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-11-28 Thread Evangelos Foutras
Date: Monday, November 28, 2016 @ 11:57:34
  Author: foutrelis
Revision: 282155

icu 58.1 / poppler 0.49.0 / hunspell 1.5.0 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-28 11:35:39 UTC (rev 282154)
+++ PKGBUILD2016-11-28 11:57:34 UTC (rev 282155)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-11-20 Thread Antonio Rojas
Date: Sunday, November 20, 2016 @ 11:08:03
  Author: arojas
Revision: 281669

Fix memory leak (FS#51896), revert unintended change

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-20 10:37:52 UTC (rev 281668)
+++ PKGBUILD2016-11-20 11:08:03 UTC (rev 281669)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -31,13 +31,13 @@
 
qtbug-53071b.patch::"https://github.com/qtproject/qtbase/commit/cd25866f.patch;
 
qtbug-53237.patch::"https://github.com/qtproject/qtbase/commit/8e889378.patch;
 qtbug-49452.patch::"https://github.com/qt/qtbase/commit/6f423555.patch;
-no-gtk-qpa-on-wayland.patch)
+
qtbase-memory-leak.patch::"https://github.com/qt/qtbase/commit/42283868.patch;)
 md5sums=('184f9460b40752d71b15b827260580c2'
  '462f079cd46f869def6858903a718bf5'
  'da4fd787ea877516397a027412e975e1'
  '981255fb1aea0d3c0b5c5f306fe374da'
  '646aea77ca90031c453a65ef61db55f9'
- '880c9d0060916888ba17b7f9ea41a8c5')
+ '9842c327b091b360da7a4d90f5fdf4da')
 
 prepare() {
   cd ${_pkgfqn}
@@ -66,8 +66,8 @@
   # Fix freetype engine performance 
   patch -p1 -i ../qtbug-49452.patch
 
-  # Don't use the GTK QPA on Wayland - file chooser segfaults
-  patch -p1 -i ../no-gtk-qpa-on-wayland.patch
+  # Fix memory leak
+  patch -p1 -i ../qtbase-memory-leak.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD no-gtk-qpa-on-wayland.patch)

2016-11-19 Thread Antonio Rojas
Date: Sunday, November 20, 2016 @ 00:38:59
  Author: arojas
Revision: 281639

tslib 1.2 rebuild

Added:
  qt5-base/trunk/no-gtk-qpa-on-wayland.patch
Modified:
  qt5-base/trunk/PKGBUILD

-+
 PKGBUILD|   11 ---
 no-gtk-qpa-on-wayland.patch |   13 +
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-20 00:03:18 UTC (rev 281638)
+++ PKGBUILD2016-11-20 00:38:59 UTC (rev 281639)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -30,12 +30,14 @@
 
qtbug-53071.patch::"https://github.com/qtproject/qtbase/commit/e9041c7fc.patch;
 
qtbug-53071b.patch::"https://github.com/qtproject/qtbase/commit/cd25866f.patch;
 
qtbug-53237.patch::"https://github.com/qtproject/qtbase/commit/8e889378.patch;
-
qtbug-49452.patch::"https://github.com/qt/qtbase/commit/6f423555.patch;)
+qtbug-49452.patch::"https://github.com/qt/qtbase/commit/6f423555.patch;
+no-gtk-qpa-on-wayland.patch)
 md5sums=('184f9460b40752d71b15b827260580c2'
  '462f079cd46f869def6858903a718bf5'
  'da4fd787ea877516397a027412e975e1'
  '981255fb1aea0d3c0b5c5f306fe374da'
- '646aea77ca90031c453a65ef61db55f9')
+ '646aea77ca90031c453a65ef61db55f9'
+ '880c9d0060916888ba17b7f9ea41a8c5')
 
 prepare() {
   cd ${_pkgfqn}
@@ -63,6 +65,9 @@
 
   # Fix freetype engine performance 
   patch -p1 -i ../qtbug-49452.patch
+
+  # Don't use the GTK QPA on Wayland - file chooser segfaults
+  patch -p1 -i ../no-gtk-qpa-on-wayland.patch
 }
 
 build() {

Added: no-gtk-qpa-on-wayland.patch
===
--- no-gtk-qpa-on-wayland.patch (rev 0)
+++ no-gtk-qpa-on-wayland.patch 2016-11-20 00:38:59 UTC (rev 281639)
@@ -0,0 +1,13 @@
+diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp 
b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+index db264d1..e3cb2f3 100644
+--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
 b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+@@ -814,7 +814,7 @@ QStringList QGenericUnixTheme::themeNames()
+ #ifndef QT_NO_SETTINGS
+ result.push_back(QLatin1String(QKdeTheme::name));
+ #endif
+-} else if (gtkBasedEnvironments.contains(desktopName)) {
++} else if (gtkBasedEnvironments.contains(desktopName) && 
QString::fromLocal8Bit(qgetenv("XDG_SESSION_TYPE")) != 
QLatin1String("wayland")) {
+ // prefer the GTK3 theme implementation with native dialogs 
etc.
+ result.push_back(QStringLiteral("gtk3"));
+ // fallback to the generic Gnome theme if loading the GTK3 
theme fails


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-10-01 Thread Antonio Rojas
Date: Saturday, October 1, 2016 @ 07:54:33
  Author: arojas
Revision: 277479

Install binaries to the standard location

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-01 03:37:51 UTC (rev 277478)
+++ PKGBUILD2016-10-01 07:54:33 UTC (rev 277479)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -12,7 +12,7 @@
 pkgdesc='A cross-platform application and UI framework'
 depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'fontconfig'
  'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'qtchooser' 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy')
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy')
 makedepends=('mtdev' 'libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
  'gtk3' 'libpulse' 'cups' 'freetds')
 optdepends=('qt5-svg: to use SVG icon themes'
@@ -23,6 +23,7 @@
 'freetds: MS SQL driver'
 'mtdev: evdev plugin'
 'gtk3: GTK platform plugin')
+conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
@@ -72,7 +73,6 @@
 
   PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource -v \
 -prefix /usr \
--bindir /usr/lib/qt/bin \
 -docdir /usr/share/doc/qt \
 -headerdir /usr/include/qt \
 -archdatadir /usr/lib/qt \
@@ -109,9 +109,8 @@
   sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
 
-  # Useful symlinks
-  install -d "${pkgdir}"/usr/bin
-  for b in "${pkgdir}"/usr/lib/qt/bin/*; do
-ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+  # Symlinks for backwards compatibility
+  for b in "${pkgdir}"/usr/bin/*; do
+ln -s /usr/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
   done
 }


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-08-02 Thread Antonio Rojas
Date: Tuesday, August 2, 2016 @ 08:04:16
  Author: arojas
Revision: 272827

Fix freetype engine performance (FS#49989)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-02 07:23:54 UTC (rev 272826)
+++ PKGBUILD2016-08-02 08:04:16 UTC (rev 272827)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -28,11 +28,13 @@
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 
qtbug-53071.patch::"https://github.com/qtproject/qtbase/commit/e9041c7fc.patch;
 
qtbug-53071b.patch::"https://github.com/qtproject/qtbase/commit/cd25866f.patch;
-
qtbug-53237.patch::"https://github.com/qtproject/qtbase/commit/8e889378.patch;)
+
qtbug-53237.patch::"https://github.com/qtproject/qtbase/commit/8e889378.patch;
+
qtbug-49452.patch::"https://github.com/qt/qtbase/commit/6f423555.patch;)
 md5sums=('184f9460b40752d71b15b827260580c2'
  '462f079cd46f869def6858903a718bf5'
  'da4fd787ea877516397a027412e975e1'
- '981255fb1aea0d3c0b5c5f306fe374da')
+ '981255fb1aea0d3c0b5c5f306fe374da'
+ '646aea77ca90031c453a65ef61db55f9')
 
 prepare() {
   cd ${_pkgfqn}
@@ -57,6 +59,9 @@
 
   # Fix UNSIGNED values in QMYSQL
   patch -p1 -i ../qtbug-53237.patch
+
+  # Fix freetype engine performance 
+  patch -p1 -i ../qtbug-49452.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-06-14 Thread Antonio Rojas
Date: Tuesday, June 14, 2016 @ 16:12:37
  Author: arojas
Revision: 269678

Fix UNSIGNED values in QMYSQL (FS#48778)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-14 16:12:31 UTC (rev 269677)
+++ PKGBUILD2016-06-14 16:12:37 UTC (rev 269678)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.6.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -28,10 +28,12 @@
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 
qtbug-53071.patch::"https://github.com/qtproject/qtbase/commit/e9041c7fc.patch;
-
qtbug-53071b.patch::"https://github.com/qtproject/qtbase/commit/cd25866f.patch;)
+
qtbug-53071b.patch::"https://github.com/qtproject/qtbase/commit/cd25866f.patch;
+
qtbug-53237.patch::"https://github.com/qtproject/qtbase/commit/8e889378.patch;)
 md5sums=('b23232190a3df61fe1ba81636987b036'
  '462f079cd46f869def6858903a718bf5'
- 'da4fd787ea877516397a027412e975e1')
+ 'da4fd787ea877516397a027412e975e1'
+ '981255fb1aea0d3c0b5c5f306fe374da')
 
 prepare() {
   cd ${_pkgfqn}
@@ -53,6 +55,9 @@
   # Fix parsing of tzfile(5) POSIX rule zone names with bracket quotes
   patch -p1 -i ../qtbug-53071.patch
   patch -p1 -i ../qtbug-53071b.patch
+
+  # Fix UNSIGNED values in QMYSQL
+  patch -p1 -i ../qtbug-53237.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD qtbug-44964.patch)

2016-05-31 Thread Antonio Rojas
Date: Tuesday, May 31, 2016 @ 12:44:24
  Author: arojas
Revision: 268772

Backport a fix required by krita 3.0

Added:
  qt5-base/trunk/qtbug-44964.patch
Modified:
  qt5-base/trunk/PKGBUILD

---+
 PKGBUILD  |   12 +++---
 qtbug-44964.patch |  100 
 2 files changed, 106 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-31 09:54:03 UTC (rev 268771)
+++ PKGBUILD2016-05-31 10:44:24 UTC (rev 268772)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -27,7 +27,7 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 qt5-alsa1.11.patch
-qtbug-51648.patch qtbug-51649.patch qtbug-51676.patch qtbug-45812.patch
+qtbug-51648.patch qtbug-51649.patch qtbug-51676.patch 
qtbug-45812.patch qtbug-44964.patch
 
qtbug-53071.patch::"https://github.com/qtproject/qtbase/commit/e9041c7fc.patch;
 
qtbug-53071b.patch::"https://github.com/qtproject/qtbase/commit/cd25866f.patch;)
 md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
@@ -36,6 +36,7 @@
  'ef981ff6892337cdab424ebb113b3c39'
  'f59a1ea0f10a055ba930a53832933482'
  '7f152c40947027acba56023e9d693260'
+ '28cddedf6c15751d08c1382bf1074fa7'
  '462f079cd46f869def6858903a718bf5'
  'da4fd787ea877516397a027412e975e1')
 
@@ -70,15 +71,14 @@
   # Fix parsing of tzfile(5) POSIX rule zone names with bracket quotes
   patch -p1 -i ../qtbug-53071.patch
   patch -p1 -i ../qtbug-53071b.patch
+
+  # Don't compress tablet motion events
+  patch -p1 -i ../qtbug-44964.patch
 }
 
 build() {
   cd ${_pkgfqn}
 
-#  export QTDIR="${srcdir}"/${_pkgfqn}
-#  export LD_LIBRARY_PATH="${QTDIR}"/lib:"${LD_LIBRARY_PATH}"
-#  export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins
-
   # FS#38796
   [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
 

Added: qtbug-44964.patch
===
--- qtbug-44964.patch   (rev 0)
+++ qtbug-44964.patch   2016-05-31 10:44:24 UTC (rev 268772)
@@ -0,0 +1,100 @@
+From 60cd1c67759642018ef93cc45a90714729100d9d Mon Sep 17 00:00:00 2001
+From: Shawn Rutledge 
+Date: Thu, 28 Apr 2016 11:30:30 +0200
+Subject: [PATCH] xcb: don't compress tablet motion events
+
+7edd10e6c added this compression feature, but it's not a good idea for
+drawing-tablet applications, because smooth drawing depends on receiving
+every movement of the stylus.
+
+Also show the device ID in qt.qpa.input.devices category logging.
+
+[ChangeLog][X11] The new X event compression feature that was added in
+5.6.0 no longer applies to motion events from drawing tablets.
+
+Task-number: QTBUG-44964
+Change-Id: Icd2ca8ca77d8f80c2f39160c74208db10e382501
+Reviewed-by: Gatis Paeglis 
+---
+ src/plugins/platforms/xcb/qxcbconnection.cpp |  7 ++-
+ src/plugins/platforms/xcb/qxcbconnection.h   |  1 +
+ src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 21 ++---
+ 3 files changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp 
b/src/plugins/platforms/xcb/qxcbconnection.cpp
+index edfaf2b..669ef3a 100644
+--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
 b/src/plugins/platforms/xcb/qxcbconnection.cpp
+@@ -1626,8 +1626,13 @@ bool QXcbConnection::compressEvent(xcb_generic_event_t 
*event, int currentIndex,
+ if (!m_xi2Enabled)
+ return false;
+ 
+-// compress XI_Motion
++// compress XI_Motion, but not from tablet devices
+ if (isXIType(event, m_xiOpCode, XI_Motion)) {
++#ifndef QT_NO_TABLETEVENT
++xXIDeviceEvent *xdev = reinterpret_cast(event);
++if (const_cast(this)->tabletDataForDevice(xdev->sourceid))
++return false;
++#endif // QT_NO_TABLETEVENT
+ for (int j = nextIndex; j < eventqueue->size(); ++j) {
+ xcb_generic_event_t *next = eventqueue->at(j);
+ if (!isValid(next))
+diff --git a/src/plugins/platforms/xcb/qxcbconnection.h 
b/src/plugins/platforms/xcb/qxcbconnection.h
+index 7ba9588..501da1c 100644
+--- a/src/plugins/platforms/xcb/qxcbconnection.h
 b/src/plugins/platforms/xcb/qxcbconnection.h
+@@ -578,6 +578,7 @@ private slots:
+ bool xi2HandleTabletEvent(void *event, TabletData *tabletData, 
QXcbWindowEventListener *eventListener);
+ void xi2ReportTabletEvent(TabletData , void *event);
+ QVector m_tabletData;
++TabletData *tabletDataForDevice(int id);
+ #endif // !QT_NO_TABLETEVENT
+ struct ScrollingDevice {
+ ScrollingDevice() : deviceId(0), 

[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-05-24 Thread Antonio Rojas
Date: Wednesday, May 25, 2016 @ 00:31:51
  Author: arojas
Revision: 268546

Fix time zones for Kazakhstan (FS#49126)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-24 21:16:05 UTC (rev 268545)
+++ PKGBUILD2016-05-24 22:31:51 UTC (rev 268546)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -27,13 +27,17 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 qt5-alsa1.11.patch
-qtbug-51648.patch qtbug-51649.patch qtbug-51676.patch 
qtbug-45812.patch)
+qtbug-51648.patch qtbug-51649.patch qtbug-51676.patch qtbug-45812.patch
+
qtbug-53071.patch::"https://github.com/qtproject/qtbase/commit/e9041c7fc.patch;
+
qtbug-53071b.patch::"https://github.com/qtproject/qtbase/commit/cd25866f.patch;)
 md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
  '5e96b5cfa248b8b071919adb27abc715'
  'b09aa4f5763f013b06153fbdbc844404'
  'ef981ff6892337cdab424ebb113b3c39'
  'f59a1ea0f10a055ba930a53832933482'
- '7f152c40947027acba56023e9d693260')
+ '7f152c40947027acba56023e9d693260'
+ '462f079cd46f869def6858903a718bf5'
+ 'da4fd787ea877516397a027412e975e1')
 
 prepare() {
   cd ${_pkgfqn}
@@ -62,6 +66,10 @@
 
   # Fix drag and drop from some applications
   patch -p1 -i ../qtbug-45812.patch
+
+  # Fix parsing of tzfile(5) POSIX rule zone names with bracket quotes
+  patch -p1 -i ../qtbug-53071.patch
+  patch -p1 -i ../qtbug-53071b.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-05-16 Thread Antonio Rojas
Date: Monday, May 16, 2016 @ 20:52:51
  Author: arojas
Revision: 268237

Revert pkgrel

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-16 18:51:52 UTC (rev 268236)
+++ PKGBUILD2016-05-16 18:52:51 UTC (rev 268237)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=6
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD rebuild.list)

2016-05-16 Thread Antonio Rojas
Date: Monday, May 16, 2016 @ 20:51:52
  Author: arojas
Revision: 268236

Update rebuild list

Modified:
  qt5-base/trunk/PKGBUILD
  qt5-base/trunk/rebuild.list

--+
 PKGBUILD |2 +-
 rebuild.list |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-16 18:51:10 UTC (rev 268235)
+++ PKGBUILD2016-05-16 18:51:52 UTC (rev 268236)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')

Modified: rebuild.list
===
--- rebuild.list2016-05-16 18:51:10 UTC (rev 268235)
+++ rebuild.list2016-05-16 18:51:52 UTC (rev 268236)
@@ -1,5 +1,4 @@
 fcitx-qt5
-frameworkintegration
 plasma-integration
 gcin
 calibre


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-04-26 Thread Antonio Rojas
Date: Tuesday, April 26, 2016 @ 12:25:44
  Author: arojas
Revision: 266161

Fix drag and drop from some applications (FS#48785)

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-26 08:49:56 UTC (rev 266160)
+++ PKGBUILD2016-04-26 10:25:44 UTC (rev 266161)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -20,6 +20,7 @@
 'libmariadbclient: MariaDB driver'
 'unixodbc: ODBC driver'
 'libfbclient: Firebird/iBase driver'
+'freetds: MS SQL driver'
 'mtdev: evdev plugin'
 'gtk2: GTK2 plugin')
 conflicts=('qt')
@@ -26,12 +27,13 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 
source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 qt5-alsa1.11.patch
-qtbug-51648.patch qtbug-51649.patch qtbug-51676.patch)
+qtbug-51648.patch qtbug-51649.patch qtbug-51676.patch 
qtbug-45812.patch)
 md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
  '5e96b5cfa248b8b071919adb27abc715'
  'b09aa4f5763f013b06153fbdbc844404'
  'ef981ff6892337cdab424ebb113b3c39'
- 'f59a1ea0f10a055ba930a53832933482')
+ 'f59a1ea0f10a055ba930a53832933482'
+ '7f152c40947027acba56023e9d693260')
 
 prepare() {
   cd ${_pkgfqn}
@@ -57,6 +59,9 @@
   patch -p1 -i ../qtbug-51648.patch
   patch -p1 -i ../qtbug-51649.patch
   patch -p1 -i ../qtbug-51676.patch
+
+  # Fix drag and drop from some applications
+  patch -p1 -i ../qtbug-45812.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-04-03 Thread Evangelos Foutras
Date: Sunday, April 3, 2016 @ 14:44:14
  Author: foutrelis
Revision: 263826

icu 57.1 / poppler 0.42.0 rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-03 12:12:39 UTC (rev 263825)
+++ PKGBUILD2016-04-03 12:44:14 UTC (rev 263826)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-03-19 Thread Antonio Rojas
Date: Wednesday, March 16, 2016 @ 20:40:01
  Author: arojas
Revision: 261925

Backport critical fixes for QDBus deadlocks

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-16 18:29:52 UTC (rev 261924)
+++ PKGBUILD2016-03-16 19:40:01 UTC (rev 261925)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -25,9 +25,13 @@
 conflicts=('qt')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 qt5-alsa1.11.patch)
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 qt5-alsa1.11.patch
+qtbug-51648.patch qtbug-51649.patch qtbug-51676.patch)
 md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
- '5e96b5cfa248b8b071919adb27abc715')
+ '5e96b5cfa248b8b071919adb27abc715'
+ 'b09aa4f5763f013b06153fbdbc844404'
+ 'ef981ff6892337cdab424ebb113b3c39'
+ 'f59a1ea0f10a055ba930a53832933482')
 
 prepare() {
   cd ${_pkgfqn}
@@ -48,6 +52,11 @@
 
   # Fix ALSA 1.11 detection
   patch -p1 -i ../qt5-alsa1.11.patch
+
+  # Backport fixes for QtDBus deadlocks
+  patch -p1 -i ../qtbug-51648.patch
+  patch -p1 -i ../qtbug-51649.patch
+  patch -p1 -i ../qtbug-51676.patch
 }
 
 build() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-03-15 Thread Antonio Rojas
Date: Tuesday, March 15, 2016 @ 20:59:58
  Author: arojas
Revision: 261671

Remove debug flag

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-15 16:08:52 UTC (rev 261670)
+++ PKGBUILD2016-03-15 19:59:58 UTC (rev 261671)
@@ -79,7 +79,7 @@
 -system-harfbuzz \
 -journald \
 -no-use-gold-linker \
--reduce-relocations ${SSE2} -debug
+-reduce-relocations ${SSE2}
 
   make
 }


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-03-04 Thread Antonio Rojas
Date: Saturday, March 5, 2016 @ 00:07:27
  Author: arojas
Revision: 260840

Cleanup PKGBUILD

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 1 file changed, 2 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-04 22:02:43 UTC (rev 260839)
+++ PKGBUILD2016-03-04 23:07:27 UTC (rev 260840)
@@ -10,11 +10,11 @@
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework'
-depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 
'systemd'
+depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'fontconfig'
  'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
  'qtchooser' 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11')
 makedepends=('mtdev' 'libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 
'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
- 'gtk2' 'libxkbcommon-x11' 'libinput' 'libpulse' 'cups' 'freetds')
+ 'gtk2' 'libpulse' 'cups' 'freetds')
 optdepends=('qt5-svg: to use SVG icon themes'
 'postgresql-libs: PostgreSQL driver'
 'libmariadbclient: MariaDB driver'
@@ -21,8 +21,6 @@
 'unixodbc: ODBC driver'
 'libfbclient: Firebird/iBase driver'
 'mtdev: evdev plugin'
-'libxkbcommon-x11: xcb plugin'
-'libsm: xcb plugin'
 'gtk2: GTK2 plugin')
 conflicts=('qt')
 groups=('qt' 'qt5')
@@ -84,17 +82,6 @@
 -reduce-relocations ${SSE2} -debug
 
   make
-
-  # Fix docs build when qt is not installed
-#  sed -e "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" \
-#-i qmake/Makefile.qmake-docs -i src/corelib/qdoc_wrapper.sh
-#  find . -name Makefile \
-#-exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/bin/qdoc|g" {} +
-#  sed -i 
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" 
qmake/Makefile.qmake-docs
-#  find . -name Makefile \
-#-exec sed -i 
"s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
-
-#  make docs
 }
 
 package() {


[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

2016-03-04 Thread Bartłomiej Piotrowski
Date: Friday, March 4, 2016 @ 12:14:01
  Author: bpiotrowski
Revision: 260806

OpenSSL 1.0.2g rebuild

Modified:
  qt5-base/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-04 11:06:44 UTC (rev 260805)
+++ PKGBUILD2016-03-04 11:14:01 UTC (rev 260806)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.6.0-rc
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')