archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-03-19 00:21:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:archlinuxarm/PKGBUILDs

Browse source
This commit is contained in:
Stephen Oliver 2012-04-05 23:28:47 -04:00
commit db6a442cdf
33 changed files with 5663 additions and 326 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
alarm/motion-noffmpeg/PKGBUILD Normal file
View file

@ -0,0 +1,46 @@
# $Id$
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
plugrel=3
_pkgbase='motion'
pkgname=motion-noffmpeg
pkgver=3.2.12
provides=('motion')
replaces=('motion')
conflicts=('motion')
pkgrel=3
pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams, built without FFMPEG, and requires fewer dependencies (~47MB -> ~3MB) "
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
depends=('libjpeg' 'v4l-utils')
backup=('etc/motion/motion.conf')
options=('!makeflags')
source=(http://downloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.gz
rc.motion
linux-headers.patch
noffmpeg.patch)
md5sums=('1ba0065ed50509aaffb171594c689f46'
'77be944e4466ab66836d50ea216af3b6'
'ea917c4ac459cd26a6d161d4e759f0dc'
'106a149dba24db497e89af7fca886348')
build() {
cd "${srcdir}/${_pkgbase}-${pkgver}"
patch -p1 motion-dist.conf.in < $srcdir/noffmpeg.patch
patch -Np1 -i $srcdir/linux-headers.patch
./configure --prefix=/usr \
--without-pgsql \
--without-ffmpeg \
--without-mysql \
--sysconfdir=/etc/motion
make
}
package(){
cd "${srcdir}/${_pkgbase}-${pkgver}"
make DESTDIR="${pkgdir}" install
mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf"
install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion"
}

35
alarm/motion-noffmpeg/linux-headers.patch Normal file
View file

@ -0,0 +1,35 @@
diff -urN motion-3.2.12-OLD/motion.h motion-3.2.12-NEW/motion.h
--- motion-3.2.12-OLD/motion.h 2010-05-31 23:48:23.000000000 -0700
+++ motion-3.2.12-NEW/motion.h 2011-08-30 02:11:08.000000000 -0700
@@ -40,7 +40,7 @@
#define _LINUX_TIME_H 1
#if !defined(WITHOUT_V4L) && !defined(BSD)
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
#endif
#include <pthread.h>
diff -urN motion-3.2.12-OLD/track.c motion-3.2.12-NEW/track.c
--- motion-3.2.12-OLD/track.c 2010-05-31 23:48:23.000000000 -0700
+++ motion-3.2.12-NEW/track.c 2011-08-30 23:05:09.000000000 -0700
@@ -11,6 +11,7 @@
#include "motion.h"
#ifndef WITHOUT_V4L
+#include <linux/videodev2.h>
#include "pwc-ioctl.h"
#endif
diff -urN motion-3.2.12-OLD/video.h motion-3.2.12-NEW/video.h
--- motion-3.2.12-OLD/video.h 2010-05-31 23:48:23.000000000 -0700
+++ motion-3.2.12-NEW/video.h 2011-08-30 02:11:12.000000000 -0700
@@ -12,7 +12,7 @@
#define _LINUX_TIME_H 1
#ifndef WITHOUT_V4L
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
#include <sys/mman.h>
#include "pwc-ioctl.h"
#endif

44
alarm/motion-noffmpeg/noffmpeg.patch Normal file
View file

@ -0,0 +1,44 @@
211c211
< max_mpeg_time 0
---
> #max_mpeg_time 0
247c247
< ffmpeg_cap_new on
---
> #ffmpeg_cap_new on
251c251
< ffmpeg_cap_motion off
---
> #ffmpeg_cap_motion off
255c255
< ffmpeg_timelapse 0
---
> #ffmpeg_timelapse 0
259c259
< ffmpeg_timelapse_mode daily
---
> #ffmpeg_timelapse_mode daily
263c263
< ffmpeg_bps 500000
---
> #ffmpeg_bps 500000
269c269
< ffmpeg_variable_bitrate 0
---
> #ffmpeg_variable_bitrate 0
282c282
< ffmpeg_video_codec mpeg4
---
> #ffmpeg_video_codec mpeg4
287c287
< ffmpeg_deinterlace off
---
> #ffmpeg_deinterlace off
385c385
< movie_filename %v-%Y%m%d%H%M%S
---
> #movie_filename %v-%Y%m%d%H%M%S
392c392
< timelapse_filename %Y%m%d-timelapse
---
> #timelapse_filename %Y%m%d-timelapse

