[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Saturday, April 6, 2019 @ 13:09:13
Author: foutrelis
Revision: 350237
icu 64.1 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-04-06 11:57:34 UTC (rev 350236)
+++ PKGBUILD2019-04-06 13:09:13 UTC (rev 350237)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=27
+pkgrel=28
arch=('x86_64')
url='https://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Wednesday, January 16, 2019 @ 14:33:55
Author: felixonmars
Revision: 344236
MariaDB 10.3 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 14:21:17 UTC (rev 344235)
+++ PKGBUILD2019-01-16 14:33:55 UTC (rev 344236)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=26
+pkgrel=27
arch=('x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Monday, October 22, 2018 @ 21:20:53
Author: felixonmars
Revision: 337087
icu 63.1 / poppler 0.70.0 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-10-22 21:18:50 UTC (rev 337086)
+++ PKGBUILD2018-10-22 21:20:53 UTC (rev 337087)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=25
+pkgrel=26
arch=('x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Monday, August 6, 2018 @ 17:52:09
Author: foutrelis
Revision: 331023
icu 62.1 / poppler 0.67.0 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-08-06 17:41:13 UTC (rev 331022)
+++ PKGBUILD2018-08-06 17:52:09 UTC (rev 331023)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=24
+pkgrel=25
arch=('x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Monday, August 6, 2018 @ 17:41:13
Author: foutrelis
Revision: 331022
Update source URL
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-08-06 17:07:42 UTC (rev 331021)
+++ PKGBUILD2018-08-06 17:41:13 UTC (rev 331022)
@@ -26,7 +26,7 @@
replaces=('qt<=4.8.4')
conflicts=('qt')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
-source=("http://download.qt.io/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz;
+source=("http://download.qt.io/archive/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz;
'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
'improve-cups-support.patch'
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, March 27, 2018 @ 22:43:44
Author: foutrelis
Revision: 320444
icu 61.1 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-27 22:31:52 UTC (rev 320443)
+++ PKGBUILD2018-03-27 22:43:44 UTC (rev 320444)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=23
+pkgrel=24
arch=('x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, November 14, 2017 @ 07:43:52
Author: arojas
Revision: 309905
ICU 60.1 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-11-14 05:05:40 UTC (rev 309904)
+++ PKGBUILD2017-11-14 07:43:52 UTC (rev 309905)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=22
+pkgrel=23
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -102,12 +102,14 @@
# Fix build with OpenSSL 1.1 (Debian + OpenMandriva)
patch -p1 -i "$srcdir"/qt4-openssl-1.1.patch
+
+ echo "QMAKE_CXXFLAGS += -std=gnu++98" >>
src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+ echo "QMAKE_CXXFLAGS += -std=gnu++98" >>
src/plugins/accessible/qaccessiblebase.pri
}
build() {
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
- export CXXFLAGS+=" -std=gnu++98" # Fix build with GCC 6
cd ${_pkgfqn}
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, July 11, 2017 @ 06:50:43
Author: arojas
Revision: 300072
PIE rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-07-11 05:58:48 UTC (rev 300071)
+++ PKGBUILD2017-07-11 06:50:43 UTC (rev 300072)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=21
+pkgrel=22
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Thursday, May 25, 2017 @ 23:39:55
Author: foutrelis
Revision: 296630
MariaDB 10.2.6 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-05-25 23:35:16 UTC (rev 296629)
+++ PKGBUILD2017-05-25 23:39:55 UTC (rev 296630)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=20
+pkgrel=21
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD qt4-openssl-1.1.patch)
Date: Thursday, May 11, 2017 @ 12:31:16
Author: arojas
Revision: 295814
Fix build against openSSL 1.1
Added:
qt4/trunk/qt4-openssl-1.1.patch
Modified:
qt4/trunk/PKGBUILD
---+
PKGBUILD | 14 -
qt4-openssl-1.1.patch | 409
2 files changed, 417 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-05-11 11:44:28 UTC (rev 295813)
+++ PKGBUILD2017-05-11 12:31:16 UTC (rev 295814)
@@ -5,13 +5,13 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=19
+pkgrel=20
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv'
'libxi' 'alsa-lib'
-'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus'
'openssl-1.0')
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus')
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa')
optdepends=('postgresql-libs: PostgreSQL driver'
@@ -37,7 +37,7 @@
'disable-sslv3.patch'
'l-qclipboard_fix_recursive.patch'
'l-qclipboard_delay.patch'
-'qt4-gcc6.patch' 'qt4-glibc-2.25.patch' 'qt4-icu59.patch')
+'qt4-gcc6.patch' 'qt4-glibc-2.25.patch' 'qt4-icu59.patch'
'qt4-openssl-1.1.patch')
sha256sums=('e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0'
'157eb47865f0b43e4717819783823c569127a2e9fc48309982ca0f2b753517a1'
'd63f22858174489068c30a12b9115d1b4e23ade00c31c117513212e9a225c1ce'
@@ -54,7 +54,8 @@
'af3648ddb2372333b0e428788fd2ffbcfe571653fb46f898a55ae5a202f7e242'
'51da49e41edac66559d3ec8dd0a152995a51a53e5d1f63f09fa089a8af7e3112'
'e6555f4a681227447e94e9f14e11626d50b7e5108aad06088311e87063bc0347'
-'61d6bf45649c728dec5f8d22be5b496ed9d40f52c2c70102696d07133cd1750d')
+'61d6bf45649c728dec5f8d22be5b496ed9d40f52c2c70102696d07133cd1750d'
+'ff3ddb5428cd2ff243558dc0c75b35f470077e9204bbc989ddcba04c866c1b68')
prepare() {
cd ${_pkgfqn}
@@ -98,6 +99,9 @@
# Fix build with ICU 59 (pld-linux)
patch -p1 -i "$srcdir"/qt4-icu59.patch
+
+ # Fix build with OpenSSL 1.1 (Debian + OpenMandriva)
+ patch -p1 -i "$srcdir"/qt4-openssl-1.1.patch
}
build() {
@@ -104,8 +108,6 @@
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
export CXXFLAGS+=" -std=gnu++98" # Fix build with GCC 6
- export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
- export CXXFLAGS+=" -I/usr/include/openssl-1.0"
cd ${_pkgfqn}
Added: qt4-openssl-1.1.patch
===
--- qt4-openssl-1.1.patch (rev 0)
+++ qt4-openssl-1.1.patch 2017-05-11 12:31:16 UTC (rev 295814)
@@ -0,0 +1,409 @@
+Description: Compile with openssl-1.1.0
+ * Most changes are related to openssl structures are now opaque.
+ * The network/ssl threading setup has been disabled because the
+ old openssl threading model has been removed and is apparently
+ no longer needed.
+ * A number of new functions had to be imported (see changes to
+ src/network/ssl/qsslsocket_openssl_symbols.cpp)
+Author: Gert Wollny
+Last-Update: 2016-06-28
+Bug-Debian: http://bugs.debian.org/828522
+
+--- a/src/network/ssl/qsslcertificate.cpp
b/src/network/ssl/qsslcertificate.cpp
+@@ -259,10 +259,10 @@
+ QByteArray QSslCertificate::version() const
+ {
+ QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+-if (d->versionString.isEmpty() && d->x509)
++if (d->versionString.isEmpty() && d->x509) {
+ d->versionString =
+-
QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) +
1);
+-
++ QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1);
++}
+ return d->versionString;
+ }
+
+@@ -276,7 +276,7 @@
+ {
+ QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+ if (d->serialNumberString.isEmpty() && d->x509) {
+-ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber;
++ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509);
+ // if we cannot convert to a long, just output the hexadecimal number
+ if (serialNumber->length > 4) {
+ QByteArray hexString;
+@@ -489,24 +489,33 @@
+ QSslKey key;
+
+ key.d->type = QSsl::PublicKey;
++#if OPENSSL_VERSION_NUMBER < 0x1010L
+ X509_PUBKEY *xkey = d->x509->cert_info->key;
++#else
++X509_PUBKEY *xkey = q_X509_get_X509_PUBKEY(d->x509);
++#endif
+ EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey);
+ Q_ASSERT(pkey);
+
+-if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) {
++int key_id;
++#if
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, April 25, 2017 @ 15:54:50
Author: foutrelis
Revision: 294681
icu 59.1 / hunspell 1.6.0 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-04-25 15:54:47 UTC (rev 294680)
+++ PKGBUILD2017-04-25 15:54:50 UTC (rev 294681)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=18
+pkgrel=19
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, April 25, 2017 @ 15:32:57
Author: arojas
Revision: 294653
Fix checksums
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD | 33 +
1 file changed, 17 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-04-25 14:52:04 UTC (rev 294652)
+++ PKGBUILD2017-04-25 15:32:57 UTC (rev 294653)
@@ -38,22 +38,23 @@
'l-qclipboard_fix_recursive.patch'
'l-qclipboard_delay.patch'
'qt4-gcc6.patch' 'qt4-glibc-2.25.patch' 'qt4-icu59.patch')
-md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
- 'a16638f4781e56e7887ff8212a322ecc'
- '8a28b3f52dbeb685d4b69440b520a3e1'
- '9727c406c240990870c905696a8c5bd1'
- '0e384663d3dd32abe35f5331c4147569'
- 'b859c5673e5098c39f72b2252947049e'
- 'c439c7731c25387352d8453ca7574971'
- 'da387bde22ae1c446f12525d2a31f070'
- 'a523644faa8f98a73f55c4aa23c114a6'
- '66dfea63916c8dbf47b23cb012ffdccc'
- '85679531c8a7310317adfb7002d9f99a'
- '1803ab6313df762d807678e58fc85f53'
- '009de09b4e589a7770fba74405656c99'
- 'addc5e88d538ee55e17bd49ba337ca67'
- '98e00c5c7e5fee12e11ecbedd03f01ff'
- '296a06554222ff583941c5d3987e')
+sha256sums=('e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0'
+'157eb47865f0b43e4717819783823c569127a2e9fc48309982ca0f2b753517a1'
+'d63f22858174489068c30a12b9115d1b4e23ade00c31c117513212e9a225c1ce'
+'c154de65da1b81564fa68f29c773b5f1751e0ee821e858ee8f0684b8d027da58'
+'22bd69ee3ba986448a63e41f529a7d28d0f2e6d83d6114e763eba761db302e01'
+'915a1cb0f7328840cac742c03f5121dc6e19498952c082b46c0bf7263bf6676d'
+'3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33'
+'876c681ef8fbcc25f28cd4ad6c697abf8a4165d540bae37433bc40256dbf9d62'
+'9fad22674c5eec835613a7f16c11b865aa793b448e90974c0f804105284a548b'
+'ce97da195445f145d9f82df8f8e5d8716128e869ec6632db66c7125be663d813'
+'e7f8d1c906640b836454e8202a48602352609d8e44a33a3de05dc1d20f5b1a8a'
+'829b02ba10f208c2beba8e8a0110b6d10c63932612dabc08d536f099b9f66101'
+'5db36cbb0686b8a503941779c821febc4a0330dc260e51d603f7aa1e4d8860ad'
+'af3648ddb2372333b0e428788fd2ffbcfe571653fb46f898a55ae5a202f7e242'
+'51da49e41edac66559d3ec8dd0a152995a51a53e5d1f63f09fa089a8af7e3112'
+'e6555f4a681227447e94e9f14e11626d50b7e5108aad06088311e87063bc0347'
+'61d6bf45649c728dec5f8d22be5b496ed9d40f52c2c70102696d07133cd1750d')
prepare() {
cd ${_pkgfqn}
[arch-commits] Commit in qt4/trunk (PKGBUILD qt4-icu59.patch)
Date: Tuesday, April 25, 2017 @ 11:10:59
Author: arojas
Revision: 294643
Fix build with ICU 59 (pld-linux)
Added:
qt4/trunk/qt4-icu59.patch
Modified:
qt4/trunk/PKGBUILD
-+
PKGBUILD|5 -
qt4-icu59.patch | 11 +++
2 files changed, 15 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-04-25 10:49:50 UTC (rev 294642)
+++ PKGBUILD2017-04-25 11:10:59 UTC (rev 294643)
@@ -37,7 +37,7 @@
'disable-sslv3.patch'
'l-qclipboard_fix_recursive.patch'
'l-qclipboard_delay.patch'
-'qt4-gcc6.patch' 'qt4-glibc-2.25.patch')
+'qt4-gcc6.patch' 'qt4-glibc-2.25.patch' 'qt4-icu59.patch')
md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
'a16638f4781e56e7887ff8212a322ecc'
'8a28b3f52dbeb685d4b69440b520a3e1'
@@ -94,6 +94,9 @@
# Fix build of Qt4 applications with glibc 2.25 (Fedora)
patch -p1 -i "$srcdir"/qt4-glibc-2.25.patch
+
+ # Fix build with ICU 59 (pld-linux)
+ patch -p1 -i "$srcdir"/qt4-icu59.patch
}
build() {
Added: qt4-icu59.patch
===
--- qt4-icu59.patch (rev 0)
+++ qt4-icu59.patch 2017-04-25 11:10:59 UTC (rev 294643)
@@ -0,0 +1,11 @@
+--- qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp~
2017-04-25 07:42:22.0 +
qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp
2017-04-25 07:44:34.675363008 +
+@@ -43,6 +43,8 @@
+ #include "qlibrary.h"
+ #include "qdebug.h"
+
++#define UCHAR_TYPE unsigned short
++
+ #include "unicode/uversion.h"
+ #include "unicode/ucol.h"
+
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Wednesday, April 5, 2017 @ 08:26:41
Author: arojas
Revision: 292090
openssl-1.0 1.0.2.k-3 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-04-05 07:58:57 UTC (rev 292089)
+++ PKGBUILD2017-04-05 08:26:41 UTC (rev 292090)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=17
+pkgrel=18
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Wednesday, March 15, 2017 @ 19:22:03
Author: arojas
Revision: 290888
openssl-1.0 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-15 18:59:49 UTC (rev 290887)
+++ PKGBUILD2017-03-15 19:22:03 UTC (rev 290888)
@@ -5,13 +5,13 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=16
+pkgrel=17
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv'
'libxi' 'alsa-lib'
-'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus')
# 'openssl-1.0'
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus'
'openssl-1.0')
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa')
optdepends=('postgresql-libs: PostgreSQL driver'
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Wednesday, March 15, 2017 @ 18:59:22
Author: arojas
Revision: 290886
typo
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-15 18:57:29 UTC (rev 290885)
+++ PKGBUILD2017-03-15 18:59:22 UTC (rev 290886)
@@ -11,7 +11,7 @@
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv'
'libxi' 'alsa-lib'
-'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus')
'openssl-1.0'
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus')
# 'openssl-1.0'
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa')
optdepends=('postgresql-libs: PostgreSQL driver'
[arch-commits] Commit in qt4/trunk (PKGBUILD qt4-glibc-2.25.patch)
Date: Wednesday, March 15, 2017 @ 18:55:49
Author: arojas
Revision: 290884
Fix more build failures caused by glibc 2.25 (FS#53295)
Modified:
qt4/trunk/PKGBUILD
qt4/trunk/qt4-glibc-2.25.patch
--+
PKGBUILD |6 +++---
qt4-glibc-2.25.patch | 17 +
2 files changed, 20 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-15 17:46:49 UTC (rev 290883)
+++ PKGBUILD2017-03-15 18:55:49 UTC (rev 290884)
@@ -5,13 +5,13 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=15
+pkgrel=16
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv'
'libxi' 'alsa-lib'
-'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus'
'openssl-1.0')
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus')
'openssl-1.0'
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa')
optdepends=('postgresql-libs: PostgreSQL driver'
@@ -53,7 +53,7 @@
'009de09b4e589a7770fba74405656c99'
'addc5e88d538ee55e17bd49ba337ca67'
'98e00c5c7e5fee12e11ecbedd03f01ff'
- 'a6e217c159d9c0f588d4b5611493f0ea')
+ '296a06554222ff583941c5d3987e')
prepare() {
cd ${_pkgfqn}
Modified: qt4-glibc-2.25.patch
===
--- qt4-glibc-2.25.patch2017-03-15 17:46:49 UTC (rev 290883)
+++ qt4-glibc-2.25.patch2017-03-15 18:55:49 UTC (rev 290884)
@@ -11,3 +11,20 @@
#define QT_PACKAGEDATE_STR "2015-05-07"
+diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829
qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829
2015-05-07 09:14:44.0 -0500
qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2016-12-08
12:32:46.638962448 -0600
+@@ -188,10 +188,12 @@ int runMoc(int _argc, char **_argv)
+ pp.macros["Q_MOC_RUN"];
+ pp.macros["__cplusplus"];
+
+-// Workaround a bug while parsing the boost/type_traits/has_operator.hpp
header. See QTBUG-22829
++// Workaround a bugs while parsing some boost headers. See QTBUG-22829
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++pp.macros["BOOST_TYPE_TRAITS_HPP"];
++pp.macros["_SYS_SYSMACROS_H_OUTER"];
+
+ QByteArray filename;
+ QByteArray output;
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Monday, March 13, 2017 @ 17:28:38
Author: arojas
Revision: 290794
openssl-1.0 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-13 16:54:40 UTC (rev 290793)
+++ PKGBUILD2017-03-13 17:28:38 UTC (rev 290794)
@@ -5,13 +5,13 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=14
+pkgrel=15
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv'
'libxi' 'alsa-lib'
-'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus')
# 'openssl-1.0'
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus'
'openssl-1.0')
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa')
optdepends=('postgresql-libs: PostgreSQL driver'
@@ -100,9 +100,8 @@
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
export CXXFLAGS+=" -std=gnu++98" # Fix build with GCC 6
-# export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig/
-# export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
-# export CXXFLAGS+=" -I/usr/include/openssl-1.0"
+ export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
+ export CXXFLAGS+=" -I/usr/include/openssl-1.0"
cd ${_pkgfqn}
[arch-commits] Commit in qt4/trunk (PKGBUILD qt4-glibc-2.25.patch)
Date: Monday, March 13, 2017 @ 15:43:58
Author: arojas
Revision: 290790
Add Fedora patch to fix build of Qt4 applications with glibc 2.25
Added:
qt4/trunk/qt4-glibc-2.25.patch
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD | 18 +++---
qt4-glibc-2.25.patch | 13 +
2 files changed, 24 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-13 15:10:31 UTC (rev 290789)
+++ PKGBUILD2017-03-13 15:43:58 UTC (rev 290790)
@@ -5,13 +5,13 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=13
+pkgrel=14
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv'
'libxi' 'alsa-lib'
-'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus'
'openssl-1.0')
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus')
# 'openssl-1.0'
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa')
optdepends=('postgresql-libs: PostgreSQL driver'
@@ -37,7 +37,7 @@
'disable-sslv3.patch'
'l-qclipboard_fix_recursive.patch'
'l-qclipboard_delay.patch'
-'qt4-gcc6.patch')
+'qt4-gcc6.patch' 'qt4-glibc-2.25.patch')
md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
'a16638f4781e56e7887ff8212a322ecc'
'8a28b3f52dbeb685d4b69440b520a3e1'
@@ -52,7 +52,8 @@
'1803ab6313df762d807678e58fc85f53'
'009de09b4e589a7770fba74405656c99'
'addc5e88d538ee55e17bd49ba337ca67'
- '98e00c5c7e5fee12e11ecbedd03f01ff')
+ '98e00c5c7e5fee12e11ecbedd03f01ff'
+ 'a6e217c159d9c0f588d4b5611493f0ea')
prepare() {
cd ${_pkgfqn}
@@ -90,6 +91,9 @@
# Fix build with GCC6 (Fedora)
patch -p1 -i "$srcdir"/qt4-gcc6.patch
+
+ # Fix build of Qt4 applications with glibc 2.25 (Fedora)
+ patch -p1 -i "$srcdir"/qt4-glibc-2.25.patch
}
build() {
@@ -96,9 +100,9 @@
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
export CXXFLAGS+=" -std=gnu++98" # Fix build with GCC 6
- export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig/
- export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
- export CXXFLAGS+=" -I/usr/include/openssl-1.0"
+# export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig/
+# export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
+# export CXXFLAGS+=" -I/usr/include/openssl-1.0"
cd ${_pkgfqn}
Added: qt4-glibc-2.25.patch
===
--- qt4-glibc-2.25.patch(rev 0)
+++ qt4-glibc-2.25.patch2017-03-13 15:43:58 UTC (rev 290790)
@@ -0,0 +1,13 @@
+diff -up
qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin
+qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h
+--- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin
2015-05-07 09:14:48.0 -0500
qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h
2016-12-08 12:10:29.677359701 -0600
+@@ -52,7 +52,7 @@
+ /*
+can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
+ */
+-#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
++#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor,
qt_version_check_patch)
((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch))
+
+ #define QT_PACKAGEDATE_STR "2015-05-07"
+
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, February 28, 2017 @ 14:17:47
Author: arojas
Revision: 289671
rebuild with openssl-1.0
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-02-28 09:46:28 UTC (rev 289670)
+++ PKGBUILD2017-02-28 14:17:47 UTC (rev 289671)
@@ -5,13 +5,13 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=12
+pkgrel=13
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv'
'libxi' 'alsa-lib'
-'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus')
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus'
'openssl-1.0')
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa')
optdepends=('postgresql-libs: PostgreSQL driver'
@@ -96,6 +96,9 @@
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
export CXXFLAGS+=" -std=gnu++98" # Fix build with GCC 6
+ export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig/
+ export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
+ export CXXFLAGS+=" -I/usr/include/openssl-1.0"
cd ${_pkgfqn}
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Monday, January 2, 2017 @ 09:59:19
Author: arojas
Revision: 285204
Add missing dbus dependency
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-01-02 08:48:27 UTC (rev 285203)
+++ PKGBUILD2017-01-02 09:59:19 UTC (rev 285204)
@@ -5,13 +5,13 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=11
+pkgrel=12
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv'
'libxi' 'alsa-lib'
-'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng')
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus')
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa')
optdepends=('postgresql-libs: PostgreSQL driver'
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Monday, November 28, 2016 @ 12:16:51
Author: foutrelis
Revision: 282157
icu 58.1 / poppler 0.49.0 / hunspell 1.5.0 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-11-28 11:57:46 UTC (rev 282156)
+++ PKGBUILD2016-11-28 12:16:51 UTC (rev 282157)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=10
+pkgrel=11
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD qt4-gcc6.patch)
Date: Saturday, October 1, 2016 @ 11:44:49
Author: arojas
Revision: 277509
Drop qtchooser optdepend, fix build with GCC6
Added:
qt4/trunk/qt4-gcc6.patch
Modified:
qt4/trunk/PKGBUILD
+
PKGBUILD | 18 +++---
qt4-gcc6.patch | 36
2 files changed, 47 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-10-01 09:04:24 UTC (rev 277508)
+++ PKGBUILD2016-10-01 11:44:49 UTC (rev 277509)
@@ -5,18 +5,16 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=9
+pkgrel=10
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
-depends=('libtiff' 'libpng' 'sqlite' 'ca-certificates' 'dbus'
-'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv'
'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng')
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa')
-optdepends=('qtchooser: set the default Qt toolkit'
-'postgresql-libs: PostgreSQL driver'
+optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver'
@@ -38,7 +36,8 @@
'glib-honor-ExcludeSocketNotifiers-flag.diff'
'disable-sslv3.patch'
'l-qclipboard_fix_recursive.patch'
-'l-qclipboard_delay.patch')
+'l-qclipboard_delay.patch'
+'qt4-gcc6.patch')
md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
'a16638f4781e56e7887ff8212a322ecc'
'8a28b3f52dbeb685d4b69440b520a3e1'
@@ -52,7 +51,8 @@
'85679531c8a7310317adfb7002d9f99a'
'1803ab6313df762d807678e58fc85f53'
'009de09b4e589a7770fba74405656c99'
- 'addc5e88d538ee55e17bd49ba337ca67')
+ 'addc5e88d538ee55e17bd49ba337ca67'
+ '98e00c5c7e5fee12e11ecbedd03f01ff')
prepare() {
cd ${_pkgfqn}
@@ -87,11 +87,15 @@
cp mkspecs/common/linux{,32}.conf
sed -i "/^QMAKE_LIBDIR\s/s|=|= /usr/lib32|g" mkspecs/common/linux32.conf
sed -i "s|common/linux.conf|common/linux32.conf|"
mkspecs/linux-g++-32/qmake.conf
+
+ # Fix build with GCC6 (Fedora)
+ patch -p1 -i "$srcdir"/qt4-gcc6.patch
}
build() {
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+ export CXXFLAGS+=" -std=gnu++98" # Fix build with GCC 6
cd ${_pkgfqn}
Added: qt4-gcc6.patch
===
--- qt4-gcc6.patch (rev 0)
+++ qt4-gcc6.patch 2016-10-01 11:44:49 UTC (rev 277509)
@@ -0,0 +1,36 @@
+diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6
qt-everywhere-opensource-src-4.8.7/configure
+--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15
07:04:19.430268222 -0500
qt-everywhere-opensource-src-4.8.7/configure 2016-04-15
07:05:22.157568689 -0500
+@@ -7744,7 +7744,7 @@ case "$XPLATFORM" in
+ *-g++*)
+ # Check gcc's version
+ case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+- 5*|4*|3.4*)
++ 8*|7*|6*|5*|4*|3.4*)
+ ;;
+ 3.3*)
+ canBuildWebKit="no"
+@@ -8060,7 +8060,7 @@ g++*)
+ 3.*)
+ COMPILER_VERSION="3.*"
+ ;;
+-5*|4.*)
++8*|7*|6*|5*|4.*)
+ COMPILER_VERSION="4"
+ ;;
+ *)
+diff -up
qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6
+qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
+---
qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6
2015-05-07 09:14:48.0 -0500
qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
2016-04-15 07:04:19.431268227 -0500
+@@ -70,8 +70,8 @@ namespace QPatternist
+ ForegroundShift = 10,
+ BackgroundShift = 20,
+ SpecialShift= 20,
+-ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,
+-BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift
++ForegroundMask = 0x1f << ForegroundShift,
++BackgroundMask = 0x7 << BackgroundShift
+ };
+
+ public:
[arch-commits] Commit in qt4/trunk (PKGBUILD qt4.install)
Date: Wednesday, April 27, 2016 @ 20:39:58
Author: fyan
Revision: 266309
upgpkg: qt4 4.8.7-9
Hooks rebuild (part 1)
Modified:
qt4/trunk/PKGBUILD
Deleted:
qt4/trunk/qt4.install
-+
PKGBUILD|3 +--
qt4.install | 12
2 files changed, 1 insertion(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 18:39:46 UTC (rev 266308)
+++ PKGBUILD2016-04-27 18:39:58 UTC (rev 266309)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=8
+pkgrel=9
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -25,7 +25,6 @@
'libxfixes: Xfixes support'
'icu: Unicode support'
'sni-qt: StatusNotifierItem (AppIndicators) support')
-install="${pkgname}.install"
replaces=('qt<=4.8.4')
conflicts=('qt')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
Deleted: qt4.install
===
--- qt4.install 2016-04-27 18:39:46 UTC (rev 266308)
+++ qt4.install 2016-04-27 18:39:58 UTC (rev 266309)
@@ -1,12 +0,0 @@
-post_install() {
-xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-update-desktop-database -q
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-post_install
-}
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Saturday, April 9, 2016 @ 09:59:10
Author: arojas
Revision: 264244
ICU 57 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-04-09 07:13:31 UTC (rev 264243)
+++ PKGBUILD2016-04-09 07:59:10 UTC (rev 264244)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=7
+pkgrel=8
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Friday, March 4, 2016 @ 12:17:52
Author: bpiotrowski
Revision: 260808
OpenSSL 1.0.2g rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-03-04 11:14:10 UTC (rev 260807)
+++ PKGBUILD2016-03-04 11:17:52 UTC (rev 260808)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD disable-sslv3.patch)
Date: Friday, March 4, 2016 @ 11:31:38
Author: heftig
Revision: 260789
Disable SSLv3
Added:
qt4/trunk/disable-sslv3.patch
Modified:
qt4/trunk/PKGBUILD
-+
PKGBUILD|5
disable-sslv3.patch | 54 ++
2 files changed, 59 insertions(+)
Modified: PKGBUILD
===
--- PKGBUILD2016-03-04 10:30:52 UTC (rev 260788)
+++ PKGBUILD2016-03-04 10:31:38 UTC (rev 260789)
@@ -37,6 +37,7 @@
'kubuntu_14_systemtrayicon.diff'
'kde4-settings.patch'
'glib-honor-ExcludeSocketNotifiers-flag.diff'
+'disable-sslv3.patch'
'l-qclipboard_fix_recursive.patch'
'l-qclipboard_delay.patch')
md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
@@ -50,6 +51,7 @@
'a523644faa8f98a73f55c4aa23c114a6'
'66dfea63916c8dbf47b23cb012ffdccc'
'85679531c8a7310317adfb7002d9f99a'
+ '1803ab6313df762d807678e58fc85f53'
'009de09b4e589a7770fba74405656c99'
'addc5e88d538ee55e17bd49ba337ca67')
@@ -76,6 +78,9 @@
# https://bugreports.qt.io/browse/QTBUG-38585
patch -p0 -i "${srcdir}"/l-qclipboard_delay.patch
+ # React to OpenSSL's OPENSSL_NO_SSL3 define
+ patch -p1 -i "${srcdir}"/disable-sslv3.patch
+
sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g"
mkspecs/common/gcc-base-unix.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
Added: disable-sslv3.patch
===
--- disable-sslv3.patch (rev 0)
+++ disable-sslv3.patch 2016-03-04 10:31:38 UTC (rev 260789)
@@ -0,0 +1,54 @@
+diff -u -r
qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp
qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp
2015-05-07 16:14:44.0 +0200
qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl.cpp
2016-03-04 11:29:17.119300898 +0100
+@@ -267,7 +267,11 @@
+ #endif
+ break;
+ case QSsl::SslV3:
++#ifndef OPENSSL_NO_SSL3
+ ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() :
q_SSLv3_server_method());
++#else
++ctx = 0; // SSL 3 not supported by the system, but chosen
deliberately -> error
++#endif
+ break;
+ case QSsl::SecureProtocols: // SslV2 will be disabled below
+ case QSsl::TlsV1SslV3: // SslV2 will be disabled below
+diff -u -r
qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp
qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl_symbols.cpp
+---
qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp
2015-05-07 16:14:44.0 +0200
qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl_symbols.cpp
2016-03-04 11:28:52.806050135 +0100
+@@ -228,13 +228,17 @@
+ #ifndef OPENSSL_NO_SSL2
+ DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG,
return 0, return)
+ #endif
++#ifndef OPENSSL_NO_SSL3
+ DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG,
return 0, return)
++#endif
+ DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG,
return 0, return)
+ DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG,
return 0, return)
+ #ifndef OPENSSL_NO_SSL2
+ DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG,
return 0, return)
+ #endif
++#ifndef OPENSSL_NO_SSL3
+ DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG,
return 0, return)
++#endif
+ DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG,
return 0, return)
+ DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG,
return 0, return)
+ #else
+@@ -822,13 +826,17 @@
+ #ifndef OPENSSL_NO_SSL2
+ RESOLVEFUNC(SSLv2_client_method)
+ #endif
++#ifndef OPENSSL_NO_SSL3
+ RESOLVEFUNC(SSLv3_client_method)
++#endif
+ RESOLVEFUNC(SSLv23_client_method)
+ RESOLVEFUNC(TLSv1_client_method)
+ #ifndef OPENSSL_NO_SSL2
+ RESOLVEFUNC(SSLv2_server_method)
+ #endif
++#ifndef OPENSSL_NO_SSL3
+ RESOLVEFUNC(SSLv3_server_method)
++#endif
+ RESOLVEFUNC(SSLv23_server_method)
+ RESOLVEFUNC(TLSv1_server_method)
+ RESOLVEFUNC(X509_NAME_entry_count)
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Sunday, December 6, 2015 @ 13:04:00
Author: foutrelis
Revision: 252768
C++11 ABI rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 12:01:54 UTC (rev 252767)
+++ PKGBUILD2015-12-06 12:04:00 UTC (rev 252768)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Sunday, December 6, 2015 @ 11:08:18
Author: bpiotrowski
Revision: 252711
C++11 ABI rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 10:00:23 UTC (rev 252710)
+++ PKGBUILD2015-12-06 10:08:18 UTC (rev 252711)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Monday, November 2, 2015 @ 08:53:28
Author: bpiotrowski
Revision: 249976
icu 56.1 / poppler 0.37.0 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-11-02 06:04:54 UTC (rev 249975)
+++ PKGBUILD2015-11-02 07:53:28 UTC (rev 249976)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Thursday, July 16, 2015 @ 08:46:33
Author: fyan
Revision: 242270
upgpkg: qt4 4.8.7-2
disable -reduce-relocation
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-16 03:43:31 UTC (rev 242269)
+++ PKGBUILD2015-07-16 06:46:33 UTC (rev 242270)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -102,7 +102,7 @@
-silent \
-no-rpath \
-optimized-qmake \
--reduce-relocations \
+-no-reduce-relocations \
-dbus-linked \
-no-openvg
make
[arch-commits] Commit in qt4/trunk (PKGBUILD qnam-corruption.patch)
Date: Wednesday, May 6, 2015 @ 10:19:59
Author: fyan
Revision: 238536
upgpkg: qt4 4.8.6-6
Added:
qt4/trunk/qnam-corruption.patch
Modified:
qt4/trunk/PKGBUILD
---+
PKGBUILD | 11 -
qnam-corruption.patch | 430
2 files changed, 438 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-06 07:50:00 UTC (rev 238535)
+++ PKGBUILD2015-05-06 08:19:59 UTC (rev 238536)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.6
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -35,7 +35,8 @@
'improve-cups-support.patch'
'moc-boost-workaround.patch'
'CVE-2014-0190.patch'
-'kubuntu_14_systemtrayicon.diff')
+'kubuntu_14_systemtrayicon.diff'
+'qnam-corruption.patch')
md5sums=('2edbe4d6c2eff33ef91732602f3518eb'
'a16638f4781e56e7887ff8212a322ecc'
'8a28b3f52dbeb685d4b69440b520a3e1'
@@ -45,7 +46,8 @@
'c439c7731c25387352d8453ca7574971'
'da387bde22ae1c446f12525d2a31f070'
'34ed257109afb83342cfe514c8abe027'
- 'a523644faa8f98a73f55c4aa23c114a6')
+ 'a523644faa8f98a73f55c4aa23c114a6'
+ '10d5d72045105c063da9076d8eebfd14')
prepare() {
cd ${_pkgfqn}
@@ -62,6 +64,9 @@
# http://blog.martin-graesslin.com/blog/2014/06/where-are-my-systray-icons/
patch -p1 -i ${srcdir}/kubuntu_14_systemtrayicon.diff
+ # https://codereview.qt-project.org/#/c/111363/
+ patch -p1 -i ${srcdir}/qnam-corruption.patch
+
sed -i s|-O2|${CXXFLAGS}| mkspecs/common/{g++,gcc}-base.conf
sed -i /^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g
mkspecs/common/gcc-base-unix.conf
sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g mkspecs/common/gcc-base.conf
Added: qnam-corruption.patch
===
--- qnam-corruption.patch (rev 0)
+++ qnam-corruption.patch 2015-05-06 08:19:59 UTC (rev 238536)
@@ -0,0 +1,430 @@
+From fa81aa6d027049e855b76f5408586a288f160575 Mon Sep 17 00:00:00 2001
+From: Markus Goetz mar...@woboq.com
+Date: Tue, 28 Apr 2015 11:57:36 +0200
+Subject: QNAM: Fix upload corruptions when server closes connection
+
+This patch fixes several upload corruptions if the server closes the connection
+while/before we send data into it. They happen inside multiple places in the
HTTP
+layer and are explained in the comments.
+Corruptions are:
+* The upload byte device has an in-flight signal with pending upload data, if
+it gets reset (because server closes the connection) then the re-send of the
+request was sometimes taking this stale in-flight pending upload data.
+* Because some signals were DirectConnection and some were QueuedConnection,
there
+was a chance that a direct signal overtakes a queued signal. The state machine
+then sent data down the socket which was buffered there (and sent later)
although
+it did not match the current state of the state machine when it was actually
sent.
+* A socket was seen as being able to have requests sent even though it was not
+encrypted yet. This relates to the previous corruption where data is stored
inside
+the socket's buffer and then sent later.
+
+The included auto test produces all fixed corruptions, I detected no
regressions
+via the other tests.
+This code also adds a bit of sanity checking to protect from possible further
+problems.
+
+[ChangeLog][QtNetwork] Fix HTTP(s) upload corruption when server closes
connection
+
+(cherry picked from commit qtbase/cff39fba10ffc10ee4dcfdc66ff6528eb26462d3)
+Change-Id: I9793297be6cf3edfb75b65ba03b65f7a133ef194
+Reviewed-by: Richard J. Moore r...@kde.org
+---
+ src/corelib/io/qnoncontiguousbytedevice.cpp| 19 +++
+ src/corelib/io/qnoncontiguousbytedevice_p.h| 4 +
+ .../access/qhttpnetworkconnectionchannel.cpp | 47 +-
+ src/network/access/qhttpthreaddelegate_p.h | 36 -
+ src/network/access/qnetworkaccesshttpbackend.cpp | 24 ++-
+ src/network/access/qnetworkaccesshttpbackend_p.h | 5 +-
+ tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 174 -
+ 7 files changed, 280 insertions(+), 29 deletions(-)
+
+diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp
b/src/corelib/io/qnoncontiguousbytedevice.cpp
+index bf58eee..1a0591e 100644
+--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
b/src/corelib/io/qnoncontiguousbytedevice.cpp
+@@ -245,6 +245,12 @@ qint64 QNonContiguousByteDeviceByteArrayImpl::size()
+ return byteArray-size();
+ }
+
++qint64 QNonContiguousByteDeviceByteArrayImpl::pos()
++{
++return currentPosition;
++}
++
++
+
QNonContiguousByteDeviceRingBufferImpl::QNonContiguousByteDeviceRingBufferImpl(QSharedPointerQRingBuffer
rb)
+ : QNonContiguousByteDevice(), currentPosition(0)
+ {
+@@ -296,6 +302,11 @@ qint64
[arch-commits] Commit in qt4/trunk (PKGBUILD kubuntu_14_systemtrayicon.diff)
Date: Sunday, December 14, 2014 @ 18:59:49 Author: andrea Revision: 227612 Support for systray icons in Plasma Next and Unity Added: qt4/trunk/kubuntu_14_systemtrayicon.diff Modified: qt4/trunk/PKGBUILD + PKGBUILD | 14 kubuntu_14_systemtrayicon.diff | 1466 +++ 2 files changed, 1476 insertions(+), 4 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 227611:227612 to see the changes.
[arch-commits] Commit in qt4/trunk (PKGBUILD moc-boost-workaround.patch)
Date: Thursday, November 6, 2014 @ 01:59:39
Author: foutrelis
Revision: 225647
upgpkg: qt4 4.8.6-3
Extend moc's boost workaround to more recent boost versions.
Added:
qt4/trunk/moc-boost-workaround.patch
Modified:
qt4/trunk/PKGBUILD
+
PKGBUILD |7 ++-
moc-boost-workaround.patch | 12
2 files changed, 18 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-11-05 22:14:28 UTC (rev 225646)
+++ PKGBUILD2014-11-06 00:59:39 UTC (rev 225647)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.6
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -32,6 +32,7 @@
'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
'improve-cups-support.patch'
+'moc-boost-workaround.patch'
'CVE-2014-0190.patch')
md5sums=('2edbe4d6c2eff33ef91732602f3518eb'
'a16638f4781e56e7887ff8212a322ecc'
@@ -40,6 +41,7 @@
'0e384663d3dd32abe35f5331c4147569'
'b859c5673e5098c39f72b2252947049e'
'c439c7731c25387352d8453ca7574971'
+ 'da387bde22ae1c446f12525d2a31f070'
'34ed257109afb83342cfe514c8abe027')
prepare() {
@@ -48,6 +50,9 @@
# (FS#28381) (KDEBUG#180051)
patch -p1 -i ${srcdir}/improve-cups-support.patch
+ # QTBUG#22829
+ patch -p1 -i ${srcdir}/moc-boost-workaround.patch
+
# QTBUG#38367
patch -p1 -i ${srcdir}/CVE-2014-0190.patch
Added: moc-boost-workaround.patch
===
--- moc-boost-workaround.patch (rev 0)
+++ moc-boost-workaround.patch 2014-11-06 00:59:39 UTC (rev 225647)
@@ -0,0 +1,12 @@
+diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp
qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp
2014-04-10 21:37:12.0 +0300
qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp 2014-11-06
02:24:44.287305916 +0200
+@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv)
+
+ // Workaround a bug while parsing the boost/type_traits/has_operator.hpp
header. See QTBUG-22829
+ pp.macros[BOOST_TT_HAS_OPERATOR_HPP_INCLUDED];
++pp.macros[BOOST_LEXICAL_CAST_INCLUDED];
++pp.macros[BOOST_NEXT_PRIOR_HPP_INCLUDED];
+
+ QByteArray filename;
+ QByteArray output;
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Saturday, October 18, 2014 @ 09:27:26
Author: andrea
Revision: 224702
upgpkg: qt4 4.8.6-2
icu rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-10-18 04:28:01 UTC (rev 224701)
+++ PKGBUILD2014-10-18 07:27:26 UTC (rev 224702)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.6
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, April 8, 2014 @ 09:29:51
Author: andrea
Revision: 209902
upgpkg: qt4 4.8.5-9
icu rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-04-08 07:29:29 UTC (rev 209901)
+++ PKGBUILD2014-04-08 07:29:51 UTC (rev 209902)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.5
-pkgrel=8
+pkgrel=9
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Saturday, March 29, 2014 @ 09:44:25
Author: andrea
Revision: 208951
upgpkg: qt4 4.8.5-8
qscintilla rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-03-29 08:43:52 UTC (rev 208950)
+++ PKGBUILD2014-03-29 08:44:25 UTC (rev 208951)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.5
-pkgrel=7
+pkgrel=8
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD qtbug-32908.patch)
Date: Thursday, October 24, 2013 @ 15:08:51
Author: andrea
Revision: 197231
upgpkg: qt4 4.8.5-6
Fix non-english keyboard shortcuts regression (FS#36947)
Added:
qt4/trunk/qtbug-32908.patch
Modified:
qt4/trunk/PKGBUILD
---+
PKGBUILD |9 ++---
qtbug-32908.patch | 40
2 files changed, 46 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-24 13:06:07 UTC (rev 197230)
+++ PKGBUILD2013-10-24 13:08:51 UTC (rev 197231)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.5
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -32,7 +32,7 @@
'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
'improve-cups-support.patch'
-'qtbug-31579.patch' 'qtbug-32534.patch')
+'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch')
md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
'a16638f4781e56e7887ff8212a322ecc'
'8a28b3f52dbeb685d4b69440b520a3e1'
@@ -41,7 +41,8 @@
'b859c5673e5098c39f72b2252947049e'
'c439c7731c25387352d8453ca7574971'
'6ed8d26a8e4a9bba1f6c08fb99cc8357'
- 'bb0e0fa6ba953fa590d81ac612374e11')
+ 'bb0e0fa6ba953fa590d81ac612374e11'
+ 'db343dcae522bc90d802ad1e83b7f5dd')
prepare() {
cd ${_pkgfqn}
@@ -53,6 +54,8 @@
patch -p1 -i ${srcdir}/qtbug-31579.patch
# (FS#36394) (QTBUG#32534)
patch -p1 -i ${srcdir}/qtbug-32534.patch
+ # (FS#36947) (QTBUG#32908)
+ patch -p1 -i ${srcdir}/qtbug-32908.patch
sed -i s|-O2|${CXXFLAGS}| mkspecs/common/{g++,gcc}-base.conf
sed -i /^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g
mkspecs/common/gcc-base-unix.conf
Added: qtbug-32908.patch
===
--- qtbug-32908.patch (rev 0)
+++ qtbug-32908.patch 2013-10-24 13:08:51 UTC (rev 197231)
@@ -0,0 +1,40 @@
+From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis gatis.paeg...@digia.com
+Date: Sat, 31 Aug 2013 21:22:47 +0200
+Subject: [PATCH] Revert QTBUG-15319: fix shortcuts with secondary Xkb layout.
+
+The change which attempted to fix QTBUG-15319 broke keyboard
+shortcuts for non latin keyboard layouts.
+
+This patch reverts QTBUG-15319 (f45cdeda8) since it caused a
+regression.
+
+Task-number: QTBUG-32908
+
+Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7
+Reviewed-by: David Faure david.fa...@kdab.com
+---
+ src/gui/kernel/qkeymapper_x11.cpp |5 +
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/src/gui/kernel/qkeymapper_x11.cpp
b/src/gui/kernel/qkeymapper_x11.cpp
+index 005ff3f..7daa41d 100644
+--- a/src/gui/kernel/qkeymapper_x11.cpp
b/src/gui/kernel/qkeymapper_x11.cpp
+@@ -282,12 +282,9 @@ QListint QKeyMapperPrivate::possibleKeysXKB(QKeyEvent
*event)
+
+ // first, translate key only using lock modifiers (there are no Qt
equivalents for these, so we must
+ // always use them when determining the baseKeySym)
+-// Note: the Xkb group to be used for the conversion keycode-keysym has
to be given to
+-// XkbLookupKeySym(). This information is contained in the bits 8
to 15 of xmodifiers.
+-// See https://bugreports.qt-project.org/browse/QTBUG-15319 .
+ KeySym baseKeySym;
+ uint consumedModifiers;
+-if (!XkbLookupKeySym(X11-display, xkeycode, (xmodifiers (0xff00 |
LockMask | qt_num_lock_mask)),
++if (!XkbLookupKeySym(X11-display, xkeycode, (xmodifiers (LockMask |
qt_num_lock_mask)),
+ consumedModifiers, baseKeySym))
+ return QListint();
+
+--
+1.7.1
+
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, October 22, 2013 @ 12:15:06
Author: andrea
Revision: 197129
upgpkg: qt4 4.8.5-4
remove static libs
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-22 10:14:37 UTC (rev 197128)
+++ PKGBUILD2013-10-22 10:15:06 UTC (rev 197129)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.5
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -24,7 +24,6 @@
'libxfixes: Xfixes support'
'icu: Unicode support')
install=${pkgname}.install
-options=('!libtool')
replaces=('qt=4.8.4')
conflicts=('qt')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, October 22, 2013 @ 19:13:59
Author: andrea
Revision: 197139
upgpkg: qt4 4.8.5-5
libQtUiTools builds as static only (FS#37447)
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-22 16:38:40 UTC (rev 197138)
+++ PKGBUILD2013-10-22 17:13:59 UTC (rev 197139)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.5
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -26,6 +26,7 @@
install=${pkgname}.install
replaces=('qt=4.8.4')
conflicts=('qt')
+options=('staticlibs') # libQtUiTools builds as static only
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz;
'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Wednesday, October 16, 2013 @ 18:37:41
Author: andrea
Revision: 196708
upgpkg: qt4 4.8.5-3
Icu rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-16 16:19:38 UTC (rev 196707)
+++ PKGBUILD2013-10-16 16:37:41 UTC (rev 196708)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.5
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Saturday, September 28, 2013 @ 19:12:31
Author: andrea
Revision: 195229
Qt4 doesn't support libmng 2.x QTBUG-33116
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-09-28 16:08:48 UTC (rev 195228)
+++ PKGBUILD2013-09-28 17:12:31 UTC (rev 195229)
@@ -9,7 +9,7 @@
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
-depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
+depends=('libtiff' 'libpng' 'sqlite' 'ca-certificates' 'dbus'
'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Wednesday, September 4, 2013 @ 21:32:38
Author: andrea
Revision: 193904
Fix makedeps
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-09-04 19:31:12 UTC (rev 193903)
+++ PKGBUILD2013-09-04 19:32:38 UTC (rev 193904)
@@ -13,7 +13,7 @@
'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
- 'mesa-libgl')
+ 'mesa')
optdepends=('qtchooser: set the default Qt toolkit'
'postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
[arch-commits] Commit in qt4/trunk (PKGBUILD qtbug-31579.patch)
Date: Friday, August 16, 2013 @ 15:39:13
Author: andrea
Revision: 193113
Fix licenses; libmng rebuild; QTBUG#31579 (FS#36028); QTBUG#32534 (FS#36394)
Added:
qt4/trunk/qtbug-31579.patch
Modified:
qt4/trunk/PKGBUILD
---+
PKGBUILD | 16 -
qtbug-31579.patch | 146
2 files changed, 158 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-08-16 13:37:44 UTC (rev 193112)
+++ PKGBUILD2013-08-16 13:39:13 UTC (rev 193113)
@@ -4,10 +4,10 @@
pkgname=qt4
pkgver=4.8.5
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
+license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
@@ -31,14 +31,17 @@
source=(http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz;
'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
-'improve-cups-support.patch')
+'improve-cups-support.patch'
+'qtbug-31579.patch' 'qtbug-32534.patch')
md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
'a16638f4781e56e7887ff8212a322ecc'
'8a28b3f52dbeb685d4b69440b520a3e1'
'9727c406c240990870c905696a8c5bd1'
'0e384663d3dd32abe35f5331c4147569'
'b859c5673e5098c39f72b2252947049e'
- 'c439c7731c25387352d8453ca7574971')
+ 'c439c7731c25387352d8453ca7574971'
+ '6ed8d26a8e4a9bba1f6c08fb99cc8357'
+ 'bb0e0fa6ba953fa590d81ac612374e11')
prepare() {
cd ${_pkgfqn}
@@ -46,6 +49,11 @@
# (FS#28381) (KDEBUG#180051)
patch -p1 -i ${srcdir}/improve-cups-support.patch
+ # (FS#36028) (QTBUG#31579)
+ patch -p1 -i ${srcdir}/qtbug-31579.patch
+ # (FS#36394) (QTBUG#32534)
+ patch -p1 -i ${srcdir}/qtbug-32534.patch
+
sed -i s|-O2|${CXXFLAGS}| mkspecs/common/{g++,gcc}-base.conf
sed -i /^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g
mkspecs/common/gcc-base-unix.conf
sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g mkspecs/common/gcc-base.conf
Added: qtbug-31579.patch
===
--- qtbug-31579.patch (rev 0)
+++ qtbug-31579.patch 2013-08-16 13:39:13 UTC (rev 193113)
@@ -0,0 +1,146 @@
+From 2a6537f0629aaff53a42d993ad94ad4de3cd3030 Mon Sep 17 00:00:00 2001
+From: Gunnar Sletta gunnar.sle...@digia.com
+Date: Thu, 4 Jul 2013 16:20:40 +1000
+Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect.
+
+This was broken by a previous fix which aimed to fix gaps in
+polylines with tiny line segments. The result was that we
+skipped updating the origin point when stroke() didn't produce
+pixels which accidentally included the case of the line
+being completely outside the deviceRect. I fixed this
+by returning the value of clipLine in drawLine to the caller
+so we could still update the origin for this case.
+
+Task-number: QTBUG-31579
+Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065
+(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87)
+Reviewed-by: Gunnar Sletta gunnar.sle...@digia.com
+---
+ src/gui/painting/qcosmeticstroker.cpp | 42
+ src/gui/painting/qcosmeticstroker_p.h |2 +-
+ 2 files changed, 27 insertions(+), 17 deletions(-)
+
+diff --git a/src/gui/painting/qcosmeticstroker.cpp
b/src/gui/painting/qcosmeticstroker.cpp
+index 0061ecb..4413170 100644
+--- a/src/gui/painting/qcosmeticstroker.cpp
b/src/gui/painting/qcosmeticstroker.cpp
+@@ -133,10 +133,15 @@ struct NoDasher {
+
+ };
+
++/*
++ * The return value is the result of the clipLine() call performed at the
start
++ * of each of the two functions, aka false means completely outside the
devices
++ * rect.
++ */
+ templateDrawPixel drawPixel, class Dasher
+-static void drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2,
qreal y2, int caps);
++static bool drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2,
qreal y2, int caps);
+ templateDrawPixel drawPixel, class Dasher
+-static void drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal
x2, qreal y2, int caps);
++static bool drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal
x2, qreal y2, int caps);
+
+ inline void drawPixel(QCosmeticStroker *stroker, int x, int y, int coverage)
+ {
+@@ -602,17 +607,20 @@ void QCosmeticStroker::drawPath(const QVectorPath path)
+ caps |= CapEnd;
+
+ QCosmeticStroker::Point last = this-lastPixel;
+-stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
++bool unclipped = stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
+
+ /* fix for gaps
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, July 2, 2013 @ 13:12:11
Author: andrea
Revision: 189289
upgpkg: qt4 4.8.5-1
Upstream release; Fix 32bit build on x86_64 (FS#35568)
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD | 24
1 file changed, 16 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-02 09:20:23 UTC (rev 189288)
+++ PKGBUILD2013-07-02 11:12:11 UTC (rev 189289)
@@ -3,8 +3,8 @@
# Contributor: Pierre Schmitz pie...@archlinux.de
pkgname=qt4
-pkgver=4.8.4
-pkgrel=18
+pkgver=4.8.5
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -28,11 +28,11 @@
replaces=('qt=4.8.4')
conflicts=('qt')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
-source=(http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz;
+source=(http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz;
'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
'improve-cups-support.patch')
-md5sums=('89c5ecba180cae74c66260ac732dc5cb'
+md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
'a16638f4781e56e7887ff8212a322ecc'
'8a28b3f52dbeb685d4b69440b520a3e1'
'9727c406c240990870c905696a8c5bd1'
@@ -40,19 +40,27 @@
'b859c5673e5098c39f72b2252947049e'
'c439c7731c25387352d8453ca7574971')
-build() {
+prepare() {
cd ${_pkgfqn}
# (FS#28381) (KDEBUG#180051)
patch -p1 -i ${srcdir}/improve-cups-support.patch
- export QT4DIR=${srcdir}/${_pkgfqn}
- export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
sed -i s|-O2|${CXXFLAGS}| mkspecs/common/{g++,gcc}-base.conf
sed -i /^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g
mkspecs/common/gcc-base-unix.conf
sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g mkspecs/common/gcc-base.conf
+ cp mkspecs/common/linux{,32}.conf
+ sed -i /^QMAKE_LIBDIR\s/s|=|= /usr/lib32|g mkspecs/common/linux32.conf
+ sed -i s|common/linux.conf|common/linux32.conf|
mkspecs/linux-g++-32/qmake.conf
+}
+
+build() {
+ export QT4DIR=${srcdir}/${_pkgfqn}
+ export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+
+ cd ${_pkgfqn}
+
./configure -confirm-license -opensource \
-prefix /usr \
-bindir /usr/lib/qt4/bin \
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Sunday, May 19, 2013 @ 19:01:58
Author: andrea
Revision: 185886
Add qtchooser as optdepends
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-19 17:00:50 UTC (rev 185885)
+++ PKGBUILD2013-05-19 17:01:58 UTC (rev 185886)
@@ -14,7 +14,8 @@
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa-libgl')
-optdepends=('postgresql-libs: PostgreSQL driver'
+optdepends=('qtchooser: set the default Qt toolkit'
+'postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver'
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Monday, May 13, 2013 @ 10:56:56
Author: andrea
Revision: 185310
Fix typo
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-13 08:19:56 UTC (rev 185309)
+++ PKGBUILD2013-05-13 08:56:56 UTC (rev 185310)
@@ -104,7 +104,7 @@
install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \
${pkgdir}/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png
install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
- ${pkgdir}/usr/share/icons/hicolor/128x128/apps/qdusviewer-qt4.png
+ ${pkgdir}/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt4.png
install -d ${pkgdir}/usr/share/applications
install -m644
${srcdir}/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Friday, May 10, 2013 @ 20:09:08
Author: andrea
Revision: 185056
upgpkg: qt4 4.8.4-18
Rebuild for gcc issue on x86
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-10 17:59:34 UTC (rev 185055)
+++ PKGBUILD2013-05-10 18:09:08 UTC (rev 185056)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=17
+pkgrel=18
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Saturday, April 27, 2013 @ 16:26:58
Author: ioni
Revision: 183738
libpng 1.6 rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-27 14:20:45 UTC (rev 183737)
+++ PKGBUILD2013-04-27 14:26:58 UTC (rev 183738)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=16
+pkgrel=17
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Monday, March 25, 2013 @ 11:10:38
Author: andrea
Revision: 180636
upgpkg: qt4 4.8.4-16
icu rebuild
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-25 09:27:17 UTC (rev 180635)
+++ PKGBUILD2013-03-25 10:10:38 UTC (rev 180636)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=15
+pkgrel=16
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Saturday, March 2, 2013 @ 10:02:48
Author: andrea
Revision: 179053
upgpkg: qt4 4.8.4-13
Install Assistant,Designer and Linguist from Qt4 (FS#34099)
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-02 08:55:05 UTC (rev 179052)
+++ PKGBUILD2013-03-02 09:02:48 UTC (rev 179053)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=12
+pkgrel=13
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -116,10 +116,4 @@
# The TGA plugin is broken (FS#33568)
rm ${pkgdir}/usr/lib/qt4/plugins/imageformats/libqtga.so
-
-# Do not install the qttools
-rm ${pkgdir}/usr/lib/qt4/bin/{assistant,designer,linguist}
-rm ${pkgdir}/usr/bin/{assistant,designer,linguist}-qt4
-rm -r ${pkgdir}/usr/lib/qt4/plugins/designer
-rm
${pkgdir}/usr/share/qt4/translations/{assistant,designer,linguist}_*.qm
}
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Friday, March 1, 2013 @ 18:55:02
Author: andrea
Revision: 179025
upgpkg: qt4 4.8.4-12
Add more qt4 symlinks
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-01 14:06:08 UTC (rev 179024)
+++ PKGBUILD2013-03-01 17:55:02 UTC (rev 179025)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=11
+pkgrel=12
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -94,12 +94,9 @@
# Useful symlinks for cmake and configure scripts
install -d ${pkgdir}/usr/bin
-ln -s /usr/lib/qt4/bin/qmake ${pkgdir}/usr/bin/qmake4
-ln -s /usr/lib/qt4/bin/moc ${pkgdir}/usr/bin/moc-qt4
-ln -s /usr/lib/qt4/bin/uic ${pkgdir}/usr/bin/uic-qt4
-ln -s /usr/lib/qt4/bin/rcc ${pkgdir}/usr/bin/rcc-qt4
-ln -s /usr/lib/qt4/bin/lrelease ${pkgdir}/usr/bin/lrelease-qt4
-ln -s /usr/lib/qt4/bin/lupdate ${pkgdir}/usr/bin/lupdate-qt4
+for b in ${pkgdir}/usr/lib/qt4/bin/*; do
+ ln -s /usr/lib/qt4/bin/$(basename $b) ${pkgdir}/usr/bin/$(basename
$b)-qt4
+done
# install license addition
install -D -m644 LGPL_EXCEPTION.txt \
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Friday, March 1, 2013 @ 19:03:00
Author: andrea
Revision: 179027
Those doesn't exist
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |1 +
1 file changed, 1 insertion(+)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-01 17:55:20 UTC (rev 179026)
+++ PKGBUILD2013-03-01 18:03:00 UTC (rev 179027)
@@ -116,6 +116,7 @@
# Do not install the qttools
rm ${pkgdir}/usr/lib/qt4/bin/{assistant,designer,linguist}
+rm ${pkgdir}/usr/bin/{assistant,designer,linguist}-qt4
rm -r ${pkgdir}/usr/lib/qt4/plugins/designer
rm
${pkgdir}/usr/share/qt4/translations/{assistant,designer,linguist}_*.qm
}
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Friday, March 1, 2013 @ 21:43:49
Author: andrea
Revision: 179042
The TGA plugin is broken (FS#33568)
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |3 +++
1 file changed, 3 insertions(+)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-01 20:41:07 UTC (rev 179041)
+++ PKGBUILD2013-03-01 20:43:49 UTC (rev 179042)
@@ -114,6 +114,9 @@
find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/'
{} \;
+# The TGA plugin is broken (FS#33568)
+rm ${pkgdir}/usr/lib/qt4/plugins/imageformats/libqtga.so
+
# Do not install the qttools
rm ${pkgdir}/usr/lib/qt4/bin/{assistant,designer,linguist}
rm ${pkgdir}/usr/bin/{assistant,designer,linguist}-qt4
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Thursday, February 28, 2013 @ 11:18:52
Author: andrea
Revision: 178883
Replace libgl by mesa-libgl
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-28 10:17:52 UTC (rev 178882)
+++ PKGBUILD2013-02-28 10:18:52 UTC (rev 178883)
@@ -10,9 +10,9 @@
license=('GPL3' 'LGPL')
pkgdesc='A cross-platform application and UI framework'
depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
-'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+'fontconfig' 'mesa-libgl' 'libsm' 'libxrandr' 'libxv' 'libxi'
'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('mesa' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2'
'libfbclient')
+makedepends=('postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmysqlclient: MySQL driver'
'unixodbc: ODBC driver'
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Thursday, February 28, 2013 @ 23:15:13
Author: andrea
Revision: 178931
More qt4 symlinks
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-28 21:40:33 UTC (rev 178930)
+++ PKGBUILD2013-02-28 22:15:13 UTC (rev 178931)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=9
+pkgrel=10
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -97,6 +97,8 @@
ln -s /usr/lib/qt4/bin/moc ${pkgdir}/usr/bin/moc-qt4
ln -s /usr/lib/qt4/bin/uic ${pkgdir}/usr/bin/uic-qt4
ln -s /usr/lib/qt4/bin/rcc ${pkgdir}/usr/bin/rcc-qt4
+ln -s /usr/lib/qt4/bin/lrelease ${pkgdir}/usr/bin/lrelease-qt4
+ln -s /usr/lib/qt4/bin/lupdate ${pkgdir}/usr/bin/lupdate-qt4
# install license addition
install -D -m644 LGPL_EXCEPTION.txt \
@@ -117,5 +119,5 @@
# Do not install the qttools
rm ${pkgdir}/usr/lib/qt4/bin/{assistant,designer,linguist}
rm -r ${pkgdir}/usr/lib/qt4/plugins/designer
-rm
${pkgdir}/usr/share/qt4/translations/{assistant,designer,linguist,qt_help}_*.qm
+rm
${pkgdir}/usr/share/qt4/translations/{assistant,designer,linguist}_*.qm
}
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Friday, March 1, 2013 @ 00:51:14
Author: andrea
Revision: 178938
Fix wrong dependence on mesa-libgl
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-28 22:50:16 UTC (rev 178937)
+++ PKGBUILD2013-02-28 23:51:14 UTC (rev 178938)
@@ -4,15 +4,16 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=10
+pkgrel=11
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
pkgdesc='A cross-platform application and UI framework'
-depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
-'fontconfig' 'mesa-libgl' 'libsm' 'libxrandr' 'libxv' 'libxi'
'alsa-lib'
+depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
+'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient')
+makedepends=('postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
+ 'mesa-libgl')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmysqlclient: MySQL driver'
'unixodbc: ODBC driver'
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, February 26, 2013 @ 15:28:24
Author: andrea
Revision: 178724
Ship some useful symlink
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-26 12:45:54 UTC (rev 178723)
+++ PKGBUILD2013-02-26 14:28:24 UTC (rev 178724)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=8
+pkgrel=9
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -91,8 +91,12 @@
# install the profile
install -D -m755 ${srcdir}/qt4.profile ${pkgdir}/etc/profile.d/qt4.sh
-# symlink qmake to qmake4 so cmake finds Qt4 when both qt4 and qt5 are
installed
-ln -sf /usr/lib/qt4/bin/qmake ${pkgdir}/usr/lib/qt4/bin/qmake4
+# Useful symlinks for cmake and configure scripts
+install -d ${pkgdir}/usr/bin
+ln -s /usr/lib/qt4/bin/qmake ${pkgdir}/usr/bin/qmake4
+ln -s /usr/lib/qt4/bin/moc ${pkgdir}/usr/bin/moc-qt4
+ln -s /usr/lib/qt4/bin/uic ${pkgdir}/usr/bin/uic-qt4
+ln -s /usr/lib/qt4/bin/rcc ${pkgdir}/usr/bin/rcc-qt4
# install license addition
install -D -m644 LGPL_EXCEPTION.txt \
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, February 26, 2013 @ 06:28:59
Author: andrea
Revision: 178628
upgpkg: qt4 4.8.4-8
Do not provide qt
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-26 05:01:50 UTC (rev 178627)
+++ PKGBUILD2013-02-26 05:28:59 UTC (rev 178628)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=7
+pkgrel=8
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -23,9 +23,8 @@
'icu: Unicode support')
install=${pkgname}.install
options=('!libtool')
-replaces=('qt')
+replaces=('qt=4.8.4')
conflicts=('qt')
-provides=(qt=${pkgver})
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz;
'qtconfig.desktop' 'qt4.profile'
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Monday, February 25, 2013 @ 18:19:37
Author: andrea
Revision: 178601
upgpkg: qt4 4.8.4-7
There is no more a qt package so this can provide it
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-25 17:16:44 UTC (rev 178600)
+++ PKGBUILD2013-02-25 17:19:37 UTC (rev 178601)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -23,8 +23,9 @@
'icu: Unicode support')
install=${pkgname}.install
options=('!libtool')
-replaces=('qt=4.8.4')
-conflicts=('qt=4.8.4')
+replaces=('qt')
+conflicts=('qt')
+provides=(qt=${pkgver})
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz;
'qtconfig.desktop' 'qt4.profile'
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Sunday, February 24, 2013 @ 12:40:51
Author: andrea
Revision: 178481
symlink qmake to qmake4 so cmake finds Qt4 when both qt4 and qt5 are installed
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-24 11:35:45 UTC (rev 178480)
+++ PKGBUILD2013-02-24 11:40:51 UTC (rev 178481)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -95,6 +95,9 @@
# install the profile
install -D -m755 ${srcdir}/qt4.profile ${pkgdir}/etc/profile.d/qt4.sh
+# symlink qmake to qmake4 so cmake finds Qt4 when both qt4 and qt5 are
installed
+ln -sf /usr/lib/qt4/bin/qmake ${pkgdir}/usr/lib/qt4/bin/qmake4
+
# install license addition
install -D -m644 LGPL_EXCEPTION.txt \
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
[arch-commits] Commit in qt4/trunk (PKGBUILD ld-gold.patch)
Date: Sunday, February 24, 2013 @ 21:11:32
Author: andrea
Revision: 178511
upgpkg: qt4 4.8.4-6
No need to replace the qtwebkit package anymore
Modified:
qt4/trunk/PKGBUILD
Deleted:
qt4/trunk/ld-gold.patch
---+
PKGBUILD | 19 ++-
ld-gold.patch | 22 --
2 files changed, 6 insertions(+), 35 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-24 20:03:42 UTC (rev 178510)
+++ PKGBUILD2013-02-24 20:11:32 UTC (rev 178511)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -23,18 +23,16 @@
'icu: Unicode support')
install=${pkgname}.install
options=('!libtool')
-replaces=('qt=4.8.4' 'qtwebkit=2.3.beta2')
-conflicts=('qt=4.8.4' 'qtwebkit=2.3.beta2')
+replaces=('qt=4.8.4')
+conflicts=('qt=4.8.4')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz;
'qtconfig.desktop' 'qt4.profile'
-'improve-cups-support.patch'
-'ld-gold.patch')
+'improve-cups-support.patch')
md5sums=('89c5ecba180cae74c66260ac732dc5cb'
'20ca06ef59775d749b9451ce7437fa9a'
'4ed0bd79a310e2b5d34fc71760b99139'
- 'c439c7731c25387352d8453ca7574971'
- '864de59a34a2f72ab2668dd918634b64')
+ 'c439c7731c25387352d8453ca7574971')
build() {
cd ${_pkgfqn}
@@ -42,9 +40,6 @@
# (FS#28381) (KDEBUG#180051)
patch -p1 -i ${srcdir}/improve-cups-support.patch
- # build on i686 fails
- patch -p1 -i ${srcdir}/ld-gold.patch
-
export QT4DIR=${srcdir}/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
@@ -68,6 +63,7 @@
-system-sqlite \
-no-phonon \
-no-phonon-backend \
+-no-webkit \
-graphicssystem raster \
-openssl-linked \
-nomake demos \
@@ -118,7 +114,4 @@
rm ${pkgdir}/usr/lib/qt4/bin/{assistant,designer,linguist}
rm -r ${pkgdir}/usr/lib/qt4/plugins/designer
rm
${pkgdir}/usr/share/qt4/translations/{assistant,designer,linguist,qt_help}_*.qm
-
-# Remove tests
-rm -r ${pkgdir}/usr/tests
}
Deleted: ld-gold.patch
===
--- ld-gold.patch 2013-02-24 20:03:42 UTC (rev 178510)
+++ ld-gold.patch 2013-02-24 20:11:32 UTC (rev 178511)
@@ -1,22 +0,0 @@
-diff -up
qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me
qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me
2012-01-24 13:05:50.460890750 +0100
-+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
2012-01-24 13:19:08.836799974 +0100
-@@ -3,12 +3,12 @@
- contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
- contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
-
--linux-g++ {
--isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
--message(Using gold linker)
--QMAKE_LFLAGS+=-fuse-ld=gold
--}
--}
-+#linux-g++ {
-+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
-+#message(Using gold linker)
-+#QMAKE_LFLAGS+=-fuse-ld=gold
-+#}
-+#}
-
- # We use this flag on production branches
- # See https://bugs.webkit.org/show_bug.cgi?id=60824
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Wednesday, February 20, 2013 @ 10:27:16
Author: andrea
Revision: 178332
Fix wrong bin path in pkgconfig files
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-20 09:26:20 UTC (rev 178331)
+++ PKGBUILD2013-02-20 09:27:16 UTC (rev 178332)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -99,10 +99,14 @@
install -D -m644 LGPL_EXCEPTION.txt \
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
-# Fix wrong path in pkgconfig files
+# Fix wrong libs path in pkgconfig files
find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \
-exec perl -pi -e s, -L${srcdir}/?\S+,,g {} \;
+# Fix wrong bins path in pkgconfig files
+find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \
+ -exec sed -i 's|/usr/bin/|/usr/lib/qt4/bin/|g' {} \;
+
# Fix wrong path in prl files
find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/'
{} \;
[arch-commits] Commit in qt4/trunk (PKGBUILD qt4.profile)
Date: Tuesday, February 19, 2013 @ 00:07:18
Author: andrea
Revision: 178248
Remove tests; exports bins PATH
Added:
qt4/trunk/qt4.profile
Modified:
qt4/trunk/PKGBUILD
-+
PKGBUILD| 12 +---
qt4.profile |1 +
2 files changed, 10 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-18 23:05:05 UTC (rev 178247)
+++ PKGBUILD2013-02-18 23:07:18 UTC (rev 178248)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -27,11 +27,12 @@
conflicts=('qt=4.8.4' 'qtwebkit=2.3.beta2')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz;
-'qtconfig.desktop'
+'qtconfig.desktop' 'qt4.profile'
'improve-cups-support.patch'
'ld-gold.patch')
md5sums=('89c5ecba180cae74c66260ac732dc5cb'
'20ca06ef59775d749b9451ce7437fa9a'
+ '4ed0bd79a310e2b5d34fc71760b99139'
'c439c7731c25387352d8453ca7574971'
'864de59a34a2f72ab2668dd918634b64')
@@ -82,7 +83,6 @@
}
package() {
-
cd ${_pkgfqn}
make INSTALL_ROOT=${pkgdir} install
@@ -92,6 +92,9 @@
install -Dm644 ${srcdir}/qtconfig.desktop \
${pkgdir}/usr/share/applications/qtconfig4.desktop
+# install the profile
+install -D -m755 ${srcdir}/qt4.profile ${pkgdir}/etc/profile.d/qt4.sh
+
# install license addition
install -D -m644 LGPL_EXCEPTION.txt \
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -110,4 +113,7 @@
rm
${pkgdir}/usr/lib/qt4/bin/{qdbus,qdbusviewer,qhelpconverter,qhelpgenerator}
rm -r ${pkgdir}/usr/lib/qt4/plugins/designer
rm
${pkgdir}/usr/share/qt4/translations/{assistant,designer,linguist,qt_help}_*.qm
+
+# Remove tests
+rm -r ${pkgdir}/usr/tests
}
Added: qt4.profile
===
--- qt4.profile (rev 0)
+++ qt4.profile 2013-02-18 23:07:18 UTC (rev 178248)
@@ -0,0 +1 @@
+export PATH=$PATH:/usr/lib/qt4/bin
[arch-commits] Commit in qt4/trunk (PKGBUILD)
Date: Tuesday, February 19, 2013 @ 05:37:14
Author: andrea
Revision: 178286
upgpkg: qt4 4.8.4-3
Remove the GUI tools only
Modified:
qt4/trunk/PKGBUILD
--+
PKGBUILD |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-19 01:56:35 UTC (rev 178285)
+++ PKGBUILD2013-02-19 04:37:14 UTC (rev 178286)
@@ -4,7 +4,7 @@
pkgname=qt4
pkgver=4.8.4
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -108,9 +108,7 @@
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/'
{} \;
# Do not install the qttools
-rm ${pkgdir}/usr/lib/qt4/bin/{assistant,designer,lconvert,linguist}
-rm
${pkgdir}/usr/lib/qt4/bin/{lrelease,lupdate,pixeltool,qcollectiongenerator}
-rm
${pkgdir}/usr/lib/qt4/bin/{qdbus,qdbusviewer,qhelpconverter,qhelpgenerator}
+rm ${pkgdir}/usr/lib/qt4/bin/{assistant,designer,linguist}
rm -r ${pkgdir}/usr/lib/qt4/plugins/designer
rm
${pkgdir}/usr/share/qt4/translations/{assistant,designer,linguist,qt_help}_*.qm
