Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Willam Christensen 2014-07-21 23:46:17 -06:00
commit 21ca36a80d
36 changed files with 482 additions and 309 deletions

View file

@ -1,8 +1,8 @@
pkgname=dkms-mt7601
pkgver=v3.0.0.3
pkgver=v3.0.0.4
pkgrel=1
pkgdesc="Driver for Ralink MT7601 chipset wireless adaptors"
arch=('arm')
arch=('arm' 'armv7h')
url="http://www.ralinktech.com"
license=('GPL')
depends=('dkms' 'linux-headers')
@ -10,20 +10,16 @@ conflicts=()
install=${pkgname}.install
options=(!strip)
_pkgname="mt7601"
source=("https://googledrive.com/host/0B_JlgOR4VNe0Sjg4ei0ySEY4aUE/DPA_MT7601U_LinuxSTA_3.0.0.3_20130717_LS.tar.bz2"
source=("https://ddaygold.github.io/DPO_MT7601U_LinuxSTA_3.0.0.4_20130913.pfc.tar.bz2"
"dkms.conf")
md5sums=('7597450f4374ecaa5798a8f60c956911'
'230952e09ff23d9725fc329a2e9522e3')
md5sums=('f7984ea77c465a01e89453a8b60f9e4f'
'f07b4518d0f1190e0c72230137afadb4')
package() {
# Change src dir name
mv ${srcdir}/DPA_MT7601U_LinuxSTA_3.0.0.3_20130717_LS ${srcdir}/$_pkgname-$pkgver
# Copy Makefile to subdir (because symbolic link is not copied for some reason)
rm ${srcdir}/$_pkgname-$pkgver/UTIL/Makefile
cp ${srcdir}/$_pkgname-$pkgver/Makefile.inc ${srcdir}/$_pkgname-$pkgver/UTIL/Makefile
mv ${srcdir}/DPO_MT7601U_LinuxSTA_3.0.0.4_20130913 ${srcdir}/$_pkgname-$pkgver
installDir="$pkgdir/usr/src/$_pkgname-$pkgver"

View file

@ -1,26 +1,24 @@
post_install (){
MODULE="mt7601"
VERSION="v3.0.0.3"
DKMS=$(which dkms)
MODPROBE=$(which modprobe)
CP=$(which cp)
MKDIR=$(which mkdir)
VERSION="v3.0.0.4"
# TODO: replace /usr/src with a variable.
SRCDIR=/usr/src/$MODULE-$VERSION
$DKMS add -m $MODULE -v $VERSION
$DKMS build -m $MODULE -v $VERSION
$DKMS install -m $MODULE -v $VERSION
dkms add -m $MODULE -v $VERSION
dkms build -m $MODULE -v $VERSION
dkms install -m $MODULE -v $VERSION
# This file is read form a hardcoded location.
# Can we put this in a standard location?
PARAMSDIR="/etc/Wireless/RT2870STA"
$MKDIR -p $PARAMSDIR
$CP $SRCDIR/RT2870STA.dat $PARAMSDIR
mkdir -p $PARAMSDIR
cp $SRCDIR/RT2870STA.dat $PARAMSDIR
$MODPROBE -a mt7601Usta mtutil7601Usta mtnet7601Usta
depmod -a $(uname -r)
modprobe -a mt7601Usta
}
pre_upgrade(){
@ -37,18 +35,15 @@ pre_remove (){
/usr/bin/rmmod mt7601 &> /dev/null
fi
DKMS=$(which dkms)
_line=$($DKMS status -m mt7601)
_line=$(dkms status -m mt7601)
if echo "$_line" | grep -E 'added|built|installed'; then
version=$(echo "$_line" | sed 's/mt7601,\([^,]*\)[,:].*/\1/;t;d')
$DKMS remove -m mt7601 -v $version --all
dkms remove -m mt7601 -v $version --all
fi
RM=$(which rm)
RMDIR=$(which rmdir)
$RM -rf /etc/Wireless/RT2870STA
$RMDIR --ignore-fail-on-non-empty /etc/Wireless
rm -rf /etc/Wireless/RT2870STA
rmdir --ignore-fail-on-non-empty /etc/Wireless
}
post_remove () {

View file

@ -1,19 +1,13 @@
PACKAGE_NAME="mt7601"
PACKAGE_VERSION="v3.0.0.3"
PACKAGE_VERSION="v3.0.0.4"
AUTOINSTALL="yes"
MAKE[0]="make"
BUILT_MODULE_NAME[0]="mt7601Usta"
BUILT_MODULE_NAME[1]="mtutil7601Usta"
BUILT_MODULE_NAME[2]="mtnet7601Usta"
BUILT_MODULE_LOCATION[0]="MODULE/os/linux"
BUILT_MODULE_LOCATION[1]="UTIL/os/linux"
BUILT_MODULE_LOCATION[2]="NETIF/os/linux"
BUILT_MODULE_LOCATION[0]="os/linux"
DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless"
DEST_MODULE_LOCATION[1]="/kernel/drivers/net/wireless"
DEST_MODULE_LOCATION[2]="/kernel/drivers/net/wireless"

View file

@ -3,7 +3,7 @@
pkgname=xf86-video-fbturbo-git
_gitname=xf86-video-fbturbo
pkgver=193.8dec039
pkgver=195.4c7313c
pkgrel=1
pkgdesc="X.org MALI video driver"
arch=('armv7h')

View file

@ -3,8 +3,8 @@
# Contributor: Maik Broemme <mbroemme@libmpq.org>
pkgname=asterisk
pkgver=12.3.2
pkgrel=2
pkgver=12.4.0
pkgrel=1
pkgdesc="A complete PBX solution"
arch=('i686' 'x86_64')
backup=('etc/asterisk/acl.conf'
@ -118,15 +118,15 @@ backup=('etc/asterisk/acl.conf'
'etc/asterisk/xmpp.conf')
url="http://www.asterisk.org"
license=('GPL')
depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl' 'libxml2' 'jansson' 'libxslt')
makedepends=('sqlite3' 'gsm' 'pjproject')
depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl' 'libxml2' 'jansson' 'libxslt' 'pjproject')
makedepends=('sqlite3' 'gsm')
optdepends=('lua51' 'libsrtp' 'postgresql' 'unixodbc' 'libpri' 'libss7' 'openr2' 'iksemel' 'radiusclient-ng' 'dahdi')
source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${pkgver}.tar.gz \
${pkgname}.service \
${pkgname}.logrotated \
${pkgname}.tmpfile)
install=${pkgname}.install
sha256sums=('0724ab25ba6e9334d69b7dd3866c046cb09b8c08a7b42ce4281a5f00393d5576'
sha256sums=('6c72d0060d1ce7a7d09f510d91d588f269aac0032de6a4464d5449b0d5600a72'
'74e0b278d553499f0c648a6e3d55c0dbb11b0c6dc93a85b020a21eafadb83783'
'caa24cfec5c6b4f8cea385269e39557362acad7e2a552994c3bc24080e3bdd4e'
'673c0c55bce8068c297f9cdd389402c2d5d5a25e2cf84732cb071198bd6fa78a')
@ -153,3 +153,4 @@ package(){
install -D -m 644 ${srcdir}/asterisk.service ${pkgdir}/usr/lib/systemd/system/asterisk.service
install -D -m 644 ${srcdir}/asterisk.tmpfile ${pkgdir}/usr/lib/tmpfiles.d/asterisk.conf
}

View file

@ -6,7 +6,7 @@
pkgbase=bird
pkgname=('bird' 'bird6')
pkgver=1.4.3
pkgver=1.4.4
pkgrel=1
arch=('i686' 'x86_64')
url='http://bird.network.cz/'
@ -15,7 +15,7 @@ depends=('readline' 'ncurses')
source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz"
'bird.service'
'bird6.service')
md5sums=('eb7e00b9c1d102ddfcbc19d9cb168511'
md5sums=('4ec3a9165928a541326ec9de316da974'
'69221e063a3f07dcad519d5eeacaae75'
'5b172bd052b523efd95ee018e891e181')

View file

@ -10,7 +10,7 @@
pkgname=gradm
_version=3.0
_timestamp=201405281853
_timestamp=201407162022
pkgver=3.0.$_timestamp
pkgrel=1
pkgdesc="Administration utility for grsecurity's Role Based Access Control (RBAC)"
@ -22,10 +22,10 @@ source=(https://grsecurity.net/stable/$pkgname-$_version-$_timestamp.tar.gz
https://grsecurity.net/stable/$pkgname-$_version-$_timestamp.tar.gz.sig
learn_config
policy)
sha256sums=('4ee8a4e3a658f14b58c55fb8c5a9d3234e0ec87cf90a886499918553a15c557a'
sha256sums=('300d119f584644a4698cf6c9125fa0cd17a7ff00b4f7885fe782828b93881e1b'
'SKIP'
'704ea6ba7f748761735cbe1cf52ef04f53eab1a1e9ea1bdcb6abaaf4a641e44d'
'c2fb8e696969530c4dc707c59cdc608df6c21d6226979dfeadef92c51deabc5e')
'0d069e28845f789d0e9da82fc6dffa368ab71b2ca4ab37e0d3e3c6951e82d98a')
prepare() {
cd $pkgname

View file

@ -385,6 +385,7 @@ subject /usr/bin/sshd dpo
/root
/proc r
/proc/*/oom_adj rw
/proc/*/oom_score_adj rw
/proc/kcore h
/proc/sys h
/proc/sys/kernel/ngroups_max r
@ -412,6 +413,7 @@ subject /usr/bin/sshd dpo
+CAP_SYS_RESOURCE
+CAP_SYS_TTY_CONFIG
+CAP_AUDIT_WRITE
+CAP_KILL
# to access user keys
+CAP_DAC_OVERRIDE

View file

@ -8,18 +8,21 @@
pkgname=nodejs
pkgver=0.10.29
pkgrel=1
_npmver=1.4.21
pkgrel=3
pkgdesc='Evented I/O for V8 javascript'
arch=('i686' 'x86_64' 'arm')
url='http://nodejs.org/'
license=('MIT')
provides=('nodejs-node-gyp')
makedepends=('python2')
makedepends=('python2' 'git' 'procps-ng')
optdepends=('python2: for node-gyp')
checkdepends=('curl')
options=('!emptydirs !strip')
source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
sha256sums=('47379d01f765f87c1a1498b4e65de30e45201de50334954860d7375a8258b15d')
source=("http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz"
git+https://github.com/npm/npm.git#tag=v$_npmver)
sha256sums=('47379d01f765f87c1a1498b4e65de30e45201de50334954860d7375a8258b15d'
'SKIP')
set_flags_for_arm() {
if [ "$CARCH" == "arm" ]; then
@ -49,6 +52,11 @@ set_flags_for_arm() {
prepare() {
cd node-v$pkgver
# We need new version of npm to fix bugs
rm -r deps/npm
ln -s "$srcdir/npm" deps
rm -r "$srcdir/npm/.git"
msg 'fixing for python2 name'
find -type f -exec sed -e 's_^#!/usr/bin/env python$_&2_' -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' -e 's_^#!/usr/bin/python$_&2_' -e "s_'python'_'python2'_" -i {} \;
find test -type f -exec sed -e "s|python |python2 |" -i {} \;
@ -85,6 +93,11 @@ build() {
make
cd ../npm
../node-v$pkgver/node cli.js install ronn marked
PATH="$srcdir/node-v$pkgver:$PATH" make
../node-v$pkgver/node cli.js uninstall ronn marked
}
check() {
@ -112,7 +125,14 @@ package() {
install -D -m644 LICENSE \
${pkgdir}/usr/share/licenses/nodejs/LICENSE
# Why the hell wasn't this installed?! FS#40221
install -d "$pkgdir"/usr/share/man/{man1,man3,man5,man7}
for _dir in man1 man3 man5 man7; do
cd "$pkgdir"/usr/lib/node_modules/npm/man/$_dir
for _file in *; do
ln -s /usr/lib/node_modules/npm/man/$_dir/$_file "$pkgdir"/usr/share/man/$_dir/
done
done
ln -s /usr/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js "$pkgdir"/usr/bin/node-gyp
}

View file

@ -0,0 +1,27 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_test_runner_bad_virtual_method_arg.dpatch by <proppy@yada>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad unittest++-1.4.0~/src/tests/TestTestRunner.cpp unittest++-1.4.0/src/tests/TestTestRunner.cpp
--- unittest++-1.4.0~/src/tests/TestTestRunner.cpp 2008-10-30 15:27:42.000000000 +0100
+++ unittest++-1.4.0/src/tests/TestTestRunner.cpp 2009-07-10 23:25:53.000000000 +0200
@@ -20,14 +20,14 @@
{
}
- virtual void RunImpl(TestResults& testResults_) const
+ virtual void RunImpl() const
{
for (int i=0; i < count; ++i)
{
if (asserted)
ReportAssert("desc", "file", 0);
else if (!success)
- testResults_.OnTestFailure(m_details, "message");
+ CurrentTest::Results()->OnTestFailure(m_details, "message");
}
}

View file

@ -0,0 +1,55 @@
# $Id:
# Maintainer : Martin Wimpress <code@flexion.org>
# Contributor: Jorge Araya Navarro <elcorreo@deshackra.com>
# Contributor: Piotr Beling <qwak@w8.pl>
# Contributor: Vianney le Clément <vleclement AT gmail · com>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - patch to fix build
pkgname=unittestpp
pkgver=1.4
pkgrel=6
pkgdesc="A lightweight unit testing framework for C++"
arch=('i686' 'x86_64')
url="http://unittest-cpp.sourceforge.net/"
depends=('gcc-libs')
source=("http://downloads.sourceforge.net/project/unittest-cpp/UnitTest%2B%2B/$pkgver/unittest-cpp-$pkgver.zip"
'unittest++.pc'
'20_test_runner_bad_virtual_method_arg.dpatch')
md5sums=('bd373a53403ed51ea1bbb60b1952d7e3'
'fa35c8a0274264dcb75e5106c5b3deb7'
'b2721cb13e8e74143d05662eba0d97f8')
license=('MIT')
options=('staticlibs')
prepare() {
cd "${srcdir}/UnitTest++"
patch -p1 -i ../20_test_runner_bad_virtual_method_arg.dpatch
}
build() {
cd "${srcdir}/UnitTest++"
make all
}
package() {
install -dm755 "${pkgdir}/usr/lib/pkgconfig"
install -m644 unittest++.pc "${pkgdir}/usr/lib/pkgconfig"
cd "${srcdir}/UnitTest++"
install -dm755 "${pkgdir}/usr/include/unittest++/Posix"
install -m644 src/*.h "${pkgdir}/usr/include/unittest++"
install -m644 src/Posix/*.h "${pkgdir}/usr/include/unittest++/Posix"
install -dm755 "${pkgdir}/usr/lib"
install -m644 libUnitTest++.a "${pkgdir}/usr/lib"
ln -s libUnitTest++.a "${pkgdir}/usr/lib/libunittest++.a"
install -dm755 "${pkgdir}/usr/share/licenses/unittestpp"
install -m644 COPYING "${pkgdir}/usr/share/licenses/unittestpp/LICENSE"
install -dm755 "${pkgdir}/usr/share/doc/unittestpp"
install -m644 README "${pkgdir}/usr/share/doc/unittestpp/README"
install -m644 docs/UnitTest++.html "${pkgdir}/usr/share/doc/unittestpp/UnitTest++.html"
}

View file

@ -0,0 +1,14 @@
# pkg-config source file
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: unittest++
Description: UnitTest++ is a unit testing framework for C++
Version: 1.4
Requires:
Conflicts:
Libs: -L${libdir} -lUnitTest++
Cflags: -I${includedir}/unittest++

View file

@ -7,7 +7,7 @@ pkgbase=linux-armv5
_srcname=linux-3.15
_kernelname=${pkgbase#linux}
_desc="ARMv5 based platforms"
pkgver=3.15.5
pkgver=3.15.6
pkgrel=1
arch=('arm')
url="http://www.kernel.org/"
@ -30,7 +30,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
'archlinuxarm.patch'
'config')
md5sums=('97ca1625bb40368dc41b9a7971549071'
'c0ecbe6a65913273c3338be7218dcf58'
'25e4c27b4aff5e14dc4b3dc0029fd05d'
'SKIP'
'537d3b1821b5685036138621308148d2'
'eb663234804d647a64cea20b949f3afd'
@ -284,17 +284,3 @@ for _p in ${pkgname[@]}; do
_package${_p#${pkgbase}}
}"
done
md5sums=('97ca1625bb40368dc41b9a7971549071'
'c604bc7db1d2a365a114c43e7ac504bd'
'SKIP'
'537d3b1821b5685036138621308148d2'
'eb663234804d647a64cea20b949f3afd'
'5fdfb6fe8c30934f38fb6315aa9d9912'
'bc9c1dbb9b5df11621ef750a919c546c'
'fb0f2d798b826e9b935b77dfe9422eff'
'02c58ebac58a3eeeaf709e1d8b98ca5f'
'14570ba571b001b1f42070e2066232d7'
'ad4eb847c301bc3d5a66de3ee2369da8'
'ef607cd7a01d7c287b107f677f6a7808'
'e319a8e1a596a39a8951fc6454664b15'
'1023171a1d8c682ea13c3b18a66d4878')

View file

@ -4,12 +4,12 @@
buildarch=4
pkgbase=linux-armv7-rc
_srcname=linux-3.16-rc5
_srcname=linux-3.16-rc6
_kernelname=${pkgbase#linux}
_desc="ARMv7 multi-platform"
pkgver=3.16.0
pkgrel=5
rcnrel=armv7-x0
pkgrel=6
rcnrel=armv7-x2
arch=('armv7h')
url="http://www.kernel.org/"
license=('GPL2')
@ -23,14 +23,14 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/testing/${_srcname}.tar.xz"
'0003-smileplug-devicetree.patch'
'0004-emmc-timing-fix.patch'
'config')
md5sums=('f9f2194569f186735ff6c84f849476eb'
'd780ae01d9dee05e96ed1cf9931aea43'
md5sums=('73afad5261287d46f35c36428c0c81bc'
'abc5ed0370daabb7a2b22b4c9ab457b7'
'SKIP'
'3ad860d0d6daedc82091ea29c9730b95'
'02cce6b8f88c4392f552b14d0bf2e71c'
'0a0c5691aea2503cd0c503cb50244f48'
'911bffe9c261ca5b91dd0a083d99e81f'
'25b58b48708f86194369c34ed79d18cb')
'995dab7ffd6ba5a40bab3dd886e849bf')
prepare() {
cd "${srcdir}/${_srcname}"

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.16.0-rc2-2 Kernel Configuration
# Linux/arm 3.16.0-rc6-6 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@ -297,7 +297,9 @@ CONFIG_DEFAULT_CFQ=y
CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_PADATA=y
CONFIG_UNINLINE_SPIN_UNLOCK=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
CONFIG_FREEZER=y
#
@ -371,23 +373,19 @@ CONFIG_HAVE_IMX_ANATOP=y
CONFIG_HAVE_IMX_GPC=y
CONFIG_HAVE_IMX_MMDC=y
CONFIG_HAVE_IMX_SRC=y
CONFIG_ARCH_MXC_IOMUX_V3=y
CONFIG_SOC_IMX5=y
CONFIG_SOC_IMX51=y
#
# Device tree only
#
CONFIG_SOC_IMX5=y
CONFIG_SOC_IMX50=y
CONFIG_MACH_IMX51_DT=y
CONFIG_SOC_IMX51=y
CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
CONFIG_SOC_IMX6SX=y
CONFIG_SOC_VF610=y
CONFIG_IMX_HAVE_PLATFORM_FEC=y
CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS=y
CONFIG_WAND_RFKILL=m
#
@ -474,7 +472,7 @@ CONFIG_SOC_EXYNOS5410=y
CONFIG_SOC_EXYNOS5420=y
CONFIG_SOC_EXYNOS5440=y
CONFIG_SOC_EXYNOS5800=y
# CONFIG_EXYNOS5420_MCPM is not set
CONFIG_EXYNOS5420_MCPM=y
CONFIG_PLAT_SAMSUNG=y
#
@ -1613,7 +1611,7 @@ CONFIG_IMX_WEIM=y
CONFIG_MVEBU_MBUS=y
CONFIG_OMAP_OCP2SCP=y
CONFIG_OMAP_INTERCONNECT=y
# CONFIG_ARM_CCI is not set
CONFIG_ARM_CCI=y
# CONFIG_VEXPRESS_CONFIG is not set
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
@ -3071,6 +3069,7 @@ CONFIG_PINCTRL_TEGRA20=y
CONFIG_PINCTRL_TEGRA30=y
CONFIG_PINCTRL_TEGRA114=y
CONFIG_PINCTRL_TEGRA124=y
CONFIG_PINCTRL_TEGRA_XUSB=y
CONFIG_PINCTRL_SAMSUNG=y
CONFIG_PINCTRL_EXYNOS=y
CONFIG_PINCTRL_EXYNOS5440=y
@ -3537,7 +3536,7 @@ CONFIG_MFD_PALMAS=y
# CONFIG_TPS6507X is not set
CONFIG_MFD_TPS65090=y
CONFIG_MFD_TPS65217=y
# CONFIG_MFD_TPS65218 is not set
CONFIG_MFD_TPS65218=y
CONFIG_MFD_TPS6586X=y
CONFIG_MFD_TPS65910=y
# CONFIG_MFD_TPS65912 is not set
@ -3609,6 +3608,7 @@ CONFIG_REGULATOR_TPS65023=y
CONFIG_REGULATOR_TPS6507X=y
CONFIG_REGULATOR_TPS65090=y
CONFIG_REGULATOR_TPS65217=y
CONFIG_REGULATOR_TPS65218=y
# CONFIG_REGULATOR_TPS6524X is not set
CONFIG_REGULATOR_TPS6586X=y
CONFIG_REGULATOR_TPS65910=y

View file

@ -7,9 +7,9 @@ pkgbase=linux-armv7
_srcname=linux-3.15
_kernelname=${pkgbase#linux}
_desc="ARMv7 multi-platform"
pkgver=3.15.5
pkgver=3.15.6
pkgrel=1
rcnrel=armv7-x4
rcnrel=armv7-x5
arch=('armv7h')
url="http://www.kernel.org/"
license=('GPL2')
@ -26,8 +26,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
'0004-emmc-timing-fix.patch'
'config')
md5sums=('97ca1625bb40368dc41b9a7971549071'
'c604bc7db1d2a365a114c43e7ac504bd'
'f78901d34c43052c416a2b8a0191f6b0'
'25e4c27b4aff5e14dc4b3dc0029fd05d'
'b1e78e7a15016a3208dfb2a488be9408'
'SKIP'
'3ad860d0d6daedc82091ea29c9730b95'
'02cce6b8f88c4392f552b14d0bf2e71c'

View file

@ -5,7 +5,7 @@ buildarch=4
pkgbase=linux-chromebook2
pkgname=('linux-chromebook2' 'linux-headers-chromebook2')
pkgver=20140707
pkgver=20140719
pkgrel=1
_kernelname=${pkgname#linux}
pkgdesc="ChromiumOS kernel with ArchLinux ARM tweaks"
@ -15,7 +15,7 @@ url="https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'dtc' 'inetutils' 'kmod' 'vboot-utils' 'git')
options=('!strip')
_commit=e27730dd2877ee4aca8d1f002b70807504140336
_commit=2969e1155c9dabf95df3dc5fc38e5bb83d6b18a4
source=("https://chromium.googlesource.com/chromiumos/third_party/kernel/+archive/${_commit}.tar.gz"
'http://archlinuxarm.org/builder/src/sd8797_uapsta_cros.bin'
'0001-exynos-drm-smem-start-len.patch'
@ -29,7 +29,7 @@ md5sums=('SKIP'
'dc6da2272ffb8ea63f10bc4457cc3f70'
'dc8c3ffa65edd9ee30a1f9805d2b3460'
'533ebbdc096adab3ec0d649fd04a0ca5'
'a5d06241e13c11fae3eff39aa737dddf'
'3853f4a83db95448b0ebcd2810cd72fe'
'1e66637b4771568d2dfa161f5e0357f7'
'61c5ff73c136ed07a7aadbf58db3d96a'
'584777ae88bce2c5659960151b64c7d8')

View file

@ -1300,7 +1300,8 @@ CONFIG_NET_CORE=y
# CONFIG_EQUALIZER is not set
CONFIG_MII=y
# CONFIG_NET_TEAM is not set
# CONFIG_MACVLAN is not set
CONFIG_MACVLAN=m
# CONFIG_MACVTAP is not set
# CONFIG_VXLAN is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set

View file

@ -7,7 +7,7 @@ buildarch=2
pkgbase=linux-kirkwood-dt
_kernelname=${pkgbase#linux}
_desc="Marvell Kirkwood DT"
pkgver=3.15.5
pkgver=3.15.6
pkgrel=1
cryptodev_commit=8af0fe8a977f33236d3e00306ac3648063052704
bfqver=v7r5
@ -32,7 +32,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz"
'goflexhome_dtb.patch'
'pogo_e02_dtb.patch')
md5sums=('abb4c4cea2452ef1d1cfed1c804d8b24'
md5sums=('739272475e2e3981974e1f083d0eba47'
'11cfa05ab3d1399e8f6c784a09bec17b'
'e319a8e1a596a39a8951fc6454664b15'
'SKIP'

View file

@ -7,7 +7,7 @@ buildarch=2
pkgbase=linux-kirkwood
_kernelname=${pkgbase#linux}
_desc="Marvell Kirkwood"
pkgver=3.15.5
pkgver=3.15.6
pkgrel=1
cryptodev_commit=8af0fe8a977f33236d3e00306ac3648063052704
bfqver=v7r5
@ -30,7 +30,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch")
md5sums=('abb4c4cea2452ef1d1cfed1c804d8b24'
md5sums=('739272475e2e3981974e1f083d0eba47'
'20c0aa36ce1a9c5ef082b2e2f56a0a22'
'03f32c3aa8890e9f23e08e0f77ef09b7'
'SKIP'

View file

@ -7,7 +7,7 @@ pkgbase=linux-mmp
_srcname=linux-3.10
_kernelname=${pkgbase#linux}
_desc="Marvell PXA168/MMP platforms"
pkgver=3.10.48
pkgver=3.10.49
pkgrel=1
arch=('armv7h')
url="https://github.com/Marvell-Semi/PXA168_kernel/tree/gplugd-dev"
@ -20,10 +20,10 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
'http://archlinuxarm.org/builder/src/gplugd.patch.xz'
'config')
md5sums=('4f25cd5bec5f8d5a7d935b3f2ccb8481'
'76fee501b3f76f1b4034730c8421e9c3'
'316a0e7eadd96fc036160301f07e3442'
'SKIP'
'e5d2d65404b0ad9e6596b2e22365dfdc'
'b73e349e34c90b42ce7c0f8f415110a6')
'401cb02470c8be7acfa542a10b2e59ce')
prepare() {
cd "${srcdir}/${_srcname}"
@ -280,8 +280,3 @@ for _p in ${pkgname[@]}; do
_package${_p#${pkgbase}}
}"
done
md5sums=('4f25cd5bec5f8d5a7d935b3f2ccb8481'
'44348efc910022b26d4d75b7d8390ca8'
'SKIP'
'e5d2d65404b0ad9e6596b2e22365dfdc'
'b73e349e34c90b42ce7c0f8f415110a6')

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.10.45-1 Kernel Configuration
# Linux/arm 3.10.48-1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -2521,7 +2521,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_DEFAULT_PERSIST=y
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_OTG=y
CONFIG_USB_OTG_WHITELIST=y
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
CONFIG_USB_MON=y
# CONFIG_USB_WUSB_CBAF is not set

View file

@ -5,11 +5,11 @@
buildarch=18
pkgbase=linux-raspberrypi-latest
_commit=dba14197f482131aa88c5ae4c2606e6635aeee51
_commit=f9b062f9b1c25d2ae3ce480179ad0c4d3033bd23
_srcname=linux-${_commit}
_kernelname=${pkgbase#linux}
_desc="Raspberry Pi"
pkgver=3.15.5
pkgver=3.15.6
pkgrel=1
bfqver=v7r5
@ -30,7 +30,7 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch")
md5sums=('d1de27c97d2dcdb4e56bc0a6cd9ff38d'
md5sums=('89acf8f3437509f5e79dd25e3ddac187'
'8988cc304eb8ffcbfca4acf0b71617b8'
'c0d63f4d42fd334bf31e4f749d4694f3'
'9335d1263fd426215db69841a380ea26'

View file

@ -2,7 +2,7 @@
# Maintainer: Tom Gundersen <teg@jklm.no>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - !distcc
# - disable optimization, currently breaks timesyncd over distcc
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
@ -14,7 +14,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt'
'util-linux' 'linux-api-headers' 'pam' 'python' 'python-lxml' 'quota-tools'
'shadow' 'xz')
options=('strip' 'debug' '!distcc')
options=('strip' 'debug')
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-hook-udev'
'initcpio-install-systemd'
@ -35,6 +35,9 @@ prepare() {
build() {
cd "$pkgname-$pkgver"
CFLAGS=`echo $CFLAGS | sed -e 's/-O2/-O0/'` && CXXFLAGS="$CFLAGS"
unset CPPFLAGS
./configure \
--libexecdir=/usr/lib \
--localstatedir=/var \

View file

@ -21,14 +21,14 @@
buildarch=4
pkgname=chromium
pkgver=35.0.1916.153
pkgver=36.0.1985.125
pkgrel=1
pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
arch=('armv6h' 'armv7h')
url="http://www.chromium.org/"
license=('BSD')
depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss'
'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'flac' 'snappy'
'libexif' 'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'flac' 'snappy'
'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz'
'desktop-file-utils' 'hicolor-icon-theme')
makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
@ -49,7 +49,7 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
chromium-arm-r0.patch
skia.patch
v6-ffmpeg.patch)
sha256sums=('280ceb4307ba334918aacd1c5672e6ce6538bf229f90415245ede5b569e5e70e'
sha256sums=('1782d0a5397e94313dee9e456de38bdfccf575c4e565f064a6ed7f9c509d5023'
'09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
'478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
'4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
@ -127,7 +127,8 @@ fi
-Dlinux_link_libspeechd=1
-Dlinux_link_pulseaudio=1
-Dlinux_strip_binary=1
-Dlinux_use_gold_binary=0
-Dlinux_use_bundled_binutils=0
-Dlinux_use_bundled_gold=0
-Dlinux_use_gold_flags=0
-Drelease_extra_cflags="$CFLAGS -DUSE_EABI_HARDFLOAT"
-Dlibspeechd_h_prefix=speech-dispatcher/
@ -147,6 +148,7 @@ fi
-Duse_system_xdg_utils=1
-Duse_system_yasm=1
-Duse_system_zlib=0
-Dusb_ids_path=/usr/share/hwdata/usb.ids
-Duse_gconf=0
-Ddisable_fatal_linker_warnings=1
-Ddisable_glibc=1

View file

@ -21,8 +21,8 @@
noautobuild=1
pkgname=ghc
pkgver=7.8.2
pkgrel=4
pkgver=7.8.3
pkgrel=2
pkgdesc='The Glasgow Haskell Compiler'
arch=('i686' 'x86_64')
url='http://www.haskell.org/ghc/'
@ -33,7 +33,7 @@ checkdepends=('python2')
install='ghc.install'
options=('staticlibs')
provides=('haskell-array=0.5.0.0'
'haskell-base=4.7.0.0'
'haskell-base=4.7.0.1'
'haskell-binary=0.7.1.0'
'haskell-bin-package-db=0.0.0.0'
'haskell-bytestring=0.10.4.0'
@ -56,31 +56,38 @@ provides=('haskell-array=0.5.0.0'
'haskell-transformers=0.3.0.0'
'haskell-unix=2.7.0.1'
'haskell-cabal=1.18.1.3'
'ghc=7.8.3-1'
'haskell-haskeline=0.7.1.2'
'haskell-terminfo=0.4.0.0'
'haskell-xhtml=3000.2.1'
)
replaces=('haskell-array<0.5.0.0'
'haskell-base<4.7.0.0'
'haskell-binary<0.7.1.0'
'haskell-bin-package-db<0.0.0.0'
'haskell-bytestring<0.10.4.0'
'haskell-containers<0.5.5.1'
'haskell-deepseq<1.3.0.2'
'haskell-directory<1.2.1.0'
'haskell-filepath<1.3.0.2'
'haskell-ghc-prim<0.3.1.0'
'haskell-haskell2010<1.1.2.0'
'haskell-haskell98<2.0.0.3'
'haskell-hoopl<3.10.0.1'
'haskell-hpc<0.6.0.1'
'haskell-integer-gmp<0.5.1.0'
'haskell-old-locale<1.0.0.6'
'haskell-old-time<1.1.0.2'
'haskell-pretty<1.1.1.1'
'haskell-process<1.2.0.0'
'haskell-template-haskell<2.9.0.0'
'haskell-time<1.4.2'
replaces=('haskell-array'
'haskell-base'
'haskell-binary'
'haskell-bin-package-db'
'haskell-bytestring'
'haskell-containers'
'haskell-deepseq'
'haskell-directory'
'haskell-filepath'
'haskell-ghc-prim'
'haskell-haskell2010'
'haskell-haskell98'
'haskell-hoopl'
'haskell-hpc'
'haskell-integer-gmp'
'haskell-old-locale'
'haskell-old-time'
'haskell-pretty'
'haskell-process'
'haskell-template-haskell'
'haskell-time'
'haskell-transformers'
'haskell-unix<2.7.0.1'
'haskell-cabal<1.18.1.3'
'haskell-unix'
'haskell-cabal'
'haskell-haskeline'
'haskell-terminfo'
'haskell-xhtml'
)
source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.xz"
"http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.xz"
@ -88,8 +95,8 @@ source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.xz"
'ghc'
'add-vfp-flags.patch'
'ghc-7.8.1-mk-config.mk.in-ARM-dynlinking.patch')
md5sums=('97578e0c27574a99e0d5071a7f35d136'
'ac54f7fa453010149a573740705ecbfb'
md5sums=('5e34b2a29564596c9ed83fb8667b47d4'
'7ca72a039d44ca2586c02863392b5dce'
'b622685c767d0b054c92d1432708d516'
'c1d46d86752c50dd85e7143b029fa07f'
'1eb0ed10fa9676c2e23a587c40166e0e'
@ -110,7 +117,7 @@ build() {
./configure \
--prefix=/usr \
--with-system-libffi \
--with-ffi-includes=/usr/lib/libffi-3.0.13/include
--with-ffi-includes=/usr/lib/libffi-3.1/include
make
}
@ -160,7 +167,7 @@ package() {
-i "${pkgdir}/usr/lib/ghc-${pkgver}/settings"
# provide non vanilla bash completion since ghc currently doesn't ship with any:
# https://ghc.haskell.org/trac/ghc/ticket/9006
# https://ghc.haskell.org/trac/ghc/ticket/9005
install -d ${pkgdir}/usr/share/bash-completion/completions
install -m644 ${srcdir}/ghc \
${pkgdir}/usr/share/bash-completion/completions

View file

@ -12,11 +12,6 @@ declare -A exclude
exclude['Win32']=1
# no integer-simple because we use integer-gmp
exclude['integer-simple']=1
# the rest are installed as dependencies of ghc and some shouldn't even be installed!
# https://ghc.haskell.org/trac/ghc/ticket/8919
exclude['haskeline']=1
exclude['terminfo']=1
exclude['xhtml']=1
# extract excluded libraries from ghc.mk
for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
exclude[${exclude_pkg}]=1

View file

@ -18,7 +18,7 @@ _java_ver=7
_icedtea_ver=2.5.1
# check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
_JDK_UPDATE_VERSION=60
_JDK_UPDATE_VERSION=65
_bootstrap=0 # 0/1 for quick build or full bootstrap

View file

@ -5,7 +5,7 @@
# - patch and cmake define to disable opengl for ARM
pkgname=kdeedu-analitza
pkgver=4.13.2
pkgver=4.13.3
pkgrel=1
pkgdesc="A library to add mathematical features to your program"
url="https://projects.kde.org/projects/kde/kdeedu/analitza"
@ -16,7 +16,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4' 'glu')
source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz"
'analitza-4.10.1-opengl_optional.patch')
sha1sums=('d6af0f7c3289ae7cdfab33bbcc451d69ef8cf753'
sha1sums=('2fe6612bb74c7725871babe6720cadd8d35ef36e'
'1b3a522acf87ed3dee51af4290a841645bf98a32')
prepare() {

View file

@ -5,7 +5,7 @@
# - patch and cmake define to disable opengl for ARM
pkgname=kdeedu-kalgebra
pkgver=4.13.2
pkgver=4.13.3
pkgrel=1
pkgdesc="Graph Calculator"
url="http://kde.org/applications/education/kalgebra/"
@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'glu')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz"
"kalgebra-opengl_optional.patch")
sha1sums=('906eaacb21cfc760fcefd82ca21a21d72ebdb971'
sha1sums=('a1cc526be3563fac32b0e854944ba9041898caa7'
'ae1b75e5192f8519517134447b481421112a6dd7')
prepare() {

View file

@ -1,55 +0,0 @@
From: David Faure <faure@kde.org>
Date: Wed, 18 Jun 2014 18:29:04 +0000
Subject: Don't require a job to handle messageboxes.
X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d
---
Don't require a job to handle messageboxes.
The POP3 ioslave doesn't have a job when it gets here.
---
--- a/kio/kio/usernotificationhandler.cpp
+++ b/kio/kio/usernotificationhandler.cpp
@@ -19,7 +19,7 @@
#include "usernotificationhandler_p.h"
#include "slave.h"
-#include "job_p.h"
+#include "jobuidelegate.h"
#include <kdebug.h>
@@ -76,19 +76,18 @@
if (m_cachedResults.contains(key)) {
result = *(m_cachedResults[key]);
- } else if (r->slave->job()) {
- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job());
- if (jobPrivate) {
- result = jobPrivate->requestMessageBox(r->type,
- r->data.value(MSG_TEXT).toString(),
- r->data.value(MSG_CAPTION).toString(),
- r->data.value(MSG_YES_BUTTON_TEXT).toString(),
- r->data.value(MSG_NO_BUTTON_TEXT).toString(),
- r->data.value(MSG_YES_BUTTON_ICON).toString(),
- r->data.value(MSG_NO_BUTTON_ICON).toString(),
- r->data.value(MSG_DONT_ASK_AGAIN).toString(),
- r->data.value(MSG_META_DATA).toMap());
- }
+ } else {
+ JobUiDelegate ui;
+ const JobUiDelegate::MessageBoxType type = static_cast<JobUiDelegate::MessageBoxType>(r->type);
+ result = ui.requestMessageBox(type,
+ r->data.value(MSG_TEXT).toString(),
+ r->data.value(MSG_CAPTION).toString(),
+ r->data.value(MSG_YES_BUTTON_TEXT).toString(),
+ r->data.value(MSG_NO_BUTTON_TEXT).toString(),
+ r->data.value(MSG_YES_BUTTON_ICON).toString(),
+ r->data.value(MSG_NO_BUTTON_ICON).toString(),
+ r->data.value(MSG_DONT_ASK_AGAIN).toString(),
+ r->data.value(MSG_META_DATA).toMap());
m_cachedResults.insert(key, new int(result));
}
} else {

View file

@ -6,8 +6,8 @@
# - patch to fix unclickable plasmoid buttons on ARM
pkgname=kdelibs
pkgver=4.13.2
pkgrel=3
pkgver=4.13.3
pkgrel=1
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kdelibs'
@ -21,8 +21,8 @@ install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch'
'arm-coronaoffscreen-input-fixes.diff'
'CVE-2014-3494.patch')
sha1sums=('1008effc37f316bf6e3a4d527c4257937fc572ec'
'pyqt.patch')
sha1sums=('9c0e963fa2db119ac37e15f31c05d18d3043a58e'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
'ed1f57ee661e5c7440efcaba7e51d2554709701c'
@ -40,9 +40,9 @@ prepare() {
patch -p1 -i "${srcdir}"/qt4.patch
# fix unclickable plasmoid buttons on ARM
patch -p1 -i "${srcdir}"/arm-coronaoffscreen-input-fixes.diff
# fix build with giflib 5.1.0
sed -i "/DGifCloseFile/s:file:&, NULL:g" khtml/imload/decoders/gifloader.cpp
patch -p1 -i "${srcdir}"/CVE-2014-3494.patch
# support newer PyQt build system
patch -p1 -i "${srcdir}"/pyqt.patch
}
build() {

161
extra/kdelibs/pyqt.patch Normal file
View file

@ -0,0 +1,161 @@
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Wed, 16 Jul 2014 19:29:40 +0000
Subject: Make FindPyQt4 work with PyQt's new build system.
X-Git-Tag: v4.13.90
X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=a7e47438d4e3469dc9df70d613826cb360fc8d19
---
Make FindPyQt4 work with PyQt's new build system.
Since PyQt 4.10, PyQt.pyqtconfig is deprecated and not available unless
PyQt is built using the old configure script.
There is no direct replacement for it, as PyQt's new build system does
not provide as much information as before by design. Luckily, most of
the variables we are interested in can be obtained from PyQt's QtCore
module itself even if its old build system is used.
The only exception is pyqt_sip_dir, which cannot be determined at all if
pyqtconfig is not available. In this case, the most we can do is guess
the default path like QScintilla2 does, and fail if it does not exist.
The user then needs to specify it manually via CMake with something like
-DPYQT4_SIP_DIR=/usr/share/sip/PyQt4. To this effect, all variables set
by FindPyQt4.cmake have been made cache variables, which means their
values can be overriden by the user, thus ignoring the contents read via
FindPyQt.py.
BUG: 337462
FIXED-IN: 4.14.0
REVIEW: 119302
---
--- a/cmake/modules/FindPyQt4.cmake
+++ b/cmake/modules/FindPyQt4.cmake
@@ -9,16 +9,20 @@
# Find the installed version of PyQt4. FindPyQt4 should only be called after
# Python has been found.
#
-# This file defines the following variables:
+# This file defines the following variables, which can also be overriden by
+# users:
#
# PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
# suitable for comparison as a string
#
# PYQT4_VERSION_STR - The version of PyQt4 as a human readable string.
#
-# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files.
+# PYQT4_VERSION_TAG - The Qt4 version tag used by PyQt's sip files.
#
-# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files.
+# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. This can be unset
+# if PyQt4 was built using its new build system and pyqtconfig.py is not
+# present on the system, as in this case its value cannot be determined
+# automatically.
#
# PYQT4_SIP_FLAGS - The SIP flags used to build PyQt.
@@ -31,13 +35,27 @@
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config)
IF(pyqt_config)
- STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config})
- STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config})
- STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1" PYQT4_VERSION_TAG ${pyqt_config})
- STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT4_SIP_DIR ${pyqt_config})
- STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT4_SIP_FLAGS ${pyqt_config})
+ STRING(REGEX MATCH "^pyqt_version:([^\n]+).*$" _dummy ${pyqt_config})
+ SET(PYQT4_VERSION "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a 6-digit hexadecimal number")
- SET(PYQT4_FOUND TRUE)
+ STRING(REGEX MATCH ".*\npyqt_version_str:([^\n]+).*$" _dummy ${pyqt_config})
+ SET(PYQT4_VERSION_STR "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a human-readable string")
+
+ STRING(REGEX MATCH ".*\npyqt_version_tag:([^\n]+).*$" _dummy ${pyqt_config})
+ SET(PYQT4_VERSION_TAG "${CMAKE_MATCH_1}" CACHE STRING "The Qt4 version tag used by PyQt4's .sip files")
+
+ STRING(REGEX MATCH ".*\npyqt_sip_dir:([^\n]+).*$" _dummy ${pyqt_config})
+ SET(PYQT4_SIP_DIR "${CMAKE_MATCH_1}" CACHE FILEPATH "The base directory where PyQt4's .sip files are installed")
+
+ STRING(REGEX MATCH ".*\npyqt_sip_flags:([^\n]+).*$" _dummy ${pyqt_config})
+ SET(PYQT4_SIP_FLAGS "${CMAKE_MATCH_1}" CACHE STRING "The SIP flags used to build PyQt4")
+
+ IF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}")
+ MESSAGE(WARNING "The base directory where PyQt4's SIP files are installed could not be determined. This usually means PyQt4 was built with its new build system and pyqtconfig.py is not present.\n"
+ "Please set the PYQT4_SIP_DIR variable manually.")
+ ELSE(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}")
+ SET(PYQT4_FOUND TRUE)
+ ENDIF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}")
ENDIF(pyqt_config)
IF(PYQT4_FOUND)
--- kdelibs-4.13.3/cmake/modules/FindPyQt.py~ 2014-07-11 06:42:13.000000000 +0000
+++ kdelibs-4.13.3/cmake/modules/FindPyQt.py 2014-07-18 13:04:32.070296111 +0000
@@ -1,24 +1,49 @@
# Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
+# Copyright (c) 2014, Raphael Kubo da Costa <rakuco@FreeBSD.org>
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-import PyQt4.pyqtconfig
+import PyQt4.QtCore
+import os
+import sys
-pyqtcfg = PyQt4.pyqtconfig.Configuration()
-print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
-print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str)
-
-pyqt_version_tag = ""
-in_t = False
-for item in pyqtcfg.pyqt_sip_flags.split(' '):
- if item=="-t":
- in_t = True
- elif in_t:
- if item.startswith("Qt_4"):
- pyqt_version_tag = item
+def get_default_sip_dir():
+ # This is based on QScintilla's configure.py, and only works for the
+ # default case where installation paths have not been changed in PyQt's
+ # configuration process.
+ if sys.platform == 'win32':
+ pyqt_sip_dir = os.path.join(sys.platform, 'sip', 'PyQt4')
else:
- in_t = False
-print("pyqt_version_tag:%s" % pyqt_version_tag)
+ pyqt_sip_dir = os.path.join(sys.platform, 'share', 'sip', 'PyQt4')
+ return pyqt_sip_dir
+
+def get_qt4_tag(sip_flags):
+ in_t = False
+ for item in sip_flags.split(' '):
+ if item == '-t':
+ in_t = True
+ elif in_t:
+ if item.startswith('Qt_4'):
+ return item
+ else:
+ in_t = False
+ raise ValueError('Cannot find Qt\'s tag in PyQt4\'s SIP flags.')
+
+if __name__ == '__main__':
+ try:
+ import PyQt4.pyqtconfig
+ pyqtcfg = PyQt4.pyqtconfig.Configuration()
+ sip_dir = pyqtcfg.pyqt_sip_dir
+ sip_flags = pyqtcfg.pyqt_sip_flags
+ except ImportError:
+ # PyQt4 >= 4.10.0 was built with configure-ng.py instead of
+ # configure.py, so pyqtconfig.py is not installed.
+ sip_dir = get_default_sip_dir()
+ sip_flags = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags']
+
+ print('pyqt_version:%06.x' % PyQt4.QtCore.PYQT_VERSION)
+ print('pyqt_version_str:%s' % PyQt4.QtCore.PYQT_VERSION_STR)
+ print('pyqt_version_tag:%s' % get_qt4_tag(sip_flags))
+ print('pyqt_sip_dir:%s' % sip_dir)
+ print('pyqt_sip_flags:%s' % sip_flags)
-print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir)
-print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags)

View file

@ -10,8 +10,8 @@
pkgbase=mesa
pkgname=('mesa' 'mesa-libgl')
pkgver=10.2.3
pkgrel=2
pkgver=10.2.4
pkgrel=1
arch=('i686' 'x86_64')
makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd'
@ -21,7 +21,7 @@ license=('custom')
options=('!libtool')
source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
LICENSE)
sha256sums=('e482a96170c98b17d6aba0d6e4dda4b9a2e61c39587bb64ac38cadfa4aba4aeb'
sha256sums=('06a2341244eb85c283f59f70161e06ded106f835ed9b6be1ef0243bd9344811a'
'7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
build() {

View file

@ -9,6 +9,9 @@
# - added Raspberry Pi patches for armv6h
# - icu makedepend so qtwebkit can build
# Arno Rehn <arno@arnorehn.de>
# - fix Raspberry Pi EGL/GLESv2 build
pkgbase=qt5
pkgname=('qt5-base'
'qt5-connectivity'
@ -32,7 +35,7 @@ pkgname=('qt5-base'
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.3.1
pkgrel=1
pkgrel=1.1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@ -49,13 +52,13 @@ source=("http://download.qt-project.org/official_releases/qt/5.3/${pkgver}/singl
'use-python2.patch'
'rpi.patch'
'qt5webkit-0002-Fix-QtWebKit-build-on-ARM-softfp.patch')
md5sums=('f00ac7930e3b1b2b364dedcd15acc142'
md5sums=('f9a24a0d5645efa0715b6ff0fa13d60f'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
'a378deccf363bd6079da459c89aff7b9'
'd7992d2309194c42a7d47b86010d13d7'
'8df638e1dbf41617ffb0827978b54c8e'
'd9eb94a6cf4f178a7d77d6b8a9280ee2')
prepare() {
@ -69,13 +72,26 @@ prepare() {
cd ..
# Raspberry Pi
# if [ "$CARCH" == 'armv6h' ]; then
# cd qtbase
# patch -p1 -i "${srcdir}"/rpi.patch
# cd ..
# rbp_config="-device linux-rasp-pi-g++ -eglfs"
# export CXXFLAGS=${CXXFLAGS}" -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
# fi
if [ "$CARCH" == 'armv6h' ]; then
# Removes pkg-config checks for egl and glesv2 which would interfere with our custom paths below.
# Better solution would be to provide a raspberrypi-libgl package which provides 'libgl' and pkg-config modules
# for the egl, glesv2 libs in /opt/vc/. Not sure if that would break other packages, though. So I'm leaving it
# at this for now.
patch -p1 -i "${srcdir}"/rpi.patch
# VideoCore libs and includes
vc_include_dir="/opt/vc/include /opt/vc/include/interface/vcos/pthreads /opt/vc/include/interface/vmcs_host/linux"
vc_lib_dir="/opt/vc/lib"
sed -i "/^QMAKE_INCDIR_OPENGL\s/s|=|= $vc_include_dir|g" qtbase/mkspecs/common/linux.conf
sed -i "/^QMAKE_LIBDIR_OPENGL\s/s|=|= $vc_lib_dir|g" qtbase/mkspecs/common/linux.conf
sed -i "/^QMAKE_INCDIR_EGL\s/s|=|= $vc_include_dir|g" qtbase/mkspecs/common/linux.conf
sed -i "/^QMAKE_LIBDIR_EGL\s/s|=|= $vc_lib_dir|g" qtbase/mkspecs/common/linux.conf
sed -i "/^QMAKE_LIBS_EGL\s/s|= -lEGL|= -lEGL -lGLESv2|g" qtbase/mkspecs/common/linux.conf
echo "EGLFS_PLATFORM_HOOKS_SOURCES = $PWD/qtbase/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp" >> qtbase/mkspecs/common/linux.conf
echo "EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host" >> qtbase/mkspecs/common/linux.conf
fi
sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf
sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf
@ -121,8 +137,7 @@ build() {
-no-sse4.2 \
-no-avx \
-no-avx2 \
-opengl es2 \
$rbp_config
-opengl es2
make
@ -138,9 +153,14 @@ build() {
package_qt5-base() {
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'dbus' 'fontconfig' 'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
'qtchooser')
# On the Raspberry Pi, we don't need mesa-libgl and use broadcom's libs instead
# (see above in prepare())
test "$CARCH" != 'armv6h' && depends+=('libgl')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'

View file

@ -1,80 +1,34 @@
--- a/src/gui/Qt5GuiConfigExtras.cmake.in
+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -96,12 +96,10 @@
string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib})
if (NOT TARGET Qt5::Gui_${_cmake_lib_name})
find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib}
-!!IF !isEmpty(CROSS_COMPILE)
PATHS \"${LibDir}\"
!!IF !mac
NO_DEFAULT_PATH
!!ENDIF
-!!ENDIF
)
!!IF mac
set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}")
--- a/configure
+++ b/configure
@@ -3206,11 +3206,6 @@
else
XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}"
fi
-if [ "$PLATFORM" != "$XPLATFORM" ]; then
- QT_CROSS_COMPILE=yes
- QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
- QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile"
-fi
if [ "$BUILD_ON_MAC" = "yes" ]; then
if [ `basename $QMAKESPEC` = "macx-xcode" ] || [ `basename $XQMAKESPEC` = "macx-xcode" ]; then
@@ -3538,11 +3533,6 @@
if [ "$CFG_DEV" = "yes" ]; then
CFG_BUILD_PARTS="$CFG_BUILD_PARTS tests"
--- qt-everywhere-opensource-src-5.3.1/qtbase/configure.orig 2014-07-19 13:59:34.000000000 +0200
+++ qt-everywhere-opensource-src-5.3.1/qtbase/configure 2014-07-19 13:53:37.000000000 +0200
@@ -4801,16 +4801,6 @@
fi
-
- # don't build tools by default when cross-compiling
- if [ "$PLATFORM" != "$XPLATFORM" ]; then
- CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
elif [ "$CFG_OPENGL" = "es2" ]; then
#OpenGL ES 2.x
- if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists glesv2 2>/dev/null; then
- QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
- QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --libs-only-L glesv2 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'`
- QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2>/dev/null`
- QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2>/dev/null`
- QMakeVar set QMAKE_INCDIR_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_INCDIR_OPENGL_ES2"`"
- QMakeVar set QMAKE_LIBDIR_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_LIBDIR_OPENGL_ES2"`"
- QMakeVar set QMAKE_LIBS_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_LIBS_OPENGL_ES2"`"
- fi
fi
for nobuild in $CFG_NOBUILD_PARTS; do
CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
--- a/mkspecs/devices/common/linux_device_post.conf
+++ b/mkspecs/devices/common/linux_device_post.conf
@@ -6,4 +6,3 @@
QMAKE_CFLAGS += $$COMPILER_FLAGS
QMAKE_CXXFLAGS += $$COMPILER_FLAGS
-deviceSanityCheckCompiler()
diff --git a/mkspecs/devices/common/linux_device_pre.conf b/mkspecs/devices/common/linux_device_pre.conf
index 51f04d9..4794b1e 100644
--- a/mkspecs/devices/common/linux_device_pre.conf
+++ b/mkspecs/devices/common/linux_device_pre.conf
@@ -12,14 +12,3 @@
error(Could not successfully load device configuration)
}
-# modifications to g++-unix.conf
-QMAKE_CC = $${CROSS_COMPILE}gcc
-QMAKE_CXX = $${CROSS_COMPILE}g++
-QMAKE_LINK = $${QMAKE_CXX}
-QMAKE_LINK_SHLIB = $${QMAKE_CXX}
-
-# modifications to linux.conf
-QMAKE_AR = $${CROSS_COMPILE}ar cqs
-QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
-QMAKE_NM = $${CROSS_COMPILE}nm -P
-QMAKE_STRIP = $${CROSS_COMPILE}strip
--- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
+++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
@@ -18,6 +18,10 @@
compileTest unix/opengles2 "OpenGL ES 2.x" $QMAKE_LIBS_OPENGL_ES2 $QMAKE_CFLAGS_OPENGL_ES2
if [ $? != "0" ]; then
echo "The OpenGL ES 2.0 functionality test failed!"
@@ -5130,14 +5120,6 @@
exit 101
fi
QMAKE_LIBS_EGL = -lEGL -lGLESv2
+QMAKE_INCDIR_OPENVG = $$[QT_SYSROOT]/opt/vc/include
+QMAKE_LIBDIR_OPENVG = $$[QT_SYSROOT]/opt/vc/lib
+QMAKE_LIBS_OPENVG = -lOpenVG -lGLESv2
+
contains(DISTRO, squeeze) {
#Debian Squeeze: Legacy everything
QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lEGL
- if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then
- QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
- QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null`
- QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null`
- QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"
- QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"
- QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`"
- fi # detect EGL support
if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
CFG_EGL=yes
if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then