37
alarm/motion-noffmpeg/rc.motion Normal file
View file

@ -0,0 +1,37 @@
#!/bin/bash
. /etc/rc.conf
. /etc/rc.d/functions
PID=`pidof -o %PPID /usr/bin/motion`
case "$1" in
start)
stat_busy "Starting Motion"
mkdir -p /var/run/motion
[ -z "$PID" ] && /usr/bin/motion
if [ $? -gt 0 ]; then
stat_fail
else
add_daemon motion
stat_done
fi
;;
stop)
stat_busy "Stopping Motion"
[ ! -z "$PID" ] && kill $PID &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
else
rm_daemon motion
stat_done
fi
;;
restart)
$0 stop
sleep 3
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac
exit 0

4
community/percona-server/PKGBUILD
View file

@ -6,7 +6,7 @@
plugrel=1
pkgname=percona-server
pkgver=5.5.21_rel25.0
pkgver=5.5.21_rel25.1
pkgrel=1
pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server"
arch=('i686' 'x86_64')
@ -105,7 +105,7 @@ package() {
install -dm700 "${pkgdir}"/var/lib/mysql
}
md5sums=('e0091c0e8213378f0b5756535fe5799f'
md5sums=('fdbc6cb1452f577d4c21ed3f1686dac8'
'243864805611764a7e5883c1dba7afd8'
'1c949c0dbea5206af0db14942d9927b6'
'9eb0ad531d162e031a2bcc08a5ab3bc5')

4
community/percona-server/percona.install
View file

@ -1,8 +1,8 @@
post_install(){
groupadd -g 89 mysql &>/dev/null
useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
/usr/bin/mysql_install_db --user=mysql --basedir=/usr
chown -R mysql:mysql var/lib/mysql &>/dev/null
/usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
chown -R mysql:mysql /var/lib/mysql &>/dev/null
}
post_upgrade(){

7
community/setconf/PKGBUILD
View file

@ -7,8 +7,8 @@
plugrel=1
pkgname=setconf
pkgver=0.3.2
pkgrel=4
pkgver=0.4
pkgrel=1
pkgdesc="Utility to easily change settings in Makefiles and configuration files"
arch=('x86_64' 'i686')
url="http://setconf.roboticoverlords.org/"
@ -16,7 +16,7 @@ license=('GPL')
depends=('pcre' 'gc')
makedepends=('shedskin>=0.9.1')
source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2")
sha256sums=('8b18e11da7adf78f2e21c39cfa949b178fa1b2f85e691b85be123023b7303f03')
sha256sums=('dca9d6e829f3247da8cb78434dd18d96f3439fc83a32626ff83d4a5c16099d31')
build() {
cd "$srcdir/$pkgname-$pkgver"
@ -31,7 +31,6 @@ package() {
install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz"
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}
# vim:set ts=2 sw=2 et:

2
core/diffutils/PKGBUILD
View file

@ -7,7 +7,7 @@ plugrel=1
pkgname=diffutils
pkgver=3.2
pkgrel=1
pkgrel=1.1
pkgdesc="Utility programs used for creating patch files"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/diffutils"

46
core/gawk/PKGBUILD Normal file
View file

@ -0,0 +1,46 @@
# $Id: PKGBUILD 142109 2011-11-05 10:13:54Z tpowa $
# Maintainer:
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - rebuild for libsigsegv, remove when bumped upstream
plugrel=1
pkgname=gawk
pkgver=4.0.0
pkgrel=2.1
pkgdesc="GNU version of awk"
arch=('i686' 'x86_64')
url="http://www.gnu.org/directory/GNU/gawk.html"
license=('GPL')
groups=('base')
depends=('sh' 'glibc')
provides=('awk')
install=gawk.install
source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
md5sums=('51e417b71287629940051e6f652c6492')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr --libexecdir=/usr/lib
make
}
check() {
cd ${srcdir}/${pkgname}-${pkgver}
make -j1 check
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
install -dm755 ${pkgdir}/bin
mv ${pkgdir}/usr/bin/gawk* ${pkgdir}/bin/
ln -sf gawk ${pkgdir}/bin/awk
ln -sf /bin/gawk ${pkgdir}/usr/bin/
}

22
core/gawk/gawk.install Normal file
View file

@ -0,0 +1,22 @@
infodir=usr/share/info
filelist=(gawk.info.gz gawkinet.info.gz)
post_install() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info $infodir/$file $infodir/dir 2> /dev/null
done
}
post_upgrade() {
post_install $1
}
pre_remove() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
done
}
# vim:set ts=2 sw=2 et:

