[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Monday, February 25, 2013 @ 15:20:04
Author: andrea
Revision: 178535
Split the qt5-addons pakcage
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD | 130 ++---
1 file changed, 99 insertions(+), 31 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-25 11:02:58 UTC (rev 178534)
+++ PKGBUILD2013-02-25 14:20:04 UTC (rev 178535)
@@ -4,12 +4,19 @@
pkgbase=qt
pkgname=('qt5-base'
'qt5-declarative'
+ 'qt5-graphicaleffects'
+ 'qt5-imageformats'
+ 'qt5-jsbackend'
'qt5-multimedia'
- 'qt5-addons'
+ 'qt5-quick1'
+ 'qt5-script'
+ 'qt5-svg'
'qt5-tools'
- 'qt5-webkit')
+ 'qt5-translations'
+ 'qt5-webkit'
+ 'qt5-xmlpatterns')
pkgver=5.0.1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -68,7 +75,7 @@
}
package_qt5-base() {
- pkgdesc=('A cross-platform application and UI framework (Qt Core, Qt GUI, Qt
Network, Qt SQL, Qt Widgets)')
+ 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')
@@ -76,15 +83,12 @@
'libmysqlclient: MySQL driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver')
- conflicts=('qt' 'qt-private-headers')
install='qt5-base.install'
+ conflicts=('qt')
cd ${_pkgfqn}/qtbase
make INSTALL_ROOT="${pkgdir}" install
- cd ../../${_pkgfqn}/qttranslations
- make INSTALL_ROOT="${pkgdir}" install
-
cd "${srcdir}"
install -p -D -m644
${_pkgfqn}/qtbase/src/widgets/dialogs/images/qtlogo-64.png \
"${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
@@ -98,17 +102,36 @@
}
package_qt5-declarative() {
- pkgdesc=('A cross-platform application and UI framework (Qt QML)')
- depends=('qt5-base')
- conflicts=('qt' 'qt-private-headers')
+ pkgdesc=('A cross-platform application and UI framework (QtQml, QtQuick)')
+ depends=('qt5-jsbackend' 'qt5-xmlpatterns')
+ conflicts=('qt')
cd ${_pkgfqn}/qtdeclarative
make INSTALL_ROOT="${pkgdir}" install
- cd ../../${_pkgfqn}/qtjsbackend
+ # 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-jsbackend() {
+ pkgdesc=('A cross-platform application and UI framework (QtV8)')
+ depends=('qt5-base')
+
+ cd ${_pkgfqn}/qtjsbackend
make INSTALL_ROOT="${pkgdir}" install
-
- cd ../../${_pkgfqn}/qtxmlpatterns
+
+ # 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-xmlpatterns() {
+ pkgdesc=('A cross-platform application and UI framework (QtXmlPatterns)')
+ depends=('qt5-base')
+ conflicts=('qt')
+
+ cd ${_pkgfqn}/qtxmlpatterns
make INSTALL_ROOT="${pkgdir}" install
# Fix wrong path in prl files
@@ -116,8 +139,17 @@
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {}
\;
}
+package_qt5-translations() {
+ pkgdesc=('A cross-platform application and UI framework (Translations)')
+ depends=('qt5-base')
+ conflicts=('qt')
+
+ cd ${_pkgfqn}/qttranslations
+ make INSTALL_ROOT="${pkgdir}" install
+}
+
package_qt5-multimedia() {
- pkgdesc=('A cross-platform application and UI framework (Qt Multimedia)')
+ pkgdesc=('A cross-platform application and UI framework (QtMultimedia)')
depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base')
conflicts=('qt')
@@ -129,37 +161,68 @@
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {}
\;
}
-package_qt5-addons() {
- pkgdesc=('A cross-platform application and UI framework (Qt Add-ons
Modules)')
- depends=('qt5-webkit' 'libtiff')
- conflicts=('qt')
+package_qt5-graphicaleffects() {
+ pkgdesc=('A cross-platform application and UI framework
(QtGraphicalEffects)')
+ depends=('qt5-declarative')
cd ${_pkgfqn}/qtgraphicaleffects
make INSTALL_ROOT="${pkgdir}" install
-
- cd ../../${_pkgfqn}/qtimageformats
- make INSTALL_ROOT="${pkgdir}" install
-
- cd ../../${_pkgfqn}/qtquick1
+}
+
+package_qt5-imageformats() {
+ pkgdesc=('A cross-platform application and UI framework (Images plugins)')
+ depends=('qt5-base' 'libtiff')
+ conflicts=('qt')
+
+ cd ${_pkgfqn}/qtimageformats
make INSTALL_ROOT="${pkgdir}" install
+}
+
+package_qt5-quick1() {
+ pkgdesc=('A cross-platform application and UI framework (QtDeclarative)')
+ depends=('qt5-webkit' 'qt5-script')
+ conflicts=('qt')
+
+ cd ${_pkgfqn}/qtquick1
+ make INSTALL_ROOT="${pkgdir}" install
- c
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Sunday, February 24, 2013 @ 21:02:02
Author: andrea
Revision: 178509
This doesn't conflict anymore with qtwebkit
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-24 19:42:59 UTC (rev 178508)
+++ PKGBUILD2013-02-24 20:02:02 UTC (rev 178509)
@@ -9,7 +9,7 @@
'qt5-tools'
'qt5-webkit')
pkgver=5.0.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -132,7 +132,7 @@
package_qt5-addons() {
pkgdesc=('A cross-platform application and UI framework (Qt Add-ons
Modules)')
depends=('qt5-webkit' 'libtiff')
- conflicts=('qt' 'qtwebkit')
+ conflicts=('qt')
cd ${_pkgfqn}/qtgraphicaleffects
make INSTALL_ROOT="${pkgdir}" install
@@ -158,7 +158,7 @@
pkgdesc=('A cross-platform application and UI framework (Development Tools)')
depends=('qt5-webkit' 'desktop-file-utils')
optdepends=('qt5-doc: documentation')
- conflicts=('qt' 'qtwebkit')
+ conflicts=('qt')
install='qt5-tools.install'
cd ${_pkgfqn}/qttools
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Sunday, January 20, 2013 @ 02:26:10
Author: andyrtr
Revision: 175717
upgpkg: qt 4.8.4-2
icu rebuild
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-01-20 06:55:55 UTC (rev 175716)
+++ PKGBUILD2013-01-20 07:26:10 UTC (rev 175717)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.4
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Monday, December 24, 2012 @ 06:15:35
Author: andrea
Revision: 173823
Install high-resolution icon for qtassistant (FS#33182)
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-12-24 06:33:29 UTC (rev 173822)
+++ PKGBUILD2012-12-24 11:15:35 UTC (rev 173823)
@@ -94,14 +94,16 @@
# install missing icons and desktop files
for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
size=$(echo $(basename ${icon}) | cut -d- -f2)
- install -p -D -m644 ${icon} \
+ install -D -m644 ${icon} \
"${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
done
-install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \
+install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
"${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
-install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \
+install -D -m644 tools/assistant/tools/assistant/images/assistant.png \
"${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
-install -p -D -m644 tools/designer/src/designer/images/designer.png \
+install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \
+ "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png"
+install -D -m644 tools/designer/src/designer/images/designer.png \
"${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
install -d "${pkgdir}/usr/share/applications"
install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Tuesday, November 20, 2012 @ 08:12:12
Author: andrea
Revision: 171610
Update checksums
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-11-20 13:10:56 UTC (rev 171609)
+++ PKGBUILD2012-11-20 13:12:12 UTC (rev 171610)
@@ -24,10 +24,10 @@
'fix-qtscript-crash.patch'
'qsortfilterproxymodel.patch')
md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
- 'fc211414130ab2764132e7370f8e5caa'
- '85179f5e0437514f8639957e1d8baf62'
- 'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd'
+ 'f1837a03fd0ebbd2da58975845f278e3'
+ '480fea1ed076992b688373c8db274be0'
+ '5595c24d5bb942c21e3a4d299e6d0bf1'
+ '824a3b77a25e98567f640e0441ccdebc'
'c439c7731c25387352d8453ca7574971'
'57590084078b6379f0501f7728b02ae2'
'94e9e433342018bf35e8d6d968b7432c'
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Friday, November 16, 2012 @ 16:54:10
Author: andrea
Revision: 171242
upgpkg: qt 4.8.3-6
icu rebuild
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-11-16 21:41:41 UTC (rev 171241)
+++ PKGBUILD2012-11-16 21:54:10 UTC (rev 171242)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.3
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
[arch-commits] Commit in qt/trunk (PKGBUILD undo-fix-jit-crash-on-x86_64.patch)
Date: Sunday, November 4, 2012 @ 03:23:34
Author: andrea
Revision: 170184
With the last patch this is no more needed
Modified:
qt/trunk/PKGBUILD
Deleted:
qt/trunk/undo-fix-jit-crash-on-x86_64.patch
+
PKGBUILD |5
undo-fix-jit-crash-on-x86_64.patch | 280 ---
2 files changed, 285 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-11-04 08:05:32 UTC (rev 170183)
+++ PKGBUILD2012-11-04 08:23:34 UTC (rev 170184)
@@ -20,7 +20,6 @@
'qtconfig.desktop'
'improve-cups-support.patch'
'fix-crash-in-assistant.patch'
-'undo-fix-jit-crash-on-x86_64.patch'
'disable-ssl-compression.patch'
'fix-qtscript-crash.patch'
'qsortfilterproxymodel.patch')
@@ -31,7 +30,6 @@
'6b771c8a81dd90b45e8a79afa0e5bbfd'
'c439c7731c25387352d8453ca7574971'
'57590084078b6379f0501f7728b02ae2'
- '094e5a4e30e52423c77daa4a9c782df5'
'94e9e433342018bf35e8d6d968b7432c'
'71579422635e9343665de1c1ba5a3f91'
'd288b87afa4a3c81e54a3aea8f42e3b0')
@@ -45,9 +43,6 @@
# (FS#29469)
patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch
- # (FS#31654)
- patch -Rp1 -i "${srcdir}"/undo-fix-jit-crash-on-x86_64.patch
-
# Security fix
patch -p1 -i "${srcdir}"/disable-ssl-compression.patch
Deleted: undo-fix-jit-crash-on-x86_64.patch
===
--- undo-fix-jit-crash-on-x86_64.patch 2012-11-04 08:05:32 UTC (rev 170183)
+++ undo-fix-jit-crash-on-x86_64.patch 2012-11-04 08:23:34 UTC (rev 170184)
@@ -1,280 +0,0 @@
-Description: Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow)
- .
- Cherry-picked from webkit commit
- a5b3261a8c4386b4e14ce40a34c7fc933a5f7001
-Origin: commit ada98493bbfbd9af0d0b593017e29d39bcd3495e
-Author: Kent Hansen
-Forwarded: not-needed
-Applied-Upstream: yes
-Reviewed-by: Simon Hausmann
-Reviewed-by: Kent Hansen
- .../javascriptcore/JavaScriptCore/ChangeLog| 27 +
- .../JavaScriptCore/JavaScriptCore.pri |1 +
- .../JavaScriptCore/jit/ExecutableAllocator.cpp | 21 +
- .../jit/ExecutableAllocatorFixedVMPool.cpp | 31 +---
- .../jit/ExecutableAllocatorPosix.cpp | 29 ++
- .../jit/ExecutableAllocatorSymbian.cpp |2 +-
- .../JavaScriptCore/jit/ExecutableAllocatorWin.cpp |2 +-
- .../javascriptcore/JavaScriptCore/wtf/Platform.h | 10 +++
- 8 files changed, 84 insertions(+), 39 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-index 9cbf0c1..5ab23e6 100644
a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-@@ -1,3 +1,30 @@
-+2010-07-08 Gavin Barraclough
-+
-+Reviewed by Sam Weinig.
-+
-+https://bugs.webkit.org/show_bug.cgi?id=41641
-+
-+Update compile flags to allow use of ExecutableAllocatorFixedVMPool
on platforms
-+other than x86-64 (this may be useful on 32-bit platforms, too).
-+
-+Simplify ifdefs by dividing into thwo broad allocation strategies
-+(ENABLE_EXECUTABLE_ALLOCATOR_FIXED &
ENABLE_EXECUTABLE_ALLOCATOR_DEMAND).
-+
-+Rename constant used in the code to have names descriptive of their
purpose,
-+rather than their specific value on a given platform.
-+
-+* jit/ExecutableAllocator.cpp:
-+(JSC::ExecutableAllocator::reprotectRegion):
-+(JSC::ExecutableAllocator::cacheFlush):
-+* jit/ExecutableAllocatorFixedVMPool.cpp:
-+(JSC::FixedVMPoolAllocator::FixedVMPoolAllocator):
-+(JSC::FixedVMPoolAllocator::free):
-+(JSC::ExecutablePool::systemAlloc):
-+* jit/ExecutableAllocatorPosix.cpp:
-+* jit/ExecutableAllocatorSymbian.cpp:
-+* jit/ExecutableAllocatorWin.cpp:
-+* wtf/Platform.h:
-+
- 2010-08-24 Oliver Hunt
-
- Reviewed by Geoff Garen.
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-index b061321..847f69c 100644
a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-@@ -100,6 +100,7 @@ SOURCES += \
- interpreter/CallFrame.cpp \
- interpreter/Interpreter.cpp \
- interpreter/RegisterFile.cpp \
-+jit/ExecutableAllocatorFixedVMPool.cpp \
- jit/ExecutableAllocatorPosix.cpp \
- jit/ExecutableAllocatorSymbian.cpp \
- jit/ExecutableAllocatorWin.cpp \
-diff --git
a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp
b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAlloc
[arch-commits] Commit in qt/trunk (PKGBUILD qsortfilterproxymodel.patch)
Date: Sunday, November 4, 2012 @ 04:16:52
Author: andrea
Revision: 170185
Do not patch non-existent file
Modified:
qt/trunk/PKGBUILD
qt/trunk/qsortfilterproxymodel.patch
-+
PKGBUILD|2 -
qsortfilterproxymodel.patch | 78 --
2 files changed, 1 insertion(+), 79 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-11-04 08:23:34 UTC (rev 170184)
+++ PKGBUILD2012-11-04 09:16:52 UTC (rev 170185)
@@ -32,7 +32,7 @@
'57590084078b6379f0501f7728b02ae2'
'94e9e433342018bf35e8d6d968b7432c'
'71579422635e9343665de1c1ba5a3f91'
- 'd288b87afa4a3c81e54a3aea8f42e3b0')
+ 'cd550cd628d10459128ca5f231ca6d3f')
build() {
cd ${_pkgfqn}
Modified: qsortfilterproxymodel.patch
===
--- qsortfilterproxymodel.patch 2012-11-04 08:23:34 UTC (rev 170184)
+++ qsortfilterproxymodel.patch 2012-11-04 09:16:52 UTC (rev 170185)
@@ -58,84 +58,6 @@
}
/*!
-diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-index 8ab5098..d0887fc 100644
a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-+++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-@@ -152,6 +152,7 @@ private slots:
- void testResetInternalData();
- void filteredColumns();
- void hierarchyFilterInvalidation();
-+void simpleFilterInvalidation();
-
- protected:
- void buildHierarchy(const QStringList &data, QAbstractItemModel *model);
-@@ -3475,5 +3476,65 @@ void
tst_QSortFilterProxyModel::hierarchyFilterInvalidation()
- proxy.setMode(true);
- }
-
-+
-+class FilterProxy2 : public QSortFilterProxyModel
-+{
-+Q_OBJECT
-+public:
-+FilterProxy2(QObject *parent = 0)
-+ : QSortFilterProxyModel(parent),
-+mode(false)
-+{
-+
-+}
-+
-+public slots:
-+void setMode(bool on)
-+{
-+mode = on;
-+invalidateFilter();
-+}
-+
-+protected:
-+virtual bool filterAcceptsRow ( int source_row, const QModelIndex &
source_parent ) const
-+{
-+if (source_parent.isValid()) {
-+return true;
-+} else {
-+if (0 == source_row) {
-+return true;
-+} else {
-+return !mode;
-+}
-+}
-+}
-+
-+private:
-+bool mode;
-+};
-+
-+void tst_QSortFilterProxyModel::simpleFilterInvalidation()
-+{
-+QStandardItemModel model;
-+for (int i = 0; i < 2; ++i) {
-+QStandardItem *child = new QStandardItem(QString("Row %1").arg(i));
-+child->appendRow(new QStandardItem("child"));
-+model.appendRow(child);
-+}
-+
-+FilterProxy2 proxy;
-+proxy.setSourceModel(&model);
-+
-+QTreeView view;
-+view.setModel(&proxy);
-+
-+view.show();
-+QTest::qWaitForWindowShown(&view);
-+
-+proxy.setMode(true);
-+model.insertRow(0, new QStandardItem("extra"));
-+}
-+
-+
- QTEST_MAIN(tst_QSortFilterProxyModel)
- #include "tst_qsortfilterproxymodel.moc"
--
1.8.0
[arch-commits] Commit in qt/trunk (PKGBUILD disable-ssl-compression.patch)
Date: Thursday, September 27, 2012 @ 07:08:23
Author: andrea
Revision: 167190
Security fix, see
http://lists.qt-project.org/pipermail/announce/2012-September/09.html
Added:
qt/trunk/disable-ssl-compression.patch
Modified:
qt/trunk/PKGBUILD
---+
PKGBUILD | 11 --
disable-ssl-compression.patch | 68
2 files changed, 76 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-09-27 01:16:55 UTC (rev 167189)
+++ PKGBUILD2012-09-27 11:08:23 UTC (rev 167190)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.3
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -20,7 +20,8 @@
'qtconfig.desktop'
'improve-cups-support.patch'
'fix-crash-in-assistant.patch'
-'undo-fix-jit-crash-on-x86_64.patch')
+'undo-fix-jit-crash-on-x86_64.patch'
+'disable-ssl-compression.patch')
md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
@@ -28,7 +29,8 @@
'6b771c8a81dd90b45e8a79afa0e5bbfd'
'c439c7731c25387352d8453ca7574971'
'57590084078b6379f0501f7728b02ae2'
- '094e5a4e30e52423c77daa4a9c782df5')
+ '094e5a4e30e52423c77daa4a9c782df5'
+ '94e9e433342018bf35e8d6d968b7432c')
build() {
cd "${srcdir}"/${_pkgfqn}
@@ -41,6 +43,9 @@
# (FS#31654)
patch -Rp1 -i "${srcdir}"/undo-fix-jit-crash-on-x86_64.patch
+
+ # Security fix
+ patch -p1 -i "${srcdir}"/disable-ssl-compression.patch
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Added: disable-ssl-compression.patch
===
--- disable-ssl-compression.patch (rev 0)
+++ disable-ssl-compression.patch 2012-09-27 11:08:23 UTC (rev 167190)
@@ -0,0 +1,68 @@
+From d41dc3e101a694dec98d7bbb582d428d209e5401 Mon Sep 17 00:00:00 2001
+From: Richard Moore
+Date: Fri, 14 Sep 2012 00:13:08 +0100
+Subject: [PATCH] Disable SSL compression by default.
+
+Disable SSL compression by default since this appears to be the a likely
+cause of the currently hyped CRIME attack.
+
+This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74
+
+Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a
+Reviewed-by: Thiago Macieira
+Reviewed-by: Peter Hartmann
+---
+ src/network/ssl/qssl.cpp |5 +++--
+ src/network/ssl/qsslconfiguration.cpp |4 +++-
+ src/network/ssl/qsslconfiguration_p.h |4 +++-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
+index 49e086f..9578178 100644
+--- a/src/network/ssl/qssl.cpp
b/src/network/ssl/qssl.cpp
+@@ -148,8 +148,9 @@ QT_BEGIN_NAMESPACE
+
+ By default, SslOptionDisableEmptyFragments is turned on since this causes
+ problems with a large number of servers.
SslOptionDisableLegacyRenegotiation
+-is also turned on, since it introduces a security risk. The other options
+-are turned off.
++is also turned on, since it introduces a security risk.
++SslOptionDisableCompression is turned on to prevent the attack publicised
by
++CRIME. The other options are turned off.
+
+ Note: Availability of above options depends on the version of the SSL
+ backend in use.
+diff --git a/src/network/ssl/qsslconfiguration.cpp
b/src/network/ssl/qsslconfiguration.cpp
+index 24c7b77..3a05f54 100644
+--- a/src/network/ssl/qsslconfiguration.cpp
b/src/network/ssl/qsslconfiguration.cpp
+@@ -201,7 +201,9 @@ bool QSslConfiguration::isNull() const
+ d->privateKey.isNull() &&
+ d->peerCertificate.isNull() &&
+ d->peerCertificateChain.count() == 0 &&
+-d->sslOptions ==
(QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation));
++d->sslOptions == ( QSsl::SslOptionDisableEmptyFragments
++ |QSsl::SslOptionDisableLegacyRenegotiation
++ |QSsl::SslOptionDisableCompression));
+ }
+
+ /*!
+diff --git a/src/network/ssl/qsslconfiguration_p.h
b/src/network/ssl/qsslconfiguration_p.h
+index 74f17cd..c36b651 100644
+--- a/src/network/ssl/qsslconfiguration_p.h
b/src/network/ssl/qsslconfiguration_p.h
+@@ -83,7 +83,9 @@ public:
+ : protocol(QSsl::SecureProtocols),
+ peerVerifyMode(QSslSocket::AutoVerifyPeer),
+ peerVerifyDepth(0),
+-
sslOptions(QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation)
++ sslOptions(QSsl::SslOptionDisableEmptyFragments
++ |QSsl::SslOptionDisableLegacyRenegotiation
++ |QSsl::SslOptionDisableCompres
[arch-commits] Commit in qt/trunk (PKGBUILD undo-fix-jit-crash-on-x86_64.patch)
Date: Sunday, September 23, 2012 @ 05:07:35
Author: andrea
Revision: 166951
upgpkg: qt 4.8.3-3
Fix regression
Added:
qt/trunk/undo-fix-jit-crash-on-x86_64.patch
Modified:
qt/trunk/PKGBUILD
+
PKGBUILD | 13 +
undo-fix-jit-crash-on-x86_64.patch | 280 +++
2 files changed, 289 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-09-23 08:02:47 UTC (rev 166950)
+++ PKGBUILD2012-09-23 09:07:35 UTC (rev 166951)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.3
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -19,14 +19,16 @@
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
'improve-cups-support.patch'
-'fix-crash-in-assistant.patch')
+'fix-crash-in-assistant.patch'
+'undo-fix-jit-crash-on-x86_64.patch')
md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
'c439c7731c25387352d8453ca7574971'
- '57590084078b6379f0501f7728b02ae2')
+ '57590084078b6379f0501f7728b02ae2'
+ '094e5a4e30e52423c77daa4a9c782df5')
build() {
cd "${srcdir}"/${_pkgfqn}
@@ -34,8 +36,11 @@
# (FS#28381) (KDEBUG#180051)
patch -p1 -i "${srcdir}"/improve-cups-support.patch
- # (FS#)
+ # (FS#29469)
patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch
+
+ # (FS#31654)
+ patch -Rp1 -i "${srcdir}"/undo-fix-jit-crash-on-x86_64.patch
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Added: undo-fix-jit-crash-on-x86_64.patch
===
--- undo-fix-jit-crash-on-x86_64.patch (rev 0)
+++ undo-fix-jit-crash-on-x86_64.patch 2012-09-23 09:07:35 UTC (rev 166951)
@@ -0,0 +1,280 @@
+Description: Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow)
+ .
+ Cherry-picked from webkit commit
+ a5b3261a8c4386b4e14ce40a34c7fc933a5f7001
+Origin: commit ada98493bbfbd9af0d0b593017e29d39bcd3495e
+Author: Kent Hansen
+Forwarded: not-needed
+Applied-Upstream: yes
+Reviewed-by: Simon Hausmann
+Reviewed-by: Kent Hansen
+---
+ .../javascriptcore/JavaScriptCore/ChangeLog| 27 +
+ .../JavaScriptCore/JavaScriptCore.pri |1 +
+ .../JavaScriptCore/jit/ExecutableAllocator.cpp | 21 +
+ .../jit/ExecutableAllocatorFixedVMPool.cpp | 31 +---
+ .../jit/ExecutableAllocatorPosix.cpp | 29 ++
+ .../jit/ExecutableAllocatorSymbian.cpp |2 +-
+ .../JavaScriptCore/jit/ExecutableAllocatorWin.cpp |2 +-
+ .../javascriptcore/JavaScriptCore/wtf/Platform.h | 10 +++
+ 8 files changed, 84 insertions(+), 39 deletions(-)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
+index 9cbf0c1..5ab23e6 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
+@@ -1,3 +1,30 @@
++2010-07-08 Gavin Barraclough
++
++Reviewed by Sam Weinig.
++
++https://bugs.webkit.org/show_bug.cgi?id=41641
++
++Update compile flags to allow use of ExecutableAllocatorFixedVMPool
on platforms
++other than x86-64 (this may be useful on 32-bit platforms, too).
++
++Simplify ifdefs by dividing into thwo broad allocation strategies
++(ENABLE_EXECUTABLE_ALLOCATOR_FIXED &
ENABLE_EXECUTABLE_ALLOCATOR_DEMAND).
++
++Rename constant used in the code to have names descriptive of their
purpose,
++rather than their specific value on a given platform.
++
++* jit/ExecutableAllocator.cpp:
++(JSC::ExecutableAllocator::reprotectRegion):
++(JSC::ExecutableAllocator::cacheFlush):
++* jit/ExecutableAllocatorFixedVMPool.cpp:
++(JSC::FixedVMPoolAllocator::FixedVMPoolAllocator):
++(JSC::FixedVMPoolAllocator::free):
++(JSC::ExecutablePool::systemAlloc):
++* jit/ExecutableAllocatorPosix.cpp:
++* jit/ExecutableAllocatorSymbian.cpp:
++* jit/ExecutableAllocatorWin.cpp:
++* wtf/Platform.h:
++
+ 2010-08-24 Oliver Hunt
+
+ Reviewed by Geoff Garen.
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+index b061321..847f69c 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+@@ -100,6 +100,7 @@ SOURCES += \
+ interpre
[arch-commits] Commit in qt/trunk (PKGBUILD fix-crash-in-assistant.patch)
Date: Monday, September 17, 2012 @ 12:05:35
Author: andrea
Revision: 166747
upgpkg: qt 4.8.3-2
Fix crash in assistant (FS29469)
Added:
qt/trunk/fix-crash-in-assistant.patch
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD | 11 ---
fix-crash-in-assistant.patch | 11 +++
2 files changed, 19 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-09-17 15:48:51 UTC (rev 166746)
+++ PKGBUILD2012-09-17 16:05:35 UTC (rev 166747)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.3
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -18,19 +18,24 @@
source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
-'improve-cups-support.patch')
+'improve-cups-support.patch'
+'fix-crash-in-assistant.patch')
md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'c439c7731c25387352d8453ca7574971')
+ 'c439c7731c25387352d8453ca7574971'
+ '57590084078b6379f0501f7728b02ae2')
build() {
cd "${srcdir}"/${_pkgfqn}
# (FS#28381) (KDEBUG#180051)
patch -p1 -i "${srcdir}"/improve-cups-support.patch
+
+ # (FS#)
+ patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Added: fix-crash-in-assistant.patch
===
--- fix-crash-in-assistant.patch(rev 0)
+++ fix-crash-in-assistant.patch2012-09-17 16:05:35 UTC (rev 166747)
@@ -0,0 +1,11 @@
+---
qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp
2012-06-26 17:37:47.334536023 +
qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~
2012-06-26 17:37:08.531487286 +
+@@ -944,8 +944,7 @@
+ if (helpEngine.usesAppFont())
+ font = helpEngine.appFont();
+
+-const QWidgetList &widgets = qApp->allWidgets();
+-foreach (QWidget* widget, widgets)
++foreach (QWidget* widget, QApplication::allWidgets())
+ widget->setFont(font);
+ }
[arch-commits] Commit in qt/trunk (PKGBUILD fix-assistant-crash.patch)
Date: Thursday, September 13, 2012 @ 11:16:18
Author: andrea
Revision: 166630
upgpkg: qt 4.8.3-1
Upstream release
Modified:
qt/trunk/PKGBUILD
Deleted:
qt/trunk/fix-assistant-crash.patch
---+
PKGBUILD | 14 +-
fix-assistant-crash.patch | 12
2 files changed, 5 insertions(+), 21 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-09-13 14:11:07 UTC (rev 166629)
+++ PKGBUILD2012-09-13 15:16:18 UTC (rev 166630)
@@ -4,8 +4,8 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.2
-pkgrel=3
+pkgver=4.8.3
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -18,15 +18,13 @@
source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
-'improve-cups-support.patch'
-'fix-assistant-crash.patch')
-md5sums=('3c1146ddf56247e16782f96910a8423b'
+'improve-cups-support.patch')
+md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'c439c7731c25387352d8453ca7574971'
- 'e9c11e4606b7f55ae405e3e76f863dc1')
+ 'c439c7731c25387352d8453ca7574971')
build() {
cd "${srcdir}"/${_pkgfqn}
@@ -34,8 +32,6 @@
# (FS#28381) (KDEBUG#180051)
patch -p1 -i "${srcdir}"/improve-cups-support.patch
- patch -p1 -i "${srcdir}"/fix-assistant-crash.patch
-
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Deleted: fix-assistant-crash.patch
===
--- fix-assistant-crash.patch 2012-09-13 14:11:07 UTC (rev 166629)
+++ fix-assistant-crash.patch 2012-09-13 15:16:18 UTC (rev 166630)
@@ -1,12 +0,0 @@
qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp
2012-06-26 17:37:47.334536023 +
-+++
qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~
2012-06-26 17:37:08.531487286 +
-@@ -944,8 +944,7 @@
- if (helpEngine.usesAppFont())
- font = helpEngine.appFont();
-
--const QWidgetList &widgets = qApp->allWidgets();
--foreach (QWidget* widget, widgets)
-+foreach (QWidget* widget, QApplication::allWidgets())
- widget->setFont(font);
- }
-
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Sunday, July 22, 2012 @ 07:43:17
Author: allan
Revision: 163936
upgpkg: qt 4.8.2-3
gcc rebuild
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-22 11:23:00 UTC (rev 163935)
+++ PKGBUILD2012-07-22 11:43:17 UTC (rev 163936)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.2
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Tuesday, June 26, 2012 @ 19:05:16
Author: andrea
Revision: 162420
Add ibase support (FS#30062); Fix Assistant crash (FS#29469)
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-06-26 20:24:30 UTC (rev 162419)
+++ PKGBUILD2012-06-26 23:05:16 UTC (rev 162420)
@@ -5,32 +5,36 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2'
'dbus'
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa'
'postgresql-libs'
-'mysql' 'unixodbc' 'cups' 'gtk2')
+'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient')
options=('!libtool')
_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
-'improve-cups-support.patch')
+'improve-cups-support.patch'
+'fix-assistant-crash.patch')
md5sums=('3c1146ddf56247e16782f96910a8423b'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'c439c7731c25387352d8453ca7574971')
+ 'c439c7731c25387352d8453ca7574971'
+ 'e9c11e4606b7f55ae405e3e76f863dc1')
build() {
cd "${srcdir}"/${_pkgfqn}
# (FS#28381) (KDEBUG#180051)
patch -p1 -i "${srcdir}"/improve-cups-support.patch
+
+ patch -p1 -i "${srcdir}"/fix-assistant-crash.patch
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
@@ -49,7 +53,7 @@
-sysconfdir /etc/xdg \
-examplesdir /usr/share/doc/qt/examples \
-demosdir /usr/share/doc/qt/demos \
--plugin-sql-{psql,mysql,sqlite,odbc} \
+-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-system-sqlite \
-no-phonon \
-no-phonon-backend \
@@ -76,6 +80,7 @@
optdepends=('postgresql-libs: PostgreSQL driver'
'libmysqlclient: MySQL driver'
'unixodbc: ODBC driver'
+'libfbclient: Firebird/iBase driver'
'libxinerama: Xinerama support'
'libxcursor: Xcursor support'
'libxfixes: Xfixes support')
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Friday, April 6, 2012 @ 14:38:03
Author: andrea
Revision: 155810
rename pkg sqlite3 -> sqlite
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-06 18:28:29 UTC (rev 155809)
+++ PKGBUILD2012-04-06 18:38:03 UTC (rev 155810)
@@ -9,7 +9,7 @@
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2'
'dbus'
+makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2'
'dbus'
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa'
'postgresql-libs'
'mysql' 'unixodbc' 'cups' 'gtk2')
@@ -69,7 +69,7 @@
package_qt() {
pkgdesc='A cross-platform application and UI framework'
-depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2'
'dbus'
+depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2'
'dbus'
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
optdepends=('postgresql-libs: PostgreSQL driver'
[arch-commits] Commit in qt/trunk (PKGBUILD gcc47.patch)
Date: Wednesday, March 28, 2012 @ 15:42:53
Author: andrea
Revision: 154463
Build with gcc 4.7.0 still fails
Added:
qt/trunk/gcc47.patch
Modified:
qt/trunk/PKGBUILD
-+
PKGBUILD|8 ++--
gcc47.patch | 27 +++
2 files changed, 33 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-28 19:30:33 UTC (rev 154462)
+++ PKGBUILD2012-03-28 19:42:53 UTC (rev 154463)
@@ -17,16 +17,20 @@
_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-'qtconfig.desktop')
+'qtconfig.desktop'
+'gcc47.patch')
md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd')
+ '6b771c8a81dd90b45e8a79afa0e5bbfd'
+ 'd8a0e81075b290ddc18ecd33b9b7ee22')
build() {
cd "${srcdir}"/${_pkgfqn}
+ patch -p1 -i "${srcdir}"/gcc47.patch
+
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Added: gcc47.patch
===
--- gcc47.patch (rev 0)
+++ gcc47.patch 2012-03-28 19:42:53 UTC (rev 154463)
@@ -0,0 +1,27 @@
+diff -up
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+---
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me
2012-01-24 11:24:14.729942043 +0100
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
2012-01-24 14:28:39.848109534 +0100
+@@ -57,9 +57,7 @@ namespace JSC {
+
+ class JSGlobalObject : public JSVariableObject {
+ protected:
+-using JSVariableObject::JSVariableObjectData;
+-
+-struct JSGlobalObjectData : public JSVariableObjectData {
++struct JSGlobalObjectData : public
JSVariableObject::JSVariableObjectData {
+ // We use an explicit destructor function pointer instead of a
+ // virtual destructor because we want to avoid adding a vtable
+ // pointer to this struct. Adding a vtable pointer would force the
+diff -up
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+---
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me
2012-01-24 11:40:07.167856677 +0100
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
2012-01-24 14:28:34.640306629 +0100
+@@ -32,8 +32,7 @@ namespace JSC{
+
+ class JSStaticScopeObject : public JSVariableObject {
+ protected:
+-using JSVariableObject::JSVariableObjectData;
+-struct JSStaticScopeObjectData : public JSVariableObjectData {
++struct JSStaticScopeObjectData : public
JSVariableObject::JSVariableObjectData {
+ JSStaticScopeObjectData()
+ : JSVariableObjectData(&symbolTable, ®isterStore + 1)
+ {
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Sunday, March 25, 2012 @ 08:48:23
Author: andrea
Revision: 154289
No need to bump pkgrel
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-25 12:38:48 UTC (rev 154288)
+++ PKGBUILD2012-03-25 12:48:23 UTC (rev 154289)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.0
-pkgrel=7
+pkgrel=6
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
[arch-commits] Commit in qt/trunk (PKGBUILD gcc47.patch)
Date: Sunday, March 25, 2012 @ 08:38:48
Author: andrea
Revision: 154288
Fix build with gcc 4.7
Added:
qt/trunk/gcc47.patch
Modified:
qt/trunk/PKGBUILD
-+
PKGBUILD| 10 +++---
gcc47.patch | 27 +++
2 files changed, 34 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-25 10:43:43 UTC (rev 154287)
+++ PKGBUILD2012-03-25 12:38:48 UTC (rev 154288)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.0
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -21,7 +21,8 @@
'fix-qgraphicsscene-regression.patch'
'improved-filter-event.patch'
'qurl-backward-compatibility.patch'
-'improve-cups-support.patch')
+'improve-cups-support.patch'
+'gcc47.patch')
md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
@@ -30,7 +31,8 @@
'c2e91fc028250a590e76effe234468e2'
'444ebeb716d7c7379835efb8aa88e6c8'
'7bc255a36733d0fbc80c1902ade4beca'
- 'c439c7731c25387352d8453ca7574971')
+ 'c439c7731c25387352d8453ca7574971'
+ 'd8a0e81075b290ddc18ecd33b9b7ee22')
build() {
cd "${srcdir}"/${_pkgfqn}
@@ -43,6 +45,8 @@
# (FS#28381) (KDEBUG#180051)
patch -p1 -i "${srcdir}"/improve-cups-support.patch
+
+ patch -p1 -i "${srcdir}"/gcc47.patch
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Added: gcc47.patch
===
--- gcc47.patch (rev 0)
+++ gcc47.patch 2012-03-25 12:38:48 UTC (rev 154288)
@@ -0,0 +1,27 @@
+diff -up
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+---
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me
2012-01-24 11:24:14.729942043 +0100
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
2012-01-24 14:28:39.848109534 +0100
+@@ -57,9 +57,7 @@ namespace JSC {
+
+ class JSGlobalObject : public JSVariableObject {
+ protected:
+-using JSVariableObject::JSVariableObjectData;
+-
+-struct JSGlobalObjectData : public JSVariableObjectData {
++struct JSGlobalObjectData : public
JSVariableObject::JSVariableObjectData {
+ // We use an explicit destructor function pointer instead of a
+ // virtual destructor because we want to avoid adding a vtable
+ // pointer to this struct. Adding a vtable pointer would force the
+diff -up
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+---
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me
2012-01-24 11:40:07.167856677 +0100
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
2012-01-24 14:28:34.640306629 +0100
+@@ -32,8 +32,7 @@ namespace JSC{
+
+ class JSStaticScopeObject : public JSVariableObject {
+ protected:
+-using JSVariableObject::JSVariableObjectData;
+-struct JSStaticScopeObjectData : public JSVariableObjectData {
++struct JSStaticScopeObjectData : public
JSVariableObject::JSVariableObjectData {
+ JSStaticScopeObjectData()
+ : JSVariableObjectData(&symbolTable, ®isterStore + 1)
+ {
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Thursday, March 8, 2012 @ 05:06:44
Author: andrea
Revision: 152664
upgpkg: qt 4.8.0-6
typo
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-08 08:51:48 UTC (rev 152663)
+++ PKGBUILD2012-03-08 10:06:44 UTC (rev 152664)
@@ -21,7 +21,7 @@
'fix-qgraphicsscene-regression.patch'
'improved-filter-event.patch'
'qurl-backward-compatibility.patch'
-'improve-cups-support')
+'improve-cups-support.patch')
md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
[arch-commits] Commit in qt/trunk (PKGBUILD improve-cups-support.patch)
Date: Thursday, March 8, 2012 @ 03:51:48
Author: andrea
Revision: 152663
Apply non upstream patch to improve cups support in Qt/Kde apps (FS#28381)
Added:
qt/trunk/improve-cups-support.patch
Modified:
qt/trunk/PKGBUILD
+
PKGBUILD | 11 -
improve-cups-support.patch | 84 +++
2 files changed, 92 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-08 01:36:52 UTC (rev 152662)
+++ PKGBUILD2012-03-08 08:51:48 UTC (rev 152663)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.0
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -20,7 +20,8 @@
'qtconfig.desktop'
'fix-qgraphicsscene-regression.patch'
'improved-filter-event.patch'
-'qurl-backward-compatibility.patch')
+'qurl-backward-compatibility.patch'
+'improve-cups-support')
md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
@@ -28,7 +29,8 @@
'6b771c8a81dd90b45e8a79afa0e5bbfd'
'c2e91fc028250a590e76effe234468e2'
'444ebeb716d7c7379835efb8aa88e6c8'
- '7bc255a36733d0fbc80c1902ade4beca')
+ '7bc255a36733d0fbc80c1902ade4beca'
+ 'c439c7731c25387352d8453ca7574971')
build() {
cd "${srcdir}"/${_pkgfqn}
@@ -39,6 +41,9 @@
patch -p1 -i "${srcdir}"/improved-filter-event.patch
patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch
+ # (FS#28381) (KDEBUG#180051)
+ patch -p1 -i "${srcdir}"/improve-cups-support.patch
+
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Added: improve-cups-support.patch
===
--- improve-cups-support.patch (rev 0)
+++ improve-cups-support.patch 2012-03-08 08:51:48 UTC (rev 152663)
@@ -0,0 +1,84 @@
+diff -ur
qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp
qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp
2010-02-11 16:55:22.0 +0100
qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
2010-02-28 04:34:16.0 +0100
+@@ -569,6 +569,32 @@
+ void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
+ {
+ options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
++
++if (cups) {
++const ppd_option_t* duplex = cups->ppdOption("Duplex");
++if (duplex) {
++// copy default ppd duplex to qt dialog
++if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++options.duplexShort->setChecked(true);
++else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++options.duplexLong->setChecked(true);
++else
++options.noDuplex->setChecked(true);
++}
++
++if (cups->currentPPD()) {
++// set default color
++if (cups->currentPPD()->color_device)
++options.color->setChecked(true);
++else
++options.grayscale->setChecked(true);
++}
++
++// set collation
++const ppd_option_t *collate = cups->ppdOption("Collate");
++if (collate)
++options.collate->setChecked(qstrcmp(collate->defchoice,
"True")==0);
++}
+ }
+ #endif
+
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp
qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp
2010-02-11 16:55:22.0 +0100
qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
2010-02-28 04:55:15.0 +0100
+@@ -627,6 +627,44 @@
+&& d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
+ setOutputFormat(QPrinter::PdfFormat);
+ }
++
++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
++// fill in defaults from ppd file
++QCUPSSupport cups;
++
++int printernum = -1;
++for (int i = 0; i < cups.availablePrintersCount(); i++) {
++if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
++printernum = i;
++}
++if (printernum >= 0) {
++cups.setCurrentPrinter(printernum);
++
++const ppd_option_t* duplex = cups.ppdOption("Duplex");
++if (duplex) {
++// copy default ppd duplex to qt dialog
++if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++setDuplex(DuplexShortSide);
++else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++setDuplex(DuplexLongSide);
++els
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Saturday, March 3, 2012 @ 04:44:24
Author: andrea
Revision: 151838
Fix sysconf dir (FS#28748)
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-03 09:35:06 UTC (rev 151837)
+++ PKGBUILD2012-03-03 09:44:24 UTC (rev 151838)
@@ -53,7 +53,7 @@
-importdir /usr/lib/qt/imports \
-datadir /usr/share/qt \
-translationdir /usr/share/qt/translations \
--sysconfdir /etc \
+-sysconfdir /etc/xdg \
-examplesdir /usr/share/doc/qt/examples \
-demosdir /usr/share/doc/qt/demos \
-plugin-sql-{psql,mysql,sqlite,odbc} \
[arch-commits] Commit in qt/trunk (PKGBUILD fix-qurl.patch)
Date: Wednesday, February 29, 2012 @ 13:43:45
Author: andrea
Revision: 151652
upgpkg: qt 4.8.0-5
Duplicate patch
Modified:
qt/trunk/PKGBUILD
Deleted:
qt/trunk/fix-qurl.patch
+
PKGBUILD |6 +-
fix-qurl.patch | 13 -
2 files changed, 1 insertion(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-02-29 16:49:07 UTC (rev 151651)
+++ PKGBUILD2012-02-29 18:43:45 UTC (rev 151652)
@@ -18,7 +18,6 @@
source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
-'fix-qurl.patch'
'fix-qgraphicsscene-regression.patch'
'improved-filter-event.patch'
'qurl-backward-compatibility.patch')
@@ -27,7 +26,6 @@
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
- '7bc255a36733d0fbc80c1902ade4beca'
'c2e91fc028250a590e76effe234468e2'
'444ebeb716d7c7379835efb8aa88e6c8'
'7bc255a36733d0fbc80c1902ade4beca')
@@ -35,11 +33,9 @@
build() {
cd "${srcdir}"/${_pkgfqn}
- # (FS#27757)
- patch -p1 -i "${srcdir}"/fix-qurl.patch
# (FS#28707)
patch -p1 -i "${srcdir}"/fix-qgraphicsscene-regression.patch
- # (KDEBUG#275469)
+ # (FS#27757) (KDEBUG#275469)
patch -p1 -i "${srcdir}"/improved-filter-event.patch
patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch
Deleted: fix-qurl.patch
===
--- fix-qurl.patch 2012-02-29 16:49:07 UTC (rev 151651)
+++ fix-qurl.patch 2012-02-29 18:43:45 UTC (rev 151652)
@@ -1,13 +0,0 @@
-diff -up
qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile
qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp
qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile
2011-10-03 22:44:32.0 -0500
-+++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp 2011-10-27
12:58:35.706815049 -0500
-@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString &
- QString QUrl::toLocalFile() const
- {
- // the call to isLocalFile() also ensures that we're parsed
--if (!isLocalFile())
-+// Treat URLs with no scheme as local for backward compatibility
-+if (!isLocalFile() && (!d || !d->scheme.isEmpty()))
- return QString();
-
- QString tmp;
[arch-commits] Commit in qt/trunk (PKGBUILD fix-qurl.patch)
Date: Monday, January 30, 2012 @ 17:55:37
Author: andrea
Revision: 148387
upgpkg: qt 4.8.0-4
Fix QUrl regression
Added:
qt/trunk/fix-qurl.patch
Modified:
qt/trunk/PKGBUILD
+
PKGBUILD | 11 ---
fix-qurl.patch | 13 +
2 files changed, 21 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-30 22:52:09 UTC (rev 148386)
+++ PKGBUILD2012-01-30 22:55:37 UTC (rev 148387)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.0
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -17,16 +17,21 @@
_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-'qtconfig.desktop')
+'qtconfig.desktop'
+'fix-qurl.patch')
md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd')
+ '6b771c8a81dd90b45e8a79afa0e5bbfd'
+ '7bc255a36733d0fbc80c1902ade4beca')
build() {
cd "${srcdir}"/${_pkgfqn}
+ # (FS#27757)
+ patch -p1 -i "${srcdir}"/fix-qurl.patch
+
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Added: fix-qurl.patch
===
--- fix-qurl.patch (rev 0)
+++ fix-qurl.patch 2012-01-30 22:55:37 UTC (rev 148387)
@@ -0,0 +1,13 @@
+diff -up
qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile
qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp
+--- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile
2011-10-03 22:44:32.0 -0500
qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp 2011-10-27
12:58:35.706815049 -0500
+@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString &
+ QString QUrl::toLocalFile() const
+ {
+ // the call to isLocalFile() also ensures that we're parsed
+-if (!isLocalFile())
++// Treat URLs with no scheme as local for backward compatibility
++if (!isLocalFile() && (!d || !d->scheme.isEmpty()))
+ return QString();
+
+ QString tmp;
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Wednesday, January 18, 2012 @ 15:53:44
Author: andrea
Revision: 146852
upgpkg: qt 4.8.0-3
libpng and libtiff rebuild
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-18 20:41:52 UTC (rev 146851)
+++ PKGBUILD2012-01-18 20:53:44 UTC (rev 146852)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.0
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Friday, January 13, 2012 @ 17:18:07
Author: andrea
Revision: 146596
Fix gcc options (FS#27684)
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-13 22:15:55 UTC (rev 146595)
+++ PKGBUILD2012-01-13 22:18:07 UTC (rev 146596)
@@ -30,7 +30,7 @@
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
- sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf
+ sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g"
mkspecs/common/gcc-base-unix.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Sunday, December 18, 2011 @ 00:35:02
Author: andrea
Revision: 145151
upgpkg: qt 4.8.0-2
Enable QML debug support
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-12-18 04:37:39 UTC (rev 145150)
+++ PKGBUILD2011-12-18 05:35:02 UTC (rev 145151)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -49,7 +49,6 @@
-no-phonon \
-no-phonon-backend \
-no-webkit \
--no-declarative-debug \
-graphicssystem raster \
-openssl-linked \
-nomake demos \
[arch-commits] Commit in qt/trunk (PKGBUILD blacklist-diginotar-certs.diff)
Date: Friday, December 16, 2011 @ 21:20:08
Author: andrea
Revision: 145100
upgpkg: qt 4.8.0-1
Upstream release
Modified:
qt/trunk/PKGBUILD
Deleted:
qt/trunk/blacklist-diginotar-certs.diff
+
PKGBUILD | 24 +++---
blacklist-diginotar-certs.diff | 89 ---
2 files changed, 9 insertions(+), 104 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-12-17 01:36:17 UTC (rev 145099)
+++ PKGBUILD2011-12-17 02:20:08 UTC (rev 145100)
@@ -4,8 +4,8 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.4
-pkgrel=3
+pkgver=4.8.0
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -17,14 +17,12 @@
_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-'qtconfig.desktop'
-'blacklist-diginotar-certs.diff')
-md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf'
+'qtconfig.desktop')
+md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'd875a2a7639de3bd63dc519c13b4d069')
+ '6b771c8a81dd90b45e8a79afa0e5bbfd')
build() {
cd "${srcdir}"/${_pkgfqn}
@@ -32,15 +30,10 @@
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
- # FS#24601
- export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+ sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf
+ sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g"
mkspecs/common/gcc-base-unix.conf
+ sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
- patch -p1 -i "${srcdir}"/blacklist-diginotar-certs.diff
-
- sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
- sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
- sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
-
./configure -confirm-license -opensource \
-prefix /usr \
-docdir /usr/share/doc/qt \
@@ -55,6 +48,7 @@
-system-sqlite \
-no-phonon \
-no-phonon-backend \
+-no-webkit \
-no-declarative-debug \
-graphicssystem raster \
-openssl-linked \
Deleted: blacklist-diginotar-certs.diff
===
--- blacklist-diginotar-certs.diff 2011-12-17 01:36:17 UTC (rev 145099)
+++ blacklist-diginotar-certs.diff 2011-12-17 02:20:08 UTC (rev 145100)
@@ -1,89 +0,0 @@
-diff --git a/src/network/ssl/qsslcertificate.cpp
b/src/network/ssl/qsslcertificate.cpp
-index 328c5c2..1ae98f4 100644
a/src/network/ssl/qsslcertificate.cpp
-+++ b/src/network/ssl/qsslcertificate.cpp
-@@ -803,22 +803,47 @@ QList
QSslCertificatePrivate::certificatesFromDer(const QByteAr
- // These certificates are known to be fraudulent and were created during the
comodo
- // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
- static const char *certificate_blacklist[] = {
--"04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
--"f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
--"d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
--"39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
--"3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
--"e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
--"92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
--"b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
--"d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+"04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", //
Comodo
-+"f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", //
Comodo
-+"d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", //
Comodo
-+"39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", //
Comodo
-+"3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", //
Comodo
-+"e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", //
Comodo
-+"92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org",
// Comodo
-+"b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", //
Comodo
-+"d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", //
Comodo
-+
-+"05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", //
leaf certificate issued by DigiNotar
-+"0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA",
// DigiNotar root
-+"f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49", "DigiNotar Services
CA", // DigiNotar intermediate signed by DigiNotar Root
-+"36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar Services
1024 CA", // Di
[arch-commits] Commit in qt/trunk (PKGBUILD qt.install)
Date: Friday, October 21, 2011 @ 15:25:52
Author: andrea
Revision: 141016
upgpkg: qt 4.8.0rc1-1
Modified:
qt/trunk/PKGBUILD
qt/trunk/qt.install
+
PKGBUILD |2 +-
qt.install |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-10-21 18:47:37 UTC (rev 141015)
+++ PKGBUILD2011-10-21 19:25:52 UTC (rev 141016)
@@ -66,7 +66,7 @@
}
package_qt() {
-pkgdesc='A cross-platform application and UI framework (GUI libraries)'
+pkgdesc='A cross-platform application and UI framework'
depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2'
'dbus'
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
Modified: qt.install
===
--- qt.install 2011-10-21 18:47:37 UTC (rev 141015)
+++ qt.install 2011-10-21 19:25:52 UTC (rev 141016)
@@ -1,12 +1,12 @@
post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
post_upgrade() {
- post_install
+post_install
}
post_remove() {
- post_install
+post_install
}
[arch-commits] Commit in qt/trunk (PKGBUILD blacklist-diginotar-certs.diff)
Date: Thursday, October 20, 2011 @ 19:02:24
Author: andrea
Revision: 140993
Prepare 4.8
Modified:
qt/trunk/PKGBUILD
Deleted:
qt/trunk/blacklist-diginotar-certs.diff
+
PKGBUILD | 177 ++-
blacklist-diginotar-certs.diff | 89 ---
2 files changed, 82 insertions(+), 184 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-10-20 22:47:43 UTC (rev 140992)
+++ PKGBUILD2011-10-20 23:02:24 UTC (rev 140993)
@@ -4,138 +4,125 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.4
-pkgrel=3
+pkgver=4.8.0rc1
+_pkgver=4.8.0-rc1
+pkgrel=1
arch=('i686' 'x86_64')
-url='http://qt.nokia.com/'
+url='http://qt-project.org/'
license=('GPL3' 'LGPL')
makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2'
'dbus'
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa'
'postgresql-libs'
'mysql' 'unixodbc' 'cups' 'gtk2')
options=('!libtool')
-_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
-source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
+_pkgfqn="${pkgbase}-everywhere-opensource-src-4.8.0"
+source=("http://get.qt.nokia.com/qt/source/${pkgbase}-everywhere-opensource-src-${_pkgver}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-'qtconfig.desktop'
-'blacklist-diginotar-certs.diff')
-md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf'
+'qtconfig.desktop')
+md5sums=('3e003b671384df8d1cb77dd6cc804934'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'd875a2a7639de3bd63dc519c13b4d069')
+ '6b771c8a81dd90b45e8a79afa0e5bbfd')
build() {
- unset QMAKESPEC
- export QT4DIR=$srcdir/$_pkgfqn
- export PATH=${QT4DIR}/bin:${PATH}
- export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+ cd "${srcdir}"/${_pkgfqn}
-# FS#24601
-export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+ export QT4DIR="${srcdir}"/${_pkgfqn}
+ export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
- cd $srcdir/$_pkgfqn
+ sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf
+ sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g"
mkspecs/common/gcc-base-unix.conf
+ sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
-patch -p1 -i "${srcdir}"/blacklist-diginotar-certs.diff
-
-sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
- sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
- sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
-
- ./configure -confirm-license -opensource \
- -prefix /usr \
- -docdir /usr/share/doc/qt \
- -plugindir /usr/lib/qt/plugins \
- -importdir /usr/lib/qt/imports \
- -datadir /usr/share/qt \
- -translationdir /usr/share/qt/translations \
- -sysconfdir /etc \
- -examplesdir /usr/share/doc/qt/examples \
- -demosdir /usr/share/doc/qt/demos \
- -largefile \
- -plugin-sql-{psql,mysql,sqlite,odbc} \
- -system-sqlite \
- -xmlpatterns \
- -no-phonon \
- -no-phonon-backend \
- -svg \
- -webkit \
- -script \
- -scripttools \
- -system-zlib \
- -system-libtiff \
- -system-libpng \
- -system-libmng \
- -system-libjpeg \
- -nomake demos \
- -nomake examples \
- -nomake docs \
- -no-rpath \
- -openssl-linked \
- -silent \
- -optimized-qmake \
- -dbus \
- -reduce-relocations \
- -no-separate-debug-info \
- -gtkstyle \
- -opengl \
- -no-openvg \
- -glib
- make
+ ./configure -confirm-license -opensource \
+-prefix /usr \
+-docdir /usr/share/doc/qt \
+-plugindir /usr/lib/qt/plugins \
+-importdir /usr/lib/qt/imports \
+-datadir /usr/share/qt \
+-translationdir /usr/share/qt/translations \
+-sysconfdir /etc \
+-examplesdir /usr/share/doc/qt/examples \
+-demosdir /usr/share/doc/qt/demos \
+-plugin-sql-{psql,mysql,sqlite,odbc} \
+-system-sqlite \
+-no-phonon \
+-no-phonon-backend \
+-no-webkit \
+-no-declarative-debug \
+-graphicssystem raster \
+-openssl-linked \
+-nomake demos \
+-nomake examples \
+-nomake docs \
+-silent \
+-no-rpath \
+-optimized-qmake \
+-reduce-relocations \
+-dbus-linked \
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Tuesday, September 13, 2011 @ 06:34:54
Author: andrea
Revision: 137969
upgpkg: qt 4.7.4-3
our checksum was wrong, rebuilt to be sure everything is ok
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-13 09:17:12 UTC (rev 137968)
+++ PKGBUILD2011-09-13 10:34:54 UTC (rev 137969)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.7.4
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
license=('GPL3' 'LGPL')
@@ -19,7 +19,7 @@
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
'blacklist-diginotar-certs.diff')
-md5sums=('ddf7d83f912cf1283aa066368464fa22'
+md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
[arch-commits] Commit in qt/trunk (PKGBUILD blacklist-diginotar-certs.diff)
Date: Wednesday, September 7, 2011 @ 12:41:01
Author: andrea
Revision: 137350
Blacklist DigiNotar certificates
Added:
qt/trunk/blacklist-diginotar-certs.diff
Modified:
qt/trunk/PKGBUILD
+
PKGBUILD | 10 +++-
blacklist-diginotar-certs.diff | 89 +++
2 files changed, 96 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-07 13:58:22 UTC (rev 137349)
+++ PKGBUILD2011-09-07 16:41:01 UTC (rev 137350)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.7.4
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
license=('GPL3' 'LGPL')
@@ -17,12 +17,14 @@
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-'qtconfig.desktop')
+'qtconfig.desktop'
+'blacklist-diginotar-certs.diff')
md5sums=('ddf7d83f912cf1283aa066368464fa22'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd')
+ '6b771c8a81dd90b45e8a79afa0e5bbfd'
+ 'd875a2a7639de3bd63dc519c13b4d069')
build() {
unset QMAKESPEC
@@ -35,6 +37,8 @@
cd $srcdir/$_pkgfqn
+patch -p1 -i "${srcdir}"/blacklist-diginotar-certs.diff
+
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
Added: blacklist-diginotar-certs.diff
===
--- blacklist-diginotar-certs.diff (rev 0)
+++ blacklist-diginotar-certs.diff 2011-09-07 16:41:01 UTC (rev 137350)
@@ -0,0 +1,89 @@
+diff --git a/src/network/ssl/qsslcertificate.cpp
b/src/network/ssl/qsslcertificate.cpp
+index 328c5c2..1ae98f4 100644
+--- a/src/network/ssl/qsslcertificate.cpp
b/src/network/ssl/qsslcertificate.cpp
+@@ -803,22 +803,47 @@ QList
QSslCertificatePrivate::certificatesFromDer(const QByteAr
+ // These certificates are known to be fraudulent and were created during the
comodo
+ // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
+ static const char *certificate_blacklist[] = {
+-"04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
+-"f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
+-"d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
+-"39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
+-"3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
+-"e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
+-"92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
+-"b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
+-"d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
++"04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", //
Comodo
++"f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", //
Comodo
++"d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", //
Comodo
++"39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", //
Comodo
++"3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", //
Comodo
++"e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", //
Comodo
++"92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org",
// Comodo
++"b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", //
Comodo
++"d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", //
Comodo
++
++"05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", //
leaf certificate issued by DigiNotar
++"0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA",
// DigiNotar root
++"f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49", "DigiNotar Services
CA", // DigiNotar intermediate signed by DigiNotar Root
++"36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar Services
1024 CA", // DigiNotar intermediate signed by DigiNotar Root
++"0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e", "DigiNotar Root CA
G2", // other DigiNotar Root CA
++"a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21", "CertiID Enterprise
Certificate Authority", // DigiNotar intermediate signed by "DigiNotar Root CA
G2"
++"5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41", "DigiNotar Qualified
CA", // DigiNotar intermediate signed by DigiNotar Root
++
++"1184640176", "DigiNotar Services
1024 CA", // DigiNotar intermediate cross-signed by Entrust
++"12525", "DigiNotar Cyber CA",
// DigiNotar intermediate cross-signed by CyberTrust
++
[arch-commits] Commit in qt/trunk (PKGBUILD qtbug-16292.patch)
Date: Thursday, September 1, 2011 @ 19:40:36
Author: andrea
Revision: 136830
upgpkg: qt 4.7.4-1
upstream release
Modified:
qt/trunk/PKGBUILD
Deleted:
qt/trunk/qtbug-16292.patch
---+
PKGBUILD | 15
qtbug-16292.patch | 62
2 files changed, 5 insertions(+), 72 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-01 21:49:29 UTC (rev 136829)
+++ PKGBUILD2011-09-01 23:40:36 UTC (rev 136830)
@@ -4,8 +4,8 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.3
-pkgrel=3
+pkgver=4.7.4
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
license=('GPL3' 'LGPL')
@@ -17,14 +17,12 @@
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-'qtconfig.desktop'
-'qtbug-16292.patch')
-md5sums=('49b96eefb1224cc529af6fe5608654fe'
+'qtconfig.desktop')
+md5sums=('ddf7d83f912cf1283aa066368464fa22'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'dc7ed8c2e8c68a175f7f05a34dccc937')
+ '6b771c8a81dd90b45e8a79afa0e5bbfd')
build() {
unset QMAKESPEC
@@ -37,9 +35,6 @@
cd $srcdir/$_pkgfqn
-# Already fixed upstream
-patch -p1 -i "${srcdir}"/qtbug-16292.patch
-
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
Deleted: qtbug-16292.patch
===
--- qtbug-16292.patch 2011-09-01 21:49:29 UTC (rev 136829)
+++ qtbug-16292.patch 2011-09-01 23:40:36 UTC (rev 136830)
@@ -1,62 +0,0 @@
-From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001
-From: Gabriel de Dietrich
-Date: Tue, 15 Feb 2011 11:19:26 +0100
-Subject: [PATCH] Fix crash in KPackageKit
-
-QTreeViewPrivate::itemHeight() may refer to an invalid QModelIndex
-after calling QTreeView::indexRowSizeHint().
-
-Same thing inside QTreeView::indexRowSizeHint(), since
-QHeaderView::count() will call
-QAbstractItemViewPrivate::executePostedLayout() which may invalidate
-all the QModelIndex.
-
-Reviewed-by: Olivier
-Task-number: QTBUG-16292
- src/gui/itemviews/qtreeview.cpp | 11 ++-
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
-index f1f3236..c0573bb 100644
a/src/gui/itemviews/qtreeview.cpp
-+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -2753,6 +2753,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex
&index) const
-
- int start = -1;
- int end = -1;
-+int indexRow = index.row();
- int count = d->header->count();
- bool emptyHeader = (count == 0);
- QModelIndex parent = index.parent();
-@@ -2789,7 +2790,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex
&index) const
- int logicalColumn = emptyHeader ? column :
d->header->logicalIndex(column);
- if (d->header->isSectionHidden(logicalColumn))
- continue;
--QModelIndex idx = d->model->index(index.row(), logicalColumn, parent);
-+QModelIndex idx = d->model->index(indexRow, logicalColumn, parent);
- if (idx.isValid()) {
- QWidget *editor = d->editorForIndex(idx).editor;
- if (editor && d->persistent.contains(editor)) {
-@@ -3224,14 +3225,14 @@ int QTreeViewPrivate::itemHeight(int item) const
- if (viewItems.isEmpty())
- return 0;
- const QModelIndex &index = viewItems.at(item).index;
-+if (!index.isValid())
-+return 0;
- int height = viewItems.at(item).height;
--if (height <= 0 && index.isValid()) {
-+if (height <= 0) {
- height = q_func()->indexRowSizeHint(index);
- viewItems[item].height = height;
- }
--if (!index.isValid() || height < 0)
--return 0;
--return height;
-+return qMax(height, 0);
- }
-
-
---
-1.6.1
-
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Thursday, June 9, 2011 @ 03:23:06
Author: andrea
Revision: 126981
s/CFLAGS/CXXFLAGS
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-09 06:52:47 UTC (rev 126980)
+++ PKGBUILD2011-06-09 07:23:06 UTC (rev 126981)
@@ -33,7 +33,7 @@
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
# FS#24601
-export CFLAGS="$CFLAGS -fno-strict-aliasing"
+export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
cd $srcdir/$_pkgfqn
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Thursday, June 9, 2011 @ 02:52:13
Author: andrea
Revision: 126976
upgpkg: qt 4.7.3-3
build with -fno-strict-aliasing
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-09 06:46:27 UTC (rev 126975)
+++ PKGBUILD2011-06-09 06:52:13 UTC (rev 126976)
@@ -13,7 +13,7 @@
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa'
'postgresql-libs'
'mysql' 'unixodbc' 'cups' 'gtk2')
-options=('!libtool' '!buildflags')
+options=('!libtool')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
@@ -32,6 +32,9 @@
export PATH=${QT4DIR}/bin:${PATH}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+# FS#24601
+export CFLAGS="$CFLAGS -fno-strict-aliasing"
+
cd $srcdir/$_pkgfqn
# Already fixed upstream
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Wednesday, June 8, 2011 @ 18:14:27
Author: andrea
Revision: 126957
rebuild with \!buildflags to fix a segmentation fault in qmlviewer (FS#24601)
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-08 20:11:24 UTC (rev 126956)
+++ PKGBUILD2011-06-08 22:14:27 UTC (rev 126957)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.7.3
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
license=('GPL3' 'LGPL')
@@ -13,7 +13,7 @@
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa'
'postgresql-libs'
'mysql' 'unixodbc' 'cups' 'gtk2')
-options=('!libtool')
+options=('!libtool' '!buildflags')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Wednesday, June 8, 2011 @ 09:27:38
Author: andrea
Revision: 126874
remove headers not needed; move headers in /usr/src and symlink them in
/usr/include
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD | 101 +
1 file changed, 9 insertions(+), 92 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-08 13:07:37 UTC (rev 126873)
+++ PKGBUILD2011-06-08 13:27:38 UTC (rev 126874)
@@ -125,98 +125,15 @@
pkgdesc="Qt private headers for development"
depends=("qt=${pkgver}")
-install -d ${pkgdir}/usr/include/phonon/private
-cd ${srcdir}/$_pkgfqn/src/3rdparty/phonon/phonon/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/phonon/private/ \; &> /dev/null
+install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
+install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script}
-install -d ${pkgdir}/usr/include/Qt3Support/private
-cd ${srcdir}/$_pkgfqn/src/qt3support/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/Qt3Support/private/ \; &> /dev/null
+for i in QtCore QtDeclarative QtGui QtScript; do
+ cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \
+${pkgdir}/usr/include/${i}/
+done
-install -d ${pkgdir}/usr/include/QtCore/private
-cd ${srcdir}/$_pkgfqn/src/corelib/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtCore/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtDBus/private
-cd ${srcdir}/$_pkgfqn/src/dbus/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtDBus/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtDeclarative/private
-cd ${srcdir}/$_pkgfqn/src/declarative/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtDeclarative/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtDesigner/private
-cd ${srcdir}/$_pkgfqn/tools/designer/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtDesigner/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtGui/private
-cd ${srcdir}/$_pkgfqn/src/gui/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtGui/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtHelp/private
-cd ${srcdir}/$_pkgfqn/tools/assistant/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtHelp/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtMultimedia/private
-cd ${srcdir}/$_pkgfqn/src/multimedia/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtMultimedia/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtNetwork/private
-cd ${srcdir}/$_pkgfqn/src/network/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtNetwork/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtOpenGL/private
-cd ${srcdir}/$_pkgfqn/src/opengl/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtOpenGL/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtScript/private
-cd ${srcdir}/$_pkgfqn/src/script/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtScript/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtScriptTools/private
-cd ${srcdir}/$_pkgfqn/src/scripttools/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtScriptTools/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtSql/private
-cd ${srcdir}/$_pkgfqn/src/sql/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtSql/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtSvg/private
-cd ${srcdir}/$_pkgfqn/src/svg/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtSvg/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtTest/private
-cd ${srcdir}/$_pkgfqn/src/testlib/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtTest/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtUiTools/private
-cd ${srcdir}/$_pkgfqn/tools/designer/src/uitools
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtUiTools/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtWebKit/private
-cd ${srcdir}/$_pkgfqn/src/3rdparty/webkit
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtWebKit/private/ \; &> /dev/null
-
-install -d ${pkgdir}/usr/include/QtXmlPatterns/private
-cd ${srcdir}/$_pkgfqn/src/xmlpatterns/
-find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtXmlPatterns/private/ \;
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Wednesday, March 23, 2011 @ 13:59:09
Author: andrea
Revision: 116416
split private headers in a new package
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD | 133 +
1 file changed, 116 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-03-23 16:35:30 UTC (rev 116415)
+++ PKGBUILD2011-03-23 17:59:09 UTC (rev 116416)
@@ -2,24 +2,17 @@
# Maintainer: Andrea Scarpino
# Contributor: Pierre Schmitz
-pkgname=qt
+pkgbase=qt
+pkgname=('qt' 'qt-private-headers')
pkgver=4.7.2
-pkgrel=4
-pkgdesc='A cross-platform application and UI framework'
+pkgrel=5
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
license=('GPL3' 'LGPL')
-depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
+makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2'
'dbus'
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
-optdepends=('postgresql-libs: PostgreSQL driver'
- 'libmysqlclient: MySQL driver'
- 'unixodbc: ODBC driver'
- 'libxinerama: Xinerama support'
- 'libxcursor: Xcursor support'
- 'libxfixes: Xfixes support')
-makedepends=('mesa' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2')
-install="${pkgname}.install"
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa'
'postgresql-libs'
+'mysql' 'unixodbc' 'cups' 'gtk2')
options=('!libtool')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
@@ -85,8 +78,20 @@
make
}
-package() {
- cd $srcdir/$_pkgfqn
+package_qt() {
+pkgdesc='A cross-platform application and UI framework'
+depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2'
'dbus'
+ 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+ 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
+optdepends=('postgresql-libs: PostgreSQL driver'
+ 'libmysqlclient: MySQL driver'
+ 'unixodbc: ODBC driver'
+ 'libxinerama: Xinerama support'
+ 'libxcursor: Xcursor support'
+ 'libxfixes: Xfixes support')
+install='qt.install'
+
+cd $srcdir/$_pkgfqn
make INSTALL_ROOT=$pkgdir install
# install missing icons and desktop files
@@ -109,10 +114,104 @@
# 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 QtDeclarative private headers needed by QtCreator (FS#23263)
+package_qt-private-headers(){
+pkgdesc="Qt private headers for development"
+depends=("qt=${pkgver}")
+
+install -d ${pkgdir}/usr/include/phonon/private
+cd ${srcdir}/$_pkgfqn/src/3rdparty/phonon/phonon/
+find . -name "*_p.h" -exec install -m644 {} \
+ ${pkgdir}/usr/include/phonon/private/ \; &> /dev/null
+
+install -d ${pkgdir}/usr/include/Qt3Support/private
+cd ${srcdir}/$_pkgfqn/src/qt3support/
+find . -name "*_p.h" -exec install -m644 {} \
+ ${pkgdir}/usr/include/Qt3Support/private/ \; &> /dev/null
+
+install -d ${pkgdir}/usr/include/QtCore/private
+cd ${srcdir}/$_pkgfqn/src/corelib/
+find . -name "*_p.h" -exec install -m644 {} \
+ ${pkgdir}/usr/include/QtCore/private/ \; &> /dev/null
+
+install -d ${pkgdir}/usr/include/QtDBus/private
+cd ${srcdir}/$_pkgfqn/src/dbus/
+find . -name "*_p.h" -exec install -m644 {} \
+ ${pkgdir}/usr/include/QtDBus/private/ \; &> /dev/null
+
install -d ${pkgdir}/usr/include/QtDeclarative/private
cd ${srcdir}/$_pkgfqn/src/declarative/
-find . -name *_p.h -exec install -m644 {} \
+find . -name "*_p.h" -exec install -m644 {} \
${pkgdir}/usr/include/QtDeclarative/private/ \; &> /dev/null
+
+install -d ${pkgdir}/usr/include/QtDesigner/private
+cd ${srcdir}/$_pkgfqn/tools/designer/
+find . -name "*_p.h" -exec install -m644 {} \
+ ${pkgdir}/usr/include/QtDesigner/private/ \; &> /dev/null
+
+install -d ${pkgdir}/usr/include/QtGui/private
+cd ${srcdir}/$_pkgfqn/src/gui/
+find . -name "*_p.h" -exec install -m644 {} \
+ ${pkgdir}/usr/include/QtGui/private/ \; &> /dev/null
+
+install -d ${pkgdir}/usr/include/QtHelp/private
+cd ${srcdir}/$_pkgfqn/tools/assistant/
+find . -name "*_p.h" -exec install -m644 {} \
+ ${pkgdir}/usr/include/QtHelp/private/ \; &> /dev/null
+
+install -d ${pkgdir}/usr/include/QtMultimedia/private
+cd ${srcdir}/$_pkgfqn/src/multimedia/
+find . -name "*_p.h" -exec install -m644 {} \
+ ${pkgdir}/usr/include/QtMultimedia/private/ \; &> /dev/null
+
+install -d ${pkgdir}/usr/include/QtNetwork/private
+cd ${srcdir}/$_pkgfqn/src/network/
+find . -name "*_p.h" -
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Tuesday, March 22, 2011 @ 19:12:19
Author: remy
Revision: 116367
Don't mix private headers with public ones.
Private headers are expected in a private/ subdirectory.
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-03-22 23:10:57 UTC (rev 116366)
+++ PKGBUILD2011-03-22 23:12:19 UTC (rev 116367)
@@ -4,7 +4,7 @@
pkgname=qt
pkgver=4.7.2
-pkgrel=3
+pkgrel=4
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
@@ -111,11 +111,8 @@
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS
=\).*/\1/' {} \;
# Install QtDeclarative private headers needed by QtCreator (FS#23263)
-install -d ${pkgdir}/usr/include/QtDeclarative
+install -d ${pkgdir}/usr/include/QtDeclarative/private
cd ${srcdir}/$_pkgfqn/src/declarative/
find . -name *_p.h -exec install -m644 {} \
- ${pkgdir}/usr/include/QtDeclarative/ \; &> /dev/null
-cd ${pkgdir}/usr/include/QtDeclarative/
-sed -i 's|#include /dev/null
}
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Thursday, March 17, 2011 @ 08:45:02
Author: andrea
Revision: 115256
upgpkg: qt 4.7.2-3
mysql rebuild
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-03-17 12:38:41 UTC (rev 115255)
+++ PKGBUILD2011-03-17 12:45:02 UTC (rev 115256)
@@ -4,7 +4,7 @@
pkgname=qt
pkgver=4.7.2
-pkgrel=1
+pkgrel=3
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
@@ -109,4 +109,13 @@
# 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 QtDeclarative private headers needed by QtCreator (FS#23263)
+install -d ${pkgdir}/usr/include/QtDeclarative
+cd ${srcdir}/$_pkgfqn/src/declarative/
+find . -name *_p.h -exec install -m644 {} \
+ ${pkgdir}/usr/include/QtDeclarative/ \; &> /dev/null
+cd ${pkgdir}/usr/include/QtDeclarative/
+sed -i 's|#include
[arch-commits] Commit in qt/trunk (PKGBUILD qt.install)
Date: Friday, February 18, 2011 @ 02:47:11
Author: andrea
Revision: 110247
build cache database of MIME types after installation (FS#22936)
Modified:
qt/trunk/PKGBUILD
qt/trunk/qt.install
+
PKGBUILD |2 +-
qt.install |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-18 07:45:20 UTC (rev 110246)
+++ PKGBUILD2011-02-18 07:47:11 UTC (rev 110247)
@@ -11,7 +11,7 @@
license=('GPL3' 'LGPL')
depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-'xdg-utils' 'hicolor-icon-theme')
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmysqlclient: MySQL driver'
'unixodbc: ODBC driver'
Modified: qt.install
===
--- qt.install 2011-02-18 07:45:20 UTC (rev 110246)
+++ qt.install 2011-02-18 07:47:11 UTC (rev 110247)
@@ -1,5 +1,6 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+update-desktop-database -q
}
post_upgrade() {
[arch-commits] Commit in qt/trunk (PKGBUILD add-postgresql9.patch)
Date: Thursday, December 23, 2010 @ 05:04:34
Author: andrea
Revision: 103789
upgpkg: qt 4.7.1-3
Add support to PostgreSQL 9
Added:
qt/trunk/add-postgresql9.patch
Modified:
qt/trunk/PKGBUILD
---+
PKGBUILD |9 +-
add-postgresql9.patch | 215
2 files changed, 221 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-12-23 03:09:23 UTC (rev 103788)
+++ PKGBUILD2010-12-23 10:04:34 UTC (rev 103789)
@@ -4,7 +4,7 @@
pkgname=qt
pkgver=4.7.1
-pkgrel=2
+pkgrel=3
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
@@ -25,13 +25,15 @@
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
-'fix-qtbug-15857.patch')
+'fix-qtbug-15857.patch'
+'add-postgresql9.patch')
md5sums=('6f88d96507c84e9fea5bf3a71ebeb6d7'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'c359d7b8c3a7fdd99512feaab8c2e26b')
+ 'c359d7b8c3a7fdd99512feaab8c2e26b'
+ 'ae3bb58e7b63786d420905baf083fcd2')
build() {
unset QMAKESPEC
@@ -43,6 +45,7 @@
# Already fixed upstream
patch -Np1 -i ${srcdir}/fix-qtbug-15857.patch
+patch -Np1 -i ${srcdir}/add-postgresql9.patch
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
Added: add-postgresql9.patch
===
--- add-postgresql9.patch (rev 0)
+++ add-postgresql9.patch 2010-12-23 10:04:34 UTC (rev 103789)
@@ -0,0 +1,215 @@
+From 03f94089a16cf6b6a3b533ba1f90444eb18c29ab Mon Sep 17 00:00:00 2001
+From: Charles Yin
+Date: Thu, 4 Nov 2010 15:38:57 +1000
+Subject: [PATCH] Add Postgresql 8.x and 9 supports
+
+Change-Id: Ic740686ead768cc3e106703049d878549dfd3c6a
+Task-number:QTBUG-14206
+Reviewed-by: Michael Goddard
+---
+ src/sql/drivers/psql/qsql_psql.cpp | 116 +-
+ src/sql/drivers/psql/qsql_psql.h|6 ++-
+ tests/auto/qsqldatabase/tst_databases.h |2 +
+ 3 files changed, 88 insertions(+), 36 deletions(-)
+
+diff --git a/src/sql/drivers/psql/qsql_psql.cpp
b/src/sql/drivers/psql/qsql_psql.cpp
+index 2a4e595..bf9685f 100644
+--- a/src/sql/drivers/psql/qsql_psql.cpp
b/src/sql/drivers/psql/qsql_psql.cpp
+@@ -54,7 +54,6 @@
+ #include
+ #include
+
+-
+ #include
+ #include
+
+@@ -619,6 +618,50 @@ static void setDatestyle(PGconn* connection)
+ PQclear(result);
+ }
+
++static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin)
++{
++switch (vMaj) {
++case 6:
++return QPSQLDriver::Version6;
++case 7:
++{
++switch (vMin) {
++case 1:
++return QPSQLDriver::Version71;
++case 3:
++return QPSQLDriver::Version73;
++case 4:
++return QPSQLDriver::Version74;
++default:
++return QPSQLDriver::Version7;
++}
++break;
++}
++case 8:
++{
++switch (vMin) {
++case 1:
++return QPSQLDriver::Version81;
++case 2:
++return QPSQLDriver::Version82;
++case 3:
++return QPSQLDriver::Version83;
++case 4:
++return QPSQLDriver::Version84;
++default:
++return QPSQLDriver::Version8;
++}
++break;
++}
++case 9:
++return QPSQLDriver::Version9;
++break;
++default:
++break;
++}
++return QPSQLDriver::VersionUnknown;
++}
++
+ static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection)
+ {
+ QPSQLDriver::Protocol serverVersion = QPSQLDriver::Version6;
+@@ -626,50 +669,44 @@ static QPSQLDriver::Protocol getPSQLVersion(PGconn*
connection)
+ int status = PQresultStatus(result);
+ if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK) {
+ QString val = QString::fromAscii(PQgetvalue(result, 0, 0));
++
+ QRegExp rx(QLatin1String("(\\d+)\\.(\\d+)"));
+ rx.setMinimal(true); // enforce non-greedy RegExp
++
+ if (rx.indexIn(val) != -1) {
+ int vMaj = rx.cap(1).toInt();
+ int vMin = rx.cap(2).toInt();
+-
+-switch (vMaj) {
+-case 7:
+-switch (vMin) {
+-case 0:
+-serverVersion = QPSQLDriver::Version7;
+-break;
+-case 1:
+-case 2:
+-serverVersion = QPSQLDriver::Version71;
+-break;
+-default:
+-serverVersion = QP
[arch-commits] Commit in qt/trunk (PKGBUILD fix-qtbug-15857.patch)
Date: Wednesday, December 8, 2010 @ 17:39:02
Author: andrea
Revision: 102628
upgpkg: qt 4.7.1-2
fix crash when an entire block of text is removed (FS#22025)
Added:
qt/trunk/fix-qtbug-15857.patch
Modified:
qt/trunk/PKGBUILD
---+
PKGBUILD | 11 ---
fix-qtbug-15857.patch | 32
2 files changed, 40 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-12-08 18:28:23 UTC (rev 102627)
+++ PKGBUILD2010-12-08 22:39:02 UTC (rev 102628)
@@ -4,7 +4,7 @@
pkgname=qt
pkgver=4.7.1
-pkgrel=1
+pkgrel=2
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
@@ -24,12 +24,14 @@
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-'qtconfig.desktop')
+'qtconfig.desktop'
+'fix-qtbug-15857.patch')
md5sums=('6f88d96507c84e9fea5bf3a71ebeb6d7'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd')
+ '6b771c8a81dd90b45e8a79afa0e5bbfd'
+ 'c359d7b8c3a7fdd99512feaab8c2e26b')
build() {
unset QMAKESPEC
@@ -39,6 +41,9 @@
cd $srcdir/$_pkgfqn
+# Already fixed upstream
+patch -Np1 -i ${srcdir}/fix-qtbug-15857.patch
+
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
Added: fix-qtbug-15857.patch
===
--- fix-qtbug-15857.patch (rev 0)
+++ fix-qtbug-15857.patch 2010-12-08 22:39:02 UTC (rev 102628)
@@ -0,0 +1,32 @@
+From 6ae84f1183e91c910ca92a55e37f8254ace805c0 Mon Sep 17 00:00:00 2001
+From: Jiang Jiang
+Date: Mon, 6 Dec 2010 13:07:36 +0100
+Subject: [PATCH] Fix QTextEdit::selectAll crash from textChanged()
+
+Doing selectAll() after the entire block of text has been removed
+will cause this crash, because we didn't check if the block we
+found is valid or not.
+
+Task-number: QTBUG-15857
+Reviewed-by: Eskil
+---
+ src/gui/text/qtextcursor.cpp |3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
+index 769ab2f..f73cc4b 100644
+--- a/src/gui/text/qtextcursor.cpp
b/src/gui/text/qtextcursor.cpp
+@@ -363,6 +363,9 @@ bool
QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor
+ bool adjustX = true;
+ QTextBlock blockIt = block();
+
++if (!blockIt.isValid())
++return false;
++
+ if (op >= QTextCursor::Left && op <= QTextCursor::WordRight
+ && blockIt.textDirection() == Qt::RightToLeft) {
+ if (op == QTextCursor::Left)
+--
+1.6.1
+
[arch-commits] Commit in qt/trunk (PKGBUILD fix-multisampling-with-ati-card.patch)
Date: Sunday, October 10, 2010 @ 10:30:15
Author: andrea
Revision: 94734
fix multisampling with ATI card (FS#20930); set doc,example and demos dir (this
fix FS#21164)
Added:
qt/trunk/fix-multisampling-with-ati-card.patch
Modified:
qt/trunk/PKGBUILD
---+
PKGBUILD | 12 +---
fix-multisampling-with-ati-card.patch | 25 +
2 files changed, 34 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-10-10 14:05:37 UTC (rev 94733)
+++ PKGBUILD2010-10-10 14:30:15 UTC (rev 94734)
@@ -4,7 +4,7 @@
pkgname=qt
pkgver=4.7.0
-pkgrel=3
+pkgrel=4
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
@@ -24,13 +24,15 @@
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
- 'fix-scroll-when-last-item-is-removed.patch')
+'fix-scroll-when-last-item-is-removed.patch'
+'fix-multisampling-with-ati-card.patch')
md5sums=('3a2f25b9b115037277f4fb759194a7a5'
'a445c6917086d80f1cfc1e40cb6b0132'
'd457f0a0ad68a3861c3cadefe3b42ded'
'668331d9798a0e2b94381efb7be4c513'
'c29f2993d6a0f73d756d2fa36e130e1c'
- 'ef20c34afc5be5ed62f2935be66d9402')
+ 'ef20c34afc5be5ed62f2935be66d9402'
+ 'b2e0f134bbb848ebef41134a45a36ee9')
build() {
unset QMAKESPEC
@@ -42,6 +44,7 @@
# Already fixed in 4.7.1
patch -Np1 -i ${srcdir}/fix-scroll-when-last-item-is-removed.patch
+ patch -Np1 -i ${srcdir}/fix-multisampling-with-ati-card.patch
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
@@ -49,11 +52,14 @@
./configure -confirm-license -opensource \
-prefix /usr \
+ -docdir /usr/share/doc/qt \
-plugindir /usr/lib/qt/plugins \
-importdir /usr/lib/qt/imports \
-datadir /usr/share/qt \
-translationdir /usr/share/qt/translations \
-sysconfdir /etc \
+ -examplesdir /usr/share/doc/qt/examples \
+ -demosdir /usr/share/doc/qt/demos \
-largefile \
-plugin-sql-{psql,mysql,sqlite,odbc} \
-system-sqlite \
Added: fix-multisampling-with-ati-card.patch
===
--- fix-multisampling-with-ati-card.patch (rev 0)
+++ fix-multisampling-with-ati-card.patch 2010-10-10 14:30:15 UTC (rev
94734)
@@ -0,0 +1,25 @@
+From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001
+From: Jonathan Liu
+Date: Wed, 25 Aug 2010 14:07:40 +1000
+Subject: [PATCH] Fix OpenGL multisampling for some graphics drivers
+
+---
+ src/opengl/qgl_win.cpp |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp
+index 5ab944a..8eb6177 100644
+--- a/src/opengl/qgl_win.cpp
b/src/opengl/qgl_win.cpp
+@@ -1042,7 +1042,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC
pdc)
+ iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB;
+ iAttributes[i++] = TRUE;
+ iAttributes[i++] = WGL_COLOR_BITS_ARB;
+-iAttributes[i++] = 32;
++iAttributes[i++] = 24;
+ iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB;
+ iAttributes[i++] = d->glFormat.doubleBuffer();
+ if (d->glFormat.stereo()) {
+--
+1.7.2.1
+
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Friday, October 8, 2010 @ 08:09:22
Author: andrea
Revision: 94567
sort configure options; fix path to install imports for QML (FS#21018); add
libxv to dependecies to add Xvideo support (FS#21056); cleanup dependencies and
makedependencies
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD | 29 +
1 file changed, 17 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-10-08 11:55:27 UTC (rev 94566)
+++ PKGBUILD2010-10-08 12:09:22 UTC (rev 94567)
@@ -4,15 +4,21 @@
pkgname=qt
pkgver=4.7.0
-pkgrel=2
+pkgrel=3
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
license=('GPL3' 'LGPL')
-depends=('libpng' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'xdg-utils'
'ca-certificates'
- 'hicolor-icon-theme' 'alsa-lib' 'glib2' 'dbus' 'libxrender' 'libgl'
'libsm')
-optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
-makedepends=('mesa' 'inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups'
'libxfixes' 'gtk2')
+depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
+ 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+ 'xdg-utils' 'hicolor-icon-theme')
+optdepends=('postgresql-libs: PostgreSQL driver'
+ 'libmysqlclient: MySQL driver'
+ 'unixodbc: ODBC driver'
+ 'libxinerama: Xinerama support'
+ 'libxcursor: Xcursor support'
+ 'libxfixes: Xfixes support')
+makedepends=('mesa' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2')
install="${pkgname}.install"
options=('!libtool')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
@@ -43,13 +49,11 @@
./configure -confirm-license -opensource \
-prefix /usr \
- -sysconfdir /etc \
-plugindir /usr/lib/qt/plugins \
+ -importdir /usr/lib/qt/imports \
+ -datadir /usr/share/qt \
-translationdir /usr/share/qt/translations \
- -datadir /usr/share/qt \
- -docdir /usr/share/doc/qt \
- -examplesdir /usr/share/doc/qt/examples \
- -demosdir /usr/share/doc/qt/demos \
+ -sysconfdir /etc \
-largefile \
-plugin-sql-{psql,mysql,sqlite,odbc} \
-system-sqlite \
@@ -58,22 +62,23 @@
-no-phonon-backend \
-svg \
-webkit \
+ -script \
-scripttools \
-system-zlib \
-system-libtiff \
-system-libpng \
-system-libmng \
-system-libjpeg \
- -openssl-linked \
-nomake demos \
-nomake examples \
-nomake docs \
-no-rpath \
+ -openssl-linked \
-silent \
-optimized-qmake \
-dbus \
+ -reduce-relocations \
-no-separate-debug-info \
- -reduce-relocations \
-gtkstyle \
-opengl \
-no-openvg \
[arch-commits] Commit in qt/trunk (PKGBUILD ca-certificates.patch)
Date: Thursday, September 23, 2010 @ 13:56:29
Author: andrea
Revision: 91174
upgpkg: qt 4.7.0-1
upstream release
Modified:
qt/trunk/PKGBUILD
Deleted:
qt/trunk/ca-certificates.patch
---+
PKGBUILD | 19 +++
ca-certificates.patch | 25 -
2 files changed, 7 insertions(+), 37 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-09-23 17:52:22 UTC (rev 91173)
+++ PKGBUILD2010-09-23 17:56:29 UTC (rev 91174)
@@ -1,8 +1,9 @@
# $Id$
-# Maintainer: Pierre Schmitz
+# Maintainer: Andrea Scarpino
+# Contributor: Pierre Schmitz
pkgname=qt
-pkgver=4.6.3
+pkgver=4.7.0
pkgrel=1
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
@@ -12,18 +13,16 @@
'hicolor-icon-theme' 'alsa-lib' 'glib2' 'dbus' 'libxrender' 'libgl'
'libsm')
optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
makedepends=('mesa' 'inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups'
'libxfixes' 'gtk2')
-install=qt.install
+install="${pkgname}.install"
options=('!libtool')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
-'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
-'ca-certificates.patch')
-md5sums=('5c69f16d452b0bb3d44bc3c10556c072'
+'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop')
+md5sums=('3a2f25b9b115037277f4fb759194a7a5'
'a445c6917086d80f1cfc1e40cb6b0132'
'd457f0a0ad68a3861c3cadefe3b42ded'
'668331d9798a0e2b94381efb7be4c513'
- 'c29f2993d6a0f73d756d2fa36e130e1c'
- 'd5c4cad7af93f1d736d4569a207bd739')
+ 'c29f2993d6a0f73d756d2fa36e130e1c')
build() {
unset QMAKESPEC
@@ -33,10 +32,6 @@
cd $srcdir/$_pkgfqn
- # see http://cvs.fedoraproject.org/viewvc/rpms/qt/devel/
- # use system ssl cert bundle
- patch -p1 -i $srcdir/ca-certificates.patch || return 1
-
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
Deleted: ca-certificates.patch
===
--- ca-certificates.patch 2010-09-23 17:52:22 UTC (rev 91173)
+++ ca-certificates.patch 2010-09-23 17:56:29 UTC (rev 91174)
@@ -1,25 +0,0 @@
-diff -up
qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates
qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates
2009-09-29 06:01:38.0 -0500
-+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
2009-10-02 11:20:10.674662746 -0500
-@@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
-
- QList QSslSocketPrivate::systemCaCertificates()
- {
-+
-+QFile caBundle;
-+
-+#ifdef Q_OS_UNIX
-+// Check known locations for the system's default bundle. ### On Windows,
-+// we should use CAPI to find the bundle, and not rely on default unix
-+// locations.
-+caBundle.setFileName(QLatin1String("/etc/ssl/certs/ca-certificates.crt"));
-+if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
-+ return QSslCertificate::fromDevice(&caBundle);
-+#endif
-+
- // Qt provides a default bundle of certificates
--QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
-+
caBundle.setFileName(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
- if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
- return QSslCertificate::fromDevice(&caBundle);
-
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Tuesday, June 8, 2010 @ 07:58:32
Author: pierre
Revision: 82062
upgpkg: qt 4.6.3-1
upstream update
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-06-08 10:05:35 UTC (rev 82061)
+++ PKGBUILD2010-06-08 11:58:32 UTC (rev 82062)
@@ -2,8 +2,8 @@
# Maintainer: Pierre Schmitz
pkgname=qt
-pkgver=4.6.2
-pkgrel=4
+pkgver=4.6.3
+pkgrel=1
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
@@ -18,7 +18,7 @@
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
'ca-certificates.patch')
-md5sums=('eb651ee4b157c01696aa56777fc6e0e5'
+md5sums=('5c69f16d452b0bb3d44bc3c10556c072'
'a445c6917086d80f1cfc1e40cb6b0132'
'd457f0a0ad68a3861c3cadefe3b42ded'
'668331d9798a0e2b94381efb7be4c513'
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Friday, April 23, 2010 @ 16:26:35
Author: pierre
Revision: 78445
don't use versiond deps; damnit
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-04-23 19:57:45 UTC (rev 78444)
+++ PKGBUILD2010-04-23 20:26:35 UTC (rev 78445)
@@ -11,7 +11,7 @@
depends=('libpng' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'xdg-utils'
'ca-certificates'
'hicolor-icon-theme' 'alsa-lib' 'glib2' 'dbus' 'libxrender' 'libgl'
'libsm')
optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
-makedepends=('mesa' 'inputproto' 'postgresql-libs' 'mysql' 'unixodbc>=2.3.0'
'cups' 'libxfixes' 'gtk2')
+makedepends=('mesa' 'inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups'
'libxfixes' 'gtk2')
install=qt.install
options=('!libtool')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Friday, April 23, 2010 @ 15:23:07
Author: andyrtr
Revision: 78432
upgpkg: qt 4.6.2-4
rebuild to make sure it builds and works with new unixodbc, #19163
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-04-23 18:52:55 UTC (rev 78431)
+++ PKGBUILD2010-04-23 19:23:07 UTC (rev 78432)
@@ -3,7 +3,7 @@
pkgname=qt
pkgver=4.6.2
-pkgrel=3
+pkgrel=4
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
@@ -11,7 +11,7 @@
depends=('libpng' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'xdg-utils'
'ca-certificates'
'hicolor-icon-theme' 'alsa-lib' 'glib2' 'dbus' 'libxrender' 'libgl'
'libsm')
optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
-makedepends=('mesa' 'inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups'
'libxfixes' 'gtk2')
+makedepends=('mesa' 'inputproto' 'postgresql-libs' 'mysql' 'unixodbc>=2.3.0'
'cups' 'libxfixes' 'gtk2')
install=qt.install
options=('!libtool')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Thursday, April 1, 2010 @ 04:54:50
Author: pierre
Revision: 75292
upgpkg: qt 4.6.2-3
openssl/heimdal rebuild
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 08:21:42 UTC (rev 75291)
+++ PKGBUILD2010-04-01 08:54:50 UTC (rev 75292)
@@ -3,7 +3,7 @@
pkgname=qt
pkgver=4.6.2
-pkgrel=2
+pkgrel=3
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Tuesday, March 23, 2010 @ 18:22:59
Author: pierre
Revision: 73195
upgpkg: qt 4.6.2-2
remove *.debug files
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-03-23 20:34:11 UTC (rev 73194)
+++ PKGBUILD2010-03-23 22:22:59 UTC (rev 73195)
@@ -3,7 +3,7 @@
pkgname=qt
pkgver=4.6.2
-pkgrel=1
+pkgrel=2
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Monday, March 22, 2010 @ 17:12:19 Author: pierre Revision: 73124 remove seperate debugging symbols which should effectivly disable debug at all Modified: qt/trunk/PKGBUILD --+ PKGBUILD |1 + 1 file changed, 1 insertion(+) Modified: PKGBUILD === --- PKGBUILD2010-03-22 20:38:11 UTC (rev 73123) +++ PKGBUILD2010-03-22 21:12:19 UTC (rev 73124) @@ -72,6 +72,7 @@ -silent \ -optimized-qmake \ -dbus \ + -no-separate-debug-info \ -reduce-relocations \ -gtkstyle \ -opengl \
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Monday, February 15, 2010 @ 11:55:32
Author: pierre
Revision: 68967
upstream update
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-02-15 15:41:30 UTC (rev 68966)
+++ PKGBUILD2010-02-15 16:55:32 UTC (rev 68967)
@@ -2,7 +2,7 @@
# Maintainer: Pierre Schmitz
pkgname=qt
-pkgver=4.6.1
+pkgver=4.6.2
pkgrel=1
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
'ca-certificates.patch')
-md5sums=('0542a4be6425451ab5f668c6899cac36'
+md5sums=('eb651ee4b157c01696aa56777fc6e0e5'
'a445c6917086d80f1cfc1e40cb6b0132'
'd457f0a0ad68a3861c3cadefe3b42ded'
'668331d9798a0e2b94381efb7be4c513'
[arch-commits] Commit in qt/trunk (PKGBUILD qt-png14.patch)
Date: Saturday, January 16, 2010 @ 17:27:15
Author: jgc
Revision: 63288
upgpkg: qt 4.5.3-4
Rebuild for libjpeg8 and libpng14
Added:
qt/trunk/qt-png14.patch
Modified:
qt/trunk/PKGBUILD
+
PKGBUILD | 10 +++---
qt-png14.patch | 33 +
2 files changed, 40 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 22:13:25 UTC (rev 63287)
+++ PKGBUILD2010-01-16 22:27:15 UTC (rev 63288)
@@ -3,17 +3,17 @@
pkgname=qt
pkgver=4.5.3
-pkgrel=3
+pkgrel=4
_kdeqtver=063bded33b417cdf92fd51366fc7fdb06dea00ba
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://www.qtsoftware.com/'
license=('GPL3' 'LGPL')
-depends=('libpng' 'mesa' 'fontconfig' 'libtiff>=3.8.2-5' 'libmng>=1.0.10-2'
'sqlite3' 'xdg-utils' 'hicolor-icon-theme'
+depends=('libpng>=1.4.0' 'mesa' 'fontconfig>=2.8.0' 'libtiff>=3.9.2-2'
'libmng>=1.0.10-2' 'sqlite3' 'xdg-utils' 'hicolor-icon-theme'
'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama'
'libxrender' 'gstreamer0.10-base-plugins'
'ca-certificates')
optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
-makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups'
'libxfixes' 'gtk2')
+makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'libxfixes'
'gtk2' 'cups')
install=qt.install
provides=("qt4=${pkgver}" 'phonon')
replaces=('qt4' 'phonon')
@@ -22,11 +22,13 @@
_pkgfqn="qt-x11-opensource-src-${pkgver}"
source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.gz";
"ftp://ftp.archlinux.org/other/kde-qt/kde-qt-${_kdeqtver}.patch.gz";
+qt-png14.patch
'gstreamer-logo.png'
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
'qdoc3.patch' 'phonon.patch' 'ca-certificates.patch')
md5sums=('3988cf9af68be2df8a8000ede231de9b'
'a8b984c95ea658116a7b4f632ae93596'
+ '15faef8356cf5545d7e8300e5dd186f2'
'f0c26f76acf8b6a3297cfb31f872b0b7'
'a445c6917086d80f1cfc1e40cb6b0132'
'd457f0a0ad68a3861c3cadefe3b42ded'
@@ -65,6 +67,8 @@
# use system ssl cert bundle
patch -p1 -i $srcdir/ca-certificates.patch || return 1
+ patch -p0 -i ${srcdir}/qt-png14.patch || return 1
+
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
Added: qt-png14.patch
===
--- qt-png14.patch (rev 0)
+++ qt-png14.patch 2010-01-16 22:27:15 UTC (rev 63288)
@@ -0,0 +1,33 @@
+--- src/gui/image/qpnghandler.cpp.orig 2010-01-16 20:58:18.0 +0100
src/gui/image/qpnghandler.cpp 2010-01-16 21:00:10.0 +0100
+@@ -205,7 +205,7 @@
+ image.setColor(i, qRgba(c,c,c,0xff));
+ }
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+-const int g = info_ptr->trans_values.gray;
++const int g = info_ptr->trans_color.gray;
+ if (g < ncols) {
+ image.setColor(g, 0);
+ }
+@@ -234,7 +234,7 @@
+ info_ptr->palette[i].red,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].blue,
+-info_ptr->trans[i]
++info_ptr->trans_alpha[i]
+)
+);
+ i++;
+@@ -454,9 +454,9 @@
+ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
+ if (outImage->depth()==32 && png_get_valid(png_ptr, info_ptr,
PNG_INFO_tRNS)) {
+ QRgb trans = 0xFF00 | qRgb(
+-(info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
+-(info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
+-(info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
++(info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
++(info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
++(info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
+ for (uint y=0; ywidth; x++) {
+ if (((uint**)jt)[y][x] == trans) {
[arch-commits] Commit in qt/trunk (PKGBUILD)
Date: Sunday, November 29, 2009 @ 12:39:30
Author: andrea
Revision: 59916
undo
Modified:
qt/trunk/PKGBUILD
--+
PKGBUILD | 165 +
1 file changed, 91 insertions(+), 74 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2009-11-29 17:39:22 UTC (rev 59915)
+++ PKGBUILD2009-11-29 17:39:30 UTC (rev 59916)
@@ -1,10 +1,13 @@
+# $Id$
+# Maintainer: Pierre Schmitz
-pkgname=kde-qt
-pkgver=20091125
-pkgrel=1
+pkgname=qt
+pkgver=4.5.3
+pkgrel=3
+_kdeqtver=063bded33b417cdf92fd51366fc7fdb06dea00ba
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
-url='http://qt.gitorious.org/+kde-developers/qt/kde-qt'
+url='http://www.qtsoftware.com/'
license=('GPL3' 'LGPL')
depends=('libpng' 'mesa' 'fontconfig' 'libtiff>=3.8.2-5' 'libmng>=1.0.10-2'
'sqlite3' 'xdg-utils' 'hicolor-icon-theme'
'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama'
'libxrender' 'gstreamer0.10-base-plugins'
@@ -12,101 +15,115 @@
optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups'
'libxfixes' 'gtk2')
install=qt.install
-provides=("qt4=${pkgver}" "qt=${pkgver}")
-replaces=('qt4')
-conflicts=('qt4' 'phonon' 'qt')
+provides=("qt4=${pkgver}" 'phonon')
+replaces=('qt4' 'phonon')
+conflicts=('qt4' 'phonon')
options=('!libtool')
-source=('gstreamer-logo.png'
+_pkgfqn="qt-x11-opensource-src-${pkgver}"
+source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.gz";
+"ftp://ftp.archlinux.org/other/kde-qt/kde-qt-${_kdeqtver}.patch.gz";
+ 'gstreamer-logo.png'
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
-'ca-certificates.patch')
-md5sums=('f0c26f76acf8b6a3297cfb31f872b0b7'
+'qdoc3.patch' 'phonon.patch' 'ca-certificates.patch')
+md5sums=('3988cf9af68be2df8a8000ede231de9b'
+ 'a8b984c95ea658116a7b4f632ae93596'
+ 'f0c26f76acf8b6a3297cfb31f872b0b7'
'a445c6917086d80f1cfc1e40cb6b0132'
'd457f0a0ad68a3861c3cadefe3b42ded'
'668331d9798a0e2b94381efb7be4c513'
'c29f2993d6a0f73d756d2fa36e130e1c'
+ 'a7e450751f42bdff17e57fdc4af72a18'
+ 'ca0debc49d3505423e3b5742fdbfd852'
'd5c4cad7af93f1d736d4569a207bd739')
-_gitroot=git://gitorious.org/+kde-developers/qt/kde-qt.git
-_gitname=kde-qt
+_create-kdeqt-patch() {
+ local codir=$(mktemp -d)
+ mkdir -p "${codir}/kde-qt"
+ git clone git://gitorious.org/+kde-developers/qt/kde-qt.git
"${codir}/kde-qt"
+ pushd "${codir}/kde-qt"
+ local kdeqtver=$(git --no-pager show --format='%H' "${pkgver}-patched"
| head -1)
+ git diff "v${pkgver}..${pkgver}-patched" | gzip >
"${codir}/kde-qt-${kdeqtver}.patch.gz"
+ popd
+ mv "${codir}/kde-qt-${kdeqtver}.patch.gz" .
+ rm -rf "${codir}"
+}
build() {
- cd ${srcdir}
- if [[ -d ${srcdir}/${_gitname} ]]; then
-cd ${_gitname}
- git pull origin
- msg "The local files are updated..."
-else
- git clone ${_gitroot}
- fi
+ unset QMAKESPEC
+ export QT4DIR=$srcdir/$_pkgfqn
+ export PATH=${QT4DIR}/bin:${PATH}
+ export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
- git clone ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build
- cd ${srcdir}/${_gitname}-build
- unset QMAKESPEC
- export QT4DIR=${srcdir}/${pkgname}
- export PATH=${QT4DIR}/bin:${PATH}
- export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
- # use system ssl cert bundle
- patch -p1 -i $srcdir/ca-certificates.patch || return 1
+ cd $srcdir/$_pkgfqn
+ patch -p1 -i $srcdir/kde-qt-${_kdeqtver}.patch || return 1
- sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
- sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
+ # see http://cvs.fedoraproject.org/viewvc/rpms/qt/devel/
+ # enable qdoc3
+ patch -p1 -i $srcdir/qdoc3.patch || return 1
+ # install service files needed by KDE
+ patch -p1 -i $srcdir/phonon.patch || return 1
+ # use system ssl cert bundle
+ patch -p1 -i $srcdir/ca-certificates.patch || return 1
- ./configure -confirm-license -opensource \
- -prefix /usr \
- -sysconfdir /etc \
- -plugindir /usr/lib/qt/plugins \
- -translationdir /usr/share/qt/translations \
- -datadir /usr/share/qt \
- -docdir /usr/share/doc/qt \
- -examplesdir /usr/share/doc/qt/examples \
- -demosdir /usr/share/doc/qt/demos \
- -largefile \
- -plugin-sql-{psql,mysql,sqlite,odbc} \
- -system-sqlite \
- -xmlpatterns \
- -svg \
- -webkit \
- -scripttools \
- -system-zlib \
- -system-libtiff \
- -system-libpng \
- -system-libmng \
- -system-libjpeg \
- -openssl-linked \
- -nomake demos \
- -nomake examples \
- -nomake docs \
- -no-rpath \
- -silent \
- -o
