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

This commit is contained in:
Mikkel Oscar Lyderik 2014-03-14 15:42:56 +01:00
commit e5b772fb22
52 changed files with 558 additions and 284 deletions

View file

@ -14,8 +14,7 @@ provides=("chromium-pepper-flash=${pkgver}")
optdepends=('pulseaudio-alsa: For PulseAudio users')
install=chromium-pepper-flash.install
source=('license.html::http://www.google.com/chrome/intl/en/eula_text.html'
"http://mirror.nekinie.com/chromium-pepper-flash-armv7h/PepperFlash-${pkgver}-armv7h.tar.gz")
# Backup (slow) mirror "https://www.dray.be/PepperFlash-${pkgver}-armv7h.tar.gz"
"http://archlinuxarm.org/builder/src/PepperFlash-${pkgver}-armv7h.tar.gz")
md5sums=('ba19ea498f294975d320ff0b26a6cd63'
'7631da586071874409dac066f85ca567')

View file

@ -0,0 +1,29 @@
# Contributor: Oleg Trenkin <o.trenkin@ya.ru>
buildarch=4
_pkgname=gst-plugin-cedar
pkgname=${_pkgname}-sun7i
pkgver=0.10.1
pkgrel=1
pkgdesc="GStreamer 0.10 plugin for Cedar h264 hardware encoding with no binary blobs"
arch=('armv7h')
license=('GPL2')
url="https://github.com/ebutera/gst-plugin-cedar"
depends=('gstreamer0.10-base')
_rev=908987a
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ebutera/${_pkgname}/tarball/${_rev}")
md5sums=('73c5cd32e32c0e10e3bebc2c576c23fc')
build() {
cd $srcdir/ebutera-${_pkgname}-${_rev}
autoreconf -fi
./configure --prefix=/usr
make
}
package() {
cd $srcdir/ebutera-${_pkgname}-${_rev}
make DESTDIR="${pkgdir}" install
}

23
alarm/macspoof/PKGBUILD Normal file
View file

@ -0,0 +1,23 @@
# Maintainer Jason Plum <jplum@archlinuxarm.org>
pkgname=macspoof
pkgdesc="MAC Spoofing service"
pkgver=0.1
pkgrel=1
arch=('any')
url="https://wiki.archlinux.org/index.php/MAC_Address_Spoofing#Systemd_unit"
license=('GPL2')
source=('macspoof@.service'
'macspoof.conf.d')
md5sums=('c830b7ee6425390005189a2a01bb84eb'
'b50f74e4b71d6fda819feb89ccb62bc3')
backup=('etc/conf.d/macspoof')
install=macspoof.install
package() {
install -m644 -D "${srcdir}/macspoof.conf.d" "${pkgdir}/etc/conf.d/macspoof"
install -m644 -D "${srcdir}/macspoof@.service" "${pkgdir}/usr/lib/systemd/system/macspoof@.service"
}

View file

@ -0,0 +1,4 @@
# macspoof@.service configuration file
# example of setting for eth0 and wlan0
# mac_addr_eth0=DE:AD:BE:EF:00:01
# mac_addr_wlan0=DE:AD:BE:EF:00:02

View file

@ -0,0 +1,3 @@
post_install() {
echo " Be sure to edit /etc/conf.d/macspoof"
}

View file

@ -0,0 +1,13 @@
[Unit]
Description=MAC address change %I
Before=dhcpcd@%i.service netctl@%1.service netctl-ifplugd@%i.service netctl-auto@%i.service
[Service]
Type=oneshot
EnvironmentFile=/etc/conf.d/macspoof
ExecStart=/usr/bin/ip link set dev %i down
ExecStart=/usr/bin/ip link set dev %i address ${mac_addr_%i}
[Install]
WantedBy=network.target

View file

@ -7,7 +7,7 @@ pkgname=('raspberrypi-firmware'
'raspberrypi-firmware-emergency-kernel'
'raspberrypi-firmware-tools'
'raspberrypi-firmware-examples')
pkgver=20140223
pkgver=20140312
pkgrel=1
pkgdesc="Firmware files for Raspberry Pi"
arch=('any')

View file

