summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/gnuplot/PKGBUILD13
-rw-r--r--extra/gnuplot/lua_tikz.patch10
-rw-r--r--extra/hwloc/PKGBUILD7
-rw-r--r--extra/lirc/PKGBUILD4
-rw-r--r--extra/lyx/PKGBUILD10
-rw-r--r--extra/ntp/PKGBUILD6
-rw-r--r--extra/ntp/ntp.conf8
-rw-r--r--extra/openmpi/PKGBUILD15
-rw-r--r--extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch43
-rw-r--r--extra/qt/PKGBUILD17
-rw-r--r--extra/qt/fix-qgraphicsscene-regression.patch55
-rw-r--r--extra/qt/improved-filter-event.patch98
-rw-r--r--extra/qt/qurl-backward-compatibility.patch13
-rw-r--r--extra/sdl_ttf/PKGBUILD14
-rw-r--r--extra/sdl_ttf/bug1433.patch11
15 files changed, 289 insertions, 35 deletions
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index 5b2f3b3a0..76ba2047d 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 147985 2012-01-29 11:40:13Z ronald $
+# $Id: PKGBUILD 151647 2012-02-29 10:28:02Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=gnuplot
pkgver=4.4.4
-pkgrel=1
+pkgrel=2
pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others"
arch=('i686' 'x86_64')
url="http://www.gnuplot.info"
@@ -13,12 +13,17 @@ license=('custom')
depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua')
makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
install=gnuplot.install
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+ "lua_tikz.patch")
+sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31'
+ 'd84518c7e46fc0912554c28ba1fc8cdb70d4ee30')
build() {
cd $srcdir/$pkgname-$pkgver
+ # upstram patch to fix lua/tikz terminal
+ patch -Np0 -i ${srcdir}/lua_tikz.patch
+
# fix default source location; use the GDFONTPATH variable to modify at runtime
sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
diff --git a/extra/gnuplot/lua_tikz.patch b/extra/gnuplot/lua_tikz.patch
new file mode 100644
index 000000000..f9a939d47
--- /dev/null
+++ b/extra/gnuplot/lua_tikz.patch
@@ -0,0 +1,10 @@
+--- term/lua/gnuplot-tikz-444.lua Sun Nov 13 00:57:15 2011
++++ term/lua/gnuplot-tikz.lua Fri Nov 25 01:11:38 2011
+@@ -251,6 +251,7 @@
+ gp.write(string.format("\\begin{tikzpicture}[gnuplot%s]\n",global_opt))
+ gp.write(string.format("%%%% generated with GNUPLOT %sp%s (%s; terminal rev. %s, script rev. %s)\n%%%% %s\n",
+ term.gp_version, term.gp_patchlevel,
++ _VERSION,
+ string.sub(term.lua_term_revision,7,-3),
+ pgf.REVISION,os.date()))
+ if font ~= "" then \ No newline at end of file
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index fb16f141b..918685dca 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 147724 2012-01-27 15:42:58Z stephane $
+# $Id: PKGBUILD 151699 2012-02-29 23:23:35Z stephane $
# Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
# Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
pkgname=hwloc
pkgver=1.4
-pkgrel=1
+pkgrel=2
pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
arch=('i686' 'x86_64')
url="http://www.open-mpi.org/projects/hwloc/"
license=('BSD')
-depends=('sh' 'pciutils')
+depends=('sh' 'pciutils' 'cairo' 'libxml2')
makedepends=('pkg-config')
-optdepends=('cairo: Graphical output' 'libxml2: XML export')
options=('!libtool' '!docs')
source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2)
sha1sums=('04326ebbf5a084164d72269f05e37ae23996c023')
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index e31812148..e6204ede5 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146925 2012-01-19 10:00:36Z thomas $
+# $Id: PKGBUILD 151643 2012-02-29 07:23:23Z tpowa $
# Maintainer: Paul Mattal <paul@archlinux.org>
pkgbase=lirc
pkgname=('lirc' 'lirc-utils')
pkgver=0.9.0
-pkgrel=10
+pkgrel=11
epoch=1
_extramodules=extramodules-3.2-ARCH
_kernver="$(cat /lib/modules/${_extramodules}/version)"
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index bc0e7856f..58abd3d35 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145773 2011-12-31 06:32:37Z schiv $
+# $Id: PKGBUILD 151657 2012-02-29 20:04:42Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=lyx
-pkgver=2.0.2
+pkgver=2.0.3
pkgrel=1
pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
arch=('i686' 'x86_64')
@@ -18,9 +18,9 @@ source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
backup=('etc/lyx/lyxrc.dist')
install=lyx.install
options=('emptydirs')
-md5sums=('f6421fdf118ace93d259220e6a3c4431'
- '1f65a736f015a5350f8efb41b2f13abd'
- 'b70fdeab95ba4a6c3ff72410dfa61823')
+sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f'
+ 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
+ '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index d1d2e2fb1..9b4d97908 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 151633 2012-02-29 01:32:42Z bisson $
+# $Id: PKGBUILD 151695 2012-02-29 21:30:41Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: kevin <kevin@archlinux.org>
pkgname=ntp
pkgver=4.2.6.p5
_realver=4.2.6p5
-pkgrel=4
+pkgrel=5
pkgdesc='Network Time Protocol reference implementation'
url='http://www.ntp.org/'
license=('custom')
@@ -22,7 +22,7 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
'4e324e625c1f080b5c028be5092aa71adbf9bd99'
'01394b8a952f5edc85d19df8335eeac3980320f4'
- 'c18b0e35068a06500e1556889b54194e3a63a056'
+ 'eb1f63814b9adbd3d518e880fa3b38c375f0fe91'
'4537d1f58b299d463db5048129cb264511474b0b'
'4f76f7f9ffc8315ff9924f793f272d4f6939b816')
diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf
index 0d548ac1e..a27b22820 100644
--- a/extra/ntp/ntp.conf
+++ b/extra/ntp/ntp.conf
@@ -6,12 +6,14 @@
# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
# Associate to public NTP pool servers; see http://www.pool.ntp.org/
-pool pool.ntp.org
+server 0.pool.ntp.org
+server 1.pool.ntp.org
+server 2.pool.ntp.org
# Only allow read-only access from localhost
restrict default noquery nopeer
-restrict 127.0.0.1 noserve nomodify
-restrict ::1 noserve nomodify
+restrict 127.0.0.1
+restrict ::1
# Location of drift and log files
driftfile /var/lib/ntp/ntp.drift
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index 5ee8ba60d..39ea544a8 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 150800 2012-02-22 17:25:13Z stephane $
+# $Id: PKGBUILD 151701 2012-03-01 00:42:34Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=openmpi
pkgver=1.5.4
-pkgrel=4
+pkgrel=5
pkgdesc="High performance message passing library (MPI)"
arch=('i686' 'x86_64')
url="http://www.open-mpi.org"
@@ -10,12 +10,17 @@ license=('custom')
depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc')
makedepends=('inetutils')
options=(!libtool)
-source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('81f7736a83b2134ba20c2e5c380b4d267cfd9d9c')
+source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2
+ openmpi-1.5.4-fix-fakeroot-execution.patch)
+sha1sums=('81f7736a83b2134ba20c2e5c380b4d267cfd9d9c'
+ 'ec46abb6f9e01daca910e4079b9abc036db9ed20')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ # Fix fakeroot problem (FS#28644)
+ patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch
+
./configure --prefix=/usr \
--sysconfdir=/etc/${pkgname} \
--mandir=/usr/share/man \
@@ -50,7 +55,7 @@ package() {
mv "${pkgdir}"/usr/bin/otfinfo{,mpi}
# Openmpi's otfdump conflicts with the one from libotf
- mv "${pkgdir}"/usr/bin/otfdump{,ompi}
+ mv "${pkgdir}"/usr/bin/otfdump{,ompi}
# Remove dangling symlink
rm "${pkgdir}"/usr/share/man/man1/orteCC.1
diff --git a/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch b/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch
new file mode 100644
index 000000000..dc9dcfeae
--- /dev/null
+++ b/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch
@@ -0,0 +1,43 @@
+Description: If running under Debian fakeroot then its important
+ that this hook is disabled; a new stat check was introduced in
+ 1.5.x which preceeds the FAKEROOT check resulting in a SEGFAULT.
+Author: James Page <james.page@ubuntu.com>
+Origin: https://svn.open-mpi.org/trac/ompi/changeset/21489
+
+Index: openmpi-1.5.4/opal/mca/memory/linux/hooks.c
+===================================================================
+--- openmpi-1.5.4.orig/opal/mca/memory/linux/hooks.c 2012-02-15 12:59:39.986314651 +0000
++++ openmpi-1.5.4/opal/mca/memory/linux/hooks.c 2012-02-15 13:14:57.744722517 +0000
+@@ -738,15 +738,6 @@
+ check_result_t r1, r2, lp, lpp;
+ bool want_rcache = false, found_driver = false;
+
+- /* First, check if ummunotify is present on the system. If it is,
+- then we don't need to do the following ptmalloc2 hacks.
+- open/mmap on the device may fail during init, but if /dev/ummunotify
+- exists, we assume that the user/administrator *wants* to use
+- ummunotify. */
+- if (stat("/dev/ummunotify", &st) == 0) {
+- return;
+- }
+-
+ /* Yes, checking for an MPI MCA parameter here is an abstraction
+ violation. Cope. Yes, even checking for *any* MCA parameter
+ here (without going through the MCA param API) is an
+@@ -769,6 +760,15 @@
+ return;
+ }
+
++ /* Next, check if ummunotify is present on the system. If it is,
++ then we don't need to do the following ptmalloc2 hacks.
++ open/mmap on the device may fail during init, but if /dev/ummunotify
++ exists, we assume that the user/administrator *wants* to use
++ ummunotify. */
++ if (stat("/dev/ummunotify", &st) == 0) {
++ return;
++ }
++
+ /* Look for sentinel files (directories) to see if various network
+ drivers are loaded (yes, I know, further abstraction
+ violations...).
+
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 97f3cac36..77c0ea289 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148904 2012-02-05 11:55:04Z ibiru $
+# $Id: PKGBUILD 151653 2012-02-29 18:44:48Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.0
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -18,19 +18,26 @@ _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'
- 'fix-qurl.patch')
+ 'fix-qgraphicsscene-regression.patch'
+ 'improved-filter-event.patch'
+ 'qurl-backward-compatibility.patch')
md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
+ 'c2e91fc028250a590e76effe234468e2'
+ '444ebeb716d7c7379835efb8aa88e6c8'
'7bc255a36733d0fbc80c1902ade4beca')
build() {
cd "${srcdir}"/${_pkgfqn}
- # (FS#27757)
- patch -p1 -i "${srcdir}"/fix-qurl.patch
+ # (FS#28707)
+ patch -p1 -i "${srcdir}"/fix-qgraphicsscene-regression.patch
+ # (FS#27757) (KDEBUG#275469)
+ patch -p1 -i "${srcdir}"/improved-filter-event.patch
+ patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
diff --git a/extra/qt/fix-qgraphicsscene-regression.patch b/extra/qt/fix-qgraphicsscene-regression.patch
new file mode 100644
index 000000000..0c0a28a61
--- /dev/null
+++ b/extra/qt/fix-qgraphicsscene-regression.patch
@@ -0,0 +1,55 @@
+From 15c14584199dc43e4a309fc331f3144009008128 Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147@gmail.com>
+Date: Fri, 24 Feb 2012 00:42:34 +1100
+Subject: [PATCH] Revert "Don't rely on mapFromGlobal in
+ QGraphicsScenePrivate::itemsAtPosition."
+
+This reverts commit 7c0d15a22266a425c9e9ac0120d6774e120fe01e.
+The commit caused a regression whereby tooltips may be shown even if the
+mouse is not over the item if it has the Qt::ItemIgnoresTransformations
+flag and the QGraphicsView had been scaled.
+
+Task-number: QTBUG-17517
+Task-number: QTBUG-22663
+Change-Id: Ib7fd788d9712c5e659fe07182f9505a4eb135ab2
+Reviewed-by: Andy Shaw <andy.shaw@digia.com>
+Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
+---
+ src/gui/graphicsview/qgraphicsscene.cpp | 10 +++++++---
+ 1 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
+index 14c0f3c..d1cdd4f 100644
+--- a/src/gui/graphicsview/qgraphicsscene.cpp
++++ b/src/gui/graphicsview/qgraphicsscene.cpp
+@@ -1084,7 +1084,7 @@ void QGraphicsScenePrivate::enableMouseTrackingOnViews()
+ /*!
+ Returns all items for the screen position in \a event.
+ */
+-QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*screenPos*/,
++QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &screenPos,
+ const QPointF &scenePos,
+ QWidget *widget) const
+ {
+@@ -1093,12 +1093,16 @@ QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*sc
+ if (!view)
+ return q->items(scenePos, Qt::IntersectsItemShape, Qt::DescendingOrder, QTransform());
+
+- const QRectF pointRect(scenePos, QSizeF(1, 1));
++ const QRectF pointRect(QPointF(widget->mapFromGlobal(screenPos)), QSizeF(1, 1));
+ if (!view->isTransformed())
+ return q->items(pointRect, Qt::IntersectsItemShape, Qt::DescendingOrder);
+
+ const QTransform viewTransform = view->viewportTransform();
+- return q->items(pointRect, Qt::IntersectsItemShape,
++ if (viewTransform.type() <= QTransform::TxScale) {
++ return q->items(viewTransform.inverted().mapRect(pointRect), Qt::IntersectsItemShape,
++ Qt::DescendingOrder, viewTransform);
++ }
++ return q->items(viewTransform.inverted().map(pointRect), Qt::IntersectsItemShape,
+ Qt::DescendingOrder, viewTransform);
+ }
+
+--
+1.7.6
+
diff --git a/extra/qt/improved-filter-event.patch b/extra/qt/improved-filter-event.patch
new file mode 100644
index 000000000..b03cdbe94
--- /dev/null
+++ b/extra/qt/improved-filter-event.patch
@@ -0,0 +1,98 @@
+--- qt-opensource-4.8.0.old/src/gui/kernel/qapplication_x11.cpp 2011-12-16 03:22:33.918428374 -0500
++++ qt-opensource-4.8.0.new/src/gui/kernel/qapplication_x11.cpp 2012-01-07 18:18:40.258246384 -0500
+@@ -4244,7 +4205,12 @@ bool QETWidget::translateMouseEvent(cons
+ && (nextEvent.xclient.message_type == ATOM(_QT_SCROLL_DONE) ||
+ (nextEvent.xclient.message_type == ATOM(WM_PROTOCOLS) &&
+ (Atom)nextEvent.xclient.data.l[0] == ATOM(_NET_WM_SYNC_REQUEST))))) {
+- qApp->x11ProcessEvent(&nextEvent);
++ // As we may run through a significant number of a large class of non-MotionNotify
++ // events here, without returning to the event loop, first pass nextEvent to
++ // QAbstractEventDispatcher::filterEvent() to allow applications which override
++ // QAbstractEventDispatcher::filterEvent() to handle the event first.
++ if (!QAbstractEventDispatcher::instance()->filterEvent(&nextEvent))
++ qApp->x11ProcessEvent(&nextEvent);
+ continue;
+ } else if (nextEvent.type != MotionNotify ||
+ nextEvent.xmotion.window != event->xmotion.window ||
+--- qt-opensource-4.8.0.old/src/gui/kernel/qclipboard_x11.cpp 2011-12-08 00:06:02.000000000 -0500
++++ qt-opensource-4.8.0.new/src/gui/kernel/qclipboard_x11.cpp 2012-01-07 18:30:35.298287639 -0500
+@@ -573,7 +573,11 @@ bool QX11Data::clipboardWaitForEvent(Win
+
+ // process other clipboard events, since someone is probably requesting data from us
+ XEvent e;
+- if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0))
++ // Some applications may override QAbstractEventDispatcher::filterEvent(), so
++ // pass event to QAbstractEventDispatcher::filterEvent() before processing in
++ // x11ProcessEvent().
++ if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0) &&
++ !QAbstractEventDispatcher::instance()->filterEvent(&e))
+ qApp->x11ProcessEvent(&e);
+
+ now.start();
+--- qt-opensource-4.8.0.old/src/gui/kernel/qdnd_x11.cpp 2011-12-08 00:06:02.000000000 -0500
++++ qt-opensource-4.8.0.new/src/gui/kernel/qdnd_x11.cpp 2012-01-07 18:28:13.841279478 -0500
+@@ -42,6 +42,7 @@
+ #include "qplatformdefs.h"
+
+ #include "qapplication.h"
++#include "qabstracteventdispatcher.h"
+
+ #ifndef QT_NO_DRAGANDDROP
+
+@@ -1941,7 +1942,11 @@ Qt::DropAction QDragManager::drag(QDrag
+ timer.start();
+ do {
+ XEvent event;
+- if (XCheckTypedEvent(X11->display, ClientMessage, &event))
++ // Some applications may override QAbstractEventDispatcher::filterEvent(), so
++ // pass event to QAbstractEventDispatcher::filterEvent() before processing in
++ // x11ProcessEvent().
++ if (XCheckTypedEvent(X11->display, ClientMessage, &event) &&
++ !QAbstractEventDispatcher::instance()->filterEvent(&event))
+ qApp->x11ProcessEvent(&event);
+
+ // sleep 50 ms, so we don't use up CPU cycles all the time.
+--- qt-opensource-4.8.0.old/src/gui/kernel/qwidget_x11.cpp 2011-12-08 00:06:02.000000000 -0500
++++ qt-opensource-4.8.0.new/src/gui/kernel/qwidget_x11.cpp 2012-01-07 18:29:26.286283657 -0500
+@@ -44,6 +44,7 @@
+ #include "qdesktopwidget.h"
+ #include "qapplication.h"
+ #include "qapplication_p.h"
++#include "qabstracteventdispatcher.h"
+ #include "qnamespace.h"
+ #include "qpainter.h"
+ #include "qbitmap.h"
+@@ -376,17 +377,22 @@ void qt_x11_wait_for_window_manager(QWid
+ do {
+ if (XEventsQueued(X11->display, QueuedAlready)) {
+ XNextEvent(X11->display, &ev);
+- qApp->x11ProcessEvent(&ev);
+-
+- switch (state) {
+- case Initial:
+- if (ev.type == MapNotify && ev.xany.window == winid)
+- state = Mapped;
+- break;
+- case Mapped:
+- if (ev.type == Expose && ev.xany.window == winid)
+- return;
+- break;
++ // Some applications may override QAbstractEventDispatcher::filterEvent(), so
++ // pass event to QAbstractEventDispatcher::filterEvent() before processing in
++ // x11ProcessEvent().
++ if (!QAbstractEventDispatcher::instance()->filterEvent(&ev)) {
++ qApp->x11ProcessEvent(&ev);
++
++ switch (state) {
++ case Initial:
++ if (ev.type == MapNotify && ev.xany.window == winid)
++ state = Mapped;
++ break;
++ case Mapped:
++ if (ev.type == Expose && ev.xany.window == winid)
++ return;
++ break;
++ }
+ }
+ } else {
+ if (!XEventsQueued(X11->display, QueuedAfterFlush))
diff --git a/extra/qt/qurl-backward-compatibility.patch b/extra/qt/qurl-backward-compatibility.patch
new file mode 100644
index 000000000..1c666dba4
--- /dev/null
+++ b/extra/qt/qurl-backward-compatibility.patch
@@ -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.000000000 -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;
diff --git a/extra/sdl_ttf/PKGBUILD b/extra/sdl_ttf/PKGBUILD
index 7aa5b252b..02a4649f5 100644
--- a/extra/sdl_ttf/PKGBUILD
+++ b/extra/sdl_ttf/PKGBUILD
@@ -1,22 +1,28 @@
-# $Id: PKGBUILD 146690 2012-01-16 11:37:07Z heftig $
+# $Id: PKGBUILD 151697 2012-02-29 21:54:21Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=sdl_ttf
pkgver=2.0.11
-pkgrel=1
+pkgrel=2
pkgdesc="A library that allows you to use TrueType fonts in your SDL applications"
arch=('i686' 'x86_64')
license=('custom')
url="http://www.libsdl.org/projects/SDL_ttf/"
depends=('sdl>=1.2.12' 'freetype2')
options=('!libtool')
-source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz)
-md5sums=('61e29bd9da8d245bc2471d1b2ce591aa')
+source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz
+ bug1433.patch)
+md5sums=('61e29bd9da8d245bc2471d1b2ce591aa'
+ 'f847697e18eec539aaf3ffb96996abbf')
build() {
cd "$srcdir/SDL_ttf-$pkgver"
+
+ # Fix FS#28674
+ patch -Ni "$srcdir/bug1433.patch"
+
./configure --prefix=/usr --disable-static
make
}
diff --git a/extra/sdl_ttf/bug1433.patch b/extra/sdl_ttf/bug1433.patch
new file mode 100644
index 000000000..b402fb3e9
--- /dev/null
+++ b/extra/sdl_ttf/bug1433.patch
@@ -0,0 +1,11 @@
+--- SDL_ttf.c.orig 2012-02-12 16:36:41.859977617 +0100
++++ SDL_ttf.c 2012-02-12 16:36:53.696580159 +0100
+@@ -1747,7 +1747,7 @@
+ /* Copy the character from the pixmap */
+ src = glyph->pixmap.buffer;
+ dst = (Uint8*) textbuf->pixels;
+- for ( row = 0; row < glyph->bitmap.rows; ++row ) {
++ for ( row = 0; row < glyph->pixmap.rows; ++row ) {
+ memcpy( dst, src, glyph->pixmap.width );
+ src += glyph->pixmap.pitch;
+ dst += textbuf->pitch; \ No newline at end of file
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-07 05:56:41 +0000