[arch-commits] Commit in qt5/trunk (PKGBUILD fs47703.patch)
Date: Saturday, January 16, 2016 @ 14:25:48
Author: fyan
Revision: 258361
upgpkg: qt5 5.5.1-9
remove fs47703.patch for FS#47728
Modified:
qt5/trunk/PKGBUILD
Deleted:
qt5/trunk/fs47703.patch
---+
PKGBUILD | 10 +++---
fs47703.patch | 49 -
2 files changed, 3 insertions(+), 56 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-01-16 12:31:10 UTC (rev 258360)
+++ PKGBUILD2016-01-16 13:25:48 UTC (rev 258361)
@@ -30,7 +30,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.5.1
-pkgrel=8
+pkgrel=9
arch=('i686' 'x86_64')
url='http://www.qt.io/developers'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -44,20 +44,16 @@
groups=('qt' 'qt5')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
-'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
-'fs47703.patch')
+'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop')
md5sums=('c2a249e8795d45200d997d96860d0353'
'b2897dd6a2967bccf8f10e397aafee55'
'76e150b20178d2d43801f7367232e5f7'
'188da8f4c87316e730ebf1c6217bf5a0'
- '322b419b16c75d4de0ee7ad0a246caa1'
- 'e710bb841ba2919bd3c9e10c80d67b0b')
+ '322b419b16c75d4de0ee7ad0a246caa1')
prepare() {
cd ${_pkgfqn}
- (cd qtbase; patch -p1 -i "$srcdir"/fs47703.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}|" \
Deleted: fs47703.patch
===
--- fs47703.patch 2016-01-16 12:31:10 UTC (rev 258360)
+++ fs47703.patch 2016-01-16 13:25:48 UTC (rev 258361)
@@ -1,49 +0,0 @@
-From f6ba546d57018ddd2bfdc226db498f12a0c2d8bf Mon Sep 17 00:00:00 2001
-From: =?utf8?q?D=C4=81vis=20Mos=C4=81ns?=
-Date: Fri, 8 Jan 2016 04:12:13 +0200
-Subject: [PATCH] Don't pass NULL Display to glXGetClientString
-
-glXGetCurrentDisplay can return NULL so need to check
-for that.
-
-Change-Id: I1b85a5c575d1deb24dcce4719b6f737283adeabe
- .../platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp| 5 -
- .../platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp | 5 -
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git
a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-index 8b14fc7..3412f3f 100644
a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-@@ -644,7 +644,10 @@ void QGLXContext::queryDummyContext()
- oldSurface = oldContext->surface();
-
- QScopedPointer surface;
--const char *glxvendor = glXGetClientString(glXGetCurrentDisplay(),
GLX_VENDOR);
-+Display *display = glXGetCurrentDisplay();
-+const char *glxvendor = 0;
-+if (display)
-+glxvendor = glXGetClientString(display, GLX_VENDOR);
- if (glxvendor && !strcmp(glxvendor, "ATI")) {
- QWindow *window = new QWindow;
- window->resize(64, 64);
-diff --git
a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
-index ce72cb6..cd4949af 100644
a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
-+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
-@@ -195,7 +195,10 @@ QPlatformOffscreenSurface
*QXcbGlxIntegration::createPlatformOffscreenSurface(QO
- static bool glxPbufferUsable = true;
- if (!vendorChecked) {
- vendorChecked = true;
--const char *glxvendor = glXGetClientString(glXGetCurrentDisplay(),
GLX_VENDOR);
-+Display *display = glXGetCurrentDisplay();
-+const char *glxvendor = 0;
-+if (display)
-+glxvendor = glXGetClientString(display, GLX_VENDOR);
- if (glxvendor && !strcmp(glxvendor, "ATI"))
- glxPbufferUsable = false;
- }
---
-2.6.2.2.g1b5ffa3
-
[arch-commits] Commit in qt5/trunk (PKGBUILD fs47703.patch)
Date: Monday, January 11, 2016 @ 11:28:19
Author: fyan
Revision: 257942
upgpkg: qt5 5.5.1-8
Add a patch to avoid crashes with nvidia 361.16 drivers (FS#47703)
Added:
qt5/trunk/fs47703.patch
Modified:
qt5/trunk/PKGBUILD
---+
PKGBUILD | 10 +++---
fs47703.patch | 49 +
2 files changed, 56 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-01-11 09:51:28 UTC (rev 257941)
+++ PKGBUILD2016-01-11 10:28:19 UTC (rev 257942)
@@ -30,7 +30,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.5.1
-pkgrel=7
+pkgrel=8
arch=('i686' 'x86_64')
url='http://www.qt.io/developers'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -44,16 +44,20 @@
groups=('qt' 'qt5')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
-'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop')
+'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
+'fs47703.patch')
md5sums=('c2a249e8795d45200d997d96860d0353'
'b2897dd6a2967bccf8f10e397aafee55'
'76e150b20178d2d43801f7367232e5f7'
'188da8f4c87316e730ebf1c6217bf5a0'
- '322b419b16c75d4de0ee7ad0a246caa1')
+ '322b419b16c75d4de0ee7ad0a246caa1'
+ 'e710bb841ba2919bd3c9e10c80d67b0b')
prepare() {
cd ${_pkgfqn}
+ (cd qtbase; patch -p1 -i "$srcdir"/fs47703.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: fs47703.patch
===
--- fs47703.patch (rev 0)
+++ fs47703.patch 2016-01-11 10:28:19 UTC (rev 257942)
@@ -0,0 +1,49 @@
+From f6ba546d57018ddd2bfdc226db498f12a0c2d8bf Mon Sep 17 00:00:00 2001
+From: =?utf8?q?D=C4=81vis=20Mos=C4=81ns?=
+Date: Fri, 8 Jan 2016 04:12:13 +0200
+Subject: [PATCH] Don't pass NULL Display to glXGetClientString
+
+glXGetCurrentDisplay can return NULL so need to check
+for that.
+
+Change-Id: I1b85a5c575d1deb24dcce4719b6f737283adeabe
+---
+ .../platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp| 5 -
+ .../platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp | 5 -
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git
a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+index 8b14fc7..3412f3f 100644
+--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+@@ -644,7 +644,10 @@ void QGLXContext::queryDummyContext()
+ oldSurface = oldContext->surface();
+
+ QScopedPointer surface;
+-const char *glxvendor = glXGetClientString(glXGetCurrentDisplay(),
GLX_VENDOR);
++Display *display = glXGetCurrentDisplay();
++const char *glxvendor = 0;
++if (display)
++glxvendor = glXGetClientString(display, GLX_VENDOR);
+ if (glxvendor && !strcmp(glxvendor, "ATI")) {
+ QWindow *window = new QWindow;
+ window->resize(64, 64);
+diff --git
a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
+index ce72cb6..cd4949af 100644
+--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
+@@ -195,7 +195,10 @@ QPlatformOffscreenSurface
*QXcbGlxIntegration::createPlatformOffscreenSurface(QO
+ static bool glxPbufferUsable = true;
+ if (!vendorChecked) {
+ vendorChecked = true;
+-const char *glxvendor = glXGetClientString(glXGetCurrentDisplay(),
GLX_VENDOR);
++Display *display = glXGetCurrentDisplay();
++const char *glxvendor = 0;
++if (display)
++glxvendor = glXGetClientString(display, GLX_VENDOR);
+ if (glxvendor && !strcmp(glxvendor, "ATI"))
+ glxPbufferUsable = false;
+ }
+--
+2.6.2.2.g1b5ffa3
+
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Sunday, December 27, 2015 @ 06:57:27
Author: fyan
Revision: 257297
upgpkg: qt5 5.5.1-7
libwebp 0.5.0 rebuild
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-26 11:38:37 UTC (rev 257296)
+++ PKGBUILD2015-12-27 05:57:27 UTC (rev 257297)
@@ -30,7 +30,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.5.1
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
url='http://www.qt.io/developers'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Monday, December 14, 2015 @ 10:41:51
Author: fyan
Revision: 256040
upgpkg: qt5 5.5.1-6
- make qt5-base depends on libxkbcommon-x11
- enable proprietary_codecs (FS#45652)
- use system yasm
- remove -no-use-gold-linker (gold issue has been fixed)
- remove -no-reduce-relocations (adopted by major distributions already,
downstream projects should adapt to it)
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-14 08:19:36 UTC (rev 256039)
+++ PKGBUILD2015-12-14 09:41:51 UTC (rev 256040)
@@ -30,7 +30,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.5.1
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://www.qt.io/developers'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -40,7 +40,7 @@
'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' 'libmng'
'python2' 'ruby'
'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'bluez-libs'
'openal' 'gtk2'
'libxkbcommon-x11' 'mtdev' 'harfbuzz' 'libwebp' 'leveldb'
'geoclue' 'pciutils'
-'libinput')
+'libinput' 'yasm' 'git')
groups=('qt' 'qt5')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
@@ -67,6 +67,11 @@
# in qtwebengine there are still a lot of relative calls which need a
workaround
mkdir "${srcdir}"/python2-path
ln -s /usr/bin/python2 "${srcdir}"/python2-path/python
+
+ # Try to enable proprietary_codecs and use some system yasm
+ sed -e 's/contains(WEBENGINE_CONFIG, proprietary_codecs): //' \
+ -e '/use_system_ffmpeg=0"/a GYP_ARGS += "-Duse_system_yasm=1"' \
+ -i qtwebengine/src/core/gyp_run.pro
}
build() {
@@ -100,9 +105,7 @@
-dbus-linked \
-system-harfbuzz \
-journald \
--libinput \
--no-use-gold-linker \
--no-reduce-relocations ${SSE2}
+-libinput ${SSE2}
make
@@ -140,7 +143,7 @@
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig'
'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'qtchooser' 'libinput')
+ 'qtchooser' 'libinput' 'libsm' 'libxkbcommon-x11')
optdepends=('qt5-svg: to use SVG icon themes'
'postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
@@ -147,8 +150,6 @@
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver'
'mtdev: evdev plugin'
- 'libxkbcommon-x11: xcb plugin'
- 'libsm: xcb plugin'
'gtk2: GTK2 plugin')
conflicts=('qt')
@@ -203,7 +204,7 @@
package_qt5-declarative() {
pkgdesc='Classes for QML and JavaScript languages'
- depends=('qt5-xmlpatterns' 'libxkbcommon-x11' 'libsm')
+ depends=('qt5-xmlpatterns')
conflicts=('qt')
cd ${_pkgfqn}/qtdeclarative
@@ -464,7 +465,7 @@
package_qt5-wayland() {
pkgdesc='Provides APIs for Wayland'
- depends=('qt5-base' 'libxcomposite' 'libxkbcommon')
+ depends=('qt5-base' 'libxcomposite')
cd ${_pkgfqn}/qtwayland
make INSTALL_ROOT="${pkgdir}" install
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Sunday, December 6, 2015 @ 16:26:56
Author: foutrelis
Revision: 252834
C++11 ABI rebuild
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 15:15:36 UTC (rev 252833)
+++ PKGBUILD2015-12-06 15:26:56 UTC (rev 252834)
@@ -30,7 +30,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.5.1
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url='http://www.qt.io/developers'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Sunday, December 6, 2015 @ 10:15:59
Author: bpiotrowski
Revision: 252676
C++11 ABI rebuild
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 09:07:12 UTC (rev 252675)
+++ PKGBUILD2015-12-06 09:15:59 UTC (rev 252676)
@@ -30,7 +30,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.5.1
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://www.qt.io/developers'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Monday, November 2, 2015 @ 04:22:47
Author: bpiotrowski
Revision: 249959
icu 56.1 / poppler 0.37.0 rebuild
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-11-02 03:01:49 UTC (rev 249958)
+++ PKGBUILD2015-11-02 03:22:47 UTC (rev 249959)
@@ -30,7 +30,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.5.1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://www.qt.io/developers'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Friday, October 30, 2015 @ 07:02:29
Author: fyan
Revision: 249857
upgpkg: qt5 5.5.1-2
add libsm as dependency of qt5-declarative
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-10-29 14:13:54 UTC (rev 249856)
+++ PKGBUILD2015-10-30 06:02:29 UTC (rev 249857)
@@ -30,7 +30,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.5.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://www.qt.io/developers'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -203,7 +203,7 @@
package_qt5-declarative() {
pkgdesc='Classes for QML and JavaScript languages'
- depends=('qt5-xmlpatterns' 'libxkbcommon-x11')
+ depends=('qt5-xmlpatterns' 'libxkbcommon-x11' 'libsm')
conflicts=('qt')
cd ${_pkgfqn}/qtdeclarative
[arch-commits] Commit in qt5/trunk (PKGBUILD gcc-5.patch)
Date: Tuesday, July 14, 2015 @ 10:47:09
Author: fyan
Revision: 242197
update url and remove old patch
Modified:
qt5/trunk/PKGBUILD
Deleted:
qt5/trunk/gcc-5.patch
-+
PKGBUILD|2 +-
gcc-5.patch | 17 -
2 files changed, 1 insertion(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-14 07:37:09 UTC (rev 242196)
+++ PKGBUILD2015-07-14 08:47:09 UTC (rev 242197)
@@ -32,7 +32,7 @@
pkgver=5.5.0
pkgrel=1
arch=('i686' 'x86_64')
-url='http://qt-project.org/'
+url='http://www.qt.io/developers'
license=('GPL3' 'LGPL' 'FDL' 'custom')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm'
'xcb-util-keysyms'
'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs'
'libjpeg-turbo' 'cups'
Deleted: gcc-5.patch
===
--- gcc-5.patch 2015-07-14 07:37:09 UTC (rev 242196)
+++ gcc-5.patch 2015-07-14 08:47:09 UTC (rev 242197)
@@ -1,17 +0,0 @@
-diff -up
qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than
-qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp
qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than
2015-03-18 10:24:38.683352327
--0400
-+++ qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp
2015-03-18 10:25:21.953352327 -0400
-@@ -1909,6 +1909,10 @@ void JSObject::putByIndexBeyondVectorLen
- }
- }
-
-+template void
JSObject::putByIndexBeyondVectorLengthWithoutAttributesContiguousShape(ExecState*
exec, unsigned i, JSValue value);
-+template void
JSObject::putByIndexBeyondVectorLengthWithoutAttributesDoubleShape(ExecState*
exec, unsigned i, JSValue value);
-+template void
JSObject::putByIndexBeyondVectorLengthWithoutAttributesInt32Shape(ExecState*
exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec,
unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- VM vm = exec-vm();
-
[arch-commits] Commit in qt5/trunk (PKGBUILD gcc-5.patch)
Date: Saturday, May 30, 2015 @ 20:26:49
Author: arojas
Revision: 239947
Add patch to fix build with GCC 5
Added:
qt5/trunk/gcc-5.patch
Modified:
qt5/trunk/PKGBUILD
-+
PKGBUILD| 10 +++---
gcc-5.patch | 17 +
2 files changed, 24 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-30 18:13:30 UTC (rev 239946)
+++ PKGBUILD2015-05-30 18:26:49 UTC (rev 239947)
@@ -48,7 +48,7 @@
'0001-Try-to-ensure-that-fPIC-is-used-in-CMake-builds.patch'
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop' 'glib-2.43.patch'
'qlockfile-deadlock.patch' 'qnam-corruption.patch'
'keypad-shortcuts.patch'
-'CVE-2015-0295.patch' 'CVE-2015-1858_1859.patch' 'CVE-2015-1860.patch')
+'CVE-2015-0295.patch' 'CVE-2015-1858_1859.patch' 'CVE-2015-1860.patch'
'gcc-5.patch')
md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
'fb1459f325a15b15b18afeac51173a1d'
'ac8fa252868161c676d876b614e24436'
@@ -64,7 +64,8 @@
'665439088fc7de52a97455c5eaf87889'
'871ab111d03a640b4d0250388a4307cc'
'b799130014294cb3c73fc46e7e8889db'
- '64bc4f7d5097438eb6c6f8042378b3a3')
+ '64bc4f7d5097438eb6c6f8042378b3a3'
+ '67d8771036883a1733c812719d9ad17e')
prepare() {
cd ${_pkgfqn}
@@ -80,6 +81,9 @@
# for glib 2.43+ https://bugreports.qt.io/browse/QTBUG-44714
(cd qtwebkit; patch -p1 -i $srcdir/glib-2.43.patch)
+ # Fix build with GCC 5 https://bugreports.qt.io/browse/QTBUG-44829
+ (cd qtwebkit; patch -p1 -i $srcdir/gcc-5.patch)
+
# https://bugs.kde.org/show_bug.cgi?id=345901
(cd qtbase; patch -p1 -i $srcdir/qlockfile-deadlock.patch)
@@ -94,7 +98,7 @@
# http://lists.qt-project.org/pipermail/announce/2015-April/67.html
(cd qtbase; patch -p1 -i $srcdir/CVE-2015-1858_1859.patch; patch -p1 -i
$srcdir/CVE-2015-1860.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: gcc-5.patch
===
--- gcc-5.patch (rev 0)
+++ gcc-5.patch 2015-05-30 18:26:49 UTC (rev 239947)
@@ -0,0 +1,17 @@
+diff -up
qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than
+qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp
+---
qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than
2015-03-18 10:24:38.683352327
+-0400
qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp
2015-03-18 10:25:21.953352327 -0400
+@@ -1909,6 +1909,10 @@ void JSObject::putByIndexBeyondVectorLen
+ }
+ }
+
++template void
JSObject::putByIndexBeyondVectorLengthWithoutAttributesContiguousShape(ExecState*
exec, unsigned i, JSValue value);
++template void
JSObject::putByIndexBeyondVectorLengthWithoutAttributesDoubleShape(ExecState*
exec, unsigned i, JSValue value);
++template void
JSObject::putByIndexBeyondVectorLengthWithoutAttributesInt32Shape(ExecState*
exec, unsigned i, JSValue value);
++
+ void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec,
unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
+ {
+ VM vm = exec-vm();
+
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Tuesday, May 12, 2015 @ 17:36:13
Author: foutrelis
Revision: 239191
upgpkg: qt5 5.4.1-7
Build with -no-use-gold-linker to work around a bug in ld.gold (FS#44910).
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-12 15:14:59 UTC (rev 239190)
+++ PKGBUILD2015-05-12 15:36:13 UTC (rev 239191)
@@ -28,7 +28,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.4.1
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -120,6 +120,7 @@
-dbus-linked \
-system-harfbuzz \
-journald \
+-no-use-gold-linker \
-reduce-relocations ${SSE2}
make
[arch-commits] Commit in qt5/trunk (PKGBUILD qnam-corruption.patch)
Date: Wednesday, May 6, 2015 @ 12:13:45
Author: fyan
Revision: 238538
upgpkg: qt5 5.4.1-5
Added:
qt5/trunk/qnam-corruption.patch
Modified:
qt5/trunk/PKGBUILD
---+
PKGBUILD | 10
qnam-corruption.patch | 691
2 files changed, 698 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-06 08:21:39 UTC (rev 238537)
+++ PKGBUILD2015-05-06 10:13:45 UTC (rev 238538)
@@ -28,7 +28,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.4.1
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -42,7 +42,7 @@
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
-'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop' 'glib-2.43.patch' 'qlockfile-deadlock.patch')
+'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop' 'glib-2.43.patch' 'qlockfile-deadlock.patch'
'qnam-corruption.patch')
md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
'b2897dd6a2967bccf8f10e397aafee55'
'76e150b20178d2d43801f7367232e5f7'
@@ -49,7 +49,8 @@
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
'bf756a3061e1b30b28df85dcf0c90df3'
- '30d219401f77e536d215addc420b634c')
+ '30d219401f77e536d215addc420b634c'
+ 'd0b070d6f211948ef4842b46542b9e4f')
prepare() {
cd ${_pkgfqn}
@@ -60,6 +61,9 @@
# https://bugs.kde.org/show_bug.cgi?id=345901
(cd qtbase; patch -p1 -i $srcdir/qlockfile-deadlock.patch)
+ # https://codereview.qt-project.org/#/c/110150/
+ (cd qtbase; patch -p1 -i $srcdir/qnam-corruption.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: qnam-corruption.patch
===
--- qnam-corruption.patch (rev 0)
+++ qnam-corruption.patch 2015-05-06 10:13:45 UTC (rev 238538)
@@ -0,0 +1,691 @@
+From cff39fba10ffc10ee4dcfdc66ff6528eb26462d3 Mon Sep 17 00:00:00 2001
+From: Markus Goetz mar...@woboq.com
+Date: Fri, 10 Apr 2015 14:09:53 +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
+
+Change-Id: I54c883925ec897050941498f139c4b523030432e
+Reviewed-by: Peter Hartmann peter...@hartmann.tk
+---
+ src/corelib/io/qnoncontiguousbytedevice.cpp| 18 +++
+ src/corelib/io/qnoncontiguousbytedevice_p.h| 4 +
+ .../access/qhttpnetworkconnectionchannel.cpp | 35 -
+ .../access/qhttpnetworkconnectionchannel_p.h | 2 +
+ src/network/access/qhttpprotocolhandler.cpp| 7 +
+ src/network/access/qhttpthreaddelegate_p.h | 36 -
+ src/network/access/qnetworkreplyhttpimpl.cpp | 25 ++-
+ src/network/access/qnetworkreplyhttpimpl_p.h | 7 +-
+ .../access/qnetworkreply/tst_qnetworkreply.cpp | 175 -
+ 9 files changed, 279 insertions(+), 30 deletions(-)
+
+diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp
b/src/corelib/io/qnoncontiguousbytedevice.cpp
+index 11510a8..760ca3d 100644
+--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
b/src/corelib/io/qnoncontiguousbytedevice.cpp
+@@ -236,6 +236,11 @@ qint64 QNonContiguousByteDeviceByteArrayImpl::size()
+ return byteArray-size();
+ }
+
++qint64
[arch-commits] Commit in qt5/trunk (PKGBUILD qlockfile-deadlock.patch)
Date: Friday, May 1, 2015 @ 03:06:00
Author: fyan
Revision: 238304
upgpkg: qt5 5.4.1-4
add patch for https://bugs.kde.org/show_bug.cgi?id=345901
Added:
qt5/trunk/qlockfile-deadlock.patch
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 10 ++--
qlockfile-deadlock.patch | 112 +
2 files changed, 119 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-30 19:32:40 UTC (rev 238303)
+++ PKGBUILD2015-05-01 01:06:00 UTC (rev 238304)
@@ -28,7 +28,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.4.1
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -42,13 +42,14 @@
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
-'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop' 'glib-2.43.patch')
+'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop' 'glib-2.43.patch' 'qlockfile-deadlock.patch')
md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
'b2897dd6a2967bccf8f10e397aafee55'
'76e150b20178d2d43801f7367232e5f7'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- 'bf756a3061e1b30b28df85dcf0c90df3')
+ 'bf756a3061e1b30b28df85dcf0c90df3'
+ '30d219401f77e536d215addc420b634c')
prepare() {
cd ${_pkgfqn}
@@ -56,6 +57,9 @@
# for glib 2.43+ https://bugreports.qt.io/browse/QTBUG-44714
(cd qtwebkit; patch -p1 -i $srcdir/glib-2.43.patch)
+ # https://bugs.kde.org/show_bug.cgi?id=345901
+ (cd qtbase; patch -p1 -i $srcdir/qlockfile-deadlock.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: qlockfile-deadlock.patch
===
--- qlockfile-deadlock.patch(rev 0)
+++ qlockfile-deadlock.patch2015-05-01 01:06:00 UTC (rev 238304)
@@ -0,0 +1,112 @@
+From f58e882b7594c59b6050d3c87562fcf836d10f60 Mon Sep 17 00:00:00 2001
+From: Olivier Goffart ogoff...@woboq.com
+Date: Tue, 14 Apr 2015 10:58:26 +0200
+Subject: QLockFile: fix deadlock when the lock file is corrupted
+
+[ChangeLog][QtCore][QLockFile] Fixed a deadlock when the lock file
+is corrupted.
+
+Task-number: QTBUG-44771
+Change-Id: Ic490b09d70ff1cc1733b64949889a73720b2d0f3
+Reviewed-by: David Faure david.fa...@kdab.com
+---
+ src/corelib/io/qlockfile_unix.cpp | 10 +-
+ src/corelib/io/qlockfile_win.cpp | 22 +++---
+ tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp | 17 +
+ 3 files changed, 33 insertions(+), 16 deletions(-)
+
+diff --git a/src/corelib/io/qlockfile_unix.cpp
b/src/corelib/io/qlockfile_unix.cpp
+index bf1015a..dc9f8f7 100644
+--- a/src/corelib/io/qlockfile_unix.cpp
b/src/corelib/io/qlockfile_unix.cpp
+@@ -181,11 +181,11 @@ bool QLockFilePrivate::isApparentlyStale() const
+ {
+ qint64 pid;
+ QString hostname, appname;
+-if (!getLockInfo(pid, hostname, appname))
+-return false;
+-if (hostname.isEmpty() || hostname ==
QString::fromLocal8Bit(localHostName())) {
+-if (::kill(pid, 0) == -1 errno == ESRCH)
+-return true; // PID doesn't exist anymore
++if (getLockInfo(pid, hostname, appname)) {
++if (hostname.isEmpty() || hostname ==
QString::fromLocal8Bit(localHostName())) {
++if (::kill(pid, 0) == -1 errno == ESRCH)
++return true; // PID doesn't exist anymore
++}
+ }
+ const qint64 age =
QFileInfo(fileName).lastModified().msecsTo(QDateTime::currentDateTime());
+ return staleLockTime 0 age staleLockTime;
+diff --git a/src/corelib/io/qlockfile_win.cpp
b/src/corelib/io/qlockfile_win.cpp
+index f9f2909..3587c7b 100644
+--- a/src/corelib/io/qlockfile_win.cpp
b/src/corelib/io/qlockfile_win.cpp
+@@ -115,21 +115,21 @@ bool QLockFilePrivate::isApparentlyStale() const
+ {
+ qint64 pid;
+ QString hostname, appname;
+-if (!getLockInfo(pid, hostname, appname))
+-return false;
+
+ // On WinRT there seems to be no way of obtaining information about other
+ // processes due to sandboxing
+ #ifndef Q_OS_WINRT
+-if (hostname == QString::fromLocal8Bit(localHostName())) {
+-HANDLE procHandle = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE,
pid);
+-if (!procHandle)
+-return true;
+-// We got a handle but check if process is still alive
+-DWORD dwR = ::WaitForSingleObject(procHandle, 0);
+-::CloseHandle(procHandle);
+-if (dwR ==
[arch-commits] Commit in qt5/trunk (PKGBUILD glib-2.43.patch)
Date: Saturday, April 4, 2015 @ 07:47:54
Author: fyan
Revision: 235426
upgpkg: qt5 5.4.1-3
icu 55.1 rebuild
Added:
qt5/trunk/glib-2.43.patch
Modified:
qt5/trunk/PKGBUILD
-+
PKGBUILD|8 +
glib-2.43.patch | 238 ++
2 files changed, 244 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-04 05:16:12 UTC (rev 235425)
+++ PKGBUILD2015-04-04 05:47:54 UTC (rev 235426)
@@ -42,16 +42,20 @@
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
-'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop')
+'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop' 'glib-2.43.patch')
md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
'b2897dd6a2967bccf8f10e397aafee55'
'76e150b20178d2d43801f7367232e5f7'
'188da8f4c87316e730ebf1c6217bf5a0'
- '322b419b16c75d4de0ee7ad0a246caa1')
+ '322b419b16c75d4de0ee7ad0a246caa1'
+ 'bf756a3061e1b30b28df85dcf0c90df3')
prepare() {
cd ${_pkgfqn}
+ # for glib 2.43+ https://bugreports.qt.io/browse/QTBUG-44714
+ (cd qtwebkit; patch -p1 -i $srcdir/glib-2.43.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: glib-2.43.patch
===
--- glib-2.43.patch (rev 0)
+++ glib-2.43.patch 2015-04-04 05:47:54 UTC (rev 235426)
@@ -0,0 +1,238 @@
+From ed5d6c93f7cf902e58aaf3f0abd54b3b258172ed Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen allan.jen...@theqtcompany.com
+Date: Fri, 27 Feb 2015 14:14:44 +0100
+Subject: Fix building with glib 2.43+
+
+The newest version of glib have introduced their own GMutexLocker
+conflicting with the one defined in WebCore.
+
+Task-number: QTBUG-44714
+Change-Id: Ibdd1646e129eaed84c65dc0d96bebe80f2a61f4b
+Reviewed-by: Andras Becsi andras.be...@theqtcompany.com
+---
+ .../gstreamer/WebKitWebSourceGStreamer.cpp | 48 +++---
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+diff --git
a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+index 5625873..a6d961f 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObject* object, guint
propID, const GValue*
+
+ switch (propID) {
+ case PROP_IRADIO_MODE: {
+-GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ priv-iradioMode = g_value_get_boolean(value);
+ break;
+ }
+@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObject* object, guint
propID, GValue* value
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
+ WebKitWebSrcPrivate* priv = src-priv;
+
+-GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ switch (propID) {
+ case PROP_IRADIO_MODE:
+ g_value_set_boolean(value, priv-iradioMode);
+@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src)
+
+ ASSERT(isMainThread());
+
+-GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ bool seeking = priv-seekID;
+
+@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src)
+
+ ASSERT(isMainThread());
+
+-GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ priv-startID = 0;
+
+@@ -584,7 +584,7 @@ static GstStateChangeReturn
webKitWebSrcChangeState(GstElement* element, GstStat
+ return ret;
+ }
+
+-GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ switch (transition) {
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
+ GST_DEBUG_OBJECT(src, READY-PAUSED);
+@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad,
GstObject* parent, GstQ
+ gst_query_parse_duration(query, format, NULL);
+
+ GST_DEBUG_OBJECT(src, duration query in format %s,
gst_format_get_name(format));
+-GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (format == GST_FORMAT_BYTES src-priv-size 0) {
+ gst_query_set_duration(query, format, src-priv-size);
+ result = TRUE;
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Wednesday, March 25, 2015 @ 08:53:39
Author: fyan
Revision: 234671
add qt5-svg to optdepends for https://bbs.archlinux.org/viewtopic.php?id=195205
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-25 07:29:22 UTC (rev 234670)
+++ PKGBUILD2015-03-25 07:53:39 UTC (rev 234671)
@@ -28,7 +28,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.4.1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -124,7 +124,8 @@
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig'
'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
'qtchooser')
- optdepends=('postgresql-libs: PostgreSQL driver'
+ optdepends=('qt5-svg: to use SVG icon themes'
+ 'postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver'
[arch-commits] Commit in qt5/trunk (PKGBUILD designer.desktop)
Date: Friday, February 27, 2015 @ 04:10:31
Author: fyan
Revision: 232029
upgpkg: qt5 5.4.1-2
prefix the designer icon with QtProject- (FS#43941)
Modified:
qt5/trunk/PKGBUILD
qt5/trunk/designer.desktop
--+
PKGBUILD |6 +++---
designer.desktop |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-27 02:59:28 UTC (rev 232028)
+++ PKGBUILD2015-02-27 03:10:31 UTC (rev 232029)
@@ -28,7 +28,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.4.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -45,7 +45,7 @@
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop')
md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
'b2897dd6a2967bccf8f10e397aafee55'
- '9638a78e502719ef8fe5f8d10d0361a9'
+ '76e150b20178d2d43801f7367232e5f7'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1')
@@ -432,7 +432,7 @@
install -D -m644 src/assistant/assistant/images/assistant-128.png \
${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png
install -D -m644 src/designer/src/designer/images/designer.png \
-${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png
+${pkgdir}/usr/share/icons/hicolor/128x128/apps/QtProject-designer.png
install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png \
${pkgdir}/usr/share/icons/hicolor/32x32/apps/qdbusviewer.png
install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
Modified: designer.desktop
===
--- designer.desktop2015-02-27 02:59:28 UTC (rev 232028)
+++ designer.desktop2015-02-27 03:10:31 UTC (rev 232029)
@@ -3,7 +3,7 @@
GenericName=Interface Designer
Comment=Design GUIs for Qt applications
Exec=/usr/lib/qt/bin/designer
-Icon=designer
+Icon=QtProject-designer
MimeType=application/x-designer;
Terminal=false
Type=Application
[arch-commits] Commit in qt5/trunk (PKGBUILD kdebug-329174.patch)
Date: Tuesday, February 24, 2015 @ 16:19:47
Author: fyan
Revision: 231846
upgpkg: qt5 5.4.1-1
Modified:
qt5/trunk/PKGBUILD
Deleted:
qt5/trunk/kdebug-329174.patch
-+
PKGBUILD| 19 +++
kdebug-329174.patch | 39 ---
2 files changed, 7 insertions(+), 51 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-24 15:19:25 UTC (rev 231845)
+++ PKGBUILD2015-02-24 15:19:47 UTC (rev 231846)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
+# Maintainer: Felix Yan felixonm...@archlinux.org
+# Contributor: Andrea Scarpino and...@archlinux.org
pkgbase=qt5
pkgname=('qt5-base'
@@ -26,8 +27,8 @@
'qt5-websockets'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.4.0
-pkgrel=3
+pkgver=5.4.1
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -41,14 +42,12 @@
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
-'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
-'kdebug-329174.patch')
-md5sums=('21843b00ecde8956217faab391bc007b'
+'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop')
+md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
- '322b419b16c75d4de0ee7ad0a246caa1'
- 'f69ac1589a661f232fb86ad32e293b28')
+ '322b419b16c75d4de0ee7ad0a246caa1')
prepare() {
cd ${_pkgfqn}
@@ -66,10 +65,6 @@
# in qtwebengine there are still a lot of relative calls which need a
workaround
mkdir ${srcdir}/python2-path
ln -s /usr/bin/python2 ${srcdir}/python2-path/python
-
- # Fixed in 5.4.1
- cd qtbase
- patch -p1 -i ${srcdir}/kdebug-329174.patch
}
build() {
Deleted: kdebug-329174.patch
===
--- kdebug-329174.patch 2015-02-24 15:19:25 UTC (rev 231845)
+++ kdebug-329174.patch 2015-02-24 15:19:47 UTC (rev 231846)
@@ -1,39 +0,0 @@
-From 6a7ee92b3958e3a3ebc16be15f8bd34217ec7bd2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= mgraess...@kde.org
-Date: Wed, 10 Dec 2014 07:27:23 +0100
-Subject: [PATCH] Handle SelectionClientClose in QXcbClipboard
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QXcbClipboard listens for subtype SelectionClientClose of Xfixes
-SelectionNotify event, but doesn't handle it. When the client holding
-the clipboard selection closes the Clipboard becomes empty and thus the
-change should be emitted.
-
-This fixes downstream KDE Bug #329174.
-
-Change-Id: I19fb8cfd7bd3b249c0bc6ca2a724a9aeeb05ac7e
-Reviewed-by: Jørgen Lind jorgen.l...@theqtcompany.com
-Reviewed-by: Aleix Pol Gonzalez aleix...@kde.org
- src/plugins/platforms/xcb/qxcbclipboard.cpp |3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp
b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-index 8b3893e..f56a29d 100644
a/src/plugins/platforms/xcb/qxcbclipboard.cpp
-+++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-@@ -742,7 +742,8 @@ void
QXcbClipboard::handleXFixesSelectionRequest(xcb_xfixes_selection_notify_eve
- m_xClipboard[mode]-reset();
- }
- emitChanged(mode);
--}
-+} else if (event-subtype ==
XCB_XFIXES_SELECTION_EVENT_SELECTION_CLIENT_CLOSE)
-+emitChanged(mode);
- }
-
-
---
-1.7.1
-
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Tuesday, January 20, 2015 @ 09:10:13
Author: andrea
Revision: 229604
upgpkg: qt5 5.4.0-2
Fix sed rules to apply our {C,LD}FLAGS; we don't need staticlibs anymore
because of pacman 4.2
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 31 +--
1 file changed, 21 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-20 05:15:47 UTC (rev 229603)
+++ PKGBUILD2015-01-20 08:10:13 UTC (rev 229604)
@@ -27,7 +27,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.4.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -51,12 +51,15 @@
prepare() {
cd ${_pkgfqn}
- sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g
qtbase/mkspecs/common/gcc-base.conf
+ # Build using Arch {C,LD}FLAGS
+ sed -i -e s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}| \
+qtbase/mkspecs/common/gcc-base.conf
+ sed -i -e s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}| \
+qtbase/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|' {} +
-
# There are still a lot of relative calls which need a workaround
mkdir ${srcdir}/python2-path
ln -s /usr/bin/python2 ${srcdir}/python2-path/python
@@ -69,8 +72,10 @@
export
LD_LIBRARY_PATH=${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}
export QT_PLUGIN_PATH=${QTDIR}/qtbase/plugins
+ # python2 workaround
export PATH=${srcdir}/python2-path:$PATH
+ # FS#38796
[[ ${CARCH} = i686 ]] SSE2=-no-sse2
PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
@@ -95,12 +100,19 @@
make
- # Fix paths
- find ${QTDIR} -name Makefile -exec sed -i
s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g {} +
- find ${QTDIR} -name Makefile.qmake-docs -exec sed -i
s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g {} +
- find ${QTDIR} -name Makefile -exec sed -i
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g {} +
- find ${QTDIR} -name Makefile.qmake-docs -exec sed -i
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g {} +
- sed -i
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g
qtwebkit/Source/Makefile.api
+ # Fix docs build when qt is not installed
+ sed -i s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g \
+${QTDIR}/qtbase/qmake/Makefile.qmake-docs
+ find ${QTDIR} -name Makefile \
+-exec sed -i s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g {} +
+ sed -i
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g \
+${QTDIR}/qtbase/qmake/Makefile.qmake-docs
+ find ${QTDIR} -name Makefile \
+-exec sed -i
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g {} +
+ sed -i
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g \
+qtwebkit/Source/Makefile.api
+ find ${QTDIR} -name Makefile \
+-exec sed -i
s|/usr/lib/qt/bin/qmlplugindump|${QTDIR}/qtdeclarative/bin/qmlplugindump|g {}
+
make docs
}
@@ -119,7 +131,6 @@
'libsm: xcb plugin'
'gtk2: GTK2 plugin')
conflicts=('qt')
- options=('staticlibs') #libQt5PlatformSupport builds static only
cd ${_pkgfqn}/qtbase
make INSTALL_ROOT=${pkgdir} install
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Tuesday, January 20, 2015 @ 13:53:47
Author: andrea
Revision: 229607
This is no more needed and it also broke some prl file
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 46 --
1 file changed, 24 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-20 08:11:55 UTC (rev 229606)
+++ PKGBUILD2015-01-20 12:53:47 UTC (rev 229607)
@@ -27,7 +27,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.4.0
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -51,7 +51,8 @@
prepare() {
cd ${_pkgfqn}
- # Build using Arch {C,LD}FLAGS
+ # Build qmake using Arch {C,LD}FLAGS
+ # This also sets default {C,XX,LD}FLAGS for projects built using qmake
sed -i -e s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}| \
qtbase/mkspecs/common/gcc-base.conf
sed -i -e s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}| \
@@ -60,7 +61,7 @@
# Use python2 for Python 2.x
find . -name '*.py' -exec sed -i \
's|#![ ]*/usr/bin/python$|2|;s|#![ ]*/usr/bin/env python$|2|' {} +
- # There are still a lot of relative calls which need a workaround
+ # in qtwebengine there are still a lot of relative calls which need a
workaround
mkdir ${srcdir}/python2-path
ln -s /usr/bin/python2 ${srcdir}/python2-path/python
}
@@ -139,8 +140,8 @@
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
# 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/' {}
\;
+ find ${pkgdir}/usr/lib -type f -name '*.prl' \
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Fix wrong qmake path in pri file
sed -i s|${srcdir}/${_pkgfqn}/qtbase|/usr| \
@@ -162,7 +163,7 @@
# 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/' {}
\;
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -178,7 +179,7 @@
# 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/' {}
\;
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Useful symlinks
install -d ${pkgdir}/usr/bin
@@ -216,7 +217,7 @@
# 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/' {}
\;
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -232,7 +233,7 @@
# 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/' {}
\;
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Useful symlinks
install -d ${pkgdir}/usr/bin
@@ -267,7 +268,7 @@
# 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/' {}
\;
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -305,7 +306,7 @@
# 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/' {}
\;
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -321,7 +322,7 @@
# 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/' {}
\;
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Useful symlinks
install -d ${pkgdir}/usr/bin
@@ -354,7 +355,7 @@
# 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/' {}
\;
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -369,7 +370,7 @@
# 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/' {}
\;
+-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -384,7 +385,7 @@
# Fix wrong path in prl files
find ${pkgdir}/usr/lib -type f -name '*.prl' \
--exec sed -i
[arch-commits] Commit in qt5/trunk (PKGBUILD kdebug-329174.patch)
Date: Tuesday, January 20, 2015 @ 14:38:15
Author: andrea
Revision: 229608
Handle SelectionClientClose in QXcbClipboard (KDEBUG#329174)
Added:
qt5/trunk/kdebug-329174.patch
Modified:
qt5/trunk/PKGBUILD
-+
PKGBUILD| 50 --
kdebug-329174.patch | 39 +++
2 files changed, 67 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-20 12:53:47 UTC (rev 229607)
+++ PKGBUILD2015-01-20 13:38:15 UTC (rev 229608)
@@ -41,18 +41,20 @@
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
-'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop')
+'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
+'kdebug-329174.patch')
md5sums=('21843b00ecde8956217faab391bc007b'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
- '322b419b16c75d4de0ee7ad0a246caa1')
+ '322b419b16c75d4de0ee7ad0a246caa1'
+ 'f69ac1589a661f232fb86ad32e293b28')
prepare() {
cd ${_pkgfqn}
# Build qmake using Arch {C,LD}FLAGS
- # This also sets default {C,XX,LD}FLAGS for projects built using qmake
+ # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
sed -i -e s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}| \
qtbase/mkspecs/common/gcc-base.conf
sed -i -e s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}| \
@@ -64,6 +66,10 @@
# in qtwebengine there are still a lot of relative calls which need a
workaround
mkdir ${srcdir}/python2-path
ln -s /usr/bin/python2 ${srcdir}/python2-path/python
+
+ # Fixed in 5.4.1
+ cd qtbase
+ patch -p1 -i ${srcdir}/kdebug-329174.patch
}
build() {
@@ -139,8 +145,8 @@
install -D -m644 LGPL_EXCEPTION.txt \
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
- # Fix wrong path in prl files
- find ${pkgdir}/usr/lib -type f -name '*.prl' \
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+ find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Fix wrong qmake path in pri file
@@ -161,7 +167,7 @@
cd ${_pkgfqn}/qtconnectivity
make INSTALL_ROOT=${pkgdir} install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
@@ -177,7 +183,7 @@
cd ${_pkgfqn}/qtdeclarative
make INSTALL_ROOT=${pkgdir} install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
@@ -215,7 +221,7 @@
cd ${_pkgfqn}/qtenginio
make INSTALL_ROOT=${pkgdir} install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
@@ -231,7 +237,7 @@
cd ${_pkgfqn}/qtxmlpatterns
make INSTALL_ROOT=${pkgdir} install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
@@ -266,7 +272,7 @@
cd ${_pkgfqn}/qtmultimedia
make INSTALL_ROOT=${pkgdir} install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
@@ -304,7 +310,7 @@
cd ${_pkgfqn}/qtlocation
make INSTALL_ROOT=${pkgdir} install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
@@ -320,7 +326,7 @@
cd ${_pkgfqn}/qtquick1
make INSTALL_ROOT=${pkgdir} install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
@@ -353,7 +359,7 @@
cd ${_pkgfqn}/qtscript
make INSTALL_ROOT=${pkgdir} install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
@@ -368,7 +374,7 @@
cd ${_pkgfqn}/qtsensors
make INSTALL_ROOT=${pkgdir} install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find ${pkgdir}/usr/lib -type f -name '*.prl'
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Saturday, December 27, 2014 @ 09:56:10
Author: andrea
Revision: 228077
Cleaning QMAKE_LFLAGS_RPATH is not needed anymore
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |1 -
1 file changed, 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-27 08:43:03 UTC (rev 228076)
+++ PKGBUILD2014-12-27 08:56:10 UTC (rev 228077)
@@ -52,7 +52,6 @@
cd ${_pkgfqn}
sed -i s|-O2|${CXXFLAGS}| qtbase/mkspecs/common/{g++,gcc}-base.conf
- sed -i /^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g
qtbase/mkspecs/common/gcc-base-unix.conf
sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g
qtbase/mkspecs/common/gcc-base.conf
# Use python2 for Python 2.x
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Saturday, December 27, 2014 @ 09:57:44
Author: andrea
Revision: 228078
Qt now enables 'full optimization' and this does not apply anymore, see
https://qt.gitorious.org/qt/qtbase/commit/cd652500af18671e0d64b30d51c79a0c45b973a3
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |1 -
1 file changed, 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-27 08:56:10 UTC (rev 228077)
+++ PKGBUILD2014-12-27 08:57:44 UTC (rev 228078)
@@ -51,7 +51,6 @@
prepare() {
cd ${_pkgfqn}
- sed -i s|-O2|${CXXFLAGS}| qtbase/mkspecs/common/{g++,gcc}-base.conf
sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g
qtbase/mkspecs/common/gcc-base.conf
# Use python2 for Python 2.x
[arch-commits] Commit in qt5/trunk (PKGBUILD use-python2.patch)
Date: Friday, December 12, 2014 @ 12:06:10
Author: andrea
Revision: 227556
QtWebEngine refers to python in too many ways, apply this ugly workaround to
let it build
Modified:
qt5/trunk/PKGBUILD
Deleted:
qt5/trunk/use-python2.patch
---+
PKGBUILD | 24 +
use-python2.patch | 128
2 files changed, 14 insertions(+), 138 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-12 06:49:06 UTC (rev 227555)
+++ PKGBUILD2014-12-12 11:06:10 UTC (rev 227556)
@@ -37,18 +37,16 @@
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient' 'libmng'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
'bluez-libs'
'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz'
'libwebp' 'leveldb'
-'geoclue')
+'geoclue' 'pciutils' 'nss')
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
-'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
-'use-python2.patch')
+'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop')
md5sums=('21843b00ecde8956217faab391bc007b'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
- '322b419b16c75d4de0ee7ad0a246caa1'
- '23ebafd7ad91897e870e84e281266f46')
+ '322b419b16c75d4de0ee7ad0a246caa1')
prepare() {
cd ${_pkgfqn}
@@ -58,10 +56,12 @@
sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g
qtbase/mkspecs/common/gcc-base.conf
# Use python2 for Python 2.x
- patch -p1 -i ${srcdir}/use-python2.patch
- sed -i -e s|#![ ]*/usr/bin/python$|#!/usr/bin/python2| \
--e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| \
-$(find . -name '*.py')
+ find . -name '*.py' -exec sed -i \
+'s|#![ ]*/usr/bin/python$|2|;s|#![ ]*/usr/bin/env python$|2|' {} +
+
+ # There are still a lot of relative calls which need a workaround
+ mkdir ${srcdir}/python2-path
+ ln -s /usr/bin/python2 ${srcdir}/python2-path/python
}
build() {
@@ -71,6 +71,8 @@
export
LD_LIBRARY_PATH=${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}
export QT_PLUGIN_PATH=${QTDIR}/qtbase/plugins
+ export PATH=${srcdir}/python2-path:$PATH
+
[[ ${CARCH} = i686 ]] SSE2=-no-sse2
PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
@@ -491,11 +493,13 @@
package_qt5-webengine() {
pkgdesc='Provides support for web applications using the Chromium browser
project'
- depends=('qt5-base')
+ depends=('qt5-declarative' 'nss' 'libxtst' 'libxcursor' 'libxrandr'
'alsa-lib' 'libxcomposite')
license=('LGPL')
cd ${_pkgfqn}/qtwebengine
make INSTALL_ROOT=${pkgdir} install
+
+ rm -rf ${pkgdir}/usr/share/doc
}
package_qt5-websockets() {
Deleted: use-python2.patch
===
--- use-python2.patch 2014-12-12 06:49:06 UTC (rev 227555)
+++ use-python2.patch 2014-12-12 11:06:10 UTC (rev 227556)
@@ -1,128 +0,0 @@
qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/WebCore/DerivedSources.pri~
2013-11-29 16:57:47.573721157 +
-+++
qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/WebCore/DerivedSources.pri
2013-11-29 16:58:22.270157823 +
-@@ -819,7 +819,7 @@
- inspectorValidate.output = InspectorProtocolVersion.h
- inspectorValidate.input = INSPECTOR_JSON
- inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version
--inspectorValidate.commands = python $$inspectorValidate.script -o
${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
-+inspectorValidate.commands = python2 $$inspectorValidate.script -o
${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
- inspectorValidate.depends =
$$PWD/inspector/generate-inspector-protocol-version
- inspectorValidate.add_output_to_sources = false
- GENERATORS += inspectorValidate
-@@ -827,7 +827,7 @@
- inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp
InspectorTypeBuilder.cpp
- inspectorJSON.input = INSPECTOR_JSON
- inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py
--inspectorJSON.commands = python $$inspectorJSON.script
$$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH}
--output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
-+inspectorJSON.commands = python2 $$inspectorJSON.script
$$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH}
--output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
- inspectorJSON.depends = $$inspectorJSON.script
- GENERATORS += inspectorJSON
-
-@@ -927,7 +927,7 @@
- entities.output = HTMLEntityTable.cpp
- entities.input = HTML_ENTITIES
- entities.script = $$PWD/html/parser/create-html-entity-table
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Friday, December 12, 2014 @ 12:44:23
Author: andrea
Revision: 227557
Enable extra codecs support for QtMultimedia
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-12 11:06:10 UTC (rev 227556)
+++ PKGBUILD2014-12-12 11:44:23 UTC (rev 227557)
@@ -32,12 +32,12 @@
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm'
'xcb-util-keysyms'
-'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-bad'
'gstreamer0.10-base-plugins'
+'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs'
'gstreamer0.10-base-plugins'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient' 'libmng'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
'bluez-libs'
'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz'
'libwebp' 'leveldb'
-'geoclue' 'pciutils' 'nss')
+'geoclue' 'pciutils' 'nss' 'gstreamer0.10-bad')
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
@@ -250,6 +250,7 @@
package_qt5-multimedia() {
pkgdesc='Classes for audio, video, radio and camera functionality'
depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal')
+ optdepends=('gstreamer0.10-plugins: extra codecs support')
conflicts=('qt')
cd ${_pkgfqn}/qtmultimedia
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Friday, December 12, 2014 @ 13:12:10
Author: andrea
Revision: 227558
Python3 is no more needed to build
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-12 11:44:23 UTC (rev 227557)
+++ PKGBUILD2014-12-12 12:12:10 UTC (rev 227558)
@@ -36,7 +36,7 @@
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient' 'libmng'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
'bluez-libs'
-'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz'
'libwebp' 'leveldb'
+'openal' 'gtk2' 'libxkbcommon-x11' 'mtdev' 'harfbuzz' 'libwebp'
'leveldb'
'geoclue' 'pciutils' 'nss' 'gstreamer0.10-bad')
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
@@ -250,7 +250,7 @@
package_qt5-multimedia() {
pkgdesc='Classes for audio, video, radio and camera functionality'
depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal')
- optdepends=('gstreamer0.10-plugins: extra codecs support')
+ optdepends=('gstreamer0.10-bad: Qt MediaService plugin')
conflicts=('qt')
cd ${_pkgfqn}/qtmultimedia
[arch-commits] Commit in qt5/trunk (PKGBUILD use-python2.patch)
Date: Wednesday, December 10, 2014 @ 14:23:56
Author: andrea
Revision: 227395
Upstream release
Modified:
qt5/trunk/PKGBUILD
qt5/trunk/use-python2.patch
---+
PKGBUILD | 54 ++--
use-python2.patch | 10 -
2 files changed, 53 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-10 12:36:46 UTC (rev 227394)
+++ PKGBUILD2014-12-10 13:23:56 UTC (rev 227395)
@@ -19,12 +19,15 @@
'qt5-svg'
'qt5-tools'
'qt5-translations'
+ 'qt5-wayland'
+ 'qt5-webchannel'
+ 'qt5-webengine'
'qt5-webkit'
'qt5-websockets'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.3.2
-pkgrel=2
+pkgver=5.4.0
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -36,15 +39,15 @@
'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz')
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
-source=(http://download.qt-project.org/official_releases/qt/5.3/${pkgver}/single/${_pkgfqn}.tar.xz;
+source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
'use-python2.patch')
-md5sums=('c4e893678e3d8388ab04d059523d1d78'
+md5sums=('21843b00ecde8956217faab391bc007b'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- 'a378deccf363bd6079da459c89aff7b9')
+ '767fc585e6a7ae3fad5272663c3d0e9d')
prepare() {
cd ${_pkgfqn}
@@ -439,7 +442,7 @@
package_qt5-webkit() {
pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
- depends=('qt5-sensors' 'qt5-location' 'gst-plugins-base' 'libxslt'
'libxcomposite')
+ depends=('qt5-sensors' 'qt5-location' 'qt5-webchannel' 'gst-plugins-base'
'libxslt' 'libxcomposite')
optdepends=('gst-plugins-good: Webm codec support')
license=('GPL3' 'LGPL' 'FDL')
@@ -454,6 +457,45 @@
perl -pi -e s, -L${srcdir}/?\S+,,g
${pkgdir}/usr/lib/pkgconfig/Qt5WebKit.pc
}
+package_qt5-wayland() {
+ pkgdesc='Provides APIs for Wayland'
+ depends=('qt5-base' 'libxcomposite' 'libxkbcommon')
+
+ cd ${_pkgfqn}/qtwayland
+ make INSTALL_ROOT=${pkgdir} install
+
+ # 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/' {}
\;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-webchannel() {
+ pkgdesc='Provides access to QObject or QML objects from HTML clients for
seamless integration of Qt applications with HTML/JavaScript clients'
+ depends=('qt5-base')
+
+ cd ${_pkgfqn}/qtwebchannel
+ make INSTALL_ROOT=${pkgdir} install
+
+ # 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/' {}
\;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-webengine() {
+ pkgdesc='Provides support for web applications using the Chromium browser
project'
+ depends=('qt5-base')
+ license=('LGPL')
+
+ cd ${_pkgfqn}/qtwebengine
+ make INSTALL_ROOT=${pkgdir} install
+}
+
package_qt5-websockets() {
pkgdesc='Provides WebSocket communication compliant with RFC 6455'
depends=('qt5-declarative')
Modified: use-python2.patch
===
--- use-python2.patch 2014-12-10 12:36:46 UTC (rev 227394)
+++ use-python2.patch 2014-12-10 13:23:56 UTC (rev 227395)
@@ -55,12 +55,12 @@
disassembler.CONFIG += no_link
GENERATORS += disassembler
}
qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~
2013-11-29 16:59:04.859875494 +
-+++
qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
2013-11-29 16:59:40.539638968 +
-@@ -116,7 +116,7 @@
- production_build:blackberry|qnx {
- addReasonForSkippingBuild(Build not supported on BB10/QNX yet.)
+---
qt-everywhere-opensource-src-5.4.0/qtwebkit/Tools/qmake/mkspecs/features/configure.prf.old
2014-12-10 11:27:25.875352161 +
qt-everywhere-opensource-src-5.4.0/qtwebkit/Tools/qmake/mkspecs/features/configure.prf
2014-12-10 11:27:39.008643049 +
+@@ -125,7 +125,7 @@
+ addReasonForSkippingBuild(QtWebKit cannot be built as a static
library on this platform. Check your configuration in qtbase/config.summary.)
}
+ winrt: addReasonForSkippingBuild(QtWebKit is not supported on Windows
[arch-commits] Commit in qt5/trunk (PKGBUILD use-python2.patch)
Date: Wednesday, December 10, 2014 @ 17:54:25
Author: andrea
Revision: 227406
Enable WEBP, GeoClue and Bluez 5 support
Modified:
qt5/trunk/PKGBUILD
qt5/trunk/use-python2.patch
---+
PKGBUILD | 22 --
use-python2.patch | 40
2 files changed, 52 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-10 14:44:46 UTC (rev 227405)
+++ PKGBUILD2014-12-10 16:54:25 UTC (rev 227406)
@@ -32,11 +32,12 @@
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm'
'xcb-util-keysyms'
-'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs'
'gstreamer0.10-base-plugins' 'libmng'
+'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-bad'
'gstreamer0.10-base-plugins'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
-'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient'
-'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
-'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz')
+'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient' 'libmng'
+'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
'bluez-libs'
+'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz'
'libwebp' 'leveldb'
+'geoclue')
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz;
@@ -47,7 +48,7 @@
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- '767fc585e6a7ae3fad5272663c3d0e9d')
+ '23ebafd7ad91897e870e84e281266f46')
prepare() {
cd ${_pkgfqn}
@@ -143,7 +144,7 @@
package_qt5-connectivity() {
pkgdesc='Provides access to Bluetooth hardware'
- depends=('qt5-declarative')
+ depends=('qt5-declarative' 'bluez-libs')
cd ${_pkgfqn}/qtconnectivity
make INSTALL_ROOT=${pkgdir} install
@@ -273,7 +274,7 @@
package_qt5-imageformats() {
pkgdesc='Plugins for additional image formats: TIFF, MNG, TGA, WBMP'
- depends=('qt5-base' 'jasper' 'libmng')
+ depends=('qt5-base' 'jasper' 'libmng' 'libwebp')
conflicts=('qt')
cd ${_pkgfqn}/qtimageformats
@@ -285,7 +286,7 @@
package_qt5-location() {
pkgdesc='Provides access to position, satellite and area monitoring classes'
- depends=('qt5-declarative')
+ depends=('qt5-declarative' 'geoclue')
cd ${_pkgfqn}/qtlocation
make INSTALL_ROOT=${pkgdir} install
@@ -442,7 +443,8 @@
package_qt5-webkit() {
pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
- depends=('qt5-sensors' 'qt5-location' 'qt5-webchannel' 'gst-plugins-base'
'libxslt' 'libxcomposite')
+ depends=('qt5-sensors' 'qt5-location' 'qt5-webchannel' 'gst-plugins-base'
'libxslt'
+ 'libxcomposite' 'libwebp')
optdepends=('gst-plugins-good: Webm codec support')
license=('GPL3' 'LGPL' 'FDL')
@@ -474,7 +476,7 @@
package_qt5-webchannel() {
pkgdesc='Provides access to QObject or QML objects from HTML clients for
seamless integration of Qt applications with HTML/JavaScript clients'
- depends=('qt5-base')
+ depends=('qt5-declarative')
cd ${_pkgfqn}/qtwebchannel
make INSTALL_ROOT=${pkgdir} install
Modified: use-python2.patch
===
--- use-python2.patch 2014-12-10 14:44:46 UTC (rev 227405)
+++ use-python2.patch 2014-12-10 16:54:25 UTC (rev 227406)
@@ -86,3 +86,43 @@
QMAKE_EXTRA_COMPILERS += retgen
# Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
+---
qt-everywhere-opensource-src-5.4.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf.old
2014-12-10 16:47:11.582370503 +
qt-everywhere-opensource-src-5.4.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf
2014-12-10 16:47:54.888779281 +
+@@ -15,8 +15,8 @@
+ }
+
+ defineTest(isPythonVersionSupported) {
+- python_major_version = $$system('python -c import sys; print
sys.version_info.major')
+- python_minor_version = $$system('python -c import sys; print
sys.version_info.minor')
++ python_major_version = $$system('python2 -c import sys; print
sys.version_info.major')
++ python_minor_version = $$system('python2 -c import sys; print
sys.version_info.minor')
+ greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6):
return(true)
+ warning(Using Python version
$$python_major_version.$$python_minor_version, but at least Python version
2.7 is required to build Qt WebEngine.)
+ return(false)
+@@ -69,7 +69,7 @@
+ input = $$1
+ for (file, input): \
+
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Tuesday, October 14, 2014 @ 18:49:57
Author: andrea
Revision: 224344
Add missing optdepends (FS#41694)
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-10-14 16:48:21 UTC (rev 224343)
+++ PKGBUILD2014-10-14 16:49:57 UTC (rev 224344)
@@ -24,7 +24,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.3.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -440,6 +440,7 @@
package_qt5-webkit() {
pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
depends=('qt5-sensors' 'qt5-location' 'gst-plugins-base' 'libxslt'
'libxcomposite')
+ optdepends=('gst-plugins-good: Webm codec support')
license=('GPL3' 'LGPL' 'FDL')
cd ${_pkgfqn}/qtwebkit
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Tuesday, September 16, 2014 @ 22:00:23
Author: andrea
Revision: 221808
Upstream release
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-09-16 16:55:58 UTC (rev 221807)
+++ PKGBUILD2014-09-16 20:00:23 UTC (rev 221808)
@@ -23,7 +23,7 @@
'qt5-websockets'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.3.1
+pkgver=5.3.2
pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
@@ -39,7 +39,7 @@
source=(http://download.qt-project.org/official_releases/qt/5.3/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
'use-python2.patch')
-md5sums=('f9a24a0d5645efa0715b6ff0fa13d60f'
+md5sums=('c4e893678e3d8388ab04d059523d1d78'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
[arch-commits] Commit in qt5/trunk (PKGBUILD QTBUG-39047.patch)
Date: Wednesday, June 25, 2014 @ 23:22:27
Author: andrea
Revision: 215455
upgpkg: qt5 5.3.1-1
Upstream release
Modified:
qt5/trunk/PKGBUILD
Deleted:
qt5/trunk/QTBUG-39047.patch
---+
PKGBUILD | 15 -
QTBUG-39047.patch | 57
2 files changed, 5 insertions(+), 67 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-06-25 21:05:54 UTC (rev 215454)
+++ PKGBUILD2014-06-25 21:22:27 UTC (rev 215455)
@@ -23,8 +23,8 @@
'qt5-websockets'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.3.0
-pkgrel=3
+pkgver=5.3.1
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -38,15 +38,13 @@
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/5.3/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
-'use-python2.patch'
-'QTBUG-39047.patch')
-md5sums=('f00ac7930e3b1b2b364dedcd15acc142'
+'use-python2.patch')
+md5sums=('f9a24a0d5645efa0715b6ff0fa13d60f'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- 'a378deccf363bd6079da459c89aff7b9'
- '819813c53ab11b2341baf54afbc37e37')
+ 'a378deccf363bd6079da459c89aff7b9')
prepare() {
cd ${_pkgfqn}
@@ -60,9 +58,6 @@
sed -i -e s|#![ ]*/usr/bin/python$|#!/usr/bin/python2| \
-e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| \
$(find . -name '*.py')
-
- cd qtdeclarative
- patch -p1 -i ${srcdir}/QTBUG-39047.patch
}
build() {
Deleted: QTBUG-39047.patch
===
--- QTBUG-39047.patch 2014-06-25 21:05:54 UTC (rev 215454)
+++ QTBUG-39047.patch 2014-06-25 21:22:27 UTC (rev 215455)
@@ -1,57 +0,0 @@
-From 009ad875f89d7d7bc4447e18c2fbbd485a75e0b5 Mon Sep 17 00:00:00 2001
-From: Oleg Shparber troll...@gmail.com
-Date: Mon, 19 May 2014 00:53:39 -0700
-Subject: [PATCH] Fix improper antialiasing property behavior
-
-For components antialiased by default the property was returned
-as false if default true value was set to true again.
-
-Task-number: QTBUG-39047
-Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4
-Reviewed-by: Gunnar Sletta gunnar.sle...@jollamobile.com
- src/quick/items/qquickitem.cpp |8 +---
- tests/auto/quick/qquicktext/tst_qquicktext.cpp |7 +++
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
-index 3f0dae8..ef2eac4 100644
a/src/quick/items/qquickitem.cpp
-+++ b/src/quick/items/qquickitem.cpp
-@@ -5691,10 +5691,12 @@ void QQuickItem::setAntialiasing(bool aa)
- {
- Q_D(QQuickItem);
-
--bool changed = (aa != antialiasing());
--d-antialiasingValid = true;
-+if (!d-antialiasingValid) {
-+d-antialiasingValid = true;
-+d-antialiasing = d-implicitAntialiasing;
-+}
-
--if (!changed)
-+if (aa == d-antialiasing)
- return;
-
- d-antialiasing = aa;
-diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
-index 0b69981..d36c55d 100644
a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
-+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
-@@ -1334,6 +1334,13 @@ void tst_qquicktext::antialiasing()
- text-resetAntialiasing();
- QCOMPARE(text-antialiasing(), true);
- QCOMPARE(spy.count(), 2);
-+
-+// QTBUG-39047
-+component.setData(import QtQuick 2.0\n Text { antialiasing: true },
QUrl());
-+object.reset(component.create());
-+text = qobject_castQQuickText *(object.data());
-+QVERIFY(text);
-+QCOMPARE(text-antialiasing(), true);
- }
-
- void tst_qquicktext::weight()
---
-1.7.1
-
[arch-commits] Commit in qt5/trunk (PKGBUILD QTBUG-39047.patch)
Date: Thursday, May 22, 2014 @ 14:27:18
Author: andrea
Revision: 213384
upgpkg: qt5 5.3.0-3
Fix antialiasing with QML (FS#40488)
Added:
qt5/trunk/QTBUG-39047.patch
Modified:
qt5/trunk/PKGBUILD
---+
PKGBUILD | 11 +++---
QTBUG-39047.patch | 57
2 files changed, 65 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-22 10:04:58 UTC (rev 213383)
+++ PKGBUILD2014-05-22 12:27:18 UTC (rev 213384)
@@ -24,7 +24,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.3.0
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -38,13 +38,15 @@
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/5.3/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
-'use-python2.patch')
+'use-python2.patch'
+'QTBUG-39047.patch')
md5sums=('f00ac7930e3b1b2b364dedcd15acc142'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- 'a378deccf363bd6079da459c89aff7b9')
+ 'a378deccf363bd6079da459c89aff7b9'
+ '819813c53ab11b2341baf54afbc37e37')
prepare() {
cd ${_pkgfqn}
@@ -58,6 +60,9 @@
sed -i -e s|#![ ]*/usr/bin/python$|#!/usr/bin/python2| \
-e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| \
$(find . -name '*.py')
+
+ cd qtdeclarative
+ patch -p1 -i ${srcdir}/QTBUG-39047.patch
}
build() {
Added: QTBUG-39047.patch
===
--- QTBUG-39047.patch (rev 0)
+++ QTBUG-39047.patch 2014-05-22 12:27:18 UTC (rev 213384)
@@ -0,0 +1,57 @@
+From 009ad875f89d7d7bc4447e18c2fbbd485a75e0b5 Mon Sep 17 00:00:00 2001
+From: Oleg Shparber troll...@gmail.com
+Date: Mon, 19 May 2014 00:53:39 -0700
+Subject: [PATCH] Fix improper antialiasing property behavior
+
+For components antialiased by default the property was returned
+as false if default true value was set to true again.
+
+Task-number: QTBUG-39047
+Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4
+Reviewed-by: Gunnar Sletta gunnar.sle...@jollamobile.com
+---
+ src/quick/items/qquickitem.cpp |8 +---
+ tests/auto/quick/qquicktext/tst_qquicktext.cpp |7 +++
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
+index 3f0dae8..ef2eac4 100644
+--- a/src/quick/items/qquickitem.cpp
b/src/quick/items/qquickitem.cpp
+@@ -5691,10 +5691,12 @@ void QQuickItem::setAntialiasing(bool aa)
+ {
+ Q_D(QQuickItem);
+
+-bool changed = (aa != antialiasing());
+-d-antialiasingValid = true;
++if (!d-antialiasingValid) {
++d-antialiasingValid = true;
++d-antialiasing = d-implicitAntialiasing;
++}
+
+-if (!changed)
++if (aa == d-antialiasing)
+ return;
+
+ d-antialiasing = aa;
+diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+index 0b69981..d36c55d 100644
+--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+@@ -1334,6 +1334,13 @@ void tst_qquicktext::antialiasing()
+ text-resetAntialiasing();
+ QCOMPARE(text-antialiasing(), true);
+ QCOMPARE(spy.count(), 2);
++
++// QTBUG-39047
++component.setData(import QtQuick 2.0\n Text { antialiasing: true },
QUrl());
++object.reset(component.create());
++text = qobject_castQQuickText *(object.data());
++QVERIFY(text);
++QCOMPARE(text-antialiasing(), true);
+ }
+
+ void tst_qquicktext::weight()
+--
+1.7.1
+
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Wednesday, May 21, 2014 @ 18:44:25
Author: andrea
Revision: 213368
upgpkg: qt5 5.3.0-2
add missing required deps to qt5-declarative
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-21 16:40:29 UTC (rev 213367)
+++ PKGBUILD2014-05-21 16:44:25 UTC (rev 213368)
@@ -24,7 +24,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.3.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -155,7 +155,7 @@
package_qt5-declarative() {
pkgdesc='Classes for QML and JavaScript languages'
- depends=('qt5-xmlpatterns')
+ depends=('qt5-xmlpatterns' 'libxkbcommon-x11')
conflicts=('qt')
cd ${_pkgfqn}/qtdeclarative
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Tuesday, May 20, 2014 @ 10:44:07
Author: andrea
Revision: 213326
upgpkg: qt5 5.3.0-1
Upstream release
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 82 +++--
1 file changed, 59 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-20 08:17:35 UTC (rev 213325)
+++ PKGBUILD2014-05-20 08:44:07 UTC (rev 213326)
@@ -6,6 +6,7 @@
'qt5-connectivity'
'qt5-declarative'
'qt5-doc'
+ 'qt5-enginio'
'qt5-graphicaleffects'
'qt5-imageformats'
'qt5-location'
@@ -19,10 +20,11 @@
'qt5-tools'
'qt5-translations'
'qt5-webkit'
+ 'qt5-websockets'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.2.1
-pkgrel=4
+pkgver=5.3.0
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -31,13 +33,13 @@
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
-'openal' 'gtk2' 'libxkbcommon' 'python')
+'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz')
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
-source=(http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz;
+source=(http://download.qt-project.org/official_releases/qt/5.3/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
'use-python2.patch')
-md5sums=('0c8d2aa45f38be9c3f7c9325eb059d9d'
+md5sums=('f00ac7930e3b1b2b364dedcd15acc142'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
@@ -83,6 +85,8 @@
-no-rpath \
-optimized-qmake \
-dbus-linked \
+-system-harfbuzz \
+-journald \
-reduce-relocations ${SSE2}
make
@@ -101,11 +105,15 @@
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig'
'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'qtchooser' 'libxkbcommon')
+ 'qtchooser')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
- 'libfbclient: Firebird/iBase driver')
+ 'libfbclient: Firebird/iBase driver'
+ 'mtdev: evdev plugin'
+ 'libxkbcommon-x11: xcb plugin'
+ 'libsm: xcb plugin'
+ 'gtk2: GTK2 plugin')
conflicts=('qt')
options=('staticlibs') #libQt5PlatformSupport builds static only
@@ -131,7 +139,7 @@
}
package_qt5-connectivity() {
- pkgdesc='A cross-platform application and UI framework (QtBluetooth, QtNfc)'
+ pkgdesc='Provides access to Bluetooth hardware'
depends=('qt5-declarative')
cd ${_pkgfqn}/qtconnectivity
@@ -146,7 +154,7 @@
}
package_qt5-declarative() {
- pkgdesc='A cross-platform application and UI framework (QtQml, QtQuick)'
+ pkgdesc='Classes for QML and JavaScript languages'
depends=('qt5-xmlpatterns')
conflicts=('qt')
@@ -184,8 +192,23 @@
${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
+package_qt5-enginio() {
+ pkgdesc='A Backend-as-a-Service solution to ease the backend development for
connected and data-driven application'
+ depends=('qt5-declarative')
+
+ cd ${_pkgfqn}/qtenginio
+ make INSTALL_ROOT=${pkgdir} install
+
+ # 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/' {}
\;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
package_qt5-xmlpatterns() {
- pkgdesc='A cross-platform application and UI framework (QtXmlPatterns)'
+ pkgdesc='Support for XPath, XQuery, XSLT and XML schema validation'
depends=('qt5-base')
conflicts=('qt')
@@ -219,7 +242,7 @@
}
package_qt5-multimedia() {
- pkgdesc='A cross-platform application and UI framework (QtMultimedia)'
+ pkgdesc='Classes for audio, video, radio and camera functionality'
depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal')
conflicts=('qt')
@@ -235,7 +258,7 @@
}
package_qt5-graphicaleffects() {
- pkgdesc='A cross-platform application and UI framework (QtGraphicalEffects)'
+ pkgdesc='Graphical effects for use with Qt Quick 2'
depends=('qt5-declarative')
cd ${_pkgfqn}/qtgraphicaleffects
@@ -246,8 +269,8 @@
}
package_qt5-imageformats() {
- pkgdesc='A cross-platform application and UI framework (Images plugins)'
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Monday, April 28, 2014 @ 17:11:54
Author: andrea
Revision: 211865
upgpkg: qt5 5.2.1-4
QtMultimedia still uses gstreamer 0.10
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-04-28 15:09:42 UTC (rev 211864)
+++ PKGBUILD2014-04-28 15:11:54 UTC (rev 211865)
@@ -22,12 +22,12 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.2.1
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm'
'xcb-util-keysyms'
-'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs' 'libmng'
+'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs'
'gstreamer0.10-base-plugins' 'libmng'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
@@ -220,7 +220,7 @@
package_qt5-multimedia() {
pkgdesc='A cross-platform application and UI framework (QtMultimedia)'
- depends=('qt5-declarative' 'libpulse' 'gst-plugins-base' 'openal')
+ depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal')
conflicts=('qt')
cd ${_pkgfqn}/qtmultimedia
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Thursday, April 10, 2014 @ 15:06:25
Author: andrea
Revision: 210153
upgpkg: qt5 5.2.1-3
Fix i686 segfault on AMD (FS#38796)
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-04-10 12:53:09 UTC (rev 210152)
+++ PKGBUILD2014-04-10 13:06:25 UTC (rev 210153)
@@ -22,7 +22,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.2.1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -65,6 +65,8 @@
export
LD_LIBRARY_PATH=${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}
export QT_PLUGIN_PATH=${QTDIR}/qtbase/plugins
+ [[ ${CARCH} = i686 ]] SSE2=-no-sse2
+
PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
-prefix /usr \
-bindir /usr/lib/qt/bin \
@@ -81,7 +83,7 @@
-no-rpath \
-optimized-qmake \
-dbus-linked \
--reduce-relocations
+-reduce-relocations ${SSE2}
make
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Tuesday, April 8, 2014 @ 09:30:50
Author: andrea
Revision: 209904
upgpkg: qt5 5.2.1-2
icu rebuild
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-04-08 07:30:22 UTC (rev 209903)
+++ PKGBUILD2014-04-08 07:30:50 UTC (rev 209904)
@@ -22,12 +22,12 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.2.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm'
'xcb-util-keysyms'
-'mesa' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
'libmng'
+'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs' 'libmng'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
@@ -218,7 +218,7 @@
package_qt5-multimedia() {
pkgdesc='A cross-platform application and UI framework (QtMultimedia)'
- depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal')
+ depends=('qt5-declarative' 'libpulse' 'gst-plugins-base' 'openal')
conflicts=('qt')
cd ${_pkgfqn}/qtmultimedia
@@ -245,7 +245,7 @@
package_qt5-imageformats() {
pkgdesc='A cross-platform application and UI framework (Images plugins)'
- depends=('qt5-base' 'libtiff')
+ depends=('qt5-base' 'libtiff' 'libmng')
conflicts=('qt')
cd ${_pkgfqn}/qtimageformats
@@ -414,7 +414,7 @@
package_qt5-webkit() {
pkgdesc='A cross-platform application and UI framework (QtWebKit)'
- depends=('qt5-sensors' 'qt5-location' 'gstreamer0.10-base' 'libxslt'
'libxcomposite')
+ depends=('qt5-sensors' 'qt5-location' 'gst-plugins-base' 'libxslt'
'libxcomposite')
license=('GPL3' 'LGPL' 'FDL')
cd ${_pkgfqn}/qtwebkit
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Thursday, February 6, 2014 @ 10:24:26
Author: andrea
Revision: 205500
upgpkg: qt5 5.2.1-1
Upstream release
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-02-06 08:39:31 UTC (rev 205499)
+++ PKGBUILD2014-02-06 09:24:26 UTC (rev 205500)
@@ -21,8 +21,8 @@
'qt5-webkit'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.2.0
-pkgrel=4
+pkgver=5.2.1
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -37,7 +37,7 @@
source=(http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
'use-python2.patch')
-md5sums=('8f60b47ca9461831d940f579ee90517e'
+md5sums=('0c8d2aa45f38be9c3f7c9325eb059d9d'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Thursday, January 30, 2014 @ 09:57:26
Author: andrea
Revision: 204880
upgpkg: qt5 5.2.0-4
Disable harfbuzz (FS#38714) (FS#38430)
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-01-30 08:10:20 UTC (rev 204879)
+++ PKGBUILD2014-01-30 08:57:26 UTC (rev 204880)
@@ -22,7 +22,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.2.0
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -31,7 +31,7 @@
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
-'openal' 'gtk2' 'libxkbcommon' 'python' 'harfbuzz')
+'openal' 'gtk2' 'libxkbcommon' 'python')
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz;
@@ -75,7 +75,6 @@
-sysconfdir /etc/xdg \
-examplesdir /usr/share/doc/qt/examples \
-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
--system-harfbuzz \
-system-sqlite \
-openssl-linked \
-nomake examples \
@@ -100,7 +99,7 @@
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig'
'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'qtchooser' 'libxkbcommon' 'harfbuzz')
+ 'qtchooser' 'libxkbcommon')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Friday, January 3, 2014 @ 13:11:56
Author: andrea
Revision: 203075
upgpkg: qt5 5.2.0-3
Build with Harfbuzz-NG support (FS#38355)
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-01-03 11:03:11 UTC (rev 203074)
+++ PKGBUILD2014-01-03 12:11:56 UTC (rev 203075)
@@ -22,7 +22,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.2.0
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -31,7 +31,7 @@
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
-'openal' 'gtk2' 'libxkbcommon' 'python')
+'openal' 'gtk2' 'libxkbcommon' 'python' 'harfbuzz')
groups=('qt' 'qt5')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz;
@@ -75,6 +75,7 @@
-sysconfdir /etc/xdg \
-examplesdir /usr/share/doc/qt/examples \
-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
+-system-harfbuzz \
-system-sqlite \
-openssl-linked \
-nomake examples \
@@ -99,7 +100,7 @@
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig'
'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
- 'qtchooser' 'libxkbcommon')
+ 'qtchooser' 'libxkbcommon' 'harfbuzz')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Sunday, December 22, 2013 @ 23:13:44
Author: andyrtr
Revision: 202629
upgpkg: qt5 5.2.0-2
libxcb rebuild
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-12-22 20:35:04 UTC (rev 202628)
+++ PKGBUILD2013-12-22 22:13:44 UTC (rev 202629)
@@ -22,7 +22,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.2.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Sunday, November 10, 2013 @ 10:45:06
Author: andrea
Revision: 199308
fix qt5-webkit license
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-10 08:38:12 UTC (rev 199307)
+++ PKGBUILD2013-11-10 09:45:06 UTC (rev 199308)
@@ -405,6 +405,7 @@
package_qt5-webkit() {
pkgdesc='A cross-platform application and UI framework (QtWebKit)'
depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite'
'qt5-sensors')
+ license=('GPL3' 'LGPL' 'FDL')
cd ${_pkgfqn}/qtwebkit
make INSTALL_ROOT=${pkgdir} install
@@ -415,9 +416,6 @@
# Fix wrong path in pc file
perl -pi -e s, -L${srcdir}/?\S+,,g
${pkgdir}/usr/lib/pkgconfig/Qt5WebKit.pc
-
- install -D -m644 LGPL_EXCEPTION.txt \
-${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-x11extras() {
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Saturday, November 9, 2013 @ 19:25:24
Author: andrea
Revision: 199294
Install licenses
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 58 ++
1 file changed, 54 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-09 17:12:51 UTC (rev 199293)
+++ PKGBUILD2013-11-09 18:25:24 UTC (rev 199294)
@@ -114,9 +114,8 @@
cd ${_pkgfqn}/qtbase
make INSTALL_ROOT=${pkgdir} install
- cd ${srcdir}
- install -D -m644 ${_pkgfqn}/qtbase/LGPL_EXCEPTION.txt \
-${pkgdir}/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
# Fix wrong path in prl files
find ${pkgdir}/usr/lib -type f -name '*.prl' \
@@ -150,6 +149,9 @@
for b in ${pkgdir}/usr/lib/qt/bin/*; do
ln -s /usr/lib/qt/bin/$(basename $b) ${pkgdir}/usr/bin/$(basename $b)-qt5
done
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-doc() {
@@ -159,11 +161,14 @@
conflicts=('qt-doc')
replaces=('qt-doc')
provides=('qt-doc')
- options=('docs')
+ options=('docs' '!emptydirs')
groups=()
cd ${_pkgfqn}
make INSTALL_ROOT=${pkgdir} install_docs
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-jsbackend() {
@@ -176,6 +181,9 @@
# 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/' {}
\;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-xmlpatterns() {
@@ -195,6 +203,9 @@
for b in ${pkgdir}/usr/lib/qt/bin/*; do
ln -s /usr/lib/qt/bin/$(basename $b) ${pkgdir}/usr/bin/$(basename $b)-qt5
done
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-translations() {
@@ -204,6 +215,9 @@
cd ${_pkgfqn}/qttranslations
make INSTALL_ROOT=${pkgdir} install
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-multimedia() {
@@ -217,6 +231,9 @@
# 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/' {}
\;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-graphicaleffects() {
@@ -225,6 +242,9 @@
cd ${_pkgfqn}/qtgraphicaleffects
make INSTALL_ROOT=${pkgdir} install
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-imageformats() {
@@ -234,6 +254,9 @@
cd ${_pkgfqn}/qtimageformats
make INSTALL_ROOT=${pkgdir} install
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-quick1() {
@@ -253,6 +276,9 @@
for b in ${pkgdir}/usr/lib/qt/bin/*; do
ln -s /usr/lib/qt/bin/$(basename $b) ${pkgdir}/usr/bin/$(basename $b)-qt5
done
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-quickcontrols() {
@@ -261,6 +287,9 @@
cd ${_pkgfqn}/qtquickcontrols
make INSTALL_ROOT=${pkgdir} install
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-script() {
@@ -274,6 +303,9 @@
# 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/' {}
\;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-sensors() {
@@ -286,6 +318,9 @@
# 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/' {}
\;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-serialport() {
@@ -298,6 +333,9 @@
# 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/' {}
\;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-svg() {
@@ -311,6 +349,9 @@
# 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/' {}
\;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-tools() {
@@ -355,6
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Saturday, November 9, 2013 @ 19:29:29
Author: andrea
Revision: 199295
add missing libQt5PlatformSupport (FS#37709)
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-09 18:25:24 UTC (rev 199294)
+++ PKGBUILD2013-11-09 18:29:29 UTC (rev 199295)
@@ -21,7 +21,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.1.1
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -110,6 +110,7 @@
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver')
conflicts=('qt')
+ options=('staticlibs') #libQt5PlatformSupport builds static only
cd ${_pkgfqn}/qtbase
make INSTALL_ROOT=${pkgdir} install
@@ -361,7 +362,7 @@
optdepends=('qt5-doc: documentation')
install='qt5-tools.install'
conflicts=('qt')
- options=('staticlibs') # libQtUiTools builds as static only$
+ options=('staticlibs') # libQt5UiTools builds as static only$
cd ${_pkgfqn}/qttools
make INSTALL_ROOT=${pkgdir} install
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Wednesday, October 23, 2013 @ 13:49:10
Author: andrea
Revision: 197148
upgpkg: qt5 5.1.1-5
libQtUiTools builds as static only (FS#37447)
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 39 ---
1 file changed, 20 insertions(+), 19 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-23 10:26:20 UTC (rev 197147)
+++ PKGBUILD2013-10-23 11:49:10 UTC (rev 197148)
@@ -21,7 +21,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.1.1
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -113,7 +113,7 @@
cd ${_pkgfqn}/qtbase
make INSTALL_ROOT=${pkgdir} install
-
+
cd ${srcdir}
install -D -m644 ${_pkgfqn}/qtbase/LGPL_EXCEPTION.txt \
${pkgdir}/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
@@ -140,11 +140,11 @@
cd ${_pkgfqn}/qtdeclarative
make INSTALL_ROOT=${pkgdir} install
-
+
# 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/' {}
\;
-
+
# Useful symlinks
install -d ${pkgdir}/usr/bin
for b in ${pkgdir}/usr/lib/qt/bin/*; do
@@ -189,7 +189,7 @@
# 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/' {}
\;
-
+
# Useful symlinks
install -d ${pkgdir}/usr/bin
for b in ${pkgdir}/usr/lib/qt/bin/*; do
@@ -243,11 +243,11 @@
cd ${_pkgfqn}/qtquick1
make INSTALL_ROOT=${pkgdir} install
-
+
# 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/' {}
\;
-
+
# Useful symlinks
install -d ${pkgdir}/usr/bin
for b in ${pkgdir}/usr/lib/qt/bin/*; do
@@ -270,7 +270,7 @@
cd ${_pkgfqn}/qtscript
make INSTALL_ROOT=${pkgdir} install
-
+
# 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/' {}
\;
@@ -282,7 +282,7 @@
cd ${_pkgfqn}/qtsensors
make INSTALL_ROOT=${pkgdir} install
-
+
# 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/' {}
\;
@@ -291,10 +291,10 @@
package_qt5-serialport() {
pkgdesc='A cross-platform application and UI framework (QtSerialPort)'
depends=('qt5-base')
-
+
cd ${_pkgfqn}/qtserialport
make INSTALL_ROOT=${pkgdir} install
-
+
# 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/' {}
\;
@@ -307,12 +307,12 @@
cd ${_pkgfqn}/qtsvg
make INSTALL_ROOT=${pkgdir} install
-
+
# 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/' {}
\;
}
-
+
package_qt5-tools() {
pkgdesc='A cross-platform application and UI framework (Development Tools,
QtHelp)'
depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations'
'hicolor-icon-theme'
@@ -320,10 +320,11 @@
optdepends=('qt5-doc: documentation')
install='qt5-tools.install'
conflicts=('qt')
+ options=('staticlibs') # libQtUiTools builds as static only$
cd ${_pkgfqn}/qttools
make INSTALL_ROOT=${pkgdir} install
-
+
# install missing icons and desktop files
for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
size=$(echo $(basename ${icon}) | cut -d- -f2)
@@ -348,12 +349,12 @@
# 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/' {}
\;
-
+
# 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
- done
+ done
}
package_qt5-webkit() {
@@ -362,7 +363,7 @@
cd ${_pkgfqn}/qtwebkit
make INSTALL_ROOT=${pkgdir} install
-
+
# 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/' {}
\;
@@ -374,10 +375,10 @@
package_qt5-x11extras() {
pkgdesc='A cross-platform application and UI framework (QtX11Extras)'
depends=('qt5-base')
-
+
cd ${_pkgfqn}/qtx11extras
make INSTALL_ROOT=${pkgdir} install
-
+
# 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 qt5/trunk (PKGBUILD)
Date: Tuesday, October 22, 2013 @ 12:32:13
Author: andrea
Revision: 197131
upgpkg: qt5 5.1.1-4
remove static libs
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-22 10:15:23 UTC (rev 197130)
+++ PKGBUILD2013-10-22 10:32:13 UTC (rev 197131)
@@ -21,7 +21,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.1.1
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -32,7 +32,6 @@
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
'openal' 'gtk2' 'libxkbcommon')
groups=('qt' 'qt5')
-options=('!libtool')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Saturday, October 19, 2013 @ 14:27:06
Author: andrea
Revision: 196794
upgpkg: qt5 5.1.1-3
Disable gles (FS#37386)
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-19 09:44:02 UTC (rev 196793)
+++ PKGBUILD2013-10-19 12:27:06 UTC (rev 196794)
@@ -21,7 +21,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.1.1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -87,8 +87,7 @@
-no-rpath \
-optimized-qmake \
-dbus-linked \
--reduce-relocations \
--opengl es2
+-reduce-relocations
make
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Sunday, October 13, 2013 @ 14:33:58
Author: andyrtr
Revision: 196423
upgpkg: qt5 5.1.1-2
rebuild for icu 52.1
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-13 11:11:32 UTC (rev 196422)
+++ PKGBUILD2013-10-13 12:33:58 UTC (rev 196423)
@@ -21,7 +21,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.1.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Saturday, September 28, 2013 @ 19:13:04
Author: andrea
Revision: 195230
Qt5 doesn't support libmng 2.x QTBUG-33116
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-09-28 17:12:31 UTC (rev 195229)
+++ PKGBUILD2013-09-28 17:13:04 UTC (rev 195230)
@@ -30,7 +30,7 @@
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
-'libmng' 'openal' 'gtk2' 'libxkbcommon')
+'openal' 'gtk2' 'libxkbcommon')
groups=('qt' 'qt5')
options=('!libtool')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
@@ -231,7 +231,7 @@
package_qt5-imageformats() {
pkgdesc='A cross-platform application and UI framework (Images plugins)'
- depends=('qt5-base' 'libtiff' 'libmng')
+ depends=('qt5-base' 'libtiff')
conflicts=('qt')
cd ${_pkgfqn}/qtimageformats
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Saturday, September 14, 2013 @ 13:25:10 Author: andrea Revision: 194352 Build with GLES Modified: qt5/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-14 10:56:59 UTC (rev 194351) +++ PKGBUILD2013-09-14 11:25:10 UTC (rev 194352) @@ -87,7 +87,8 @@ -no-rpath \ -optimized-qmake \ -dbus-linked \ --reduce-relocations +-reduce-relocations \ +-opengl es2 make
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Wednesday, September 4, 2013 @ 21:33:17
Author: andrea
Revision: 193905
Fix makedeps
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-09-04 19:32:38 UTC (rev 193904)
+++ PKGBUILD2013-09-04 19:33:17 UTC (rev 193905)
@@ -26,7 +26,7 @@
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm'
'xcb-util-keysyms'
-'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
+'mesa' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
[arch-commits] Commit in qt5/trunk (PKGBUILD bison3.patch)
Date: Thursday, August 29, 2013 @ 13:40:10
Author: andrea
Revision: 193720
Fix build and docs - Qt guys really don't want people to build their docs...
Added:
qt5/trunk/bison3.patch
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 21 ++---
bison3.patch | 38 ++
2 files changed, 56 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-08-29 11:16:07 UTC (rev 193719)
+++ PKGBUILD2013-08-29 11:40:10 UTC (rev 193720)
@@ -36,13 +36,15 @@
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
-'use-python2.patch')
+'use-python2.patch'
+'bison3.patch')
md5sums=('697b7b8768ef8895e168366ab6b44760'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- '92831f79144d5cb8121915423ba47575')
+ '92831f79144d5cb8121915423ba47575'
+ '6b162cd2bc104f0ae83ca039401be7bf')
prepare() {
cd ${_pkgfqn}
@@ -56,6 +58,10 @@
sed -i -e s|#![ ]*/usr/bin/python$|#!/usr/bin/python2| \
-e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| \
$(find . -name '*.py')
+
+ # Fix build with bison 3.x
+ cd qtwebkit
+ patch -p1 -i ${srcdir}/bison3.patch
}
build() {
@@ -62,7 +68,8 @@
cd ${_pkgfqn}
export QTDIR=${srcdir}/${_pkgfqn}
- export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+ export
LD_LIBRARY_PATH=${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}
+ export QT_PLUGIN_PATH=${QTDIR}/qtbase/plugins
PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
-prefix /usr \
@@ -83,6 +90,14 @@
-reduce-relocations
make
+
+ # Fix paths
+ find ${QTDIR} -name Makefile -exec sed -i
s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g {} +
+ find ${QTDIR} -name Makefile.qmake-docs -exec sed -i
s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g {} +
+ find ${QTDIR} -name Makefile -exec sed -i
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g {} +
+ find ${QTDIR} -name Makefile.qmake-docs -exec sed -i
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g {} +
+ sed -i
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g
qtwebkit/Source/Makefile.api
+
make docs
}
Added: bison3.patch
===
--- bison3.patch(rev 0)
+++ bison3.patch2013-08-29 11:40:10 UTC (rev 193720)
@@ -0,0 +1,38 @@
+From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen allan.jen...@digia.com
+Date: Fri, 16 Aug 2013 18:27:07 +0200
+Subject: [PATCH] ANGLE doesn't build with bison 3.0
+
+https://bugs.webkit.org/show_bug.cgi?id=119798
+
+Reviewed by Antti Koivisto.
+
+Make glslang.y compatible with bison 3.0
+by using %lex-param to set YYLEX_PARAM.
+
+* src/compiler/glslang.y:
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109
268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+Task-number: QTBUG-32913
+Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
+Reviewed-by: Jocelyn Turcotte jocelyn.turco...@digia.com
+---
+ Source/ThirdParty/ANGLE/src/compiler/glslang.y |1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+index 3cad335..b41e95a 100644
+--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND
glslang_tab.h).
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+
+ %union {
+ struct {
+--
+1.7.1
+
[arch-commits] Commit in qt5/trunk (PKGBUILD bison3.patch)
Date: Wednesday, August 28, 2013 @ 17:36:27
Author: andrea
Revision: 193707
Upstream release; add qt5-doc package back
Modified:
qt5/trunk/PKGBUILD
Deleted:
qt5/trunk/bison3.patch
--+
PKGBUILD | 34 +-
bison3.patch | 38 --
2 files changed, 21 insertions(+), 51 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-08-28 15:19:10 UTC (rev 193706)
+++ PKGBUILD2013-08-28 15:36:27 UTC (rev 193707)
@@ -4,6 +4,7 @@
pkgbase=qt5
pkgname=('qt5-base'
'qt5-declarative'
+ 'qt5-doc'
'qt5-graphicaleffects'
'qt5-imageformats'
'qt5-jsbackend'
@@ -19,8 +20,8 @@
'qt5-webkit'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.1.0
-pkgrel=2
+pkgver=5.1.1
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -35,15 +36,13 @@
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
-'use-python2.patch'
-'bison3.patch')
-md5sums=('44a507beebef73eb364b5a2ec7bbe090'
+'use-python2.patch')
+md5sums=('697b7b8768ef8895e168366ab6b44760'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- '92831f79144d5cb8121915423ba47575'
- '6b162cd2bc104f0ae83ca039401be7bf')
+ '92831f79144d5cb8121915423ba47575')
prepare() {
cd ${_pkgfqn}
@@ -57,10 +56,6 @@
sed -i -e s|#![ ]*/usr/bin/python$|#!/usr/bin/python2| \
-e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| \
$(find . -name '*.py')
-
- # Fix build with bison 3.x
- cd qtwebkit
- patch -p1 -i ${srcdir}/bison3.patch
}
build() {
@@ -81,9 +76,7 @@
-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-system-sqlite \
-openssl-linked \
--nomake docs \
-nomake examples \
--nomake tests \
-no-rpath \
-optimized-qmake \
-dbus-linked \
@@ -90,6 +83,7 @@
-reduce-relocations
make
+ make docs
}
package_qt5-base() {
@@ -144,6 +138,20 @@
done
}
+package_qt5-doc() {
+ pkgdesc='A cross-platform application and UI framework (Documentation)'
+ depends=('qt5-base')
+# arch=('any')
+ conflicts=('qt-doc')
+ replaces=('qt-doc')
+ provides=('qt-doc')
+ options=('docs')
+ groups=()
+
+ cd ${_pkgfqn}
+ make INSTALL_ROOT=${pkgdir} install_docs
+}
+
package_qt5-jsbackend() {
pkgdesc='A cross-platform application and UI framework (QtV8)'
depends=('qt5-base')
Deleted: bison3.patch
===
--- bison3.patch2013-08-28 15:19:10 UTC (rev 193706)
+++ bison3.patch2013-08-28 15:36:27 UTC (rev 193707)
@@ -1,38 +0,0 @@
-From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen allan.jen...@digia.com
-Date: Fri, 16 Aug 2013 18:27:07 +0200
-Subject: [PATCH] ANGLE doesn't build with bison 3.0
-
-https://bugs.webkit.org/show_bug.cgi?id=119798
-
-Reviewed by Antti Koivisto.
-
-Make glslang.y compatible with bison 3.0
-by using %lex-param to set YYLEX_PARAM.
-
-* src/compiler/glslang.y:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109
268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-Task-number: QTBUG-32913
-Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
-Reviewed-by: Jocelyn Turcotte jocelyn.turco...@digia.com
- Source/ThirdParty/ANGLE/src/compiler/glslang.y |1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-index 3cad335..b41e95a 100644
a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND
glslang_tab.h).
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {YYLEX_PARAM}
-
- %union {
- struct {
---
-1.7.1
-
[arch-commits] Commit in qt5/trunk (PKGBUILD bison3.patch)
Date: Wednesday, August 21, 2013 @ 13:10:19
Author: andrea
Revision: 193494
Fix build with bison 3.x; libmng rebuild
Added:
qt5/trunk/bison3.patch
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 12 +---
bison3.patch | 38 ++
2 files changed, 47 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-08-21 10:23:53 UTC (rev 193493)
+++ PKGBUILD2013-08-21 11:10:19 UTC (rev 193494)
@@ -20,7 +20,7 @@
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.1.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -35,13 +35,15 @@
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
-'use-python2.patch')
+'use-python2.patch'
+'bison3.patch')
md5sums=('44a507beebef73eb364b5a2ec7bbe090'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- '92831f79144d5cb8121915423ba47575')
+ '92831f79144d5cb8121915423ba47575'
+ '6b162cd2bc104f0ae83ca039401be7bf')
prepare() {
cd ${_pkgfqn}
@@ -55,6 +57,10 @@
sed -i -e s|#![ ]*/usr/bin/python$|#!/usr/bin/python2| \
-e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| \
$(find . -name '*.py')
+
+ # Fix build with bison 3.x
+ cd qtwebkit
+ patch -p1 -i ${srcdir}/bison3.patch
}
build() {
Added: bison3.patch
===
--- bison3.patch(rev 0)
+++ bison3.patch2013-08-21 11:10:19 UTC (rev 193494)
@@ -0,0 +1,38 @@
+From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen allan.jen...@digia.com
+Date: Fri, 16 Aug 2013 18:27:07 +0200
+Subject: [PATCH] ANGLE doesn't build with bison 3.0
+
+https://bugs.webkit.org/show_bug.cgi?id=119798
+
+Reviewed by Antti Koivisto.
+
+Make glslang.y compatible with bison 3.0
+by using %lex-param to set YYLEX_PARAM.
+
+* src/compiler/glslang.y:
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109
268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+Task-number: QTBUG-32913
+Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
+Reviewed-by: Jocelyn Turcotte jocelyn.turco...@digia.com
+---
+ Source/ThirdParty/ANGLE/src/compiler/glslang.y |1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+index 3cad335..b41e95a 100644
+--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND
glslang_tab.h).
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+
+ %union {
+ struct {
+--
+1.7.1
+
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Friday, August 16, 2013 @ 16:39:47
Author: andrea
Revision: 193116
Fix licenses
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-08-16 13:47:37 UTC (rev 193115)
+++ PKGBUILD2013-08-16 14:39:47 UTC (rev 193116)
@@ -23,7 +23,7 @@
pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
+license=('GPL3' 'LGPL' 'FDL' 'custom')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm'
'xcb-util-keysyms'
'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
[arch-commits] Commit in qt5/trunk (PKGBUILD qt5-base.install use-python2.patch)
Date: Thursday, July 4, 2013 @ 17:18:06
Author: andrea
Revision: 189681
Upstream release; move qt5-doc in a separate PKGBUILD
Modified:
qt5/trunk/PKGBUILD
qt5/trunk/use-python2.patch
Deleted:
qt5/trunk/qt5-base.install
---+
PKGBUILD | 125
qt5-base.install | 11
use-python2.patch | 11
3 files changed, 80 insertions(+), 67 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-04 14:55:33 UTC (rev 189680)
+++ PKGBUILD2013-07-04 15:18:06 UTC (rev 189681)
@@ -4,20 +4,23 @@
pkgbase=qt5
pkgname=('qt5-base'
'qt5-declarative'
- 'qt5-doc'
'qt5-graphicaleffects'
'qt5-imageformats'
'qt5-jsbackend'
'qt5-multimedia'
'qt5-quick1'
+ 'qt5-quickcontrols'
'qt5-script'
+ 'qt5-sensors'
+ 'qt5-serialport'
'qt5-svg'
'qt5-tools'
'qt5-translations'
'qt5-webkit'
+ 'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.0.2
-pkgrel=2
+pkgver=5.1.0
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -26,27 +29,23 @@
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
-'libmng' 'openal' 'gtk2')
+'libmng' 'openal' 'gtk2' 'libxkbcommon')
groups=('qt' 'qt5')
options=('!libtool')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
-source=(http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz;
+source=(http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qdbusviewer.desktop'
-'use-python2.patch' 'gcc48.patch')
-md5sums=('2cab3518d86fe8f0638c7faea8b46397'
+'use-python2.patch')
+md5sums=('44a507beebef73eb364b5a2ec7bbe090'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- 'd6ab43fb371be494e3bfd9b210c40bf1'
- '7927028e2374321c78a76df858e723d6')
+ '92831f79144d5cb8121915423ba47575')
-build() {
+prepare() {
cd ${_pkgfqn}
- export QTDIR=${srcdir}/${_pkgfqn}
- export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
-
sed -i s|-O2|${CXXFLAGS}| qtbase/mkspecs/common/{g++,gcc}-base.conf
sed -i /^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g
qtbase/mkspecs/common/gcc-base-unix.conf
sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g
qtbase/mkspecs/common/gcc-base.conf
@@ -56,13 +55,15 @@
sed -i -e s|#![ ]*/usr/bin/python$|#!/usr/bin/python2| \
-e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| \
$(find . -name '*.py')
+}
- # GCC 4.8 fixes
- cd qtbase
- patch -p1 -i ${srcdir}/gcc48.patch
- cd ../
+build() {
+ cd ${_pkgfqn}
- ./configure -confirm-license -opensource \
+ export QTDIR=${srcdir}/${_pkgfqn}
+ export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+
+ PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
-prefix /usr \
-bindir /usr/lib/qt/bin \
-docdir /usr/share/doc/qt \
@@ -83,30 +84,17 @@
-reduce-relocations
make
-
- # build docs
- make docs
-
- # build examples
- for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \
-qtwebkit-examples-and-demos qtxmlpatterns; do
-cd ${m}/examples
-${QTDIR}/qtbase/bin/qmake
-make
-cd ../../
- done
}
package_qt5-base() {
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig'
'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng'
'xcb-util-image'
- 'hicolor-icon-theme' 'xdg-utils' 'icu' 'qtchooser')
+ 'icu' 'qtchooser' 'libxkbcommon')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver')
- install='qt5-base.install'
conflicts=('qt')
cd ${_pkgfqn}/qtbase
@@ -150,26 +138,6 @@
done
}
-package_qt5-doc() {
- pkgdesc='A cross-platform application and UI framework (Documentation and
Examples)'
- depends=('qt5-base')
- conflicts=('qt-doc')
- replaces=('qt-doc')
- provides=('qt-doc')
- options=('docs')
- groups=()
-
- cd ${_pkgfqn}
- make INSTALL_ROOT=${pkgdir} install_docs
-
- for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \
-qtwebkit-examples-and-demos qtxmlpatterns; do
-cd ${m}/examples
-make INSTALL_ROOT=${pkgdir} install
-cd ../../
- done
-}
-
package_qt5-jsbackend() {
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Tuesday, May 14, 2013 @ 14:19:53
Author: andrea
Revision: 185510
Add missing -qt5 symlinks (FS#35258)
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |6 ++
1 file changed, 6 insertions(+)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-14 12:14:45 UTC (rev 185509)
+++ PKGBUILD2013-05-14 12:19:53 UTC (rev 185510)
@@ -251,6 +251,12 @@
# 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/' {}
\;
+
+ # 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
+ done
}
package_qt5-script() {
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Sunday, April 28, 2013 @ 08:45:12
Author: andrea
Revision: 183827
upgpkg: qt5 5.0.2-2
libpng rebuild
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-28 06:43:39 UTC (rev 183826)
+++ PKGBUILD2013-04-28 06:45:12 UTC (rev 183827)
@@ -17,7 +17,7 @@
'qt5-webkit'
'qt5-xmlpatterns')
pkgver=5.0.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -90,9 +90,9 @@
for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \
qtwebkit-examples-and-demos qtxmlpatterns; do
cd ${m}/examples
-${QTDIR}/qmake
+${QTDIR}/qtbase/bin/qmake
make
- cd ../../
+cd ../../
done
}
[arch-commits] Commit in qt5/trunk (PKGBUILD gcc48.patch use-python2.patch)
Date: Thursday, April 11, 2013 @ 12:21:49
Author: andrea
Revision: 182618
Upstream release; ship docs and examples again; move binaries in
/usr/lib/qt/bin so people can use qtchooser
Added:
qt5/trunk/gcc48.patch
Modified:
qt5/trunk/PKGBUILD
qt5/trunk/use-python2.patch
---+
PKGBUILD | 78 +++-
gcc48.patch | 63 ++
use-python2.patch | 11 +++
3 files changed, 145 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-11 10:02:01 UTC (rev 182617)
+++ PKGBUILD2013-04-11 10:21:49 UTC (rev 182618)
@@ -4,6 +4,7 @@
pkgbase=qt5
pkgname=('qt5-base'
'qt5-declarative'
+ 'qt5-doc'
'qt5-graphicaleffects'
'qt5-imageformats'
'qt5-jsbackend'
@@ -15,8 +16,8 @@
'qt5-translations'
'qt5-webkit'
'qt5-xmlpatterns')
-pkgver=5.0.1
-pkgrel=10
+pkgver=5.0.2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -31,12 +32,13 @@
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz;
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-'use-python2.patch')
-md5sums=('00a577bd88e682d1b4d01d41d1d699cf'
+'use-python2.patch' 'gcc48.patch')
+md5sums=('2cab3518d86fe8f0638c7faea8b46397'
'f1837a03fd0ebbd2da58975845f278e3'
'480fea1ed076992b688373c8db274be0'
'5595c24d5bb942c21e3a4d299e6d0bf1'
- 'ec3133b093550f16a21bb91e5f0f2943')
+ 'd6ab43fb371be494e3bfd9b210c40bf1'
+ '7927028e2374321c78a76df858e723d6')
build() {
cd ${_pkgfqn}
@@ -54,10 +56,16 @@
-e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| \
$(find . -name '*.py')
+ # GCC 4.8 fixes
+ cd qtbase
+ patch -p1 -i ${srcdir}/gcc48.patch
+ cd ../
+
./configure -confirm-license -opensource \
-prefix /usr \
+-bindir /usr/lib/qt/bin \
-docdir /usr/share/doc/qt \
--headerdir /usr/include/qt5 \
+-headerdir /usr/include/qt \
-archdatadir /usr/lib/qt \
-datadir /usr/share/qt \
-sysconfdir /etc/xdg \
@@ -74,13 +82,25 @@
-reduce-relocations
make
+
+ # build docs
+ make docs
+
+ # build examples
+ for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \
+qtwebkit-examples-and-demos qtxmlpatterns; do
+cd ${m}/examples
+${QTDIR}/qmake
+make
+ cd ../../
+ done
}
package_qt5-base() {
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig'
'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng'
'xcb-util-image'
- 'hicolor-icon-theme' 'xdg-utils' 'icu')
+ 'hicolor-icon-theme' 'xdg-utils' 'icu' 'qtchooser')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
@@ -102,6 +122,12 @@
# Fix wrong qmake path in pri file
sed -i s|${srcdir}/${_pkgfqn}/qtbase|/usr| \
${pkgdir}/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap.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
+ done
}
package_qt5-declarative() {
@@ -115,8 +141,34 @@
# 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/' {}
\;
+
+ # 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
+ done
}
+package_qt5-doc() {
+ pkgdesc='A cross-platform application and UI framework (Documentation and
Examples)'
+ depends=('qt5-base')
+ conflicts=('qt-doc')
+ replaces=('qt-doc')
+ provides=('qt-doc')
+ options=('docs')
+ groups=()
+
+ cd ${_pkgfqn}
+ make INSTALL_ROOT=${pkgdir} install_docs
+
+ for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \
+qtwebkit-examples-and-demos qtxmlpatterns; do
+cd ${m}/examples
+make INSTALL_ROOT=${pkgdir} install
+cd ../../
+ done
+}
+
package_qt5-jsbackend() {
pkgdesc='A cross-platform application and UI framework (QtV8)'
depends=('qt5-base')
@@ -140,6 +192,12 @@
# 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/' {}
\;
+
+ # 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
+ done
}
package_qt5-translations() {
@@ -250,6 +308,12 @@
# Fix wrong
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Friday, March 22, 2013 @ 14:01:56
Author: andrea
Revision: 180515
upgpkg: qt5 5.0.1-10
icu rebuild
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-22 13:00:52 UTC (rev 180514)
+++ PKGBUILD2013-03-22 13:01:56 UTC (rev 180515)
@@ -16,7 +16,7 @@
'qt5-webkit'
'qt5-xmlpatterns')
pkgver=5.0.1
-pkgrel=8
+pkgrel=10
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Sunday, March 17, 2013 @ 11:14:22
Author: andrea
Revision: 180111
upgpkg: qt5 5.0.1-8
qt5-base links to icu
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-17 07:03:08 UTC (rev 180110)
+++ PKGBUILD2013-03-17 10:14:22 UTC (rev 180111)
@@ -16,7 +16,7 @@
'qt5-webkit'
'qt5-xmlpatterns')
pkgver=5.0.1
-pkgrel=7
+pkgrel=8
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -80,7 +80,7 @@
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig'
'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng'
'xcb-util-image'
- 'hicolor-icon-theme' 'xdg-utils')
+ 'hicolor-icon-theme' 'xdg-utils' 'icu')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
@@ -254,7 +254,7 @@
package_qt5-webkit() {
pkgdesc='A cross-platform application and UI framework (QtWebKit)'
- depends=('qt5-declarative' 'gstreamer0.10-base' 'icu' 'libxslt'
'libxcomposite')
+ depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite')
cd ${_pkgfqn}/qtwebkit
make INSTALL_ROOT=${pkgdir} install
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Thursday, March 7, 2013 @ 12:54:10
Author: andrea
Revision: 179565
upgpkg: qt5 5.0.1-7
mariadb rebuild
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-07 11:48:54 UTC (rev 179564)
+++ PKGBUILD2013-03-07 11:54:10 UTC (rev 179565)
@@ -16,14 +16,14 @@
'qt5-webkit'
'qt5-xmlpatterns')
pkgver=5.0.1
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm'
'xcb-util-keysyms'
'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
-'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc'
'libfbclient'
+'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'libfbclient'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
'libmng' 'openal' 'gtk2')
groups=('qt' 'qt5')
@@ -82,7 +82,7 @@
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng'
'xcb-util-image'
'hicolor-icon-theme' 'xdg-utils')
optdepends=('postgresql-libs: PostgreSQL driver'
- 'libmysqlclient: MySQL driver'
+ 'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver')
install='qt5-base.install'
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Sunday, March 3, 2013 @ 19:50:34
Author: andrea
Revision: 179116
Add missing supports: fontconfig, gtk2, libmng, libxcompsite...; move qt5-doc
in a separate package
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 55 +++
1 file changed, 19 insertions(+), 36 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-03 18:48:13 UTC (rev 179115)
+++ PKGBUILD2013-03-03 18:50:34 UTC (rev 179116)
@@ -4,7 +4,6 @@
pkgbase=qt5
pkgname=('qt5-base'
'qt5-declarative'
- 'qt5-doc'
'qt5-graphicaleffects'
'qt5-imageformats'
'qt5-jsbackend'
@@ -17,7 +16,7 @@
'qt5-webkit'
'qt5-xmlpatterns')
pkgver=5.0.1
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -25,7 +24,8 @@
'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc'
'libfbclient'
-'python2' 'ruby' 'gperf')
+'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
+'libmng' 'openal' 'gtk2')
groups=('qt' 'qt5')
options=('!libtool')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
@@ -74,14 +74,10 @@
-reduce-relocations
make
-
- # Build docs
- make qmake_all
- make docs
}
package_qt5-base() {
- pkgdesc=('A cross-platform application and UI framework')
+ pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig'
'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng'
'xcb-util-image'
'hicolor-icon-theme' 'xdg-utils')
@@ -109,7 +105,7 @@
}
package_qt5-declarative() {
- pkgdesc=('A cross-platform application and UI framework (QtQml, QtQuick)')
+ pkgdesc='A cross-platform application and UI framework (QtQml, QtQuick)'
depends=('qt5-jsbackend' 'qt5-xmlpatterns')
conflicts=('qt')
@@ -121,21 +117,8 @@
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {}
\;
}
-package_qt5-doc() {
- pkgdesc=('A cross-platform application and UI framework (Documentation)')
- depends=('qt5-base')
- conflicts=('qt-doc')
- replaces=('qt-doc')
- provides=('qt-doc')
- options=('docs')
- groups=()
-
- cd ${_pkgfqn}
- make INSTALL_ROOT=${pkgdir} install_docs
-}
-
package_qt5-jsbackend() {
- pkgdesc=('A cross-platform application and UI framework (QtV8)')
+ pkgdesc='A cross-platform application and UI framework (QtV8)'
depends=('qt5-base')
cd ${_pkgfqn}/qtjsbackend
@@ -147,7 +130,7 @@
}
package_qt5-xmlpatterns() {
- pkgdesc=('A cross-platform application and UI framework (QtXmlPatterns)')
+ pkgdesc='A cross-platform application and UI framework (QtXmlPatterns)'
depends=('qt5-base')
conflicts=('qt')
@@ -160,7 +143,7 @@
}
package_qt5-translations() {
- pkgdesc=('A cross-platform application and UI framework (Translations)')
+ pkgdesc='A cross-platform application and UI framework (Translations)'
depends=('qt5-base')
conflicts=('qt')
@@ -169,8 +152,8 @@
}
package_qt5-multimedia() {
- pkgdesc=('A cross-platform application and UI framework (QtMultimedia)')
- depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base')
+ pkgdesc='A cross-platform application and UI framework (QtMultimedia)'
+ depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal')
conflicts=('qt')
cd ${_pkgfqn}/qtmultimedia
@@ -182,7 +165,7 @@
}
package_qt5-graphicaleffects() {
- pkgdesc=('A cross-platform application and UI framework
(QtGraphicalEffects)')
+ pkgdesc='A cross-platform application and UI framework (QtGraphicalEffects)'
depends=('qt5-declarative')
cd ${_pkgfqn}/qtgraphicaleffects
@@ -190,8 +173,8 @@
}
package_qt5-imageformats() {
- pkgdesc=('A cross-platform application and UI framework (Images plugins)')
- depends=('qt5-base' 'libtiff')
+ pkgdesc='A cross-platform application and UI framework (Images plugins)'
+ depends=('qt5-base' 'libtiff' 'libmng')
conflicts=('qt')
cd ${_pkgfqn}/qtimageformats
@@ -199,7 +182,7 @@
}
package_qt5-quick1() {
- pkgdesc=('A cross-platform application and UI framework (QtDeclarative)')
+ pkgdesc='A cross-platform application and UI framework (QtDeclarative)'
depends=('qt5-webkit' 'qt5-script')
conflicts=('qt')
@@ -212,7 +195,7 @@
}
package_qt5-script() {
- pkgdesc=('A cross-platform application and UI framework (QtScript)')
+ pkgdesc='A cross-platform application and UI framework (QtScript)'
depends=('qt5-base')
conflicts=('qt')
@@ -225,7 +208,7 @@
}
package_qt5-svg() {
- pkgdesc=('A cross-platform application and UI framework (QtSvg)')
+ pkgdesc='A cross-platform application and UI framework (QtSvg)'
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Friday, March 1, 2013 @ 21:21:39
Author: andrea
Revision: 179038
Install headers in /usr/include/qt5 (FS#34088); Add a qt5 group too
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-01 19:03:38 UTC (rev 179037)
+++ PKGBUILD2013-03-01 20:21:39 UTC (rev 179038)
@@ -17,7 +17,7 @@
'qt5-webkit'
'qt5-xmlpatterns')
pkgver=5.0.1
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -26,7 +26,7 @@
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc'
'libfbclient'
'python2' 'ruby' 'gperf')
-groups=('qt')
+groups=('qt' 'qt5')
options=('!libtool')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz;
@@ -57,6 +57,7 @@
./configure -confirm-license -opensource \
-prefix /usr \
-docdir /usr/share/doc/qt \
+-headerdir /usr/include/qt5 \
-archdatadir /usr/lib/qt \
-datadir /usr/share/qt \
-sysconfdir /etc/xdg \
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Tuesday, February 26, 2013 @ 12:16:10
Author: andrea
Revision: 178706
Rename the qt5 group as qt; Ship qt5-doc in this PKGBUILD as it needs the built
libs to generate the docs
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-26 11:10:05 UTC (rev 178705)
+++ PKGBUILD2013-02-26 11:16:10 UTC (rev 178706)
@@ -4,6 +4,7 @@
pkgbase=qt5
pkgname=('qt5-base'
'qt5-declarative'
+ 'qt5-doc'
'qt5-graphicaleffects'
'qt5-imageformats'
'qt5-jsbackend'
@@ -16,16 +17,16 @@
'qt5-webkit'
'qt5-xmlpatterns')
pkgver=5.0.1
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm'
'xcb-util-keysyms'
-'mesa' 'libgl' 'at-spi2-core' 'alsa-lib'
'gstreamer0.10-base-plugins'
+'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme'
'desktop-file-utils'
'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc'
'libfbclient'
'python2' 'ruby' 'gperf')
-groups=('qt5')
+groups=('qt')
options=('!libtool')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz;
@@ -72,6 +73,10 @@
-reduce-relocations
make
+
+ # Build docs
+ make qmake_all
+ make docs
}
package_qt5-base() {
@@ -115,6 +120,19 @@
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {}
\;
}
+package_qt5-doc() {
+ pkgdesc=('A cross-platform application and UI framework (Documentation)')
+ depends=('qt5-base')
+ conflicts=('qt-doc')
+ replaces=('qt-doc')
+ provides=('qt-doc')
+ options=('docs')
+ groups=()
+
+ cd ${_pkgfqn}
+ make INSTALL_ROOT=${pkgdir} install_docs
+}
+
package_qt5-jsbackend() {
pkgdesc=('A cross-platform application and UI framework (QtV8)')
depends=('qt5-base')
[arch-commits] Commit in qt5/trunk (PKGBUILD)
Date: Monday, February 25, 2013 @ 15:44:44
Author: andrea
Revision: 178537
Fix wrong paths
Modified:
qt5/trunk/PKGBUILD
--+
PKGBUILD |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-25 14:24:54 UTC (rev 178536)
+++ PKGBUILD2013-02-25 14:44:44 UTC (rev 178537)
@@ -96,6 +96,10 @@
# 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/' {}
\;
+
+ # Fix wrong qmake path in pri file
+ sed -i s|${srcdir}/${_pkgfqn}/qtbase|/usr| \
+${pkgdir}/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap.pri
}
package_qt5-declarative() {
@@ -256,5 +260,7 @@
# 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/' {}
\;
+
+ # Fix wrong path in pc file
+ perl -pi -e s, -L${srcdir}/?\S+,,g
${pkgdir}/usr/lib/pkgconfig/Qt5WebKit.pc
}
-