@ -3,8 +3,8 @@
# Contributor: Maik Broemme <mbroemme@libmpq.org>
pkgname=asterisk
pkgver=12.0.0
pkgrel=4
pkgver=12.1.0
pkgrel=1
pkgdesc="A complete PBX solution"
arch=('i686' 'x86_64')
backup=('etc/asterisk/acl.conf'
@ -126,7 +126,7 @@ source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$
${pkgname}.logrotated \
${pkgname}.tmpfile)
install=${pkgname}.install
sha256sums=('0efc4507d5384447011fd1148eaaae2d06f70b04c736b4c73fbb9941a9440a2b'
sha256sums=('879bbd2bbf68ef76eb77406ba3309b8515db0a662408af991d694fbba99c0b9e'
'74e0b278d553499f0c648a6e3d55c0dbb11b0c6dc93a85b020a21eafadb83783'
'caa24cfec5c6b4f8cea385269e39557362acad7e2a552994c3bc24080e3bdd4e'
'673c0c55bce8068c297f9cdd389402c2d5d5a25e2cf84732cb071198bd6fa78a')

View file

@ -2,9 +2,9 @@
pkgname=cower
pkgver=11
pkgrel=1
pkgrel=2
pkgdesc="A simple AUR agent with a pretentious name"
arch=('any')
arch=('i686' 'x86_64')
url="http://github.com/falconindy/cower"
license=('MIT')
depends=('curl' 'yajl' 'pacman')
@ -14,11 +14,17 @@ md5sums=('7e2f3c5a8bc258ee129098aca5bfda9e'
'SKIP')
build() {
make -C "$pkgname-$pkgver"
cd "$pkgname-$pkgver"
make
sed '/^$/q' cower.c >LICENSE
}
package() {
make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install
cd "$pkgname-$pkgver"
make PREFIX=/usr DESTDIR="$pkgdir" install
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
# vim: ft=sh syn=sh

View file

@ -1,7 +1,7 @@
# Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info>
pkgname=openswan
pkgver=2.6.39
pkgrel=2
pkgver=2.6.41
pkgrel=1
pkgdesc="Open Source implementation of IPsec for the Linux operating system"
url="http://www.openswan.org"
license=('GPL' 'custom')
@ -42,5 +42,5 @@ package() {
# fix python2
sed -i '1s|python|python2|' $pkgdir/usr/lib/openswan/verify
}
md5sums=('199757597f9f776d85752bb0c713b5ed'
md5sums=('da2e8b02ecc30a408cc5766767fef84f'
'd8b465c10838c72e31329d65011002b6')

View file

@ -6,7 +6,7 @@
# - delete prepare function that set SSE build flags
pkgname=caps
pkgver=0.9.16
pkgver=0.9.21
pkgrel=1
pkgdesc="The LADSPA C* Audio Plugin Suite"
arch=('i686' 'x86_64')
@ -15,7 +15,7 @@ license=('GPL3')
groups=('ladspa-plugins')
depends=('ladspa')
source=("http://quitte.de/dsp/caps_$pkgver.tar.bz2")
md5sums=('85e79596f22636b154b152efe54d05ce')
md5sums=('8d1fb8fa5d185a348bde14c88102ffc2')
build() {
cd $pkgname-$pkgver

View file

@ -4,17 +4,18 @@
# Add patch for ARM being a supported platform.
pkgname=docker
_truever=0.8.0
_truever=0.9.0
pkgver=${_truever%.*}
pkgrel=1.2
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
url='http://www.docker.io/'
license=('Apache')
depends=('bridge-utils' 'iproute2' 'device-mapper' 'lxc' 'sqlite' 'systemd')
depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd')
makedepends=('git' 'go' 'btrfs-progs')
optdepends=('btrfs-progs: btrfs backend support')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc driver support')
# don't strip binaries! A sha1 is used to check binary consistency.
options=('!strip')
install=$pkgname.install

View file

@ -0,0 +1,44 @@
# $Id$
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Mathieu Clabaut <mathieu.clabaut@gmail.com>
# Contributor: Artyom Smirnov <smirnoffjr@gmail.com>
# Contributor: Alexis Robert <alexis.robert@gmail.com>
# Maintainer: Daniel Nagy < danielnagy at gmx de>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - configure with --disable-abiflags
# - patch to build with environment's CFLAGS
pkgname=libantlr3c
pkgver=3.4
pkgrel=1
pkgdesc="C runtime for the ANTLR parsing library"
url="http://www.antlr.org/"
arch=("i686" "x86_64")
license=("BSD")
depends=('bash')
makedepends=()
source=(http://www.antlr3.org/download/C/${pkgname}-${pkgver}.tar.gz
antlr-c-3.3-cflags.patch)
md5sums=('08b1420129d5dccd0f4461cedf2a0d7d'
'f936f142053c03ec57a0be95b7b8fe0c')
prepare() {
cd "${pkgname}-${pkgver}"
patch -p1 -i ../antlr-c-3.3-cflags.patch
autoreconf -fi
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
[ "$CARCH" = "x86_64" ] && _cfgopt=--enable-64bit
[[ $CARCH =~ arm.* ]] && _cfgopt=--disable-abiflags
./configure --prefix=/usr --sysconfdir=/etc ${_cfgopt}
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make install DESTDIR="${pkgdir}"
install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
}

View file

@ -0,0 +1,14 @@
diff -ur libantlr3c-3.3-SNAPSHOT.old//configure.ac libantlr3c-3.3-SNAPSHOT/configure.ac
--- libantlr3c-3.3-SNAPSHOT.old//configure.ac 2011-04-03 10:40:51.277000042 +0300
+++ libantlr3c-3.3-SNAPSHOT/configure.ac 2011-04-03 10:41:22.092000042 +0300
@@ -134,8 +134,8 @@
;;
esac
-CFLAGS="$CCFLAGS64 $CPPCMNTFLAGS $OPTIMFLAGS $DEBUGFLAGS $WARNFLAGS"
-AC_MSG_RESULT([$CFLAGS])
+AM_CFLAGS="$CCFLAGS64 $CPPCMNTFLAGS $OPTIMFLAGS $DEBUGFLAGS $WARNFLAGS"
+AC_MSG_RESULT([$AM_CFLAGS])
AC_SUBST([OBJECT_MODE])
AS_IF([test "x$enable_antlrdebug" = xno], [AC_DEFINE([ANTLR3_NODEBUGGER], [1], [Define if ANTLR debugger not required])], [])

View file

@ -6,8 +6,8 @@
# - remove numactl from depends, doesn't build on ARM
pkgname=libvirt
pkgver=1.2.1
pkgrel=4
pkgver=1.2.2
pkgrel=1
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
arch=('i686' 'x86_64')
url="http://libvirt.org/"
@ -19,7 +19,6 @@ depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'lxc')
optdepends=('bridge-utils: for briged networking (default)'
'dnsmasq: for NAT/DHCP for guests'
'kvm'
'openbsd-netcat: for remote management over ssh'
'qemu'
'radvd'
@ -64,17 +63,15 @@ install="libvirt.install"
source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
libvirtd.conf.d
libvirtd-guests.conf.d
libvirt.tmpfiles.d
"FS#38546.patch::http://libvirt.org/git/?p=libvirt.git;a=commitdiff_plain;h=7f0fd427413fe04963b1bcb158cf70e980ad1842")
md5sums=('cce374220f67895afb6331bd2ddedbfd'
libvirt.tmpfiles.d)
md5sums=('592958ad1ddce7574d8cb0a31e635acd'
'3ed0e24f5b5e25bf553f5427d64915e6'
'0a96ed876ffb1fcb9dff5a9b3a609c1e'
'020971887442ebbf1b6949e031c8dd3f'
'f579805e75956d32992c6934346ee740')
'020971887442ebbf1b6949e031c8dd3f')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
patch -p1 <"$srcdir/FS#38546.patch"
# patch -p1 <"$srcdir/FS#38546.patch"
}
build() {
@ -111,7 +108,7 @@ package() {
# systemd stuff
install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf
mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
# mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
rm -rf \
"$pkgdir"/var/run \

View file

@ -16,7 +16,7 @@ _prefix=/usr
pkgname=xbmc
pkgver=12.3
_codename=Frodo
pkgrel=11
pkgrel=12
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@ -41,7 +41,7 @@ source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
"polkit.rules"
"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
'b643ab67e4675c6aa88af1857f35baf2'
'03e9a33e15714d1fd1f2a516abea5393'
'02f7951824ee13103344f36009c0ef2a'
'7fd6399d2ffbdf06b724f0cc2efa0784')

View file

@ -1,6 +1,6 @@
[Unit]
Description = Starts instance of XBMC using xinit
After = remote-fs.target
After = systemd-user-sessions.service
Conflicts=getty@tty7.service
[Service]

View file

@ -8,12 +8,12 @@
# - set extra CFLAG for v5
pkgname=xulrunner
pkgver=27.0
pkgver=28.0
pkgrel=1
pkgdesc="Mozilla Runtime Environment"
arch=('i686' 'x86_64')
license=('MPL' 'GPL' 'LGPL')
depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'libvpx' 'python2')
depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'libpulse' 'libevent' 'libvpx' 'python2')
makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gstreamer0.10-base')
url="http://wiki.mozilla.org/XUL:Xul_Runner"
source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2
@ -22,8 +22,8 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/
shared-libs.patch)
options=('!emptydirs' 'staticlibs')
replaces=('xulrunner-oss')
sha256sums=('4f6125c053e12c4ac3317b075e289b10ce470dd90ed6fc43c4572bf1acc64981'
'1afb707bb7bdeb1f9b7a0d5ff875255bb634c1da81cb943e823559b773908204'
sha256sums=('6eacdc549c252da57d1f51a363ad8c7e62f09ec8c796e8eb69ddb3e1008df7af'
'7fd271e467e7bc61907d61c64b8dd57be152443d0517df3f3579a0e12785e5cd'
'23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269'
'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1')

View file

@ -34,4 +34,4 @@ ac_add_options --disable-tests
ac_add_options --disable-installer
# https://bugzilla.mozilla.org/show_bug.cgi?id=955876
ac_add_options --enable-release
#ac_add_options --enable-release

View file

@ -6,7 +6,7 @@
# - must build -j1, everything must build in order
pkgname=keyutils
pkgver=1.5.8
pkgver=1.5.9
pkgrel=1
pkgdesc="Linux Key Management Utilities"
arch=('i686' 'x86_64')
@ -16,7 +16,7 @@ depends=('glibc' 'sh')
backup=('etc/request-key.conf')
source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2
request-key.conf.patch)
md5sums=('3c7f463039b83833c12a9414c2fcb389'
md5sums=('7f8ac985c45086b5fbcd12cecd23cf07'
'89a819a7e4e90936b210c9d5020d296d')
prepare() {

View file

@ -9,8 +9,8 @@ pkgname=('linux-am33x-legacy' 'linux-headers-am33x-legacy')
_kernelname=${pkgname#linux}
_basekernel=3.8
pkgver=${_basekernel}.13
pkgrel=16
bonerel=40
pkgrel=17
bonerel=41
arch=('arm')
url="http://www.kernel.org/"
license=('GPL2')
@ -24,8 +24,8 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz"
'aufs3-3.8.patch.xz')
md5sums=('1c738edfc54e7c65faeb90c436104e2f'
'412da22dabe4d7fcb78b3c14e53cd892'
'6f2fd139a31c62c7e718fd6a02fae008'
'17a28940b697d913f6d2fca230b5bacd'
'bd2f7df63ff1d364be3cc90d92299d5b'
'd2f559553a3e6c36cf6998125faa9922'
'9d3c56a4b999c8bfbd4018089a62f662'
'd819af0969e0726cbf9ae6be5e044a75')

View file

@ -3068,7 +3068,6 @@ CONFIG_FB_SYS_FOPS=y
CONFIG_FB_DEFERRED_IO=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
@ -3484,7 +3483,6 @@ CONFIG_USB_CYPRESS_CY7C63=m
CONFIG_USB_CYTHERM=m
CONFIG_USB_IDMOUSE=m
CONFIG_USB_FTDI_ELAN=m
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_SISUSBVGA is not set
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m

View file

@ -7,8 +7,8 @@ pkgbase=linux-armv5
_srcname=linux-3.13
_kernelname=${pkgbase#linux}
_desc="ARMv5 based platforms"
pkgver=3.13.5
pkgrel=2
pkgver=3.13.6
pkgrel=1
arch=('armv7h')
url="http://www.kernel.org/"
license=('GPL2')
@ -21,7 +21,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
'imx23-olinuxino.patch'
'gpio-clamp.patch')
md5sums=('0ecbaf65c00374eb4a826c2f9f37606f'
'114c391a592131f1c12544e063173a45'
'a9b131a589a176b4c437b8ca4557b85e'
'SKIP'
'd277d406b1c488d7b26c0cf150afceb4'
'c3abaa939372af7a07ae5c2196263110'
@ -31,7 +31,7 @@ prepare() {
cd "${srcdir}/${_srcname}"
# add upstream patch
patch -Np1 -i "${srcdir}/patch-${pkgver}"
git apply "${srcdir}/patch-${pkgver}"
patch -Np1 -i "${srcdir}/imx23-olinuxino.patch"
patch -Np1 -i "${srcdir}/gpio-clamp.patch"

View file

@ -7,7 +7,7 @@ pkgbase=linux-armv7
_srcname=linux-3.13
_kernelname=${pkgbase#linux}
_desc="ARMv7 multi-platform"
pkgver=3.13.5
pkgver=3.13.6
pkgrel=1
rcnrel=armv7-x11
arch=('armv7h')
@ -25,8 +25,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
'mmc.patch'
'config')
md5sums=('0ecbaf65c00374eb4a826c2f9f37606f'
'114c391a592131f1c12544e063173a45'
'b4ff484a474169ec6d8aabe9763837b7'
'a9b131a589a176b4c437b8ca4557b85e'
'1b4a2bd6224093a770a82b87900b75b7'
'SKIP'
'3ad860d0d6daedc82091ea29c9730b95'
'02cce6b8f88c4392f552b14d0bf2e71c'

View file

@ -15,18 +15,20 @@ _srcname=linux-linaro-stable-mx6-${_commit}
_kernelname=${pkgname#linux}
_basekernel=3.10
pkgver=${_basekernel}.30
pkgrel=2
pkgrel=7
arch=('arm')
url="http://www.kernel.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-mkimage' 'git' 'lzop')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-mkimage' 'git')
options=('!strip')
source=("https://github.com/solidrun/linux-linaro-stable-mx6/archive/${_commit}.tar.gz"
'config'
'change-default-console-loglevel.pat')
'change-default-console-loglevel.pat'
'mxc_hdmi-dont-require-cea-mode.patch')
md5sums=('40a7283cfa9b3519453928f787f67fe9'
'45a6128efb6305ab1ab7edca0779bf5f'
'9d3c56a4b999c8bfbd4018089a62f662')
'40cddccd4c9ad68fcb98a089bde3842a'
'9d3c56a4b999c8bfbd4018089a62f662'
'8dc29365fc5b0668c10f630cc5b5d82d')
prepare() {
cd "${srcdir}/${_srcname}"
@ -43,7 +45,7 @@ prepare() {
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.pat"
patch -Np1 -i "${srcdir}/mxc_hdmi-dont-require-cea-mode.patch"
}
build() {

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.10.30-2 Kernel Configuration
# Linux/arm 3.10.30-7 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_MIGHT_HAVE_PCI=y
@ -27,16 +27,16 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION="-ARCH"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
# CONFIG_KERNEL_GZIP is not set
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_XZ is not set
CONFIG_KERNEL_LZO=y
# CONFIG_KERNEL_LZO is not set
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
@ -746,7 +746,7 @@ CONFIG_IRDA=y
#
# IrDA protocols
#
CONFIG_IRLAN=y
# CONFIG_IRLAN is not set
CONFIG_IRCOMM=y
CONFIG_IRDA_ULTRA=y
@ -1240,7 +1240,42 @@ CONFIG_PATA_IMX=y
#
# CONFIG_ATA_GENERIC is not set
# CONFIG_PATA_LEGACY is not set
# CONFIG_MD is not set
CONFIG_MD=y
CONFIG_BLK_DEV_MD=y
CONFIG_MD_AUTODETECT=y
CONFIG_MD_LINEAR=y
CONFIG_MD_RAID0=y
CONFIG_MD_RAID1=y
CONFIG_MD_RAID10=y
CONFIG_MD_RAID456=y
CONFIG_MD_MULTIPATH=y
CONFIG_MD_FAULTY=y
CONFIG_BCACHE=y
# CONFIG_BCACHE_DEBUG is not set
# CONFIG_BCACHE_EDEBUG is not set
# CONFIG_BCACHE_CLOSURES_DEBUG is not set
CONFIG_BLK_DEV_DM_BUILTIN=y
CONFIG_BLK_DEV_DM=y
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=y
CONFIG_DM_BIO_PRISON=y
CONFIG_DM_PERSISTENT_DATA=y
CONFIG_DM_CRYPT=y
CONFIG_DM_SNAPSHOT=y
CONFIG_DM_THIN_PROVISIONING=y
CONFIG_DM_DEBUG_BLOCK_STACK_TRACING=y
# CONFIG_DM_CACHE is not set
CONFIG_DM_MIRROR=y
CONFIG_DM_RAID=y
# CONFIG_DM_LOG_USERSPACE is not set
CONFIG_DM_ZERO=y
CONFIG_DM_MULTIPATH=y
CONFIG_DM_MULTIPATH_QL=y
CONFIG_DM_MULTIPATH_ST=y
CONFIG_DM_DELAY=y
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=y
CONFIG_DM_VERITY=y
# CONFIG_TARGET_CORE is not set
# CONFIG_FUSION is not set
@ -1252,19 +1287,21 @@ CONFIG_PATA_IMX=y
# CONFIG_I2O is not set
CONFIG_NETDEVICES=y
CONFIG_NET_CORE=y
# CONFIG_BONDING is not set
# CONFIG_DUMMY is not set
CONFIG_BONDING=y
CONFIG_DUMMY=y
# CONFIG_EQUALIZER is not set
# CONFIG_NET_FC is not set
CONFIG_MII=y
# CONFIG_NET_TEAM is not set
# CONFIG_MACVLAN is not set
# CONFIG_VXLAN is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
# CONFIG_TUN is not set
# CONFIG_VETH is not set
CONFIG_MACVLAN=y
CONFIG_MACVTAP=y
CONFIG_VXLAN=y
CONFIG_NETCONSOLE=y
CONFIG_NETPOLL=y
# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_POLL_CONTROLLER=y
CONFIG_TUN=y
CONFIG_VETH=y
# CONFIG_ARCNET is not set
#
@ -1408,10 +1445,10 @@ CONFIG_AT803X_PHY=y
# CONFIG_CICADA_PHY is not set
# CONFIG_VITESSE_PHY is not set
# CONFIG_SMSC_PHY is not set
# CONFIG_BROADCOM_PHY is not set
CONFIG_BROADCOM_PHY=y
# CONFIG_BCM87XX_PHY is not set
# CONFIG_ICPLUS_PHY is not set
# CONFIG_REALTEK_PHY is not set
CONFIG_REALTEK_PHY=y
# CONFIG_NATIONAL_PHY is not set
# CONFIG_STE10XP is not set
# CONFIG_LSI_ET1011C_PHY is not set
@ -1432,9 +1469,37 @@ CONFIG_AT803X_PHY=y
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_RTL8152 is not set
# CONFIG_USB_USBNET is not set
CONFIG_USB_USBNET=y
CONFIG_USB_NET_AX8817X=y
CONFIG_USB_NET_AX88179_178A=y
CONFIG_USB_NET_CDCETHER=y
# CONFIG_USB_NET_CDC_EEM is not set
CONFIG_USB_NET_CDC_NCM=y
# CONFIG_USB_NET_CDC_MBIM is not set
# CONFIG_USB_NET_DM9601 is not set
CONFIG_USB_NET_SMSC75XX=y
CONFIG_USB_NET_SMSC95XX=y
# CONFIG_USB_NET_GL620A is not set
CONFIG_USB_NET_NET1080=y
# CONFIG_USB_NET_PLUSB is not set
# CONFIG_USB_NET_MCS7830 is not set
# CONFIG_USB_NET_RNDIS_HOST is not set
CONFIG_USB_NET_CDC_SUBSET=y
# CONFIG_USB_ALI_M5632 is not set
# CONFIG_USB_AN2720 is not set
CONFIG_USB_BELKIN=y
CONFIG_USB_ARMLINUX=y
# CONFIG_USB_EPSON2888 is not set
# CONFIG_USB_KC2190 is not set
CONFIG_USB_NET_ZAURUS=y
# CONFIG_USB_NET_CX82310_ETH is not set
# CONFIG_USB_NET_KALMIA is not set
# CONFIG_USB_NET_QMI_WWAN is not set
# CONFIG_USB_HSO is not set
# CONFIG_USB_IPHETH is not set
# CONFIG_USB_NET_INT51X1 is not set
CONFIG_USB_IPHETH=y
# CONFIG_USB_SIERRA_NET is not set
# CONFIG_USB_VL600 is not set
CONFIG_WLAN=y
# CONFIG_LIBERTAS_THINFIRM is not set
# CONFIG_ATMEL is not set
@ -1465,17 +1530,38 @@ CONFIG_ATH6KL_SDIO=m
# CONFIG_ATH6KL_DEBUG is not set
# CONFIG_AR5523 is not set
# CONFIG_WIL6210 is not set
# CONFIG_B43 is not set
# CONFIG_B43LEGACY is not set
CONFIG_BRCMUTIL=y
CONFIG_B43=m
CONFIG_B43_SSB=y
CONFIG_B43_PCI_AUTOSELECT=y
CONFIG_B43_PCICORE_AUTOSELECT=y
CONFIG_B43_SDIO=y
CONFIG_B43_PIO=y
CONFIG_B43_PHY_N=y
CONFIG_B43_PHY_LP=y
CONFIG_B43_LEDS=y
CONFIG_B43_HWRNG=y
# CONFIG_B43_DEBUG is not set
CONFIG_B43LEGACY=m
CONFIG_B43LEGACY_PCI_AUTOSELECT=y
CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
CONFIG_B43LEGACY_LEDS=y
CONFIG_B43LEGACY_HWRNG=y
CONFIG_B43LEGACY_DEBUG=y
CONFIG_B43LEGACY_DMA=y
CONFIG_B43LEGACY_PIO=y
CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
# CONFIG_B43LEGACY_DMA_MODE is not set
# CONFIG_B43LEGACY_PIO_MODE is not set
CONFIG_BRCMUTIL=m
# CONFIG_BRCMSMAC is not set
CONFIG_BRCMFMAC=y
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
# CONFIG_BRCMFMAC_USB is not set
CONFIG_BRCMFMAC_USB=y
# CONFIG_BRCM_TRACING is not set
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=y
# CONFIG_HOSTAP_FIRMWARE is not set
CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
# CONFIG_HOSTAP_PLX is not set
# CONFIG_HOSTAP_PCI is not set
# CONFIG_IPW2100 is not set
@ -1506,7 +1592,15 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
CONFIG_RT2X00_LIB_LEDS=y
# CONFIG_RT2X00_DEBUG is not set
# CONFIG_RTLWIFI is not set
CONFIG_RTLWIFI=m
CONFIG_RTLWIFI_DEBUG=y
CONFIG_RTL8192CE=m
# CONFIG_RTL8192SE is not set
# CONFIG_RTL8192DE is not set
# CONFIG_RTL8723AE is not set
# CONFIG_RTL8188EE is not set
CONFIG_RTL8192CU=m
CONFIG_RTL8192C_COMMON=m
# CONFIG_WL_TI is not set
# CONFIG_ZD1211RW is not set
# CONFIG_MWIFIEX is not set
@ -1536,7 +1630,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m
# CONFIG_INPUT_EVBUG is not set
#
# Input Device Drivers
@ -2064,7 +2158,19 @@ CONFIG_SSB_POSSIBLE=y
#
# Sonics Silicon Backplane
#
# CONFIG_SSB is not set
CONFIG_SSB=m
CONFIG_SSB_SPROM=y
CONFIG_SSB_BLOCKIO=y
CONFIG_SSB_PCIHOST_POSSIBLE=y
CONFIG_SSB_PCIHOST=y
CONFIG_SSB_B43_PCI_BRIDGE=y
CONFIG_SSB_SDIOHOST_POSSIBLE=y
CONFIG_SSB_SDIOHOST=y
# CONFIG_SSB_SILENT is not set
# CONFIG_SSB_DEBUG is not set
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
CONFIG_SSB_DRIVER_PCICORE=y
# CONFIG_SSB_DRIVER_GPIO is not set
CONFIG_BCMA_POSSIBLE=y
#
@ -2985,6 +3091,7 @@ CONFIG_USB_EHCI_PCI=y
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_IMX21_HCD is not set
# CONFIG_USB_HCD_SSB is not set
# CONFIG_USB_MUSB_HDRC is not set
# CONFIG_USB_RENESAS_USBHS is not set
@ -3033,7 +3140,76 @@ CONFIG_USB_CHIPIDEA_HOST=y
#
# USB port drivers
#
# CONFIG_USB_SERIAL is not set
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
CONFIG_USB_SERIAL_CH341=m
CONFIG_USB_SERIAL_WHITEHEAT=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
CONFIG_USB_SERIAL_CP210X=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
CONFIG_USB_SERIAL_FUNSOFT=m
CONFIG_USB_SERIAL_VISOR=m
CONFIG_USB_SERIAL_IPAQ=m
CONFIG_USB_SERIAL_IR=m
CONFIG_USB_SERIAL_EDGEPORT=m
CONFIG_USB_SERIAL_EDGEPORT_TI=m
CONFIG_USB_SERIAL_F81232=m
CONFIG_USB_SERIAL_GARMIN=m
CONFIG_USB_SERIAL_IPW=m
CONFIG_USB_SERIAL_IUU=m
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
CONFIG_USB_SERIAL_KEYSPAN=m
# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
CONFIG_USB_SERIAL_KLSI=m
# CONFIG_USB_SERIAL_KOBIL_SCT is not set
# CONFIG_USB_SERIAL_MCT_U232 is not set
# CONFIG_USB_SERIAL_METRO is not set
# CONFIG_USB_SERIAL_MOS7720 is not set
# CONFIG_USB_SERIAL_MOS7840 is not set
# CONFIG_USB_SERIAL_MOTOROLA is not set
# CONFIG_USB_SERIAL_NAVMAN is not set
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_QCAUX=m
CONFIG_USB_SERIAL_QUALCOMM=m
CONFIG_USB_SERIAL_SPCP8X5=m
CONFIG_USB_SERIAL_HP4X=m
CONFIG_USB_SERIAL_SAFE=m
# CONFIG_USB_SERIAL_SAFE_PADDED is not set
CONFIG_USB_SERIAL_SIEMENS_MPI=m
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
# CONFIG_USB_SERIAL_SYMBOL is not set
CONFIG_USB_SERIAL_TI=m
CONFIG_USB_SERIAL_CYBERJACK=m
CONFIG_USB_SERIAL_XIRCOM=m
CONFIG_USB_SERIAL_WWAN=m
CONFIG_USB_SERIAL_OPTION=m
# CONFIG_USB_SERIAL_OMNINET is not set
# CONFIG_USB_SERIAL_OPTICON is not set
# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
# CONFIG_USB_SERIAL_XSENS_MT is not set
# CONFIG_USB_SERIAL_ZIO is not set
# CONFIG_USB_SERIAL_WISHBONE is not set
# CONFIG_USB_SERIAL_ZTE is not set
# CONFIG_USB_SERIAL_SSU100 is not set
CONFIG_USB_SERIAL_QT2=m
# CONFIG_USB_SERIAL_DEBUG is not set
#
# USB Miscellaneous drivers
@ -3058,7 +3234,7 @@ CONFIG_USB_CHIPIDEA_HOST=y
# CONFIG_USB_TEST is not set
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_YUREX is not set
# CONFIG_USB_EZUSB_FX2 is not set
CONFIG_USB_EZUSB_FX2=m
# CONFIG_USB_HSIC_USB3503 is not set
CONFIG_USB_PHY=y
# CONFIG_NOP_USB_XCEIV is not set
@ -3379,6 +3555,7 @@ CONFIG_STAGING=y
# CONFIG_TRANZPORT is not set
# CONFIG_IDE_PHISON is not set
# CONFIG_LINE6_USB is not set
# CONFIG_USB_SERIAL_QUATECH2 is not set
# CONFIG_VT6655 is not set
# CONFIG_VT6656 is not set
# CONFIG_DX_SEP is not set
@ -3595,6 +3772,7 @@ CONFIG_NFS_V4=y
CONFIG_NFS_SWAP=y
CONFIG_NFS_V4_1=y
CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_PNFS_BLOCK=m
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
CONFIG_ROOT_NFS=y
CONFIG_NFS_USE_LEGACY_DNS=y
@ -3708,6 +3886,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
@ -3751,6 +3930,7 @@ CONFIG_TRACING_SUPPORT=y
# CONFIG_DYNAMIC_DEBUG is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_ASYNC_RAID6_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
@ -3777,6 +3957,11 @@ CONFIG_SECURITYFS=y
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=y
CONFIG_ASYNC_CORE=y
CONFIG_ASYNC_MEMCPY=y
CONFIG_ASYNC_XOR=y
CONFIG_ASYNC_PQ=y
CONFIG_ASYNC_RAID6_RECOV=y
CONFIG_CRYPTO=y
#

View file

@ -0,0 +1,25 @@
This fixes problems with DVI monitors connected to the HDMI port
via a DVI <-> HDMI cable. With dvi monitors, the list of CEA modes
is always zero, preventing modes higher than 1024x768 to be used.
This patch disables the CEA mode check.
Upstream-Status: Pending
diff --git a/drivers/video/mxc/mxc_hdmi.c b/drivers/video/mxc/mxc_hdmi.c
index 544f352..fa67128 100644
--- a/drivers/video/mxc/mxc_hdmi.c
+++ b/drivers/video/mxc/mxc_hdmi.c
@@ -1804,10 +1804,10 @@ static void mxc_hdmi_edid_rebuild_modelist(struct mxc_hdmi *hdmi)
*/
mode = &hdmi->fbi->monspecs.modedb[i];
- if (!(mode->vmode & FB_VMODE_INTERLACED) &&
- (mxc_edid_mode_to_vic(mode) != 0)) {
+ if (!(mode->vmode & FB_VMODE_INTERLACED)) {
+ int vic = mxc_edid_mode_to_vic(mode);
- dev_dbg(&hdmi->pdev->dev, "Added mode %d:", i);
+ dev_dbg(&hdmi->pdev->dev, "%s: Added mode %d(VIC %u):", __func__, i, vic);
dev_dbg(&hdmi->pdev->dev,
"xres = %d, yres = %d, freq = %d, vmode = %d, flag = %d\n",
hdmi->fbi->monspecs.modedb[i].xres,

View file

@ -7,7 +7,7 @@ buildarch=2
pkgbase=linux-kirkwood
_kernelname=${pkgbase#linux}
_desc="Marvell Kirkwood"
pkgver=3.13.5
pkgver=3.13.6
pkgrel=1
cryptodev_commit=57b5544de80db85c8955499831fdaa30829db77a
bfqver=v7r2
@ -33,8 +33,8 @@ 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=('b9fa20262a7ecbbc3277aa2ee10412da'
'1c87cbbc3355eb8741143b4595d0bb5e'
md5sums=('445aa27da818617409982f42902a6e41'
'adf8b4afb532b04cbd027a768ca2970f'
'94cd91273bffe330fc8bc4cb2dd4ce9b'
'SKIP'
'65d5a4f313310bb2a732d022d51ea7e7'

View file

@ -4241,20 +4241,6 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
+ .init_time = kirkwood_timer_init,
+ .restart = kirkwood_restart,
+MACHINE_END
diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
--- a/arch/arm/plat-orion/common.c 2013-11-03 16:41:51.000000000 -0700
+++ b/arch/arm/plat-orion/common.c 2013-11-08 01:39:48.788011812 -0700
@@ -256,7 +256,9 @@
/*****************************************************************************
* GE00
****************************************************************************/
-struct mv643xx_eth_shared_platform_data orion_ge00_shared_data;
+struct mv643xx_eth_shared_platform_data orion_ge00_shared_data = {
+ .tx_csum_limit = 1600,
+};
static struct resource orion_ge00_shared_resources[] = {
{
diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
--- a/drivers/ata/sata_mv.c 2013-11-03 16:41:51.000000000 -0700
+++ b/drivers/ata/sata_mv.c 2013-11-08 01:39:48.868014917 -0700

View file

@ -1,14 +1,15 @@
# Maintainer: Dave Higham <pepedog@archlinuxarm.org>
# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
# Maintainer: Oleg Rakhmanov <orakhmanov [at] gmail [dot] com>
buildarch=18
pkgbase=linux-raspberrypi-latest
_commit=6a6b2b8d733a6359bbc2591e4b7377f333ddca82
_commit=da28f2fa9ad9bb3fb3507e1c497b1d091cc54426
_srcname=linux-${_commit}
_kernelname=${pkgbase#linux}
_desc="Raspberry Pi"
pkgver=3.13.5
pkgver=3.13.6
pkgrel=1
bfqver=v7r2
uksmver="0.1.2.2"
@ -32,7 +33,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=('0157c0303ae265e27c05ebc9e135245c'
md5sums=('46fa850f6bbbf682a63e6e087bdda76c'
'a61ef92d5aee828cf7b4fac1ff95108c'
'c0d63f4d42fd334bf31e4f749d4694f3'
'9335d1263fd426215db69841a380ea26'

View file

@ -4,11 +4,11 @@
buildarch=18
pkgbase=linux-raspberrypi
_commit=4f27bd0d364ba6cb15a924c072300c18f28d7572
_commit=a1baeb25b631e0c9ff696368d40da07dd0cf3fa4
_srcname=linux-${_commit}
_kernelname=${pkgbase#linux}
_desc="Raspberry Pi"
pkgver=3.10.32
pkgver=3.10.33
pkgrel=1
arch=('arm armv6h')
url="http://www.kernel.org/"
@ -24,7 +24,7 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}.x"
'rasclock-PCF2127.patch::http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/patch/?id=18cb6368f0b0fc6a28bd49ee547b4f655db97fc3')
md5sums=('878f9956297bf3aae1a1026a5e015c46'
md5sums=('a4b99861de69fd3d69874644be337cf8'
'faaeeb04891e260b3384d30a836ef2f2'
'9d3c56a4b999c8bfbd4018089a62f662'
'9335d1263fd426215db69841a380ea26'

View file

@ -23,7 +23,7 @@ pkgname=('calligra-braindump'
'calligra-stage'
'calligra-words')
pkgver=2.8.0
pkgrel=1
pkgrel=2
arch=('i686' 'x86_64')
url='http://www.calligra-suite.org/'
license=('FDL1.2' 'GPL2' 'LGPL')
@ -52,7 +52,8 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_active=OFF
-DBUILD_active=OFF \
-DWITH_Soprano=OFF
make
}

View file

@ -22,7 +22,7 @@
buildarch=4
pkgname=chromium
pkgver=33.0.1750.146
pkgver=33.0.1750.149
pkgrel=1
pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
arch=('armv6h' 'armv7h')
@ -47,7 +47,7 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
arm-webrtc-fix.patch
skia.patch
v6-ffmpeg.patch)
sha256sums=('d5b0e7a0f086aac200493fe4e5849ca84e9e21f7770c5d5830060da9fc2c4a74'
sha256sums=('165f6d3dd4cf936faf615f743baf2e668a259f970ceed654d2f73b390dad3084'
'09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
'478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
'a1145e83d775101b28dcdceb3ca076fc7e9a4b9f69a1a2236d0c97ad39afb3d3'

View file

@ -6,7 +6,7 @@
pkgname=gst-plugins-bad
pkgver=1.2.3
pkgrel=1
pkgrel=2
pkgdesc="GStreamer Multimedia Framework Bad Plugins"
arch=('i686' 'x86_64')
license=('LGPL')

View file

@ -7,7 +7,7 @@
pkgbase=gstreamer0.10-bad
pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins')
pkgver=0.10.23
pkgrel=7
pkgrel=8
arch=('i686' 'x86_64')
license=('LGPL' 'GPL')
makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'faac' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus' 'git' 'spandsp' 'celt')

View file

@ -8,7 +8,7 @@ pkgbase=kdebindings-python
pkgname=('kdebindings-python'
'kdebindings-python2'
'kdebindings-python-common')
pkgver=4.12.2
pkgver=4.12.3
pkgrel=1
url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
arch=('i686' 'x86_64')
@ -18,7 +18,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4'
'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
"pykde4-4.10.0-arm-sip.patch")
sha1sums=('11d0b3c11d02c3b0cb4006b2e004195697a2f598'
sha1sums=('6e5cab25aee404469d6875d067bf2ad3382e4a1a'
'f0798d25767768006d5f674049e51b2e39f9f4eb')
prepare() {

View file

@ -5,7 +5,7 @@
# - patch and cmake define to disable opengl for ARM
pkgname=kdeedu-analitza
pkgver=4.12.2
pkgver=4.12.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=('7d06a5bb421ef5a2b5083a9f71bdc985746eee9b'
sha1sums=('c241f01f7fc5e96df273331eb17f2c90f8a8ffee'
'1b3a522acf87ed3dee51af4290a841645bf98a32')
prepare() {

View file

@ -5,7 +5,7 @@
# - patch and cmake define to disable opengl for ARM
pkgname=kdeedu-kalgebra
pkgver=4.12.2
pkgver=4.12.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=('d883a5c0388860a10bfa5b8df13797d688f571b5'
sha1sums=('18867c9f6f81ef2e8953092072fa9949cca70a15'
'ae1b75e5192f8519517134447b481421112a6dd7')
build() {

View file

@ -6,7 +6,7 @@
# - patch to fix unclickable plasmoid buttons on ARM
pkgname=kdelibs
pkgver=4.12.2
pkgver=4.12.3
pkgrel=1
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64')
@ -22,7 +22,7 @@ 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')
sha1sums=('05e324af3752953ca637c2a51d989155f9f6bb8a'
sha1sums=('57a9685d9c05f9304b0037f578bc13ca3371e74d'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
'ed1f57ee661e5c7440efcaba7e51d2554709701c'

View file

@ -8,8 +8,8 @@
# - added --enable-arm-neon=no to configure
pkgname=libpng
pkgver=1.6.9
_apngver=1.6.9
pkgver=1.6.10
_apngver=1.6.10
pkgrel=1
pkgdesc="A collection of routines used to create PNG format graphics files"
arch=('i686' 'x86_64')
@ -19,9 +19,9 @@ depends=('zlib' 'sh')
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz)
md5sums=('14e037c5c9f1db16844760285ad5c2d6'
md5sums=('5f414b20f683b1d96b163c89e3eff768'
'SKIP'
'd784762a28f6a6c697a162873807f479')
'3404257f66d4a118b26ccc3fc4788810')
prepare() {
cd $pkgname-$pkgver

View file

@ -8,8 +8,8 @@
# - add --disable-strict to configure to remove -Werror
pkgname=mediastreamer
pkgver=2.9.0
pkgrel=4
pkgver=2.10.0
pkgrel=2
pkgdesc="A library written in C that allows you to create and run audio and video streams"
arch=('i686' 'x86_64')
url="http://www.linphone.org/"
@ -17,9 +17,8 @@ license=('GPL')
depends=('ortp' 'ffmpeg' 'libxv' 'libupnp')
# xxd from Vim is needed to build
makedepends=('intltool' 'vim')
options=('!libtool')
source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
md5sums=('f2ea0fe731a363749a81b6eaac22a62c'
md5sums=('5a4e7545e212068534b56fdf41c961e9'
'SKIP')
build() {

View file

@ -9,17 +9,17 @@
pkgbase=mesa
pkgname=('mesa' 'mesa-libgl')
pkgver=10.0.3
pkgrel=1
pkgver=10.1.0
pkgrel=2
arch=('i686' 'x86_64')
makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
url="http://mesa3d.sourceforge.net"
license=('custom')
options=('!libtool')
source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
source=(ftp://ftp.freedesktop.org/pub/mesa/10.1/MesaLib-${pkgver}.tar.bz2
LICENSE)
md5sums=('5f9f463ef08129f6762106b434910adb'
md5sums=('3ec43f79dbcd9aa2a4a27bf1f51655b6'
'5c65a0fe315dd347e09b1f2826a1df5a')
build() {
@ -46,7 +46,8 @@ build() {
--enable-gles1 \
--enable-gles2 \
--enable-texture-float \
--enable-xa
--enable-xa \
--enable-dri3
# --help
make
@ -58,17 +59,20 @@ build() {
package_mesa() {
pkgdesc="an open-source implementation of the OpenGL specification"
depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils' 'llvm-libs')
depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 'llvm-libs')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
conflicts=('libglapi' 'osmesa' 'libgbm')
replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
mv -v ${srcdir}/fakeinstall/* ${pkgdir}
# rename libgl.so to not conflict with blobs - may break gl.pc ?
mv ${pkgdir}/usr/lib/libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1
rm ${pkgdir}/usr/lib/libGL.so{,.1}
# rename libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
mv ${pkgdir}/usr/lib/libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
mv ${pkgdir}/usr/lib/libEGL.so.1.0.0 ${pkgdir}/usr/lib/mesa-libEGL.so.1.0.0
mv ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/mesa-libGLESv1_CM.so.1.1.0
mv ${pkgdir}/usr/lib/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/mesa-libGLESv2.so.2.0.0
rm ${pkgdir}/usr/lib/lib{GL,EGL,GLESv1_CM,GLESv2}.so*
install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
@ -84,9 +88,18 @@ package_mesa-libgl() {
install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so
ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1
ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so
ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1
ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
ln -s mesa-libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so
ln -s mesa-libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1
ln -s mesa-libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
ln -s mesa-libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so
ln -s mesa-libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1
ln -s mesa-libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
ln -s mesa-libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so
ln -s mesa-libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2
ln -s mesa-libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"

View file

@ -7,8 +7,8 @@
# and using autogen.sh to rebuild for configure.in changes.
pkgname=mono
pkgver=3.2.3
pkgrel=2
pkgver=3.2.8
pkgrel=1
pkgdesc="Free implementation of the .NET platform including runtime and compiler"
arch=(i686 x86_64)
license=('GPL' 'LGPL2.1' 'MPL' 'custom:MITX11')
@ -20,13 +20,13 @@ conflicts=('monodoc')
source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2
mono.binfmt.d
sgen_fix.patch)
md5sums=('a66c6309fad071e21f77f4c6b67a0f10'
md5sums=('1075f99bd8a69890af9e30309728e684'
'b9ef8a65fea497acf176cca16c1e2402'
'8a700b94bff7a913f920e95890d2fb4c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 < ../sgen_fix.patch
# build mono
if [ "$CARCH" = "armv7h" -o "$CARCH" = "armv6h" ]; then
#Disabling alarm patch, arm support might be in now.
@ -36,10 +36,10 @@ build() {
sed -i 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.in
sed -i 's/AUTOMAKE_OPTIONS = cygnus//' runtime/Makefile.am
./autogen.sh --prefix=/usr --sysconfdir=/etc \
--with-fpu=VFP --bindir=/usr/bin --sbindir=/usr/bin --disable-static
--with-fpu=VFP --bindir=/usr/bin --sbindir=/usr/bin --disable-static --disable-quiet-build --disable-system-aot
else
sed -i 's/armv6=yes/armv6=no/' configure
./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/bin --sbindir=/usr/bin --with-fpu=NONE --disable-static
./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/bin --sbindir=/usr/bin --with-fpu=NONE --disable-static --disable-quiet-build --disable-system-aot
fi
make

View file

@ -7,7 +7,7 @@
pkgname=net-snmp
pkgver=5.7.2.1
pkgrel=1
pkgrel=2
pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
arch=('i686' 'x86_64')
url="http://www.net-snmp.org/"
@ -20,7 +20,7 @@ optdepends=('perl-term-readkey: for snmpcheck application'
options=('!emptydirs' '!makeflags')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
snmpd.service snmptrapd.service libnl32.patch ifmib.patch)
sha1sums=('ea5b8952ca482eceac8cb1f3ffbac50e13c0a5b0'
sha1sums=('815d4e5520a1ed96a27def33e7534b4190599f0f'
'SKIP'
'84e32c54d32e6b608747054e04a3ddfe6d6638cc'
'0244e91c7baa0abebfb5c0560e8ce04c966c5992'
@ -29,10 +29,12 @@ sha1sums=('ea5b8952ca482eceac8cb1f3ffbac50e13c0a5b0'
prepare() {
cd ${pkgname}-${pkgver}
make PERL_ARCHLIB=/usr/lib/perl5/core_perl PERL_INC=/usr/lib/perl5/core_perl/CORE distclean
# http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
#make PERL_ARCHLIB=/usr/lib/perl5/core_perl PERL_INC=/usr/lib/perl5/core_perl/CORE distclean
# http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
patch -Np1 -i "$srcdir/libnl32.patch"
patch -Np1 -i "$srcdir/ifmib.patch"
autoreconf -f -i
}

View file

@ -1,5 +1,6 @@
# $Id: PKGBUILD 169007 2012-10-17 10:19:56Z allan $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# $Id$
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
@ -9,7 +10,7 @@
# - removed --with-valgrind from configure line
pkgname=python
pkgver=3.3.4
pkgver=3.3.5
pkgrel=1
_pybasever=3.3
pkgdesc="Next generation of the python high-level scripting language"
@ -17,13 +18,16 @@ arch=('i686' 'x86_64')
license=('custom')
url="http://www.python.org/"
depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
makedepends=('tk>=8.6.0' 'sqlite' 'bluez-libs')
optdepends=('tk: for tkinter' 'sqlite')
makedepends=('tk>=8.6.0' 'sqlite' 'bluez-libs' 'mpdecimal')
optdepends=('sqlite'
'mpdecimal: for decimal'
'xz: for lzma'
'tk: for tkinter')
options=('!makeflags')
provides=('python3')
replaces=('python3')
source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
sha1sums=('2c9586eeb4b6e45e9ebc28372c0856c709d9a522')
sha1sums=('6683b26dd2cfd23af852abfcf1aedf25bbd44839')
prepare() {
cd "${srcdir}/Python-${pkgver}"
@ -36,6 +40,7 @@ prepare() {
rm -r Modules/expat
rm -r Modules/zlib
rm -r Modules/_ctypes/{darwin,libffi}*
rm -r Modules/_decimal/libmpdec
}
build() {
@ -48,7 +53,8 @@ build() {
--enable-ipv6 \
--with-system-expat \
--with-dbmliborder=gdbm:ndbm \
--with-system-ffi
--with-system-ffi \
--with-system-libmpdec
make
}

View file

@ -10,8 +10,8 @@
# - patch to upgrade included botan version so it builds on ARM
pkgname=qtcreator
pkgver=3.0.1
_pkgver=3.0.1
pkgver=3.1.0beta1
_pkgver=v3.1.0-beta1
pkgrel=1
pkgdesc='Lightweight, cross-platform integrated development environment'
arch=('i686' 'x86_64')
@ -29,7 +29,7 @@ optdepends=('qt5-doc: for the integrated Qt documentation'
'bzr: for bazaar support'
'valgrind: for analyze support')
install=qtcreator.install
source=("git://gitorious.org/qt-creator/qt-creator.git#tag=v${_pkgver}"
source=("git://gitorious.org/qt-creator/qt-creator.git#tag=${_pkgver}"
"git://gitorious.org/qt-labs/qbs.git"
'qtcreator.desktop'
'botan-upgrade.patch')

View file

@ -1,84 +0,0 @@
From f5bbf838c8b13369a61c6756355305388df5824f Mon Sep 17 00:00:00 2001
From: Tim Moore <tmoore@incrementalism.net>
Date: Tue, 31 Dec 2013 17:39:45 +1100
Subject: [PATCH] Fix installing gem from file without dependencies.
Commit 9437ccc fixed the ability to install remote gems that was accidentally
broken by d97fba1, but in the process accidentally broke installing from local
files.
This also changes the order to check for local first, to avoid unnecessary
network requests in the case where the gem is local.
Closes #760.
---
lib/rubygems/commands/install_command.rb | 20 ++++++++++++--------
test/rubygems/test_gem_commands_install_command.rb | 14 ++++++++++++++
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
index 4485eb1..8219eef 100644
--- a/lib/rubygems/commands/install_command.rb
+++ b/lib/rubygems/commands/install_command.rb
@@ -228,7 +228,18 @@ to write the specification by hand. For example:
def install_gem_without_dependencies name, req # :nodoc:
gem = nil
- if remote? then
+ if local? then
+ if name =~ /\.gem$/ and File.file? name then
+ source = Gem::Source::SpecificFile.new name
+ spec = source.spec
+ else
+ source = Gem::Source::Local.new
+ spec = source.find_gem name, req
+ end
+ gem = source.download spec if spec
+ end
+
+ if remote? and not gem then
dependency = Gem::Dependency.new name, req
dependency.prerelease = options[:prerelease]
@@ -236,13 +247,6 @@ to write the specification by hand. For example:
gem = fetcher.download_to_cache dependency
end
- if local? and not gem then
- source = Gem::Source::Local.new
- spec = source.find_gem name, req
-
- gem = source.download spec
- end
-
inst = Gem::Installer.new gem, options
inst.install
diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb
index 76ea6b4..a5917c0 100644
--- a/test/rubygems/test_gem_commands_install_command.rb
+++ b/test/rubygems/test_gem_commands_install_command.rb
@@ -560,6 +560,20 @@ ERROR: Possible alternatives: non_existent_with_hint
assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
end
+ def test_install_gem_ignore_dependencies_specific_file
+ spec = quick_spec 'a', 2
+
+ util_build_gem spec
+
+ FileUtils.mv spec.cache_file, @tempdir
+
+ @cmd.options[:ignore_dependencies] = true
+
+ @cmd.install_gem File.join(@tempdir, spec.file_name), nil
+
+ assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name }
+ end
+
def test_parses_requirement_from_gemname
spec_fetcher do |fetcher|
fetcher.gem 'a', 2
--
1.8.5.2

View file

@ -0,0 +1,26 @@
From 4c4da3fc650a3595ecc06f49072f1ffae07db706 Mon Sep 17 00:00:00 2001
From: Thomas Dziedzic <gostrc@gmail.com>
Date: Sat, 1 Mar 2014 21:41:28 -0800
Subject: [PATCH] Fix undeclared identifier error by using the actual type of
rl_pre_input_hook
---
ext/readline/readline.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 659adb9..7bc0eed 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -1974,7 +1974,7 @@ Init_readline()
rl_attempted_completion_function = readline_attempted_completion_function;
#if defined(HAVE_RL_PRE_INPUT_HOOK)
- rl_pre_input_hook = (Function *)readline_pre_input_hook;
+ rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
#endif
#ifdef HAVE_RL_CATCH_SIGNALS
rl_catch_signals = 0;
--
1.9.0

View file

@ -8,8 +8,8 @@
# - patch to fix running ruby on v5 (#705)
pkgname=('ruby' 'ruby-docs')
pkgver=2.1.0
pkgrel=2.1
pkgver=2.1.1
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.ruby-lang.org/en/'
license=('BSD' 'custom')
@ -18,25 +18,21 @@ license=('BSD' 'custom')
# wait for upstream to start supporting tk 8.6
makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml') # 'tk'
options=('!emptydirs' '!makeflags' 'staticlibs')
source=("http://cache.ruby-lang.org/pub/ruby/ruby-${pkgver}.tar.bz2"
source=("http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.bz2"
'gemrc'
'0001-Fix-installing-gem-from-file-without-dependencies.patch'
'changeset_r45225.diff'
'0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch'
'0002-Use-only-unsigned-long-for-rb_serial_t.patch')
md5sums=('1546eeb763ac7754365664be763a1e8f'
'6fb8e7a09955e0f64be3158fb4a27e7a'
'61a1507f260866805fc6451c14733b25'
'64839e135447accd2e0568c563e12d23'
'0496e962e0ce11507b7577a8eb93af58'
'f6f9c200c5e9afc4d5b21575da4821a2')
build() {
cd ruby-${pkgver}
# fixes https://github.com/rubygems/rubygems/issues/760
patch -Np1 -i ${srcdir}/0001-Fix-installing-gem-from-file-without-dependencies.patch
# fixes https://bugs.ruby-lang.org/issues/9578
patch -Np0 -i ../changeset_r45225.diff
# readline 6.3 doesn't define Function anymore
# https://bugs.ruby-lang.org/issues/9578
patch -Np1 -i ${srcdir}/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch
# fixes https://bugs.ruby-lang.org/issues/9507
[[ $CARCH == 'arm' ]] && patch -Np1 -i ../0002-Use-only-unsigned-long-for-rb_serial_t.patch

View file

@ -1,13 +0,0 @@
Index: ext/readline/readline.c
===================================================================
--- ext/readline/readline.c (revision 45224)
+++ ext/readline/readline.c (revision 45225)
@@ -1974,7 +1974,7 @@
rl_attempted_completion_function = readline_attempted_completion_function;
#if defined(HAVE_RL_PRE_INPUT_HOOK)
- rl_pre_input_hook = (Function *)readline_pre_input_hook;
+ rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
#endif
#ifdef HAVE_RL_CATCH_SIGNALS
rl_catch_signals = 0;

View file

@ -9,7 +9,7 @@
pkgname=texlive-bin
pkgver=2013.30973
pkgrel=7
pkgrel=8
pkgdesc="TeX Live binaries"
license=('GPL')
arch=('i686' 'x86_64')

View file

@ -3,12 +3,12 @@
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - re-enabled --disable-silent-rules, needed for v5 and v6 to build
# - use --disable-jit for v5, uses incompatible ARM assembly
# - use --disable-jit to solve segfaults
pkgbase=webkitgtk
pkgname=(webkitgtk webkitgtk2)
pkgver=2.2.5
pkgrel=2
pkgrel=2.1
pkgdesc="GTK+ Web content engine library"
arch=(i686 x86_64)
url="http://webkitgtk.org/"
@ -28,12 +28,10 @@ _build() (
_ver="$1"; shift
cd build-${_ver}
[[ $CARCH == 'arm' ]] && CONFIG='--disable-jit'
../$pkgbase-$pkgver/configure --prefix=/usr \
--libexecdir=/usr/lib/webkit${_ver} \
--enable-introspection \
"$@" $CONFIG
--enable-introspection --disable-jit \
"$@"
# https://bugzilla.gnome.org/show_bug.cgi?id=655517
sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool