[arch-commits] Commit in qt4/trunk (4 files)
Date: Thursday, December 31, 2015 @ 13:46:23
Author: andyrtr
Revision: 257408
upgpkg: qt4 4.8.7-6
apply fixes for LibreOffice from the upstream Qt bug tracker
Added:
qt4/trunk/glib-honor-ExcludeSocketNotifiers-flag.diff
qt4/trunk/l-qclipboard_delay.patch
qt4/trunk/l-qclipboard_fix_recursive.patch
Modified:
qt4/trunk/PKGBUILD
-+
PKGBUILD| 20 -
glib-honor-ExcludeSocketNotifiers-flag.diff | 63 +
l-qclipboard_delay.patch| 12 +++
l-qclipboard_fix_recursive.patch| 94 ++
4 files changed, 186 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-31 12:01:57 UTC (rev 257407)
+++ PKGBUILD2015-12-31 12:46:23 UTC (rev 257408)
@@ -5,7 +5,7 @@
pkgname=qt4
pkgver=4.8.7
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -35,7 +35,10 @@
'improve-cups-support.patch'
'moc-boost-workaround.patch'
'kubuntu_14_systemtrayicon.diff'
-'kde4-settings.patch')
+'kde4-settings.patch'
+'glib-honor-ExcludeSocketNotifiers-flag.diff'
+'l-qclipboard_fix_recursive.patch'
+'l-qclipboard_delay.patch')
md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
'a16638f4781e56e7887ff8212a322ecc'
'8a28b3f52dbeb685d4b69440b520a3e1'
@@ -45,7 +48,10 @@
'c439c7731c25387352d8453ca7574971'
'da387bde22ae1c446f12525d2a31f070'
'a523644faa8f98a73f55c4aa23c114a6'
- '66dfea63916c8dbf47b23cb012ffdccc')
+ '66dfea63916c8dbf47b23cb012ffdccc'
+ '85679531c8a7310317adfb7002d9f99a'
+ '009de09b4e589a7770fba74405656c99'
+ 'addc5e88d538ee55e17bd49ba337ca67')
prepare() {
cd ${_pkgfqn}
@@ -62,6 +68,14 @@
# FS#45106
patch -p0 -i "${srcdir}"/kde4-settings.patch
+ # fixes for LibreOffice from the upstream Qt bug tracker FS#46436, FS#41648,
FS#39819
+ # https://bugreports.qt.io/browse/QTBUG-37380
+ patch -p1 -i "${srcdir}"/glib-honor-ExcludeSocketNotifiers-flag.diff
+ # https://bugreports.qt.io/browse/QTBUG-34614
+ patch -p0 -i "${srcdir}"/l-qclipboard_fix_recursive.patch
+ # https://bugreports.qt.io/browse/QTBUG-38585
+ patch -p0 -i "${srcdir}"/l-qclipboard_delay.patch
+
sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g"
mkspecs/common/gcc-base-unix.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
Added: glib-honor-ExcludeSocketNotifiers-flag.diff
===
--- glib-honor-ExcludeSocketNotifiers-flag.diff (rev 0)
+++ glib-honor-ExcludeSocketNotifiers-flag.diff 2015-12-31 12:46:23 UTC (rev
257408)
@@ -0,0 +1,63 @@
+Author: Jan-Marek Glogowski
+Date: Thu Mar 06 18:44:43 2014 +0100
+
+Honor QEventLoop::ExcludeSocketNotifiers in glib event loop.
+
+Implements QEventLoop::ExcludeSocketNotifiers in the same way
+QEventLoop::X11ExcludeTimers is already implemented for the glib
+event loop.
+
+--- qt4-x11-4.8.1.orig/src/corelib/kernel/qeventdispatcher_glib.cpp
qt4-x11-4.8.1/src/corelib/kernel/qeventdispatcher_glib.cpp
+@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier
+ struct GSocketNotifierSource
+ {
+ GSource source;
++QEventLoop::ProcessEventsFlags processEventsFlags;
+ QList pollfds;
+ };
+
+@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceChec
+ GSocketNotifierSource *src = reinterpret_cast(source);
+
+ bool pending = false;
++if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
++return pending;
++
+ for (int i = 0; !pending && i < src->pollfds.count(); ++i) {
+ GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
+
+@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDisp
+ QEvent event(QEvent::SockAct);
+
+ GSocketNotifierSource *src = reinterpret_cast(source);
++if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
++return true;
++
+ for (int i = 0; i < src->pollfds.count(); ++i) {
+ GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
+
+@@ -330,6 +337,7 @@ QEventDispatcherGlibPrivate::QEventDispa
+ reinterpret_cast(g_source_new(,
+
sizeof(GSocketNotifierSource)));
+ (void) new (>pollfds)
QList();
++socketNotifierSource->processEventsFlags = QEventLoop::AllEvents;
+ g_source_set_can_recurse(>source, true);
+ g_source_attach(>source, mainContext);
+
+@@ -415,6 +423,7 @@ bool QEventDispatcherGlib::processEvents
+ // tell postEventSourcePrepare() and timerSource about any new flags
+ QEventLoop::ProcessEventsFlags savedFlags =
[arch-commits] Commit in qt4/trunk (4 files)
Date: Thursday, May 28, 2015 @ 11:41:20
Author: fyan
Revision: 239833
upgpkg: qt4 4.8.7-1
- upstream new release
- add patch for FS#45106
Added:
qt4/trunk/kde4-settings.patch
Modified:
qt4/trunk/PKGBUILD
Deleted:
qt4/trunk/CVE-2014-0190.patch
qt4/trunk/qnam-corruption.patch
---+
CVE-2014-0190.patch | 32 ---
PKGBUILD | 23 +-
kde4-settings.patch | 11 +
qnam-corruption.patch | 430
4 files changed, 20 insertions(+), 476 deletions(-)
Deleted: CVE-2014-0190.patch
===
--- CVE-2014-0190.patch 2015-05-28 08:08:49 UTC (rev 239832)
+++ CVE-2014-0190.patch 2015-05-28 09:41:20 UTC (rev 239833)
@@ -1,32 +0,0 @@
-Don't crash on broken GIF images
-
-Broken GIF images could set invalid width and height
-values inside the image, leading to Qt creating a null
-QImage for it. In that case we need to abort decoding
-the image and return an error.
-
-Initial patch by Rich Moore.
-
-Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
-
-Task-number: QTBUG-38367
-Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
-Security-advisory: CVE-2014-0190
-
-diff -up
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367
2014-04-10 13:37:12.0 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp
2014-04-24 15:58:54.515862458 -0500
-@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, co
- memset(bits, 0, image-byteCount());
- }
-
-+// Check if the previous attempt to create the image failed.
If it
-+// did then the image is broken and we should give up.
-+if (image-isNull()) {
-+state = Error;
-+return -1;
-+}
-+
- disposePrevious(image);
- disposed = false;
-
Modified: PKGBUILD
===
--- PKGBUILD2015-05-28 08:08:49 UTC (rev 239832)
+++ PKGBUILD2015-05-28 09:41:20 UTC (rev 239833)
@@ -4,10 +4,10 @@
# Contributor: Pierre Schmitz pie...@archlinux.de
pkgname=qt4
-pkgver=4.8.6
-pkgrel=6
+pkgver=4.8.7
+pkgrel=1
arch=('i686' 'x86_64')
-url='http://qt-project.org/'
+url='http://www.qt.io'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('libtiff' 'libpng' 'sqlite' 'ca-certificates' 'dbus'
@@ -29,15 +29,14 @@
replaces=('qt=4.8.4')
conflicts=('qt')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
-source=(http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz;
+source=(http://download.qt.io/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz;
'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
'improve-cups-support.patch'
'moc-boost-workaround.patch'
-'CVE-2014-0190.patch'
'kubuntu_14_systemtrayicon.diff'
-'qnam-corruption.patch')
-md5sums=('2edbe4d6c2eff33ef91732602f3518eb'
+'kde4-settings.patch')
+md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
'a16638f4781e56e7887ff8212a322ecc'
'8a28b3f52dbeb685d4b69440b520a3e1'
'9727c406c240990870c905696a8c5bd1'
@@ -45,9 +44,8 @@
'b859c5673e5098c39f72b2252947049e'
'c439c7731c25387352d8453ca7574971'
'da387bde22ae1c446f12525d2a31f070'
- '34ed257109afb83342cfe514c8abe027'
'a523644faa8f98a73f55c4aa23c114a6'
- '10d5d72045105c063da9076d8eebfd14')
+ '66dfea63916c8dbf47b23cb012ffdccc')
prepare() {
cd ${_pkgfqn}
@@ -58,14 +56,11 @@
# QTBUG#22829
patch -p1 -i ${srcdir}/moc-boost-workaround.patch
- # QTBUG#38367
- patch -p1 -i ${srcdir}/CVE-2014-0190.patch
-
# http://blog.martin-graesslin.com/blog/2014/06/where-are-my-systray-icons/
patch -p1 -i ${srcdir}/kubuntu_14_systemtrayicon.diff
- # https://codereview.qt-project.org/#/c/111363/
- patch -p1 -i ${srcdir}/qnam-corruption.patch
+ # FS#45106
+ patch -p0 -i ${srcdir}/kde4-settings.patch
sed -i s|-O2|${CXXFLAGS}| mkspecs/common/{g++,gcc}-base.conf
sed -i /^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g
mkspecs/common/gcc-base-unix.conf
Added: kde4-settings.patch
===
--- kde4-settings.patch (rev 0)
+++ kde4-settings.patch 2015-05-28 09:41:20 UTC (rev 239833)
@@ -0,0 +1,11 @@
+--- src/gui/kernel/qkde.cpp.orig 2015-05-27 11:42:02.507129332 +0200
src/gui/kernel/qkde.cpp2015-05-27 11:43:26.182875729 +0200
+@@ -63,7 +63,7 @@
+ kdeHomePath =
[arch-commits] Commit in qt4/trunk (4 files)
Date: Wednesday, May 8, 2013 @ 09:24:34
Author: andrea
Revision: 184763
Install missing icons (FS#34528); Add the qdbusviewer desktop file
Modified:
qt4/trunk/PKGBUILD
qt4/trunk/assistant-qt4.desktop
qt4/trunk/designer-qt4.desktop
qt4/trunk/linguist-qt4.desktop
---+
PKGBUILD | 32 +---
assistant-qt4.desktop |2 +-
designer-qt4.desktop |2 +-
linguist-qt4.desktop |2 +-
4 files changed, 28 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-08 07:12:02 UTC (rev 184762)
+++ PKGBUILD2013-05-08 07:24:34 UTC (rev 184763)
@@ -28,13 +28,15 @@
conflicts=('qt')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz;
-'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
'linguist-qt4.desktop'
+'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
+'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
'improve-cups-support.patch')
md5sums=('89c5ecba180cae74c66260ac732dc5cb'
'a16638f4781e56e7887ff8212a322ecc'
- '4f0152ba6d645e81218b23ba8beeb42d'
- '283a00ff7f662dca481b70d6daa826e0'
- '027683880235708d4bc270a7ef961183'
+ '8a28b3f52dbeb685d4b69440b520a3e1'
+ '9727c406c240990870c905696a8c5bd1'
+ '0e384663d3dd32abe35f5331c4147569'
+ 'b859c5673e5098c39f72b2252947049e'
'c439c7731c25387352d8453ca7574971')
build() {
@@ -87,10 +89,26 @@
# install missing icons and desktop files
install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
- ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png
+ ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png
+install -D -m644 tools/assistant/tools/assistant/images/assistant.png \
+ ${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant-qt4.png
+install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \
+ ${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant-qt4.png
+install -D -m644 tools/designer/src/designer/images/designer.png \
+ ${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer-qt4.png
+for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
+ size=$(echo $(basename ${icon}) | cut -d- -f2)
+ install -D -m644 ${icon} \
+
${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist-qt4.png
+done
+install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \
+ ${pkgdir}/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png
+install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+ ${pkgdir}/usr/share/icons/hicolor/128x128/apps/qdusviewer-qt4.png
+
install -d ${pkgdir}/usr/share/applications
-install -m644
${srcdir}/{assistant,designer,linguist,qtconfig}-qt4.desktop \
- ${pkgdir}/usr/share/applications/
+install -m644
${srcdir}/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \
+ ${pkgdir}/usr/share/applications/
# Useful symlinks for cmake and configure scripts
install -d ${pkgdir}/usr/bin
Modified: assistant-qt4.desktop
===
--- assistant-qt4.desktop 2013-05-08 07:12:02 UTC (rev 184762)
+++ assistant-qt4.desktop 2013-05-08 07:24:34 UTC (rev 184763)
@@ -2,7 +2,7 @@
Name=Qt4 Assistant
Comment=Shows Qt4 documentation and examples
Exec=assistant-qt4
-Icon=assistant
+Icon=assistant-qt4
Terminal=false
Encoding=UTF-8
Type=Application
Modified: designer-qt4.desktop
===
--- designer-qt4.desktop2013-05-08 07:12:02 UTC (rev 184762)
+++ designer-qt4.desktop2013-05-08 07:24:34 UTC (rev 184763)
@@ -3,7 +3,7 @@
GenericName=Interface Designer
Comment=Design GUIs for Qt4 applications
Exec=designer-qt4
-Icon=designer
+Icon=designer-qt4
MimeType=application/x-designer;
Terminal=false
Encoding=UTF-8
Modified: linguist-qt4.desktop
===
--- linguist-qt4.desktop2013-05-08 07:12:02 UTC (rev 184762)
+++ linguist-qt4.desktop2013-05-08 07:24:34 UTC (rev 184763)
@@ -2,7 +2,7 @@
Name=Qt4 Linguist
Comment=Add translations to Qt4 applications
Exec=linguist-qt4
-Icon=linguist
+Icon=linguist-qt4
MimeType=text/vnd.trolltech.linguist;application/x-linguist;
Terminal=false
Encoding=UTF-8