10
core/linux-raspberrypi/PKGBUILD
View file

@ -9,7 +9,7 @@ pkgname=('linux-raspberrypi' 'linux-headers-raspberrypi')
_kernelname=${pkgname#linux}
_basekernel=3.1
pkgver=${_basekernel}.9
pkgrel=9
pkgrel=10
arch=('arm')
url="http://www.kernel.org/"
license=('GPL2')
@ -22,7 +22,7 @@ source=('config'
'args-uncompressed.txt'
'boot-uncompressed.txt'
'imagetool-uncompressed.py')
md5sums=('079a2b49a56e997908b23381cb9b9b8a'
md5sums=('7f1e179f80bc7f5ac096c1410f0fdcc1'
'9d3c56a4b999c8bfbd4018089a62f662'
'd00814b57448895e65fbbc800e8a58ba'
'6e7667c6c6348bfeca22eaaa05462d62'
@ -31,7 +31,7 @@ md5sums=('079a2b49a56e997908b23381cb9b9b8a'
'2f82dbe5752af65ff409d737caf11954')
build() {
git clone --depth 1 https://github.com/raspberrypi/linux.git
#git clone --depth 1 https://github.com/raspberrypi/linux.git
cd "${srcdir}/linux"
@ -42,6 +42,9 @@ build() {
# FS#26528
patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
# Add Arch Linux ARM patch for ARMv5te plug computers
#patch -Np1 -i ${srcdir}/archlinuxarm.patch
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@ -90,7 +93,6 @@ build() {
package_linux-raspberrypi() {
pkgdesc="The Linux Kernel and modules for Raspberry Pi"
groups=('base')
depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
optdepends=('crda: to set the correct wireless channels of your country')
provides=('kernel26-raspberrypi' 'linux=${pkgver}')

5
core/linux-raspberrypi/config
View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.1.9-8 Kernel Configuration
# Linux/arm 3.1.9-10 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -1401,6 +1401,8 @@ CONFIG_LOGO_LINUX_CLUT224=y
CONFIG_SOUND=m
# CONFIG_SOUND_OSS_CORE is not set
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
# CONFIG_SND_SEQUENCER is not set
# CONFIG_SND_MIXER_OSS is not set
# CONFIG_SND_PCM_OSS is not set
@ -1422,6 +1424,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_MPU401 is not set
CONFIG_SND_ARM=y
# CONFIG_SND_ARMAACI is not set
CONFIG_SND_BCM2835=m
CONFIG_SND_USB=y
# CONFIG_SND_USB_AUDIO is not set
# CONFIG_SND_USB_UA101 is not set

8
core/linux/PKGBUILD
View file

@ -10,7 +10,7 @@ pkgname=('linux' 'linux-headers')
_kernelname=${pkgname#linux}
_basekernel=3.1
pkgver=${_basekernel}.10
pkgrel=6
pkgrel=7
cryptover=1.4
arch=('arm')
url="http://www.kernel.org/"
@ -32,14 +32,14 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz")
md5sums=('8d43453f8159b2332ad410b19d86a931'
'a8e1c25a93a685ec2a1c3a808715fe9d'
'7f2c10e9e8ab4decaaf1dd5437a775a3'
'e114a524448aee5be540331654a4a18b'
'f5d3635da03cb45904bedd69b47133de'
'3f64ed9d71499fe9293dc671f4e4087e'
'29628745258df910abfb8cb24ca3ccd9'
'c9e6e8bb0774a89f7f9bd30a13be7532'
'55b04499a4578e586cf5a4d0b69fc5aa'
'e9c48e4c43e1044122bc4832dcbe065c'
'ca6fec585152e0488ee04bc0b311ecf3'
'e3cd152f2bed3fc34036115c5541a707'
'5edbe368407db0e5d305a08cfaaafabd'
'9d3c56a4b999c8bfbd4018089a62f662'
'd00814b57448895e65fbbc800e8a58ba'
'7b0ac1c0a88d8fbe7316db02f21666e6')

5201
core/linux/archlinuxarm.patch
View file

File diff suppressed because it is too large Load diff

21
core/linux/config
View file

@ -1456,6 +1456,7 @@ CONFIG_WLAN=y
CONFIG_LIBERTAS_THINFIRM=m
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
CONFIG_LIBERTAS_THINFIRM_USB=m
CONFIG_LIBERTAS_UAP=m
# CONFIG_ATMEL is not set
CONFIG_AT76C50X_USB=m
# CONFIG_PRISM54 is not set
@ -1629,13 +1630,13 @@ CONFIG_USB_ARMLINUX=y
CONFIG_USB_EPSON2888=y
CONFIG_USB_KC2190=y
CONFIG_USB_NET_ZAURUS=m
# CONFIG_USB_NET_CX82310_ETH is not set
# CONFIG_USB_NET_KALMIA is not set
CONFIG_USB_NET_CX82310_ETH=m
CONFIG_USB_NET_KALMIA=m
CONFIG_USB_HSO=m
CONFIG_USB_NET_INT51X1=m
CONFIG_USB_IPHETH=m
CONFIG_USB_SIERRA_NET=m
# CONFIG_USB_VL600 is not set
CONFIG_USB_VL600=m
# CONFIG_WAN is not set
#
@ -3153,11 +3154,16 @@ CONFIG_ET131X=m
# CONFIG_ET131X_DEBUG is not set
# CONFIG_VIDEO_GO7007 is not set
# CONFIG_VIDEO_CX25821 is not set
# CONFIG_VIDEO_TM6000 is not set
CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
# CONFIG_DVB_CXD2099 is not set
# CONFIG_USBIP_CORE is not set
CONFIG_USBIP_CORE=m
CONFIG_USBIP_VHCI_HCD=m
CONFIG_USBIP_HOST=m
# CONFIG_USBIP_DEBUG is not set
CONFIG_W35UND=m
# CONFIG_PRISM2_USB is not set
CONFIG_PRISM2_USB=m
# CONFIG_ECHO is not set
# CONFIG_BRCMUTIL is not set
CONFIG_ASUS_OLED=m
@ -3195,7 +3201,8 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
CONFIG_LIRC_SIR=m
CONFIG_LIRC_TTUSBIR=m
CONFIG_LIRC_ZILOG=m
# CONFIG_EASYCAP is not set
CONFIG_EASYCAP=m
# CONFIG_EASYCAP_DEBUG is not set
# CONFIG_SOLO6X10 is not set
# CONFIG_ATH6K_LEGACY is not set
# CONFIG_USB_ENESTORAGE is not set

2
core/linux/linux.install
View file

@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
KERNEL_VERSION=3.1.10-4-ARCH
KERNEL_VERSION=3.1.10-7-ARCH
post_install () {
# updating module dependencies

42
core/m4/PKGBUILD Normal file
View file

@ -0,0 +1,42 @@
# $Id: PKGBUILD 142067 2011-11-04 23:35:59Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - rebuild because goddamn upstream built theirs statically linked, didn't trigger rebuild
# for libsigsegv.. STOP DOING THIS IF IT'S NOT IN THE PKGBUILD
plugrel=1
pkgname=m4
pkgver=1.4.16
pkgrel=2.1
pkgdesc="The GNU macro processor"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/m4"
license=('GPL3')
groups=('base-devel')
depends=('glibc' 'bash')
install=m4.install
source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig}
m4-1.4.16-readlink-einval.patch)
md5sums=('7548ec061a1ba993790159764f522d0e'
'eebe5c94e74e7551e2e30c5844f1b653'
'cea138fa9b568d06e46269611cec8dd0')
build() {
cd ${srcdir}/$pkgname-$pkgver
patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch
./configure --prefix=/usr
make
}
check() {
cd ${srcdir}/$pkgname-$pkgver
make check
}
package() {
cd ${srcdir}/$pkgname-$pkgver
make prefix=${pkgdir}/usr install
}

12
core/m4/m4-1.4.16-readlink-einval.patch Normal file
View file

@ -0,0 +1,12 @@
diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h
--- m4-1.4.16/tests/test-readlink.h.orig 2011-09-19 12:44:58.745546826 +0200
+++ m4-1.4.16/tests/test-readlink.h 2011-09-19 12:46:00.079548410 +0200
@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con
ASSERT (errno == ENOENT);
errno = 0;
ASSERT (func ("", buf, sizeof buf) == -1);
- ASSERT (errno == ENOENT);
+ ASSERT (errno == ENOENT || errno == EINVAL);
errno = 0;
ASSERT (func (".", buf, sizeof buf) == -1);
ASSERT (errno == EINVAL);

20
core/m4/m4.install Normal file
View file

@ -0,0 +1,20 @@
infodir=usr/share/info
filelist=(m4.info m4.info-1 m4.info-2)
post_install() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
done
}
post_upgrade() {
post_install $1
}
pre_remove() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
done
}

13
core/openssl-cryptodev/PKGBUILD
View file

@ -13,7 +13,7 @@ _pkgname=openssl
_ver=1.0.1
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgrel=1
pkgrel=2
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('i686' 'x86_64')
url='https://www.openssl.org'
@ -29,12 +29,14 @@ source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"
"https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz.asc"
'fix-manpages.patch'
'no-rpath.patch'
'ca-dir.patch')
'ca-dir.patch'
'disable-tls12-client.patch')
md5sums=('134f168bc2a8333f19f81d684841710b'
'efbe93c11747fed52e60567819409d8a'
'5bbc0655bda2af95bc8eb568963ce8ba'
'dc78d3d06baffc16217519242ce92478'
'3bf51be3a1bbd262be46dc619f92aa90')
'3bf51be3a1bbd262be46dc619f92aa90'
'365328e1fff7239777adcb50dc4edd42')
build() {
cd $srcdir/$_pkgname-$_ver
@ -54,12 +56,15 @@ build() {
patch -p0 -i $srcdir/no-rpath.patch
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
# workaround for PR#2771
patch -p1 -i $srcdir/disable-tls12-client.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS -DHASH_MAX_LEN=64 \
shared threads zlib enable-md2 \
"${openssltarget}" \
-Wa,--noexecstack "${CFLAGS} -I/usr/src/linux-`uname -r`"
-Wa,--noexecstack "${CFLAGS} -I/usr/src/linux-`uname -r`" \
-DOPENSSL_NO_TLS1_2_CLIENT
make depend
make

36
core/openssl-cryptodev/disable-tls12-client.patch Normal file
View file

@ -0,0 +1,36 @@
Index: openssl/ssl/t1_lib.c
RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
rcsdiff -q -kk '-r1.64.2.14.2.31' '-r1.64.2.14.2.32' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null
--- t1_lib.c 2012/02/27 16:38:10 1.64.2.14.2.31
+++ t1_lib.c 2012/03/21 21:32:57 1.64.2.14.2.32
@@ -544,7 +544,7 @@
}
skip_ext:
- if (TLS1_get_version(s) >= TLS1_2_VERSION)
+ if (TLS1_get_client_version(s) >= TLS1_2_VERSION)
{
if ((size_t)(limit - ret) < sizeof(tls12_sigalgs) + 6)
return NULL;
Index: openssl/ssl/s23_clnt.c
RCS File: /v/openssl/cvs/openssl/ssl/s23_clnt.c,v
rcsdiff -q -kk '-r1.43.2.4.2.5' '-r1.43.2.4.2.6' -u '/v/openssl/cvs/openssl/ssl/s23_clnt.c,v' 2>/dev/null
--- s23_clnt.c 2011/05/19 18:22:15 1.43.2.4.2.5
+++ s23_clnt.c 2012/03/29 19:08:54 1.43.2.4.2.6
@@ -287,12 +287,14 @@
if (ssl2_compat && ssl23_no_ssl2_ciphers(s))
ssl2_compat = 0;
-
+#ifndef OPENSSL_NO_TLS1_2_CLIENT
if (!(s->options & SSL_OP_NO_TLSv1_2))
{
version = TLS1_2_VERSION;
}
- else if (!(s->options & SSL_OP_NO_TLSv1_1))
+ else
+#endif
+ if (!(s->options & SSL_OP_NO_TLSv1_1))
{
version = TLS1_1_VERSION;
}

13
core/openssl/PKGBUILD
View file

@ -11,7 +11,7 @@ _ver=1.0.1
# use a pacman compatible version scheme
#pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgver=$_ver
pkgrel=1
pkgrel=2
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('i686' 'x86_64')
url='https://www.openssl.org'
@ -24,12 +24,14 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
"https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc"
'fix-manpages.patch'
'no-rpath.patch'
'ca-dir.patch')
'ca-dir.patch'
'disable-tls12-client.patch')
md5sums=('134f168bc2a8333f19f81d684841710b'
'efbe93c11747fed52e60567819409d8a'
'5bbc0655bda2af95bc8eb568963ce8ba'
'dc78d3d06baffc16217519242ce92478'
'3bf51be3a1bbd262be46dc619f92aa90')
'3bf51be3a1bbd262be46dc619f92aa90'
'26432b9d7af63c63828b6405c9185400')
build() {
cd $srcdir/$pkgname-$_ver
@ -49,11 +51,14 @@ build() {
patch -p0 -i $srcdir/no-rpath.patch
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
# workaround for PR#2771
patch -p1 -i $srcdir/disable-tls12-client.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 \
"${openssltarget}" \
-Wa,--noexecstack "${CFLAGS}"
-Wa,--noexecstack "${CFLAGS}" \
-DOPENSSL_NO_TLS1_2_CLIENT
make depend
make

36
core/openssl/disable-tls12-client.patch Normal file
View file

@ -0,0 +1,36 @@
Index: openssl/ssl/t1_lib.c
RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
rcsdiff -q -kk '-r1.64.2.14.2.31' '-r1.64.2.14.2.32' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null
--- t1_lib.c 2012/02/27 16:38:10 1.64.2.14.2.31
+++ t1_lib.c 2012/03/21 21:32:57 1.64.2.14.2.32
@@ -544,7 +544,7 @@
}
skip_ext:
- if (TLS1_get_version(s) >= TLS1_2_VERSION)
+ if (TLS1_get_client_version(s) >= TLS1_2_VERSION)
{
if ((size_t)(limit - ret) < sizeof(tls12_sigalgs) + 6)
return NULL;
Index: openssl/ssl/s23_clnt.c
RCS File: /v/openssl/cvs/openssl/ssl/s23_clnt.c,v
rcsdiff -q -kk '-r1.43.2.4.2.5' '-r1.43.2.4.2.6' -u '/v/openssl/cvs/openssl/ssl/s23_clnt.c,v' 2>/dev/null
--- s23_clnt.c 2011/05/19 18:22:15 1.43.2.4.2.5
+++ s23_clnt.c 2012/03/29 19:08:54 1.43.2.4.2.6
@@ -287,12 +287,14 @@
if (ssl2_compat && ssl23_no_ssl2_ciphers(s))
ssl2_compat = 0;
-
+#ifndef OPENSSL_NO_TLS1_2_CLIENT
if (!(s->options & SSL_OP_NO_TLSv1_2))
{
version = TLS1_2_VERSION;
}
- else if (!(s->options & SSL_OP_NO_TLSv1_1))
+ else
+#endif
+ if (!(s->options & SSL_OP_NO_TLSv1_1))
{
version = TLS1_1_VERSION;
}

7
core/udev-oxnas/PKGBUILD
View file

@ -14,12 +14,10 @@ _pkgbase='udev'
pkgname='udev-oxnas'
pkgver=181
_pkgver=175
provides=('udev=181')
pkgrel=5
pkgrel=5.1
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
license=('GPL')
#groups=('base')
options=(!makeflags !libtool)
makedepends=('gobject-introspection' 'gperf')
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$_pkgbase-$_pkgver.tar.bz2
@ -49,7 +47,8 @@ package_udev-oxnas() {
depends=('util-linux' 'libusb-compat' 'glib2' 'module-init-tools' 'pciutils')
install=udev.install
backup=(etc/udev/udev.conf)
conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07' 'udev')
conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07')
provides=("udev=${pkgver}")
replaces=('devfsd')
cd $srcdir/$_pkgbase-$_pkgver

6
extra/fftw/PKGBUILD
View file

@ -10,8 +10,8 @@
plugrel=1
pkgname=fftw
pkgver=3.3
pkgrel=2
pkgver=3.3.1
pkgrel=1
pkgdesc="A library for computing the discrete Fourier transform (DFT)"
arch=('i686' 'x86_64')
license=('GPL2')
@ -21,7 +21,7 @@ makedepends=('gcc-fortran')
options=('!libtool')
source=("http://www.fftw.org/${pkgname}-${pkgver}.tar.gz")
install=fftw.install
sha1sums=('e44493ba4babeacba184568e727876d9aed44205')
sha1sums=('3fecc492f576503a6a509d2073bd82b3fe0aef13')
# notes:
# http://www.fftw.org/fftw2_doc/fftw_6.html#SEC69

6
extra/kdebindings-python/PKGBUILD
View file

@ -9,8 +9,8 @@ plugrel=1
pkgbase=kdebindings-python
pkgname=('kdebindings-python'
'kdebindings-python2')
pkgver=4.8.1
pkgrel=3
pkgver=4.8.2
pkgrel=1
url='http://kde.org/'
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL')
@ -18,7 +18,7 @@ groups=('kdebindings')
makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla')
source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
"pykde4-4.4.4-arm-sip.patch")
sha1sums=('b9ef35269d2e08578ba20d01822dbdbed72bffb8'
sha1sums=('7d1a41e00794dba160ce8e2a3f750c9a4298ef15'
'20d37a8b127eebffc4556352168786036969ee78')
build() {

26
extra/qt/PKGBUILD
View file

@ -8,13 +8,14 @@
# - don't use -no-neon on armv7
# - make -j1 for v5, -j2 for v7 (pandaboard builder)
# - added -fno-strict-volatile-bitfields to CXXFLAGS to fix ARM bug
# - disabled gcc47.patch since we're not on that yet
plugrel=1
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.0
pkgrel=6
pkgver=4.8.1
pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@ -27,31 +28,18 @@ _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-qgraphicsscene-regression.patch'
'improved-filter-event.patch'
'qurl-backward-compatibility.patch'
'improve-cups-support.patch')
md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
'gcc47.patch')
md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
'c2e91fc028250a590e76effe234468e2'
'444ebeb716d7c7379835efb8aa88e6c8'
'7bc255a36733d0fbc80c1902ade4beca'
'c439c7731c25387352d8453ca7574971')
'd8a0e81075b290ddc18ecd33b9b7ee22')
build() {
cd "${srcdir}"/${_pkgfqn}
# (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
# (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}

54
extra/qt/fix-qgraphicsscene-regression.patch
View file

@ -1,54 +0,0 @@
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

27
extra/qt/gcc47.patch Normal file
View file

@ -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, &registerStore + 1)
{

84
extra/qt/improve-cups-support.patch
View file

@ -1,84 +0,0 @@
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.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +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.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +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);
+ else
+ setDuplex(DuplexNone);
+ }
+
+ if (cups.currentPPD()) {
+ // set default color
+ if (cups.currentPPD()->color_device)
+ setColorMode(Color);
+ else
+ setColorMode(GrayScale);
+ }
+
+ // set collation
+ const ppd_option_t *collate = cups.ppdOption("Collate");
+ if (collate)
+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
+ }
+#endif
}
/*!

98
extra/qt/improved-filter-event.patch
View file

@ -1,98 +0,0 @@
--- 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))

13
extra/qt/qurl-backward-compatibility.patch
View file

@ -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.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;

2
extra/texlive-bin/PKGBUILD
View file

@ -12,7 +12,7 @@ plugrel=1
pkgname=texlive-bin
pkgver=2011.3
_luatex_ver=0.70.1
pkgrel=4
pkgrel=5
pkgdesc="TeX Live binaries"
license=('GPL')
arch=('i686' 'x86_64')