summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--community/atanks/PKGBUILD6
-rw-r--r--community/efax-gtk/PKGBUILD4
-rw-r--r--community/luakit/0001-Dont-mark-desktop-file-as-executable.patch21
-rw-r--r--community/luakit/PKGBUILD9
-rw-r--r--community/opensips/PKGBUILD8
-rw-r--r--community/oss/PKGBUILD14
-rw-r--r--community/spacefm/PKGBUILD10
-rw-r--r--community/udevil/PKGBUILD6
-rw-r--r--core/dhcpcd/PKGBUILD6
-rw-r--r--extra/hyphen/PKGBUILD6
-rw-r--r--extra/xorg-xbacklight/PKGBUILD10
-rw-r--r--testing/make/PKGBUILD65
-rw-r--r--testing/make/make-3.82-bug30612.patch66
-rw-r--r--testing/make/make-3.82-bug30723.patch12
-rw-r--r--testing/make/make-3.82-dont-prune-intermediate.patch57
-rw-r--r--testing/make/make-3.82-expensive_glob.patch116
-rw-r--r--testing/make/make-3.82-makeflags.patch36
-rw-r--r--testing/make/make-3.82-sort-blank.patch17
-rw-r--r--testing/make/make.install20
-rw-r--r--testing/xf86-video-nouveau/PKGBUILD33
-rw-r--r--testing/xf86-video-nouveau/xf86-video-nouveau.install10
21 files changed, 451 insertions, 81 deletions
diff --git a/community/atanks/PKGBUILD b/community/atanks/PKGBUILD
index 5c7dca88c..1e27f67ec 100644
--- a/community/atanks/PKGBUILD
+++ b/community/atanks/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67099 2012-03-04 08:25:15Z spupykin $
+# $Id: PKGBUILD 76226 2012-09-14 12:01:49Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jacek Poplawski <jacekpoplawski@gmail.com>
# Contributor: Charlie Cox <ccoxiv@yahoo.com>
pkgname=atanks
-pkgver=5.3
+pkgver=5.5
pkgrel=1
pkgdesc="Atomic Tanks"
url="http://atanks.sourceforge.net"
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64')
makedepends=('sed')
depends=('allegro4>=4.4.0.1' 'gcc-libs')
source=("http://downloads.sourceforge.net/project/atanks/atanks/atanks-${pkgver}/atanks-${pkgver}.tar.gz")
-md5sums=('33e344eb18b1421df120a59696958d5c')
+md5sums=('1ba5a8bae3e7e49a0fdb7d21a480e70d')
build() {
cd atanks-${pkgver}
diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD
index c9363d1a5..33b7348c1 100644
--- a/community/efax-gtk/PKGBUILD
+++ b/community/efax-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 63538 2012-02-05 11:54:36Z ibiru $
+# $Id: PKGBUILD 76212 2012-09-14 07:41:39Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=efax-gtk
pkgver=3.2.9
-pkgrel=2
+pkgrel=3
pkgdesc="A GUI front end for the 'efax' fax program"
arch=('i686' 'x86_64')
url="http://efax-gtk.sourceforge.net/"
diff --git a/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch b/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch
index 4553df933..0e5a9d1a2 100644
--- a/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch
+++ b/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch
@@ -4,7 +4,7 @@ Date: Thu, 12 Apr 2012 16:43:41 +0200
Subject: [PATCH] Don't mark desktop file as executable.
---
- Makefile | 2 +-
+ Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
@@ -12,14 +12,13 @@ index be1567b..50973d6 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ install:
- install -d $(DESTDIR)/usr/share/pixmaps
- install extras/luakit.png $(DESTDIR)/usr/share/pixmaps/
- install -d $(DESTDIR)/usr/share/applications
-- install extras/luakit.desktop $(DESTDIR)/usr/share/applications/
-+ install -m0644 extras/luakit.desktop $(DESTDIR)/usr/share/applications/
- install -d $(MANPREFIX)/man1/
- install -m644 luakit.1 $(MANPREFIX)/man1/
-
---
-1.7.10
+ install -d $(DESTDIR)/usr/share/pixmaps
+ install extras/luakit.png $(DESTDIR)/usr/share/pixmaps/
+ install -d $(DESTDIR)/usr/share/applications
+- install extras/luakit.desktop $(DESTDIR)/usr/share/applications/
++ install -m0644 extras/luakit.desktop $(DESTDIR)/usr/share/applications/
+ install -d $(MANPREFIX)/man1/
+ install -m644 luakit.1 $(MANPREFIX)/man1/
+---
+1.7.10
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index 89484ec7d..a635b2fe0 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 76198 2012-09-13 13:06:35Z bpiotrowski $
+# $Id: PKGBUILD 76207 2012-09-14 04:30:59Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com>
pkgname=luakit
-pkgver=2012.09.13
+pkgver=2012.09.13.r1
+_pkgver=2012.09.13-r1
pkgrel=1
pkgdesc='Fast, small, webkit based browser framework extensible by Lua'
arch=('i686' 'x86_64')
@@ -14,8 +15,8 @@ depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils' 'luajit')
makedepends=('git' 'help2man')
options=(!makeflags)
install='luakit.install'
-source=($pkgver.tar.gz::https://github.com/mason-larobina/luakit/tarball/$pkgver)
-md5sums=('5de91907c44286c9b5a21319fa7cb67f')
+source=($pkgver.tar.gz::https://github.com/mason-larobina/luakit/tarball/$_pkgver)
+md5sums=('77b02e6d19ba021409f1778fddd94a42')
build() {
cd mason-larobina-luakit-*
diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD
index e6dbcbedd..8ce667753 100644
--- a/community/opensips/PKGBUILD
+++ b/community/opensips/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 73317 2012-07-06 09:18:06Z spupykin $
+# $Id: PKGBUILD 76218 2012-09-14 10:04:13Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=opensips
-pkgver=1.7.1
-pkgrel=2
+pkgver=1.8.1
+pkgrel=1
pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..."
url="http://www.opensips.org"
depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2')
@@ -25,7 +25,7 @@ install=opensips.install
options=('!emptydirs' 'zipman' '!makeflags' 'docs')
source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz
opensips.init)
-md5sums=('275ecad5146a7571713baf9f3395fe0f'
+md5sums=('b3d10665ba7a47d440d60391f162dfd2'
'685fbe00826df1285b410d4610dcbb0c')
build()
diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD
index 3a56ba7df..bd792bbde 100644
--- a/community/oss/PKGBUILD
+++ b/community/oss/PKGBUILD
@@ -1,12 +1,14 @@
-# $Id: PKGBUILD 73700 2012-07-14 13:07:06Z allan $
-# Maintainer: Florian Pritz <bluewind@xinu.at>
+# $Id: PKGBUILD 76238 2012-09-14 22:52:02Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Florian Pritz <bluewind@xinu.at>
# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgbase=oss
-pkgname=(oss libflashsupport-oss)
-pkgver=4.2_2006
-pkgrel=4
+pkgname=oss
+true && pkgname=(oss libflashsupport-oss)
+pkgver=4.2_2007
+pkgrel=1
arch=('i686' 'x86_64')
url="http://developer.opensound.com/"
license=('GPL2')
@@ -18,7 +20,7 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_
"remove-hal.patch"
"oss.service"
)
-md5sums=('ca25c06bb7d0c6495e1b6f55d1bad96c'
+md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7'
'b9a380a0ac8896390d71ac13676f27e1'
'cbcbce5c03b127df5eafa8faa091492c'
'65f07fe241bfbf912f76d8b6d8f276b5'
diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD
index a87cc4df0..c15685c12 100644
--- a/community/spacefm/PKGBUILD
+++ b/community/spacefm/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 75235 2012-08-16 20:04:22Z bpiotrowski $
+# $Id: PKGBUILD 76236 2012-09-14 19:21:38Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
# Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com>
pkgname=spacefm
-pkgver=0.7.11
+pkgver=0.8.0
pkgrel=1
-pkgdesc="A multi-panel tabbed file manager"
+pkgdesc='A multi-panel tabbed file manager'
arch=('i686' 'x86_64')
-url="http://ignorantguru.github.com/spacefm/"
+url='http://ignorantguru.github.com/spacefm/'
license=('GPL2')
install=$pkgname.install
depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' 'udev')
@@ -22,7 +22,7 @@ optdepends=('lsof: device processes'
'udisks: mount as non-root user'
'udisks2: mount as non-root user')
source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz)
-md5sums=('99719d34fd60ad9514c10a25f52d0bb3')
+md5sums=('e9fe71ecd1f2ac07f4cbda2036279a99')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD
index 639697109..e08ade8d2 100644
--- a/community/udevil/PKGBUILD
+++ b/community/udevil/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 75211 2012-08-16 07:12:48Z bpiotrowski $
+# $Id: PKGBUILD 76234 2012-09-14 18:50:59Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
pkgname=udevil
-pkgver=0.3.2
+pkgver=0.3.3
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='Mount and unmount without password'
@@ -24,7 +24,7 @@ provides=('devmon')
backup=('etc/udevil/udevil.conf')
install=$pkgname.install
source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz)
-md5sums=('47b8f9334266d65020daa4679f71b504')
+md5sums=('81abe64e0c6d3555f0b66b7d7fa9a340')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 427609e39..e6cc9b108 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165283 2012-08-14 20:43:47Z ronald $
+# $Id: PKGBUILD 166650 2012-09-14 11:11:15Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tom Killian <tom.archlinux.org>
# Contributor: Judd Vinet <jvinet.zeroflux.org>
pkgname=dhcpcd
-pkgver=5.6.0
+pkgver=5.6.2
pkgrel=1
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/projects/dhcpcd/"
@@ -16,7 +16,7 @@ backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
'dhcpcd.conf.d' 'dhcpcd.service')
-sha1sums=('28ad6931393420a72da307ee173466a9e00cd952'
+sha1sums=('7127237b5594ba50642829e76033a04d1c6fd42e'
'b67b9ce6a2faaca75fea356966a16be2283b7db0'
'3d0542eab1b89a88d56ca427128228ac72c40d1f')
diff --git a/extra/hyphen/PKGBUILD b/extra/hyphen/PKGBUILD
index 05a453a1c..8c2e37a8b 100644
--- a/extra/hyphen/PKGBUILD
+++ b/extra/hyphen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163474 2012-07-12 19:03:03Z andyrtr $
+# $Id: PKGBUILD 166656 2012-09-14 14:39:16Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
pkgbase=hyphen
pkgname=('hyphen' 'hyphen-en')
-pkgver=2.8.5
+pkgver=2.8.6
pkgrel=1
arch=('i686' 'x86_64')
url="http://hunspell.sf.net"
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'MPL')
makedepends=('glibc' 'perl')
options=('!libtool')
source=(http://downloads.sourceforge.net/hunspell/${pkgname}-${pkgver}.tar.gz)
-md5sums=('15cf1c2e54869fefcdc4b8f9cca68633')
+md5sums=('ee527b48ef1a7e95ee803a1f7c283c56')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xorg-xbacklight/PKGBUILD b/extra/xorg-xbacklight/PKGBUILD
index fd40c6117..412b91056 100644
--- a/extra/xorg-xbacklight/PKGBUILD
+++ b/extra/xorg-xbacklight/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 151182 2012-02-25 07:02:48Z allan $
+# $Id: PKGBUILD 166654 2012-09-14 14:36:40Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-xbacklight
-pkgver=1.1.2
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
pkgdesc="RandR-based backlight control application"
arch=('i686' 'x86_64')
url="http://xorg.freedesktop.org/"
license=('custom')
-depends=('libxrandr' 'libx11')
+depends=('xcb-util')
makedepends=('xorg-util-macros')
groups=('xorg-apps' 'xorg')
source=(http://xorg.freedesktop.org/archive/individual/app/xbacklight-${pkgver}.tar.bz2)
-sha1sums=('e297b359ab83f3844ca5ea1c23280b2f8bb71cfd')
+sha256sums=('5152d6134fa592c9c14060d7324a7db104da0184cc9b2f9715e847f9354e36a5')
build() {
cd "${srcdir}/xbacklight-${pkgver}"
diff --git a/testing/make/PKGBUILD b/testing/make/PKGBUILD
new file mode 100644
index 000000000..428b4d925
--- /dev/null
+++ b/testing/make/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id: PKGBUILD 166640 2012-09-14 04:44:29Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=make
+pkgver=3.82
+pkgrel=5
+pkgdesc="GNU make utility to maintain groups of programs"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/make"
+license=('GPL3')
+groups=('base-devel')
+depends=('glibc' 'sh')
+install=$pkgname.install
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+ make-3.82-bug30612.patch
+ make-3.82-bug30723.patch
+ make-3.82-sort-blank.patch
+ make-3.82-makeflags.patch
+ make-3.82-expensive_glob.patch
+ make-3.82-dont-prune-intermediate.patch)
+md5sums=('1a11100f3c63fcf5753818e59d63088f'
+ 'c78daf24f4ec5900c8f81e89a6e1cd5a'
+ 'c8f496b22191f9fb9420ab14c1a19a47'
+ '662e6450e19a5acdaa5c9fcb8ad78dea'
+ '7d01a99f389d8f08dec93ed479071ee4'
+ 'bc12ad4d0c6e6c0e72d9fb61054f446b'
+ 'e58d4211c5b29d7d927a304d082849e7'
+ '45ac9e987f4bf16c0d7e1685db943917')
+
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # http://savannah.gnu.org/bugs/?30612
+ patch -Np1 -i $srcdir/make-3.82-bug30612.patch
+
+ # http://savannah.gnu.org/bugs/?30723
+ patch -Np1 -i $srcdir/make-3.82-bug30723.patch
+
+ # https://bugs.archlinux.org/task/22733 (fix from Fedora)
+ patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
+
+ # https://savannah.gnu.org/bugs/?33873
+ patch -Np0 -i $srcdir/make-3.82-makeflags.patch
+
+ # http://lists.gnu.org/archive/html/bug-make/2011-04/msg00002.html
+ patch -Np0 -i $srcdir/make-3.82-expensive_glob.patch
+
+ # https://savannah.gnu.org/bugs/?30653
+ patch -Np0 -i $srcdir/make-3.82-dont-prune-intermediate.patch
+
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
diff --git a/testing/make/make-3.82-bug30612.patch b/testing/make/make-3.82-bug30612.patch
new file mode 100644
index 000000000..fb843bcd9
--- /dev/null
+++ b/testing/make/make-3.82-bug30612.patch
@@ -0,0 +1,66 @@
+diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
+--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
++++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000
+@@ -1,3 +1,4 @@
++
+ /* Argument parsing and main program of GNU Make.
+ Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+@@ -1138,7 +1139,7 @@
+ a macro and some compilers (MSVC) don't like conditionals in macros. */
+ {
+ const char *features = "target-specific order-only second-expansion"
+- " else-if shortest-stem undefine"
++ " else-if shortest-stem undefine oneshell"
+ #ifndef NO_ARCHIVES
+ " archives"
+ #endif
+diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
+--- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000
++++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000
+@@ -3028,7 +3028,7 @@
+ {
+ /* This looks like the first element in an open archive group.
+ A valid group MUST have ')' as the last character. */
+- const char *e = p + nlen;
++ const char *e = p;
+ do
+ {
+ e = next_token (e);
+@@ -3084,19 +3084,19 @@
+ Go to the next item in the string. */
+ if (flags & PARSEFS_NOGLOB)
+ {
+- NEWELT (concat (2, prefix, tp));
++ NEWELT (concat (2, prefix, tmpbuf));
+ continue;
+ }
+
+ /* If we get here we know we're doing glob expansion.
+ TP is a string in tmpbuf. NLEN is no longer used.
+ We may need to do more work: after this NAME will be set. */
+- name = tp;
++ name = tmpbuf;
+
+ /* Expand tilde if applicable. */
+- if (tp[0] == '~')
++ if (tmpbuf[0] == '~')
+ {
+- tildep = tilde_expand (tp);
++ tildep = tilde_expand (tmpbuf);
+ if (tildep != 0)
+ name = tildep;
+ }
+@@ -3152,7 +3152,11 @@
+ else
+ {
+ /* We got a chain of items. Attach them. */
+- (*newp)->next = found;
++ if (*newp)
++ (*newp)->next = found;
++ else
++ *newp = found;
++
+
+ /* Find and set the new end. Massage names if necessary. */
+ while (1)
diff --git a/testing/make/make-3.82-bug30723.patch b/testing/make/make-3.82-bug30723.patch
new file mode 100644
index 000000000..84e7ebe7a
--- /dev/null
+++ b/testing/make/make-3.82-bug30723.patch
@@ -0,0 +1,12 @@
+diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c
+--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
++++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000
+@@ -2093,7 +2093,7 @@
+ const char *pv = define_makeflags (1, 1);
+ char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
+ sprintf (p, "MAKEFLAGS=%s", pv);
+- putenv (p);
++ putenv (allocated_variable_expand (p));
+ }
+
+ if (ISDB (DB_BASIC))
diff --git a/testing/make/make-3.82-dont-prune-intermediate.patch b/testing/make/make-3.82-dont-prune-intermediate.patch
new file mode 100644
index 000000000..f4f47dd27
--- /dev/null
+++ b/testing/make/make-3.82-dont-prune-intermediate.patch
@@ -0,0 +1,57 @@
+2012-09-09 Paul Smith <psmith@gnu.org>
+
+ * remake.c (update_file_1): Force intermediate files to be
+ considered, not pruned, if their non-intermediate parent needs to
+ be remade. Fixes Savannah bug #30653.
+
+Index: remake.c
+===================================================================
+RCS file: /sources/make/make/remake.c,v
+retrieving revision 1.153
+retrieving revision 1.154
+diff -u -r1.153 -r1.154
+--- remake.c 5 Mar 2012 14:10:45 -0000 1.153
++++ remake.c 10 Sep 2012 02:36:05 -0000 1.154
+@@ -612,6 +612,10 @@
+ d->file->dontcare = file->dontcare;
+ }
+
++ /* We may have already considered this file, when we didn't know
++ we'd need to update it. Force update_file() to consider it and
++ not prune it. */
++ d->file->considered = !considered;
+
+ dep_status |= update_file (d->file, depth);
+
+Index: tests/scripts/features/parallelism
+===================================================================
+RCS file: /sources/make/make/tests/scripts/features/parallelism,v
+retrieving revision 1.19
+retrieving revision 1.20
+diff -u -r1.19 -r1.20
+--- tests/scripts/features/parallelism 4 Mar 2012 00:24:32 -0000 1.19
++++ tests/scripts/features/parallelism 10 Sep 2012 02:36:05 -0000 1.20
+@@ -214,6 +214,23 @@
+ rmfiles(qw(foo.y foo.y.in main.bar));
+ }
+
++# Ensure intermediate/secondary files are not pruned incorrectly.
++# See Savannah bug #30653
++
++utouch(-15, 'file2');
++utouch(-10, 'file4');
++utouch(-5, 'file1');
++
++run_make_test(q!
++.INTERMEDIATE: file3
++file4: file3 ; @mv -f $< $@
++file3: file2 ; touch $@
++file2: file1 ; @touch $@
++!,
++ '--no-print-directory -j2', "touch file3");
++
++#rmfiles('file1', 'file2', 'file3', 'file4');
++
+ if ($all_tests) {
+ # Jobserver FD handling is messed up in some way.
+ # Savannah bug #28189
diff --git a/testing/make/make-3.82-expensive_glob.patch b/testing/make/make-3.82-expensive_glob.patch
new file mode 100644
index 000000000..8663f5039
--- /dev/null
+++ b/testing/make/make-3.82-expensive_glob.patch
@@ -0,0 +1,116 @@
+Index: read.c
+===================================================================
+RCS file: /sources/make/make/read.c,v
+retrieving revision 1.198
+retrieving revision 1.200
+diff -u -r1.198 -r1.200
+--- read.c 29 Apr 2011 15:27:39 -0000 1.198
++++ read.c 7 May 2011 14:36:12 -0000 1.200
+@@ -2901,6 +2901,7 @@
+ const char *name;
+ const char **nlist = 0;
+ char *tildep = 0;
++ int globme = 1;
+ #ifndef NO_ARCHIVES
+ char *arname = 0;
+ char *memname = 0;
+@@ -3109,32 +3110,40 @@
+ }
+ #endif /* !NO_ARCHIVES */
+
+- switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
+- {
+- case GLOB_NOSPACE:
+- fatal (NILF, _("virtual memory exhausted"));
+-
+- case 0:
+- /* Success. */
+- i = gl.gl_pathc;
+- nlist = (const char **)gl.gl_pathv;
+- break;
+-
+- case GLOB_NOMATCH:
+- /* If we want only existing items, skip this one. */
+- if (flags & PARSEFS_EXISTS)
+- {
+- i = 0;
+- break;
+- }
+- /* FALLTHROUGH */
+-
+- default:
+- /* By default keep this name. */
++ /* glob() is expensive: don't call it unless we need to. */
++ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
++ {
++ globme = 0;
+ i = 1;
+ nlist = &name;
+- break;
+- }
++ }
++ else
++ switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
++ {
++ case GLOB_NOSPACE:
++ fatal (NILF, _("virtual memory exhausted"));
++
++ case 0:
++ /* Success. */
++ i = gl.gl_pathc;
++ nlist = (const char **)gl.gl_pathv;
++ break;
++
++ case GLOB_NOMATCH:
++ /* If we want only existing items, skip this one. */
++ if (flags & PARSEFS_EXISTS)
++ {
++ i = 0;
++ break;
++ }
++ /* FALLTHROUGH */
++
++ default:
++ /* By default keep this name. */
++ i = 1;
++ nlist = &name;
++ break;
++ }
+
+ /* For each matched element, add it to the list. */
+ while (i-- > 0)
+@@ -3174,7 +3183,8 @@
+ #endif /* !NO_ARCHIVES */
+ NEWELT (concat (2, prefix, nlist[i]));
+
+- globfree (&gl);
++ if (globme)
++ globfree (&gl);
+
+ #ifndef NO_ARCHIVES
+ if (arname)
+Index: tests/scripts/functions/wildcard
+===================================================================
+RCS file: /sources/make/make/tests/scripts/functions/wildcard,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- tests/scripts/functions/wildcard 13 Jun 2009 21:21:49 -0000 1.6
++++ tests/scripts/functions/wildcard 7 May 2011 14:36:11 -0000 1.7
+@@ -88,4 +88,16 @@
+ !,
+ '', "\n");
+
++# TEST #5: wildcard used to verify file existence
++
++touch('xxx.yyy');
++
++run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
++ '', "file=xxx.yyy\n");
++
++unlink('xxx.yyy');
++
++run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
++ '', "file=\n");
++
+ 1;
diff --git a/testing/make/make-3.82-makeflags.patch b/testing/make/make-3.82-makeflags.patch
new file mode 100644
index 000000000..3cba3c402
--- /dev/null
+++ b/testing/make/make-3.82-makeflags.patch
@@ -0,0 +1,36 @@
+Index: main.c
+===================================================================
+RCS file: /sources/make/make/main.c,v
+retrieving revision 1.246
+diff -u -r1.246 main.c
+--- main.c 29 Aug 2010 23:05:27 -0000 1.246
++++ main.c 27 Jul 2011 22:03:12 -0000
+@@ -2091,10 +2095,16 @@
+
+ /* Reset makeflags in case they were changed. */
+ {
++ if (master_job_slots)
++ {
++ assert (job_slots == default_job_slots);
++ job_slots = master_job_slots;
++ }
+ const char *pv = define_makeflags (1, 1);
+ char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
+ sprintf (p, "MAKEFLAGS=%s", pv);
+ putenv (allocated_variable_expand (p));
++ job_slots = default_job_slots;
+ }
+
+ if (ISDB (DB_BASIC))
+@@ -2825,9 +2852,11 @@
+ && (*(unsigned int *) cs->value_ptr ==
+ *(unsigned int *) cs->noarg_value))
+ ADD_FLAG ("", 0); /* Optional value omitted; see below. */
++#if 0
+ else if (cs->c == 'j')
+ /* Special case for `-j'. */
+ ADD_FLAG ("1", 1);
++#endif
+ else
+ {
+ char *buf = alloca (30);
diff --git a/testing/make/make-3.82-sort-blank.patch b/testing/make/make-3.82-sort-blank.patch
new file mode 100644
index 000000000..2e73f5b7c
--- /dev/null
+++ b/testing/make/make-3.82-sort-blank.patch
@@ -0,0 +1,17 @@
+diff -urp make-3.82/function.c make-3.82-pm/function.c
+--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200
++++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200
+@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c
+ {
+ char c = *(t++);
+
+- if (! isspace ((unsigned char)c))
++ if (! isblank ((unsigned char)c))
+ continue;
+
+ ++wordi;
+
+- while (isspace ((unsigned char)*t))
++ while (isblank ((unsigned char)*t))
+ ++t;
+ }
diff --git a/testing/make/make.install b/testing/make/make.install
new file mode 100644
index 000000000..84260853c
--- /dev/null
+++ b/testing/make/make.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(make.info make.info-1 make.info-2)
+
+post_install() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
diff --git a/testing/xf86-video-nouveau/PKGBUILD b/testing/xf86-video-nouveau/PKGBUILD
index 03a71dbae..7880c824e 100644
--- a/testing/xf86-video-nouveau/PKGBUILD
+++ b/testing/xf86-video-nouveau/PKGBUILD
@@ -1,41 +1,30 @@
-# $Id: PKGBUILD 161842 2012-06-15 14:06:38Z ibiru $
+# $Id: PKGBUILD 166652 2012-09-14 14:14:34Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: buddabrod <buddabrod@gmail.com>
pkgname=xf86-video-nouveau
-_gitdate=20120615
-pkgver=0.0.16_git${_gitdate} # see configure.ac
+pkgver=1.0.2
pkgrel=1
-pkgdesc="Open Source 2D acceleration driver for nVidia cards (experimental)"
+pkgdesc="Open Source 2D acceleration driver for nVidia cards"
arch=('i686' 'x86_64')
-url="http://nouveau.freedesktop.org/wiki/"
-license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
+url="http://nouveau.freedesktop.org/"
+license=('GPL')
depends=('libdrm' 'udev')
-optdepends=('nouveau-dri: experimental gallium3d features')
+optdepends=('nouveau-dri: experimental gallium3d features')
makedepends=('xorg-server-devel' 'xf86driproto')
conflicts=('xorg-server<1.11.99.902')
options=('!libtool')
install=$pkgname.install
-source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('9ceb49ff436c9a00536490fb1c8bf6d1')
-
-# source PKGBUILD && mksource
-mksource() {
- mkdir /tmp/$pkgname-${_gitdate}
- pushd /tmp/$pkgname-${_gitdate}
- git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
- cd xf86-video-nouveau
- git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2
- popd
-}
+source=($url/release/$pkgname-$pkgver.tar.bz2)
+sha256sums=('765731c2a91d434d4360517a128d18af70b158f727e49813f1a42e26cccbc45d')
build() {
- cd xf86-video-nouveau-${_gitdate}
- ./autogen.sh --prefix=/usr
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
make
}
package() {
- cd xf86-video-nouveau-${_gitdate}
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/testing/xf86-video-nouveau/xf86-video-nouveau.install b/testing/xf86-video-nouveau/xf86-video-nouveau.install
index 027154ff3..23cc4cd5b 100644
--- a/testing/xf86-video-nouveau/xf86-video-nouveau.install
+++ b/testing/xf86-video-nouveau/xf86-video-nouveau.install
@@ -4,13 +4,3 @@ post_install () {
==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
_EOF
}
-
-post_upgrade() {
- if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then
- cat << _EOF
- ==> ATTENTION: Usermode support has been dropped
- ==> make sure you use KernelModeSetting (KMS)
- ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
- fi
-}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-22 03:10:58 +0000