[arch-commits] Commit in calligra/trunk (PKGBUILD)

2012-10-22 Thread Andrea Scarpino
Date: Monday, October 22, 2012 @ 03:17:06
  Author: andrea
Revision: 169490

nonsense

Modified:
  calligra/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 02:45:00 UTC (rev 169489)
+++ PKGBUILD2012-10-22 07:17:06 UTC (rev 169490)
@@ -57,12 +57,10 @@
   depends=('kdepimlibs' 'lcms2')
   conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
  'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
- 'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
- 'calligra-templates')
+ 'calligra-pics' 'calligra-servicetypes' 'calligra-templates')
   replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
  'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
- 'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
- 'calligra-templates')
+ 'calligra-pics' 'calligra-servicetypes' 'calligra-templates')
 
   for d in interfaces libs pics servicetypes templates; do
 cd ${srcdir}/build/${d}



[arch-commits] Commit in libkgapi/trunk (PKGBUILD)

2012-10-22 Thread Andrea Scarpino
Date: Monday, October 22, 2012 @ 03:20:10
  Author: andrea
Revision: 169491

upgpkg: libkgapi 0.4.3-1

Upstream release

Modified:
  libkgapi/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 07:17:06 UTC (rev 169490)
+++ PKGBUILD2012-10-22 07:20:10 UTC (rev 169491)
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino and...@archlinux.org
 
 pkgname=libkgapi
-pkgver=0.4.2
+pkgver=0.4.3
 pkgrel=1
 pkgdesc=A KDE-based library for accessing various Google services via their 
public API
 url='https://projects.kde.org/projects/extragear/libs/libkgapi'
@@ -12,11 +12,10 @@
 makedepends=('cmake' 'automoc4' 'boost')
 replaces=('akonadi-google' 'libkgoogle')
 conflicts=('akonadi-google' 'libkgoogle')
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('7da940eb4ed9bdb909d29e93ef6bce67')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('99e61ad50edd51f679170db3b997736b')
 
 build() {
-  cd ${srcdir}
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -26,6 +25,6 @@
 }
 
 package() {
-  cd ${srcdir}/build
+  cd build
   make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in libkgapi/repos (4 files)

2012-10-22 Thread Andrea Scarpino
Date: Monday, October 22, 2012 @ 03:20:41
  Author: andrea
Revision: 169492

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libkgapi/repos/extra-i686/PKGBUILD
(from rev 169491, libkgapi/trunk/PKGBUILD)
  libkgapi/repos/extra-x86_64/PKGBUILD
(from rev 169491, libkgapi/trunk/PKGBUILD)
Deleted:
  libkgapi/repos/extra-i686/PKGBUILD
  libkgapi/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   61 +++-
 extra-x86_64/PKGBUILD |   61 +++-
 2 files changed, 60 insertions(+), 62 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-22 07:20:10 UTC (rev 169491)
+++ extra-i686/PKGBUILD 2012-10-22 07:20:41 UTC (rev 169492)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-
-pkgname=libkgapi
-pkgver=0.4.2
-pkgrel=1
-pkgdesc=A KDE-based library for accessing various Google services via their 
public API
-url='https://projects.kde.org/projects/extragear/libs/libkgapi'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'qjson')
-makedepends=('cmake' 'automoc4' 'boost')
-replaces=('akonadi-google' 'libkgoogle')
-conflicts=('akonadi-google' 'libkgoogle')
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('7da940eb4ed9bdb909d29e93ef6bce67')
-
-build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}

Copied: libkgapi/repos/extra-i686/PKGBUILD (from rev 169491, 
libkgapi/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-22 07:20:41 UTC (rev 169492)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=libkgapi
+pkgver=0.4.3
+pkgrel=1
+pkgdesc=A KDE-based library for accessing various Google services via their 
public API
+url='https://projects.kde.org/projects/extragear/libs/libkgapi'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdepimlibs' 'qjson')
+makedepends=('cmake' 'automoc4' 'boost')
+replaces=('akonadi-google' 'libkgoogle')
+conflicts=('akonadi-google' 'libkgoogle')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('99e61ad50edd51f679170db3b997736b')
+
+build() {
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-10-22 07:20:10 UTC (rev 169491)
+++ extra-x86_64/PKGBUILD   2012-10-22 07:20:41 UTC (rev 169492)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-
-pkgname=libkgapi
-pkgver=0.4.2
-pkgrel=1
-pkgdesc=A KDE-based library for accessing various Google services via their 
public API
-url='https://projects.kde.org/projects/extragear/libs/libkgapi'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'qjson')
-makedepends=('cmake' 'automoc4' 'boost')
-replaces=('akonadi-google' 'libkgoogle')
-conflicts=('akonadi-google' 'libkgoogle')
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('7da940eb4ed9bdb909d29e93ef6bce67')
-
-build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}

Copied: libkgapi/repos/extra-x86_64/PKGBUILD (from rev 169491, 
libkgapi/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-10-22 07:20:41 UTC (rev 169492)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=libkgapi
+pkgver=0.4.3
+pkgrel=1
+pkgdesc=A KDE-based library for accessing various Google services via their 
public API
+url='https://projects.kde.org/projects/extragear/libs/libkgapi'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdepimlibs' 'qjson')
+makedepends=('cmake' 'automoc4' 'boost')
+replaces=('akonadi-google' 'libkgoogle')
+conflicts=('akonadi-google' 'libkgoogle')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('99e61ad50edd51f679170db3b997736b')
+
+build() {
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+

[arch-commits] Commit in linux/trunk (6 files)

2012-10-22 Thread Tobias Powalowski
Date: Monday, October 22, 2012 @ 08:12:03
  Author: tpowa
Revision: 169493

upgpkg: linux 3.6.3-1

bump to 3.6.3, added module initialisation patches, readded memgroups

Added:
  linux/trunk/module-init-wait-3.6.patch
  linux/trunk/module-symbol-waiting-3.6.patch
Modified:
  linux/trunk/PKGBUILD
  linux/trunk/config
  linux/trunk/config.x86_64
  linux/trunk/linux.install

-+
 PKGBUILD|   23 +++
 config  |7 ++-
 config.x86_64   |7 ++-
 linux.install   |2 
 module-init-wait-3.6.patch  |   77 ++
 module-symbol-waiting-3.6.patch |   66 
 6 files changed, 170 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 07:20:41 UTC (rev 169492)
+++ PKGBUILD2012-10-22 12:12:03 UTC (rev 169493)
@@ -5,7 +5,7 @@
 pkgbase=linux   # Build stock -ARCH kernel
 #pkgbase=linux-custom   # Build kernel with a different name
 _srcname=linux-3.6
-pkgver=3.6.2
+pkgver=3.6.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://www.kernel.org/;
@@ -18,13 +18,17 @@
 'config' 'config.x86_64'
 # standard config files for mkinitcpio ramdisk
 'linux.preset'
-'change-default-console-loglevel.patch')
+'change-default-console-loglevel.patch'
+'module-symbol-waiting-3.6.patch'
+'module-init-wait-3.6.patch')
 md5sums=('1a1760420eac802c541a20ab51a093d1'
- 'ad1020c82a71ee1ef2416a0d12e724df'
- '443f285744cb96401f9a631f542b9248'
- '2793e97a9e98c501afd3e18d2e3b9762'
+ '96701113d37ef4f9b785206ab8bcc71e'
+ '65f7ff39775f20f65014383564d3cb65'
+ '3adbfa45451c4bcf9dd7879bed033d77'
  'eb14dcfd80c00852ef81ded6e826826a'
- '9d3c56a4b999c8bfbd4018089a62f662')
+ '9d3c56a4b999c8bfbd4018089a62f662'
+ '670931649c60fcb3ef2e0119ed532bd4'
+ '8a71abc4224f575008f974a099b5cf6f')
 
 _kernelname=${pkgbase#linux}
 
@@ -42,6 +46,11 @@
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i ${srcdir}/change-default-console-loglevel.patch
 
+  # fix module initialisation
+  # https://bugs.archlinux.org/task/32122
+  patch -Np1 -i ${srcdir}/module-symbol-waiting-3.6.patch
+  patch -Np1 -i ${srcdir}/module-init-wait-3.6.patch
+
   if [ ${CARCH} = x86_64 ]; then
 cat ${srcdir}/config.x86_64  ./.config
   else
@@ -306,4 +315,4 @@
   }
 done
 
-# vim:set ts=8 sts=2 sw=2 et:
+# vim:set ts=8 sts=2 sw=2 et:
\ No newline at end of file

Modified: config
===
--- config  2012-10-22 07:20:41 UTC (rev 169492)
+++ config  2012-10-22 12:12:03 UTC (rev 169493)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.6.0 Kernel Configuration
+# Linux/i386 3.6.3 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -134,7 +134,10 @@
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
 # CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y

Modified: config.x86_64
===
--- config.x86_64   2012-10-22 07:20:41 UTC (rev 169492)
+++ config.x86_64   2012-10-22 12:12:03 UTC (rev 169493)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.0 Kernel Configuration
+# Linux/x86_64 3.6.3 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -136,7 +136,10 @@
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
 # CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y

Modified: linux.install
===
--- linux.install   2012-10-22 07:20:41 UTC (rev 169492)
+++ linux.install   2012-10-22 12:12:03 UTC (rev 169493)
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.6.2-1-ARCH
+KERNEL_VERSION=3.6.3-1-ARCH
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'

Added: module-init-wait-3.6.patch
===
--- module-init-wait-3.6.patch  (rev 0)
+++ module-init-wait-3.6.patch  2012-10-22 12:12:03 UTC (rev 169493)
@@ -0,0 +1,77 @@
+From: Rusty Russell ru...@rustcorp.com.au
+Date: Fri, 28 Sep 2012 05:01:03 + (+0930)
+Subject: module: wait when loading a 

[arch-commits] Commit in linux/repos (18 files)

2012-10-22 Thread Tobias Powalowski
Date: Monday, October 22, 2012 @ 08:27:52
  Author: tpowa
Revision: 169494

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  linux/repos/testing-i686/
  linux/repos/testing-i686/PKGBUILD
(from rev 169493, linux/trunk/PKGBUILD)
  linux/repos/testing-i686/change-default-console-loglevel.patch
(from rev 169493, linux/trunk/change-default-console-loglevel.patch)
  linux/repos/testing-i686/config
(from rev 169493, linux/trunk/config)
  linux/repos/testing-i686/config.x86_64
(from rev 169493, linux/trunk/config.x86_64)
  linux/repos/testing-i686/linux.install
(from rev 169493, linux/trunk/linux.install)
  linux/repos/testing-i686/linux.preset
(from rev 169493, linux/trunk/linux.preset)
  linux/repos/testing-i686/module-init-wait-3.6.patch
(from rev 169493, linux/trunk/module-init-wait-3.6.patch)
  linux/repos/testing-i686/module-symbol-waiting-3.6.patch
(from rev 169493, linux/trunk/module-symbol-waiting-3.6.patch)
  linux/repos/testing-x86_64/
  linux/repos/testing-x86_64/PKGBUILD
(from rev 169493, linux/trunk/PKGBUILD)
  linux/repos/testing-x86_64/change-default-console-loglevel.patch
(from rev 169493, linux/trunk/change-default-console-loglevel.patch)
  linux/repos/testing-x86_64/config
(from rev 169493, linux/trunk/config)
  linux/repos/testing-x86_64/config.x86_64
(from rev 169493, linux/trunk/config.x86_64)
  linux/repos/testing-x86_64/linux.install
(from rev 169493, linux/trunk/linux.install)
  linux/repos/testing-x86_64/linux.preset
(from rev 169493, linux/trunk/linux.preset)
  linux/repos/testing-x86_64/module-init-wait-3.6.patch
(from rev 169493, linux/trunk/module-init-wait-3.6.patch)
  linux/repos/testing-x86_64/module-symbol-waiting-3.6.patch
(from rev 169493, linux/trunk/module-symbol-waiting-3.6.patch)

--+
 testing-i686/PKGBUILD|  318 
 testing-i686/change-default-console-loglevel.patch   |   12 
 testing-i686/config  | 6031 +
 testing-i686/config.x86_64   | 5802 
 testing-i686/linux.install   |   65 
 testing-i686/linux.preset|   14 
 testing-i686/module-init-wait-3.6.patch  |   77 
 testing-i686/module-symbol-waiting-3.6.patch |   66 
 testing-x86_64/PKGBUILD  |  318 
 testing-x86_64/change-default-console-loglevel.patch |   12 
 testing-x86_64/config| 6031 +
 testing-x86_64/config.x86_64 | 5802 
 testing-x86_64/linux.install |   65 
 testing-x86_64/linux.preset  |   14 
 testing-x86_64/module-init-wait-3.6.patch|   77 
 testing-x86_64/module-symbol-waiting-3.6.patch   |   66 
 16 files changed, 24770 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 169493:169494 to see the changes.


[arch-commits] Commit in linux-lts/trunk (4 files)

2012-10-22 Thread Tobias Powalowski
Date: Monday, October 22, 2012 @ 08:36:15
  Author: tpowa
Revision: 169495

upgpkg: linux-lts 3.0.47-1

bump to 3.0.47, added module initialisation patches

Added:
  linux-lts/trunk/module-init-wait-3.0.patch
  linux-lts/trunk/module-symbol-waiting-3.0.patch
Modified:
  linux-lts/trunk/PKGBUILD
  linux-lts/trunk/linux-lts.install

-+
 PKGBUILD|   19 ++---
 linux-lts.install   |2 
 module-init-wait-3.0.patch  |   77 ++
 module-symbol-waiting-3.0.patch |   66 
 4 files changed, 158 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 12:27:52 UTC (rev 169494)
+++ PKGBUILD2012-10-22 12:36:15 UTC (rev 169495)
@@ -5,7 +5,7 @@
 pkgbase=linux-lts   # Build stock -lts kernel
 #pkgbase=linux-custom   # Build kernel with a different name
 _srcname=linux-3.0
-pkgver=3.0.46
+pkgver=3.0.47
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://www.kernel.org/;
@@ -20,15 +20,19 @@
 'linux-lts.preset'
 'change-default-console-loglevel.patch'
 'i915-fix-ghost-tv-output.patch'
-'ext4-options.patch')
+'ext4-options.patch'
+'module-symbol-waiting-3.0.patch'
+'module-init-wait-3.0.patch')
 md5sums=('ecf932280e2441bdd992423ef3d55f8f'
- '8dffb7415b134a5628c4cdbe9b8a3834'
+ 'c198c3b3e5ffa605c3148855403a67e7'
  'edc668eef98c6795fbdbc7efd755d9bb'
  '6ec56de185c2a3a24e234ddc0915049a'
  '232b52576a62c7a333e9fe7a1e1ca359'
  '9d3c56a4b999c8bfbd4018089a62f662'
  '263725f20c0b9eb9c353040792d644e5'
- 'c8299cf750a84e12d60b372c8ca7e1e8')
+ 'c8299cf750a84e12d60b372c8ca7e1e8'
+ '670931649c60fcb3ef2e0119ed532bd4'
+ '8a71abc4224f575008f974a099b5cf6f')
 
 _kernelname=${pkgbase#linux}
 
@@ -59,6 +63,11 @@
   # https://bugs.archlinux.org/task/28653
   patch -Np1 -i ${srcdir}/ext4-options.patch
 
+  # fix module initialisation
+  # https://bugs.archlinux.org/task/32122
+  patch -Np1 -i ${srcdir}/module-symbol-waiting-3.0.patch
+  patch -Np1 -i ${srcdir}/module-init-wait-3.0.patch
+
   if [ ${CARCH} = x86_64 ]; then
 cat ${srcdir}/config.x86_64  ./.config
   else
@@ -305,4 +314,4 @@
   }
 done
 
-# vim:set ts=8 sts=2 sw=2 et:
+# vim:set ts=8 sts=2 sw=2 et:
\ No newline at end of file

Modified: linux-lts.install
===
--- linux-lts.install   2012-10-22 12:27:52 UTC (rev 169494)
+++ linux-lts.install   2012-10-22 12:36:15 UTC (rev 169495)
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.46-1-lts
+KERNEL_VERSION=3.0.47-1-lts
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'

Added: module-init-wait-3.0.patch
===
--- module-init-wait-3.0.patch  (rev 0)
+++ module-init-wait-3.0.patch  2012-10-22 12:36:15 UTC (rev 169495)
@@ -0,0 +1,77 @@
+From: Rusty Russell ru...@rustcorp.com.au
+Date: Fri, 28 Sep 2012 05:01:03 + (+0930)
+Subject: module: wait when loading a module which is currently initializing.
+X-Git-Tag: v3.7-rc1~2^2~32
+X-Git-Url: 
http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538
+
+module: wait when loading a module which is currently initializing.
+
+The original module-init-tools module loader used a fnctl lock on the
+.ko file to avoid attempts to simultaneously load a module.
+Unfortunately, you can't get an exclusive fcntl lock on a read-only
+fd, making this not work for read-only mounted filesystems.
+module-init-tools has a hacky sleep-and-loop for this now.
+
+It's not that hard to wait in the kernel, and only return -EEXIST once
+the first module has finished loading (or continue loading the module
+if the first one failed to initialize for some reason).  It's also
+consistent with what we do for dependent modules which are still loading.
+
+Suggested-by: Lucas De Marchi lucas.demar...@profusion.mobi
+Signed-off-by: Rusty Russell ru...@rustcorp.com.au
+---
+
+diff --git a/kernel/module.c b/kernel/module.c
+index 63cf6e7..74bc195 100644
+--- a/kernel/module.c
 b/kernel/module.c
+@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const 
struct load_info *info)
+   return module_finalize(info-hdr, info-sechdrs, mod);
+ }
+ 
++/* Is this module of this name done loading?  No locks held. */
++static bool finished_loading(const char *name)
++{
++  struct module *mod;
++  bool ret;
++
++  mutex_lock(module_mutex);
++  mod = find_module(name);
++  ret = !mod || mod-state != MODULE_STATE_COMING;
++  mutex_unlock(module_mutex);
++
++  return 

[arch-commits] Commit in linux-lts/repos (22 files)

2012-10-22 Thread Tobias Powalowski
Date: Monday, October 22, 2012 @ 08:37:34
  Author: tpowa
Revision: 169496

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  linux-lts/repos/testing-i686/
  linux-lts/repos/testing-i686/PKGBUILD
(from rev 169495, linux-lts/trunk/PKGBUILD)
  linux-lts/repos/testing-i686/change-default-console-loglevel.patch
(from rev 169495, linux-lts/trunk/change-default-console-loglevel.patch)
  linux-lts/repos/testing-i686/config
(from rev 169495, linux-lts/trunk/config)
  linux-lts/repos/testing-i686/config.x86_64
(from rev 169495, linux-lts/trunk/config.x86_64)
  linux-lts/repos/testing-i686/ext4-options.patch
(from rev 169495, linux-lts/trunk/ext4-options.patch)
  linux-lts/repos/testing-i686/i915-fix-ghost-tv-output.patch
(from rev 169495, linux-lts/trunk/i915-fix-ghost-tv-output.patch)
  linux-lts/repos/testing-i686/linux-lts.install
(from rev 169495, linux-lts/trunk/linux-lts.install)
  linux-lts/repos/testing-i686/linux-lts.preset
(from rev 169495, linux-lts/trunk/linux-lts.preset)
  linux-lts/repos/testing-i686/module-init-wait-3.0.patch
(from rev 169495, linux-lts/trunk/module-init-wait-3.0.patch)
  linux-lts/repos/testing-i686/module-symbol-waiting-3.0.patch
(from rev 169495, linux-lts/trunk/module-symbol-waiting-3.0.patch)
  linux-lts/repos/testing-x86_64/
  linux-lts/repos/testing-x86_64/PKGBUILD
(from rev 169495, linux-lts/trunk/PKGBUILD)
  linux-lts/repos/testing-x86_64/change-default-console-loglevel.patch
(from rev 169495, linux-lts/trunk/change-default-console-loglevel.patch)
  linux-lts/repos/testing-x86_64/config
(from rev 169495, linux-lts/trunk/config)
  linux-lts/repos/testing-x86_64/config.x86_64
(from rev 169495, linux-lts/trunk/config.x86_64)
  linux-lts/repos/testing-x86_64/ext4-options.patch
(from rev 169495, linux-lts/trunk/ext4-options.patch)
  linux-lts/repos/testing-x86_64/i915-fix-ghost-tv-output.patch
(from rev 169495, linux-lts/trunk/i915-fix-ghost-tv-output.patch)
  linux-lts/repos/testing-x86_64/linux-lts.install
(from rev 169495, linux-lts/trunk/linux-lts.install)
  linux-lts/repos/testing-x86_64/linux-lts.preset
(from rev 169495, linux-lts/trunk/linux-lts.preset)
  linux-lts/repos/testing-x86_64/module-init-wait-3.0.patch
(from rev 169495, linux-lts/trunk/module-init-wait-3.0.patch)
  linux-lts/repos/testing-x86_64/module-symbol-waiting-3.0.patch
(from rev 169495, linux-lts/trunk/module-symbol-waiting-3.0.patch)

--+
 testing-i686/PKGBUILD|  317 
 testing-i686/change-default-console-loglevel.patch   |   12 
 testing-i686/config  | 5657 +
 testing-i686/config.x86_64   | 5395 
 testing-i686/ext4-options.patch  |   49 
 testing-i686/i915-fix-ghost-tv-output.patch  |   26 
 testing-i686/linux-lts.install   |   65 
 testing-i686/linux-lts.preset|   14 
 testing-i686/module-init-wait-3.0.patch  |   77 
 testing-i686/module-symbol-waiting-3.0.patch |   66 
 testing-x86_64/PKGBUILD  |  317 
 testing-x86_64/change-default-console-loglevel.patch |   12 
 testing-x86_64/config| 5657 +
 testing-x86_64/config.x86_64 | 5395 
 testing-x86_64/ext4-options.patch|   49 
 testing-x86_64/i915-fix-ghost-tv-output.patch|   26 
 testing-x86_64/linux-lts.install |   65 
 testing-x86_64/linux-lts.preset  |   14 
 testing-x86_64/module-init-wait-3.0.patch|   77 
 testing-x86_64/module-symbol-waiting-3.0.patch   |   66 
 20 files changed, 23356 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 169495:169496 to see the changes.


[arch-commits] Commit in git/trunk (PKGBUILD)

2012-10-22 Thread Dan McGee
Date: Monday, October 22, 2012 @ 08:47:31
  Author: dan
Revision: 169497

upgpkg: git 1.8.0-1

Modified:
  git/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 12:37:34 UTC (rev 169496)
+++ PKGBUILD2012-10-22 12:47:31 UTC (rev 169497)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee d...@archlinux.org
 
 pkgname=git
-pkgver=1.7.12.4
+pkgver=1.8.0
 pkgrel=1
 pkgdesc=the fast distributed version control system
 arch=(i686 x86_64)
@@ -109,8 +109,8 @@
   install -D -m 644 $srcdir/git-daemon.socket 
$pkgdir/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('5f3f0feb59d96f8106e0a56112bc73db'
- '9370b44fa97843c5f8adaaaf29b7a4d3'
+md5sums=('12f4d20f34ae37086d86dd3b9d037bba'
+ '66f0a839d933c7d573fb40cb051b5e66'
  '8e2648910fd5dd4f1c41d3c7fa9e9156'
  '2e42bf97779a1c6411d89043334c9e78'
  '042524f942785772d7bd52a1f02fe5ae'



[arch-commits] Commit in git/repos (24 files)

2012-10-22 Thread Dan McGee
Date: Monday, October 22, 2012 @ 08:48:27
  Author: dan
Revision: 169498

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  git/repos/extra-i686/PKGBUILD
(from rev 169497, git/trunk/PKGBUILD)
  git/repos/extra-i686/git-daemon
(from rev 169497, git/trunk/git-daemon)
  git/repos/extra-i686/git-daemon.conf
(from rev 169497, git/trunk/git-daemon.conf)
  git/repos/extra-i686/git-daemon.socket
(from rev 169497, git/trunk/git-daemon.socket)
  git/repos/extra-i686/git-daemon@.service
(from rev 169497, git/trunk/git-daemon@.service)
  git/repos/extra-i686/git.install
(from rev 169497, git/trunk/git.install)
  git/repos/extra-x86_64/PKGBUILD
(from rev 169497, git/trunk/PKGBUILD)
  git/repos/extra-x86_64/git-daemon
(from rev 169497, git/trunk/git-daemon)
  git/repos/extra-x86_64/git-daemon.conf
(from rev 169497, git/trunk/git-daemon.conf)
  git/repos/extra-x86_64/git-daemon.socket
(from rev 169497, git/trunk/git-daemon.socket)
  git/repos/extra-x86_64/git-daemon@.service
(from rev 169497, git/trunk/git-daemon@.service)
  git/repos/extra-x86_64/git.install
(from rev 169497, git/trunk/git.install)
Deleted:
  git/repos/extra-i686/PKGBUILD
  git/repos/extra-i686/git-daemon
  git/repos/extra-i686/git-daemon.conf
  git/repos/extra-i686/git-daemon.socket
  git/repos/extra-i686/git-daemon@.service
  git/repos/extra-i686/git.install
  git/repos/extra-x86_64/PKGBUILD
  git/repos/extra-x86_64/git-daemon
  git/repos/extra-x86_64/git-daemon.conf
  git/repos/extra-x86_64/git-daemon.socket
  git/repos/extra-x86_64/git-daemon@.service
  git/repos/extra-x86_64/git.install

--+
 extra-i686/PKGBUILD  |  234 ++---
 extra-i686/git-daemon|  140 +++---
 extra-i686/git-daemon.conf   |   10 -
 extra-i686/git-daemon.socket |   18 +-
 extra-i686/git-daemon@.service   |   20 +--
 extra-i686/git.install   |   42 +++---
 extra-x86_64/PKGBUILD|  234 ++---
 extra-x86_64/git-daemon  |  140 +++---
 extra-x86_64/git-daemon.conf |   10 -
 extra-x86_64/git-daemon.socket   |   18 +-
 extra-x86_64/git-daemon@.service |   20 +--
 extra-x86_64/git.install |   42 +++---
 12 files changed, 464 insertions(+), 464 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-22 12:47:31 UTC (rev 169497)
+++ extra-i686/PKGBUILD 2012-10-22 12:48:27 UTC (rev 169498)
@@ -1,117 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee d...@archlinux.org
-
-pkgname=git
-pkgver=1.7.12.4
-pkgrel=1
-pkgdesc=the fast distributed version control system
-arch=(i686 x86_64)
-url=http://git-scm.com/;
-license=('GPL2')
-depends=('curl' 'expat=2.0' 'perl-error' 'perl=5.14.0' 'openssl' 'pcre')
-makedepends=('python2' 'emacs')
-optdepends=('tk: gitk and git gui'
-'perl-libwww: git svn'
-'perl-term-readkey: git svn'
-'perl-mime-tools: git send-email'
-'perl-net-smtp-ssl: git send-email TLS support'
-'perl-authen-sasl: git send-email TLS support'
-'python2: various helper scripts'
-'subversion: git svn'
-'cvsps: git cvsimport')
-replaces=('git-core')
-provides=('git-core')
-backup=('etc/conf.d/git-daemon.conf')
-install=git.install
-source=(http://git-core.googlecode.com/files/git-$pkgver.tar.gz;
-http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz;
-git-daemon
-git-daemon.conf
-git-daemon@.service
-git-daemon.socket)
-
-build() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS \
-USE_LIBPCRE=1 \
-NO_CROSS_DIRECTORY_HARDLINKS=1 \
-all
-
-  cd contrib/emacs
-  make prefix=/usr
-}
-
-check() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd $srcdir/$pkgname-$pkgver
-  local jobs
-  jobs=$(expr $MAKEFLAGS : '.*\(-j[0-9]*\).*')
-  mkdir -p /dev/shm/git-test
-  # We used to use this, but silly git regressions:
-  #GIT_TEST_OPTS=--root=/dev/shm/ \
-  # http://comments.gmane.org/gmane.comp.version-control.git/202020
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS \
-USE_LIBPCRE=1 \
-NO_CROSS_DIRECTORY_HARDLINKS=1 \
-NO_SVN_TESTS=y \
-DEFAULT_TEST_TARGET=prove \
-GIT_PROVE_OPTS=$jobs -Q \
-GIT_TEST_OPTS=--root=/dev/shm/git-test \
-test
-}
-
-package() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS \
-USE_LIBPCRE=1 \
-NO_CROSS_DIRECTORY_HARDLINKS=1 \
-INSTALLDIRS=vendor DESTDIR=$pkgdir install 
-
-  # bash completion
-  mkdir -p $pkgdir/usr/share/bash-completion/completions/
-  install -m644 

[arch-commits] Commit in nvidia/trunk (PKGBUILD)

2012-10-22 Thread Tobias Powalowski
Date: Monday, October 22, 2012 @ 09:06:13
  Author: tpowa
Revision: 169499

upgpkg: nvidia 304.60-2

rebuild against 3.6.3

Modified:
  nvidia/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 12:48:27 UTC (rev 169498)
+++ PKGBUILD2012-10-22 13:06:13 UTC (rev 169499)
@@ -4,7 +4,7 @@
 pkgname=nvidia
 pkgver=304.60
 _extramodules=extramodules-3.6-ARCH
-pkgrel=1
+pkgrel=2
 pkgdesc=NVIDIA drivers for linux.
 arch=('i686' 'x86_64')
 url=http://www.nvidia.com/;



[arch-commits] Commit in nvidia/repos (6 files)

2012-10-22 Thread Tobias Powalowski
Date: Monday, October 22, 2012 @ 09:08:08
  Author: tpowa
Revision: 169500

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  nvidia/repos/testing-i686/
  nvidia/repos/testing-i686/PKGBUILD
(from rev 169499, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-i686/nvidia.install
(from rev 169499, nvidia/trunk/nvidia.install)
  nvidia/repos/testing-x86_64/
  nvidia/repos/testing-x86_64/PKGBUILD
(from rev 169499, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/nvidia.install
(from rev 169499, nvidia/trunk/nvidia.install)

---+
 testing-i686/PKGBUILD |   45 
 testing-i686/nvidia.install   |   15 +
 testing-x86_64/PKGBUILD   |   45 
 testing-x86_64/nvidia.install |   15 +
 4 files changed, 120 insertions(+)

Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 169499, 
nvidia/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-22 13:08:08 UTC (rev 169500)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Thomas Baechler tho...@archlinux.org
+
+pkgname=nvidia
+pkgver=304.60
+_extramodules=extramodules-3.6-ARCH
+pkgrel=2
+pkgdesc=NVIDIA drivers for linux.
+arch=('i686' 'x86_64')
+url=http://www.nvidia.com/;
+depends=('linux=3.6' 'linux3.7' nvidia-utils=${pkgver})
+makedepends=('linux-headers=3.6' 'linux-headers3.7')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+
+if [ $CARCH = i686 ]; then
+_arch='x86'
+_pkg=NVIDIA-Linux-${_arch}-${pkgver}
+
source=(ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run;)
+md5sums=('42b9887076b2ebcf1af5ee13bc332ccb')
+elif [ $CARCH = x86_64 ]; then
+_arch='x86_64'
+   _pkg=NVIDIA-Linux-${_arch}-${pkgver}-no-compat32
+
source=(ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run;)
+md5sums=('7248399a125808e3bbc9c66da99a098d')
+fi
+
+build() {
+_kernver=$(cat /usr/lib/modules/${_extramodules}/version)
+cd ${srcdir}
+sh ${_pkg}.run --extract-only
+cd ${_pkg}/kernel
+make SYSSRC=/usr/lib/modules/${_kernver}/build module
+}
+
+package() {
+install -D -m644 ${srcdir}/${_pkg}/kernel/nvidia.ko \
+${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko
+install -d -m755 ${pkgdir}/usr/lib/modprobe.d
+echo blacklist nouveau  ${pkgdir}/usr/lib/modprobe.d/nvidia.conf
+sed -i -e s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/ 
${startdir}/nvidia.install
+gzip ${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko
+}

Copied: nvidia/repos/testing-i686/nvidia.install (from rev 169499, 
nvidia/trunk/nvidia.install)
===
--- testing-i686/nvidia.install (rev 0)
+++ testing-i686/nvidia.install 2012-10-22 13:08:08 UTC (rev 169500)
@@ -0,0 +1,15 @@
+post_install() {
+EXTRAMODULES='extramodules-3.6-ARCH'
+depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+EXTRAMODULES='extramodules-3.6-ARCH'
+depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+EXTRAMODULES='extramodules-3.6-ARCH'
+depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 169499, 
nvidia/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-10-22 13:08:08 UTC (rev 169500)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Thomas Baechler tho...@archlinux.org
+
+pkgname=nvidia
+pkgver=304.60
+_extramodules=extramodules-3.6-ARCH
+pkgrel=2
+pkgdesc=NVIDIA drivers for linux.
+arch=('i686' 'x86_64')
+url=http://www.nvidia.com/;
+depends=('linux=3.6' 'linux3.7' nvidia-utils=${pkgver})
+makedepends=('linux-headers=3.6' 'linux-headers3.7')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+
+if [ $CARCH = i686 ]; then
+_arch='x86'
+_pkg=NVIDIA-Linux-${_arch}-${pkgver}
+
source=(ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run;)
+md5sums=('42b9887076b2ebcf1af5ee13bc332ccb')
+elif [ $CARCH = x86_64 ]; then
+_arch='x86_64'
+   _pkg=NVIDIA-Linux-${_arch}-${pkgver}-no-compat32
+
source=(ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run;)
+md5sums=('7248399a125808e3bbc9c66da99a098d')
+fi
+
+build() {
+_kernver=$(cat /usr/lib/modules/${_extramodules}/version)
+cd ${srcdir}
+sh ${_pkg}.run --extract-only
+cd ${_pkg}/kernel
+make SYSSRC=/usr/lib/modules/${_kernver}/build module
+}
+
+package() {
+install -D -m644 ${srcdir}/${_pkg}/kernel/nvidia.ko \

[arch-commits] Commit in lirc/trunk (PKGBUILD)

2012-10-22 Thread Tobias Powalowski
Date: Monday, October 22, 2012 @ 09:09:42
  Author: tpowa
Revision: 169501

upgpkg: lirc 1:0.9.0-32

rebuild against 3.6.3

Modified:
  lirc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 13:08:08 UTC (rev 169500)
+++ PKGBUILD2012-10-22 13:09:42 UTC (rev 169501)
@@ -4,7 +4,7 @@
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=31
+pkgrel=32
 epoch=1
 _extramodules=extramodules-3.6-ARCH
 arch=('i686' 'x86_64')



[arch-commits] Commit in lirc/repos (36 files)

2012-10-22 Thread Tobias Powalowski
Date: Monday, October 22, 2012 @ 09:11:45
  Author: tpowa
Revision: 169502

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  lirc/repos/testing-i686/
  lirc/repos/testing-i686/PKGBUILD
(from rev 169501, lirc/trunk/PKGBUILD)
  lirc/repos/testing-i686/irexec.conf
(from rev 169501, lirc/trunk/irexec.conf)
  lirc/repos/testing-i686/irexec.service
(from rev 169501, lirc/trunk/irexec.service)
  lirc/repos/testing-i686/irexecd
(from rev 169501, lirc/trunk/irexecd)
  lirc/repos/testing-i686/kernel-2.6.39.patch
(from rev 169501, lirc/trunk/kernel-2.6.39.patch)
  lirc/repos/testing-i686/lirc-utils.install
(from rev 169501, lirc/trunk/lirc-utils.install)
  lirc/repos/testing-i686/lirc.install
(from rev 169501, lirc/trunk/lirc.install)
  lirc/repos/testing-i686/lirc.logrotate
(from rev 169501, lirc/trunk/lirc.logrotate)
  lirc/repos/testing-i686/lirc.service
(from rev 169501, lirc/trunk/lirc.service)
  lirc/repos/testing-i686/lirc.tmpfiles
(from rev 169501, lirc/trunk/lirc.tmpfiles)
  lirc/repos/testing-i686/lirc_atiusb-kfifo.patch
(from rev 169501, lirc/trunk/lirc_atiusb-kfifo.patch)
  lirc/repos/testing-i686/lirc_wpc8769l.patch
(from rev 169501, lirc/trunk/lirc_wpc8769l.patch)
  lirc/repos/testing-i686/lircd
(from rev 169501, lirc/trunk/lircd)
  lirc/repos/testing-i686/lircd-handle-large-config.patch
(from rev 169501, lirc/trunk/lircd-handle-large-config.patch)
  lirc/repos/testing-i686/lircd.conf
(from rev 169501, lirc/trunk/lircd.conf)
  lirc/repos/testing-i686/lircm.service
(from rev 169501, lirc/trunk/lircm.service)
  lirc/repos/testing-i686/lircmd
(from rev 169501, lirc/trunk/lircmd)
  lirc/repos/testing-x86_64/
  lirc/repos/testing-x86_64/PKGBUILD
(from rev 169501, lirc/trunk/PKGBUILD)
  lirc/repos/testing-x86_64/irexec.conf
(from rev 169501, lirc/trunk/irexec.conf)
  lirc/repos/testing-x86_64/irexec.service
(from rev 169501, lirc/trunk/irexec.service)
  lirc/repos/testing-x86_64/irexecd
(from rev 169501, lirc/trunk/irexecd)
  lirc/repos/testing-x86_64/kernel-2.6.39.patch
(from rev 169501, lirc/trunk/kernel-2.6.39.patch)
  lirc/repos/testing-x86_64/lirc-utils.install
(from rev 169501, lirc/trunk/lirc-utils.install)
  lirc/repos/testing-x86_64/lirc.install
(from rev 169501, lirc/trunk/lirc.install)
  lirc/repos/testing-x86_64/lirc.logrotate
(from rev 169501, lirc/trunk/lirc.logrotate)
  lirc/repos/testing-x86_64/lirc.service
(from rev 169501, lirc/trunk/lirc.service)
  lirc/repos/testing-x86_64/lirc.tmpfiles
(from rev 169501, lirc/trunk/lirc.tmpfiles)
  lirc/repos/testing-x86_64/lirc_atiusb-kfifo.patch
(from rev 169501, lirc/trunk/lirc_atiusb-kfifo.patch)
  lirc/repos/testing-x86_64/lirc_wpc8769l.patch
(from rev 169501, lirc/trunk/lirc_wpc8769l.patch)
  lirc/repos/testing-x86_64/lircd
(from rev 169501, lirc/trunk/lircd)
  lirc/repos/testing-x86_64/lircd-handle-large-config.patch
(from rev 169501, lirc/trunk/lircd-handle-large-config.patch)
  lirc/repos/testing-x86_64/lircd.conf
(from rev 169501, lirc/trunk/lircd.conf)
  lirc/repos/testing-x86_64/lircm.service
(from rev 169501, lirc/trunk/lircm.service)
  lirc/repos/testing-x86_64/lircmd
(from rev 169501, lirc/trunk/lircmd)

+
 testing-i686/PKGBUILD  |  117 +++
 testing-i686/irexec.conf   |5 
 testing-i686/irexec.service|   11 ++
 testing-i686/irexecd   |   38 +++
 testing-i686/kernel-2.6.39.patch   |   54 ++
 testing-i686/lirc-utils.install|7 +
 testing-i686/lirc.install  |   16 +++
 testing-i686/lirc.logrotate|5 
 testing-i686/lirc.service  |   11 ++
 testing-i686/lirc.tmpfiles |1 
 testing-i686/lirc_atiusb-kfifo.patch   |   31 ++
 testing-i686/lirc_wpc8769l.patch   |   88 +
 testing-i686/lircd |   52 ++
 testing-i686/lircd-handle-large-config.patch   |   39 +++
 testing-i686/lircd.conf|8 +
 testing-i686/lircm.service |   11 ++
 testing-i686/lircmd|   36 +++
 testing-x86_64/PKGBUILD|  117 +++
 testing-x86_64/irexec.conf |5 
 testing-x86_64/irexec.service  |   11 ++
 testing-x86_64/irexecd |   38 +++
 testing-x86_64/kernel-2.6.39.patch |   54 ++
 testing-x86_64/lirc-utils.install  |7 +
 testing-x86_64/lirc.install|   16 +++
 testing-x86_64/lirc.logrotate  |5 
 testing-x86_64/lirc.service|   11 ++
 testing-x86_64/lirc.tmpfiles   |1 
 

[arch-commits] Commit in gtkmm3/trunk (PKGBUILD)

2012-10-22 Thread Ionut Biru
Date: Monday, October 22, 2012 @ 10:19:36
  Author: ibiru
Revision: 169503

update to 3.6.0

Modified:
  gtkmm3/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 13:11:45 UTC (rev 169502)
+++ PKGBUILD2012-10-22 14:19:36 UTC (rev 169503)
@@ -4,7 +4,7 @@
 pkgbase=gtkmm3
 _pkgbasename=gtkmm
 pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.5.13
+pkgver=3.6.0
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 
'libxslt')
@@ -12,7 +12,7 @@
 options=('!libtool' '!emptydirs')
 url=http://www.gtkmm.org/;
 
source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('2dcd3654f1e88cd80d1641e91bb9bceb10216ee74ec400c14f7bb7c5e4cecbfc')
+sha256sums=('888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359')
 
 build() {
   cd $_pkgbasename-$pkgver



[arch-commits] Commit in gtkmm3/repos (4 files)

2012-10-22 Thread Ionut Biru
Date: Monday, October 22, 2012 @ 10:39:10
  Author: ibiru
Revision: 169504

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gtkmm3/repos/testing-i686/PKGBUILD
(from rev 169503, gtkmm3/trunk/PKGBUILD)
  gtkmm3/repos/testing-x86_64/PKGBUILD
(from rev 169503, gtkmm3/trunk/PKGBUILD)
Deleted:
  gtkmm3/repos/testing-i686/PKGBUILD
  gtkmm3/repos/testing-x86_64/PKGBUILD

-+
 testing-i686/PKGBUILD   |   76 +++---
 testing-x86_64/PKGBUILD |   76 +++---
 2 files changed, 76 insertions(+), 76 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2012-10-22 14:19:36 UTC (rev 169503)
+++ testing-i686/PKGBUILD   2012-10-22 14:39:10 UTC (rev 169504)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru ib...@archlinux.org
-
-pkgbase=gtkmm3
-_pkgbasename=gtkmm
-pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.5.13
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 
'libxslt')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url=http://www.gtkmm.org/;
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('2dcd3654f1e88cd80d1641e91bb9bceb10216ee74ec400c14f7bb7c5e4cecbfc')
-
-build() {
-  cd $_pkgbasename-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package_gtkmm3() {
-  pkgdesc=C++ bindings for gtk3
-  depends=('gtk3' 'pangomm' 'atkmm')
-  cd $_pkgbasename-$pkgver
-
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-
-  make DESTDIR=$pkgdir install
-}
-
-package_gtkmm3-docs() {
-  pkgdesc=Developer documentation for gtkmm v3
-
-  cd $_pkgbasename-$pkgver
-  make -C docs DESTDIR=$pkgdir install
-}

Copied: gtkmm3/repos/testing-i686/PKGBUILD (from rev 169503, 
gtkmm3/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-22 14:39:10 UTC (rev 169504)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Ionut Biru ib...@archlinux.org
+
+pkgbase=gtkmm3
+_pkgbasename=gtkmm
+pkgname=('gtkmm3' 'gtkmm3-docs')
+pkgver=3.6.0
+pkgrel=1
+arch=('i686' 'x86_64')
+makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 
'libxslt')
+license=('LGPL')
+options=('!libtool' '!emptydirs')
+url=http://www.gtkmm.org/;
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
+sha256sums=('888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359')
+
+build() {
+  cd $_pkgbasename-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package_gtkmm3() {
+  pkgdesc=C++ bindings for gtk3
+  depends=('gtk3' 'pangomm' 'atkmm')
+  cd $_pkgbasename-$pkgver
+
+  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
+
+  make DESTDIR=$pkgdir install
+}
+
+package_gtkmm3-docs() {
+  pkgdesc=Developer documentation for gtkmm v3
+
+  cd $_pkgbasename-$pkgver
+  make -C docs DESTDIR=$pkgdir install
+}

Deleted: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2012-10-22 14:19:36 UTC (rev 169503)
+++ testing-x86_64/PKGBUILD 2012-10-22 14:39:10 UTC (rev 169504)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru ib...@archlinux.org
-
-pkgbase=gtkmm3
-_pkgbasename=gtkmm
-pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.5.13
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 
'libxslt')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url=http://www.gtkmm.org/;
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('2dcd3654f1e88cd80d1641e91bb9bceb10216ee74ec400c14f7bb7c5e4cecbfc')
-
-build() {
-  cd $_pkgbasename-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package_gtkmm3() {
-  pkgdesc=C++ bindings for gtk3
-  depends=('gtk3' 'pangomm' 'atkmm')
-  cd $_pkgbasename-$pkgver
-
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-
-  make DESTDIR=$pkgdir install
-}
-
-package_gtkmm3-docs() {
-  pkgdesc=Developer documentation for gtkmm v3
-
-  cd $_pkgbasename-$pkgver
-  make -C docs DESTDIR=$pkgdir install
-}

Copied: gtkmm3/repos/testing-x86_64/PKGBUILD (from rev 169503, 
gtkmm3/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-10-22 14:39:10 UTC (rev 169504)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Ionut Biru ib...@archlinux.org
+
+pkgbase=gtkmm3
+_pkgbasename=gtkmm
+pkgname=('gtkmm3' 'gtkmm3-docs')
+pkgver=3.6.0
+pkgrel=1
+arch=('i686' 'x86_64')
+makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 
'libxslt')
+license=('LGPL')
+options=('!libtool' '!emptydirs')

[arch-commits] Commit in cairo/trunk (PKGBUILD git_fixes.patch)

2012-10-22 Thread andyrtr
Date: Monday, October 22, 2012 @ 13:33:15
  Author: andyrtr
Revision: 169505

upgpkg: cairo 1.12.6-1

upstream update 1.12.6 - FreeNX is still broken

Modified:
  cairo/trunk/PKGBUILD
Deleted:
  cairo/trunk/git_fixes.patch

-+
 PKGBUILD|9 
 git_fixes.patch | 1086 --
 2 files changed, 5 insertions(+), 1090 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 169504:169505 to see the changes.


[arch-commits] Commit in cairo/repos (10 files)

2012-10-22 Thread andyrtr
Date: Monday, October 22, 2012 @ 13:33:56
  Author: andyrtr
Revision: 169506

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  cairo/repos/testing-i686/PKGBUILD
(from rev 169505, cairo/trunk/PKGBUILD)
  cairo/repos/testing-i686/cairo-1.10.0-buggy_gradients.patch
(from rev 169505, cairo/trunk/cairo-1.10.0-buggy_gradients.patch)
  cairo/repos/testing-x86_64/PKGBUILD
(from rev 169505, cairo/trunk/PKGBUILD)
  cairo/repos/testing-x86_64/cairo-1.10.0-buggy_gradients.patch
(from rev 169505, cairo/trunk/cairo-1.10.0-buggy_gradients.patch)
Deleted:
  cairo/repos/testing-i686/PKGBUILD
  cairo/repos/testing-i686/cairo-1.10.0-buggy_gradients.patch
  cairo/repos/testing-i686/git_fixes.patch
  cairo/repos/testing-x86_64/PKGBUILD
  cairo/repos/testing-x86_64/cairo-1.10.0-buggy_gradients.patch
  cairo/repos/testing-x86_64/git_fixes.patch

---+
 testing-i686/PKGBUILD |   93 -
 testing-i686/cairo-1.10.0-buggy_gradients.patch   |   26 
 testing-i686/git_fixes.patch  | 1086 
 testing-x86_64/PKGBUILD   |   93 -
 testing-x86_64/cairo-1.10.0-buggy_gradients.patch |   26 
 testing-x86_64/git_fixes.patch| 1086 
 6 files changed, 120 insertions(+), 2290 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 169505:169506 to see the changes.


[arch-commits] Commit in screen/trunk (PKGBUILD)

2012-10-22 Thread Thomas Bächler
Date: Monday, October 22, 2012 @ 14:00:42
  Author: thomas
Revision: 169507

upgpkg: screen 4.0.3-14: Change socket location to /run/screens

Modified:
  screen/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 17:33:56 UTC (rev 169506)
+++ PKGBUILD2012-10-22 18:00:42 UTC (rev 169507)
@@ -4,7 +4,7 @@
 
 pkgname=screen
 pkgver=4.0.3
-pkgrel=13
+pkgrel=14
 _ptygroup=5 #the UID of our PTY/TTY group
 pkgdesc=Full-screen window manager that multiplexes a physical terminal
 arch=('i686' 'x86_64')
@@ -32,7 +32,8 @@
 --with-sys-screenrc=/etc/screenrc --enable-colors256 \
--enable-rxvt_osc --enable-telnet \
--with-pty-group=$_ptygroup \
-   --mandir=/usr/share/man --infodir=/usr/share/info
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   --with-socket-dir=/run/screens
   make
 }
 



[arch-commits] Commit in screen/repos (12 files)

2012-10-22 Thread Thomas Bächler
Date: Monday, October 22, 2012 @ 14:01:13
  Author: thomas
Revision: 169508

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  screen/repos/testing-i686/
  screen/repos/testing-i686/PKGBUILD
(from rev 169507, screen/trunk/PKGBUILD)
  screen/repos/testing-i686/screen-4.0.3-caption-colors.patch
(from rev 169507, screen/trunk/screen-4.0.3-caption-colors.patch)
  screen/repos/testing-i686/screen-4.0.3-long-term.patch
(from rev 169507, screen/trunk/screen-4.0.3-long-term.patch)
  screen/repos/testing-i686/screen.install
(from rev 169507, screen/trunk/screen.install)
  screen/repos/testing-i686/screen.pam
(from rev 169507, screen/trunk/screen.pam)
  screen/repos/testing-x86_64/
  screen/repos/testing-x86_64/PKGBUILD
(from rev 169507, screen/trunk/PKGBUILD)
  screen/repos/testing-x86_64/screen-4.0.3-caption-colors.patch
(from rev 169507, screen/trunk/screen-4.0.3-caption-colors.patch)
  screen/repos/testing-x86_64/screen-4.0.3-long-term.patch
(from rev 169507, screen/trunk/screen-4.0.3-long-term.patch)
  screen/repos/testing-x86_64/screen.install
(from rev 169507, screen/trunk/screen.install)
  screen/repos/testing-x86_64/screen.pam
(from rev 169507, screen/trunk/screen.pam)

--+
 testing-i686/PKGBUILD|   49 +
 testing-i686/screen-4.0.3-caption-colors.patch   |   21 +
 testing-i686/screen-4.0.3-long-term.patch|   24 ++
 testing-i686/screen.install  |   21 +
 testing-i686/screen.pam  |1 
 testing-x86_64/PKGBUILD  |   49 +
 testing-x86_64/screen-4.0.3-caption-colors.patch |   21 +
 testing-x86_64/screen-4.0.3-long-term.patch  |   24 ++
 testing-x86_64/screen.install|   21 +
 testing-x86_64/screen.pam|1 
 10 files changed, 232 insertions(+)

Copied: screen/repos/testing-i686/PKGBUILD (from rev 169507, 
screen/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-22 18:01:13 UTC (rev 169508)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+# Committer: dorphell dorph...@gmx.net
+
+pkgname=screen
+pkgver=4.0.3
+pkgrel=14
+_ptygroup=5 #the UID of our PTY/TTY group
+pkgdesc=Full-screen window manager that multiplexes a physical terminal
+arch=('i686' 'x86_64')
+url=http://www.gnu.org/software/screen/;
+license=('GPL')
+depends=('ncurses' 'pam')
+backup=('etc/screenrc' 'etc/pam.d/screen')
+options=('!makeflags')
+install=screen.install
+source=(ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${pkgver}.tar.gz
+screen-4.0.3-long-term.patch
+screen-4.0.3-caption-colors.patch
+screen.pam)
+md5sums=('8506fd205028a96c741e4037de6e3c42'
+ '2723c3e71d5a2e5a74b6ddbc5215ef0f'
+ '191b6ced695ce2ae3a65bf02c2d4220f'
+ '74f7919d7b65436cc2ea5341fa8ca374')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i $srcdir/screen-4.0.3-long-term.patch
+  patch -Np2 -i $srcdir/screen-4.0.3-caption-colors.patch
+  
+  ./configure --prefix=/usr --enable-pam \
+--with-sys-screenrc=/etc/screenrc --enable-colors256 \
+   --enable-rxvt_osc --enable-telnet \
+   --with-pty-group=$_ptygroup \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   --with-socket-dir=/run/screens
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 ${srcdir}/screen.pam ${pkgdir}/etc/pam.d/screen
+
+  install -Dm644 etc/completer.zsh 
${pkgdir}/usr/share/zsh/site-functions/screen
+  install -Dm644 etc/etcscreenrc ${pkgdir}/etc/screenrc
+  install -Dm644 etc/screenrc ${pkgdir}/etc/skel/.screenrc
+}

Copied: screen/repos/testing-i686/screen-4.0.3-caption-colors.patch (from rev 
169507, screen/trunk/screen-4.0.3-caption-colors.patch)
===
--- testing-i686/screen-4.0.3-caption-colors.patch  
(rev 0)
+++ testing-i686/screen-4.0.3-caption-colors.patch  2012-10-22 18:01:13 UTC 
(rev 169508)
@@ -0,0 +1,21 @@
+From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001
+From: Sadrul Habib Chowdhury sad...@users.sourceforge.net
+Date: Tue, 26 Jan 2010 20:17:26 +
+Subject: Accommodate more color changes in the caption.
+
+---
+diff --git a/src/screen.c b/src/screen.c
+index b1c3dfb..2cceae0 100644
+--- a/src/screen.c
 b/src/screen.c
+@@ -2204,7 +2204,7 @@ static const char months[] = 
JanFebMarAprMayJunJulAugSepOctNovDec;
+ #endif
+ 
+ static char winmsg_buf[MAXSTR];
+-#define MAX_WINMSG_REND 16/* rendition changes */
++#define MAX_WINMSG_REND 256   /* rendition changes */
+ static int 

[arch-commits] Commit in di/trunk (PKGBUILD)

2012-10-22 Thread Eric Bélanger
Date: Monday, October 22, 2012 @ 15:35:48
  Author: eric
Revision: 169509

upgpkg: di 4.32-1

Upstream update

Modified:
  di/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 18:01:13 UTC (rev 169508)
+++ PKGBUILD2012-10-22 19:35:48 UTC (rev 169509)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=di
-pkgver=4.31
+pkgver=4.32
 pkgrel=1
 pkgdesc=A disk information utility, displaying everything (and more) that 
your df command does
 arch=('i686' 'x86_64')
@@ -10,10 +10,12 @@
 license=('ZLIB')
 depends=('glibc')
 source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('2a7212e03286b68ebb4783ae8937999145165c79')
+sha1sums=('b819e877e1135f34f362ba2f72d1e694c1878249')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  sed -i 's|error|//error|' C/di.h
+  sed -i '11i\#include string.h' C/di.h
   make
 }
 



[arch-commits] Commit in di/repos (4 files)

2012-10-22 Thread Eric Bélanger
Date: Monday, October 22, 2012 @ 15:36:13
  Author: eric
Revision: 169510

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  di/repos/extra-i686/PKGBUILD
(from rev 169509, di/trunk/PKGBUILD)
  di/repos/extra-x86_64/PKGBUILD
(from rev 169509, di/trunk/PKGBUILD)
Deleted:
  di/repos/extra-i686/PKGBUILD
  di/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   50 
 extra-x86_64/PKGBUILD |   50 
 2 files changed, 52 insertions(+), 48 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-22 19:35:48 UTC (rev 169509)
+++ extra-i686/PKGBUILD 2012-10-22 19:36:13 UTC (rev 169510)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger e...@archlinux.org
-
-pkgname=di
-pkgver=4.31
-pkgrel=1
-pkgdesc=A disk information utility, displaying everything (and more) that 
your df command does
-arch=('i686' 'x86_64')
-url=http://www.gentoo.com/di/;
-license=('ZLIB')
-depends=('glibc')
-source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('2a7212e03286b68ebb4783ae8937999145165c79')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make INSTALL_DIR=${pkgdir}/usr install
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: di/repos/extra-i686/PKGBUILD (from rev 169509, di/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-22 19:36:13 UTC (rev 169510)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Eric Bélanger e...@archlinux.org
+
+pkgname=di
+pkgver=4.32
+pkgrel=1
+pkgdesc=A disk information utility, displaying everything (and more) that 
your df command does
+arch=('i686' 'x86_64')
+url=http://www.gentoo.com/di/;
+license=('ZLIB')
+depends=('glibc')
+source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('b819e877e1135f34f362ba2f72d1e694c1878249')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  sed -i 's|error|//error|' C/di.h
+  sed -i '11i\#include string.h' C/di.h
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make INSTALL_DIR=${pkgdir}/usr install
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-10-22 19:35:48 UTC (rev 169509)
+++ extra-x86_64/PKGBUILD   2012-10-22 19:36:13 UTC (rev 169510)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger e...@archlinux.org
-
-pkgname=di
-pkgver=4.31
-pkgrel=1
-pkgdesc=A disk information utility, displaying everything (and more) that 
your df command does
-arch=('i686' 'x86_64')
-url=http://www.gentoo.com/di/;
-license=('ZLIB')
-depends=('glibc')
-source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('2a7212e03286b68ebb4783ae8937999145165c79')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make INSTALL_DIR=${pkgdir}/usr install
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: di/repos/extra-x86_64/PKGBUILD (from rev 169509, di/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-10-22 19:36:13 UTC (rev 169510)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Eric Bélanger e...@archlinux.org
+
+pkgname=di
+pkgver=4.32
+pkgrel=1
+pkgdesc=A disk information utility, displaying everything (and more) that 
your df command does
+arch=('i686' 'x86_64')
+url=http://www.gentoo.com/di/;
+license=('ZLIB')
+depends=('glibc')
+source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('b819e877e1135f34f362ba2f72d1e694c1878249')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  sed -i 's|error|//error|' C/di.h
+  sed -i '11i\#include string.h' C/di.h
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make INSTALL_DIR=${pkgdir}/usr install
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}



[arch-commits] Commit in gnome-control-center/trunk (PKGBUILD)

2012-10-22 Thread Jan Steffens
Date: Monday, October 22, 2012 @ 17:09:49
  Author: heftig
Revision: 169511

3.6.2

Modified:
  gnome-control-center/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 19:36:13 UTC (rev 169510)
+++ PKGBUILD2012-10-22 21:09:49 UTC (rev 169511)
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot j...@archlinux.org
 
 pkgname=gnome-control-center
-pkgver=3.6.1
+pkgver=3.6.2
 pkgrel=1
 pkgdesc=The Control Center for GNOME
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 license=('GPL')
 options=('!libtool' '!emptydirs')
 
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b6e9530deac15408fee43c9c7a21200456bebf947e677856cd7345a79e2923d5')
+sha256sums=('3ab5aa304b424006c9f38ce2ff50afbf38e167ca632c64509bf30aa3c786afb7')
 
 build() {
   cd $pkgname-$pkgver



[arch-commits] Commit in seahorse/trunk (PKGBUILD)

2012-10-22 Thread Jan Steffens
Date: Monday, October 22, 2012 @ 17:10:19
  Author: heftig
Revision: 169512

3.6.2

Modified:
  seahorse/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 21:09:49 UTC (rev 169511)
+++ PKGBUILD2012-10-22 21:10:19 UTC (rev 169512)
@@ -4,7 +4,7 @@
 # Contributor: Michel Brabants michel.li...@tiscali.be
 
 pkgname=seahorse
-pkgver=3.6.1
+pkgver=3.6.2
 pkgrel=1
 pkgdesc=GNOME application for managing PGP keys.
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@
 install=seahorse.install
 
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
 seahorse-ssh-askpass.sh)
-sha256sums=('dcdd9681a7896a13a597cf02aa2d6718b5f0ab3b50ed81f8d24b8db296a9214b'
+sha256sums=('cf3ffa48fdbd4c30fa3cc7ea9e8188c1325416e67e5985c9ce22af0a5fd7560b'
 '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
 
 build() {



[arch-commits] Commit in gnome-control-center/repos (8 files)

2012-10-22 Thread Jan Steffens
Date: Monday, October 22, 2012 @ 17:13:34
  Author: heftig
Revision: 169513

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnome-control-center/repos/testing-i686/PKGBUILD
(from rev 169512, gnome-control-center/trunk/PKGBUILD)
  gnome-control-center/repos/testing-i686/gnome-control-center.install
(from rev 169512, gnome-control-center/trunk/gnome-control-center.install)
  gnome-control-center/repos/testing-x86_64/PKGBUILD
(from rev 169512, gnome-control-center/trunk/PKGBUILD)
  gnome-control-center/repos/testing-x86_64/gnome-control-center.install
(from rev 169512, gnome-control-center/trunk/gnome-control-center.install)
Deleted:
  gnome-control-center/repos/testing-i686/PKGBUILD
  gnome-control-center/repos/testing-i686/gnome-control-center.install
  gnome-control-center/repos/testing-x86_64/PKGBUILD
  gnome-control-center/repos/testing-x86_64/gnome-control-center.install

-+
 testing-i686/PKGBUILD   |   84 +-
 testing-i686/gnome-control-center.install   |   22 +++---
 testing-x86_64/PKGBUILD |   84 +-
 testing-x86_64/gnome-control-center.install |   22 +++---
 4 files changed, 106 insertions(+), 106 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2012-10-22 21:10:19 UTC (rev 169512)
+++ testing-i686/PKGBUILD   2012-10-22 21:13:34 UTC (rev 169513)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-# Contributor: Jan de Groot j...@archlinux.org
-
-pkgname=gnome-control-center
-pkgver=3.6.1
-pkgrel=1
-pkgdesc=The Control Center for GNOME
-arch=('i686' 'x86_64')
-depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 
'gnome-menus'
- 'gnome-online-accounts' 'gnome-settings-daemon' 
'gsettings-desktop-schemas' 'gtk3'
- 'libgtop' 'libsocialweb' 'network-manager-applet' 
'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
-'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl')
-url=http://www.gnome.org;
-groups=('gnome')
-install=gnome-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b6e9530deac15408fee43c9c7a21200456bebf947e677856cd7345a79e2923d5')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-  --localstatedir=/var --disable-static \
-  --enable-systemd --with-libsocialweb \
-  --disable-update-mimedb \
-  --without-cheese
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test 
$export_dynamic = yes  test -n $export_dynamic_flag_spec; then/  
func_append compile_command  -Wl,-O1,--as-needed\n  func_append 
finalize_command  -Wl,-O1,--as-needed\n\0/' libtool
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-}

Copied: gnome-control-center/repos/testing-i686/PKGBUILD (from rev 169512, 
gnome-control-center/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-22 21:13:34 UTC (rev 169513)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Jan de Groot j...@archlinux.org
+
+pkgname=gnome-control-center
+pkgver=3.6.2
+pkgrel=1
+pkgdesc=The Control Center for GNOME
+arch=('i686' 'x86_64')
+depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 
'gnome-menus'
+ 'gnome-online-accounts' 'gnome-settings-daemon' 
'gsettings-desktop-schemas' 'gtk3'
+ 'libgtop' 'libsocialweb' 'network-manager-applet' 
'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd')
+optdepends=('mesa-demos: provides glxinfo for graphics information'
+'gnome-color-manager: for color management tasks')
+makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl')
+url=http://www.gnome.org;
+groups=('gnome')
+install=gnome-control-center.install
+license=('GPL')
+options=('!libtool' '!emptydirs')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('3ab5aa304b424006c9f38ce2ff50afbf38e167ca632c64509bf30aa3c786afb7')
+
+build() {
+  cd $pkgname-$pkgver
+  
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --localstatedir=/var --disable-static \
+  --enable-systemd --with-libsocialweb \
+  --disable-update-mimedb \
+  --without-cheese
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/  

[arch-commits] Commit in seahorse/repos (12 files)

2012-10-22 Thread Jan Steffens
Date: Monday, October 22, 2012 @ 17:16:04
  Author: heftig
Revision: 169514

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  seahorse/repos/testing-i686/PKGBUILD
(from rev 169513, seahorse/trunk/PKGBUILD)
  seahorse/repos/testing-i686/seahorse-ssh-askpass.sh
(from rev 169513, seahorse/trunk/seahorse-ssh-askpass.sh)
  seahorse/repos/testing-i686/seahorse.install
(from rev 169513, seahorse/trunk/seahorse.install)
  seahorse/repos/testing-x86_64/PKGBUILD
(from rev 169513, seahorse/trunk/PKGBUILD)
  seahorse/repos/testing-x86_64/seahorse-ssh-askpass.sh
(from rev 169513, seahorse/trunk/seahorse-ssh-askpass.sh)
  seahorse/repos/testing-x86_64/seahorse.install
(from rev 169513, seahorse/trunk/seahorse.install)
Deleted:
  seahorse/repos/testing-i686/PKGBUILD
  seahorse/repos/testing-i686/seahorse-ssh-askpass.sh
  seahorse/repos/testing-i686/seahorse.install
  seahorse/repos/testing-x86_64/PKGBUILD
  seahorse/repos/testing-x86_64/seahorse-ssh-askpass.sh
  seahorse/repos/testing-x86_64/seahorse.install

+
 testing-i686/PKGBUILD  |   78 +++
 testing-i686/seahorse-ssh-askpass.sh   |6 +-
 testing-i686/seahorse.install  |   26 +-
 testing-x86_64/PKGBUILD|   78 +++
 testing-x86_64/seahorse-ssh-askpass.sh |6 +-
 testing-x86_64/seahorse.install|   26 +-
 6 files changed, 110 insertions(+), 110 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2012-10-22 21:13:34 UTC (rev 169513)
+++ testing-i686/PKGBUILD   2012-10-22 21:16:04 UTC (rev 169514)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-# Contributor: Jan de Groot j...@archlinux.org
-# Contributor: Michel Brabants michel.li...@tiscali.be
-
-pkgname=seahorse
-pkgver=3.6.1
-pkgrel=1
-pkgdesc=GNOME application for managing PGP keys.
-arch=(i686 x86_64)
-license=(GPL)
-url=http://projects.gnome.org/seahorse/;
-depends=(gtk3 gcr libsecret libsoup gpgme desktop-file-utils 
hicolor-icon-theme dconf)
-makedepends=(libldap intltool yelp-tools gobject-introspection openssh libsm)
-optdepends=('openssh: SSH support')
-provides=(x11-ssh-askpass)
-options=('!libtool' '!emptydirs')
-groups=(gnome-extra)
-install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
-seahorse-ssh-askpass.sh)
-sha256sums=('dcdd9681a7896a13a597cf02aa2d6718b5f0ab3b50ed81f8d24b8db296a9214b'
-'400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-  --localstatedir=/var --disable-static \
-  --enable-ldap --enable-hkp \
-  --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  install -Dm755 $srcdir/seahorse-ssh-askpass.sh \
-$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh
-}

Copied: seahorse/repos/testing-i686/PKGBUILD (from rev 169513, 
seahorse/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-22 21:16:04 UTC (rev 169514)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Jan de Groot j...@archlinux.org
+# Contributor: Michel Brabants michel.li...@tiscali.be
+
+pkgname=seahorse
+pkgver=3.6.2
+pkgrel=1
+pkgdesc=GNOME application for managing PGP keys.
+arch=(i686 x86_64)
+license=(GPL)
+url=http://projects.gnome.org/seahorse/;
+depends=(gtk3 gcr libsecret libsoup gpgme desktop-file-utils 
hicolor-icon-theme dconf)
+makedepends=(libldap intltool yelp-tools gobject-introspection openssh libsm)
+optdepends=('openssh: SSH support')
+provides=(x11-ssh-askpass)
+options=('!libtool' '!emptydirs')
+groups=(gnome-extra)
+install=seahorse.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+seahorse-ssh-askpass.sh)
+sha256sums=('cf3ffa48fdbd4c30fa3cc7ea9e8188c1325416e67e5985c9ce22af0a5fd7560b'
+'400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --localstatedir=/var --disable-static \
+  --enable-ldap --enable-hkp \
+  --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  install -Dm755 $srcdir/seahorse-ssh-askpass.sh \
+$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh
+}

Deleted: testing-i686/seahorse-ssh-askpass.sh
===
--- testing-i686/seahorse-ssh-askpass.sh2012-10-22 21:13:34 UTC (rev 
169513)
+++ 

[arch-commits] Commit in opencv/trunk (PKGBUILD)

2012-10-22 Thread Ray Rashif
Date: Monday, October 22, 2012 @ 17:28:16
  Author: schiv
Revision: 169515

upgpkg: opencv 2.4.2-5

ilmbase rebuild

Modified:
  opencv/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 3 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 21:16:04 UTC (rev 169514)
+++ PKGBUILD2012-10-22 21:28:16 UTC (rev 169515)
@@ -6,14 +6,14 @@
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.2
-pkgrel=4
+pkgrel=5
 pkgdesc=Open Source Computer Vision Library
 arch=('i686' 'x86_64')
 license=('BSD')
 url=http://opencv.org/;
 depends=('jasper' 'gstreamer0.10-base' 'openexr=1.7.0'
- 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
+ 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase=1.0.3')
+makedepends=('cmake' 'python2-numpy' 'eigen2')
 optdepends=('opencv-docs'
 'opencv-samples'
 'eigen2'
@@ -69,13 +69,6 @@
 
   cd $pkgdir/usr/share
 
-  # prepare FSH-friendly dirs
-  #if [ -d OpenCV ]; then
-  #  mv opencv/samples OpenCV/
-  #  rm -r opencv
-  #  mv OpenCV opencv
-  #fi
-
   # separate docs package; also be -R friendly
   [ -d $_realname/doc ]  mv $_realname/doc $srcdir/opencv-doc
 



[arch-commits] Commit in opencv/repos (4 files)

2012-10-22 Thread Ray Rashif
Date: Monday, October 22, 2012 @ 17:28:51
  Author: schiv
Revision: 169516

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  opencv/repos/staging-i686/
  opencv/repos/staging-i686/PKGBUILD
(from rev 169515, opencv/trunk/PKGBUILD)
  opencv/repos/staging-x86_64/
  opencv/repos/staging-x86_64/PKGBUILD
(from rev 169515, opencv/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |  111 ++
 staging-x86_64/PKGBUILD |  111 ++
 2 files changed, 222 insertions(+)

Copied: opencv/repos/staging-i686/PKGBUILD (from rev 169515, 
opencv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-22 21:28:51 UTC (rev 169516)
@@ -0,0 +1,111 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+
+pkgbase=opencv
+pkgname=('opencv' 'opencv-docs' 'opencv-samples')
+_realname=OpenCV
+pkgver=2.4.2
+pkgrel=5
+pkgdesc=Open Source Computer Vision Library
+arch=('i686' 'x86_64')
+license=('BSD')
+url=http://opencv.org/;
+depends=('jasper' 'gstreamer0.10-base' 'openexr=1.7.0'
+ 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase=1.0.3')
+makedepends=('cmake' 'python2-numpy' 'eigen2')
+optdepends=('opencv-docs'
+'opencv-samples'
+'eigen2'
+'python2-numpy: Python 2.x interface')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2;)
+md5sums=('059ef86fc1724d69b75832a0d2929ff5')
+
+_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
+'-D CMAKE_INSTALL_PREFIX=/usr'
+'-D CMAKE_SKIP_RPATH=ON'
+'-D BUILD_TESTS=OFF'
+'-D ENABLE_SSE=ON'
+'-D ENABLE_SSE2=ON'
+'-D ENABLE_SSE3=OFF'
+'-D ENABLE_SSSE3=OFF'
+'-D ENABLE_SSE41=OFF'
+'-D ENABLE_SSE42=OFF'
+'-D BUILD_EXAMPLES=ON'
+'-D INSTALL_C_EXAMPLES=ON'
+'-D INSTALL_PYTHON_EXAMPLES=ON'
+'-D WITH_XINE=ON'
+'-D WITH_QT=OFF'
+'-D WITH_QT_OPENGL=OFF'
+'-D WITH_UNICAP=OFF'
+'-D WITH_PVAPI=OFF'
+'-D WITH_OPENNI=OFF'
+'-D WITH_TBB=OFF'
+'-D WITH_IPP=OFF'
+'-D WITH_CUDA=OFF'
+'-D USE_FAST_MATH=ON')
+
+build() {
+  cd $srcdir/$_realname-$pkgver
+
+  # x64, i.e Athlon64 and upwards, can use SSE3
+  [ $CARCH = x86_64 ]  \
+_cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
+
+  cmake ${_cmakeopts[@]} .
+
+  make
+}
+
+package_opencv() {
+  cd $srcdir/$_realname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  # install license file
+  install -Dm644 $srcdir/$_realname-$pkgver/doc/license.txt \
+$pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+  cd $pkgdir/usr/share
+
+  # separate docs package; also be -R friendly
+  [ -d $_realname/doc ]  mv $_realname/doc $srcdir/opencv-doc
+
+  # separate samples package
+  [ -d $_realname/samples ]  mv $_realname/samples $srcdir/opencv-samples
+}
+
+package_opencv-docs() {
+  pkgdesc+= (documentation)
+  unset depends
+  unset optdepends
+  options=('docs')
+
+  cd $srcdir
+
+  mkdir -p $pkgdir/usr/share/doc
+  cp -r opencv-doc $pkgdir/usr/share/doc/$_realname
+
+  # install license file
+  install -Dm644 $srcdir/$_realname-$pkgver/doc/license.txt \
+$pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_opencv-samples() {
+  pkgdesc+= (samples)
+  depends=('bash')
+  unset optdepends
+  unset options
+
+  cd $srcdir
+
+  mkdir -p $pkgdir/usr/share/$_realname
+  cp -r opencv-samples $pkgdir/usr/share/$_realname/samples
+
+  # install license file
+  install -Dm644 $srcdir/$_realname-$pkgver/doc/license.txt \
+$pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:

Copied: opencv/repos/staging-x86_64/PKGBUILD (from rev 169515, 
opencv/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-10-22 21:28:51 UTC (rev 169516)
@@ -0,0 +1,111 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+
+pkgbase=opencv
+pkgname=('opencv' 'opencv-docs' 'opencv-samples')
+_realname=OpenCV
+pkgver=2.4.2
+pkgrel=5
+pkgdesc=Open Source Computer Vision Library
+arch=('i686' 'x86_64')
+license=('BSD')
+url=http://opencv.org/;
+depends=('jasper' 'gstreamer0.10-base' 'openexr=1.7.0'
+ 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase=1.0.3')
+makedepends=('cmake' 'python2-numpy' 'eigen2')
+optdepends=('opencv-docs'
+'opencv-samples'
+'eigen2'
+'python2-numpy: Python 2.x interface')
+options=('!libtool')

[arch-commits] Commit in gnome-control-center/trunk (PKGBUILD)

2012-10-22 Thread Jan Steffens
Date: Monday, October 22, 2012 @ 17:49:11
  Author: heftig
Revision: 169517

Fix install warning

Modified:
  gnome-control-center/trunk/PKGBUILD

--+
 PKGBUILD |4 
 1 file changed, 4 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 21:28:51 UTC (rev 169516)
+++ PKGBUILD2012-10-22 21:49:11 UTC (rev 169517)
@@ -39,4 +39,8 @@
   cd $pkgname-$pkgver
 
   make DESTDIR=$pkgdir install
+
+  # Fix a warning
+  chown 102:0 $pkgdir/usr/share/polkit-1/rules.d
+  chmod 700 $pkgdir/usr/share/polkit-1/rules.d
 }



[arch-commits] Commit in dvdauthor/trunk (PKGBUILD)

2012-10-22 Thread Eric Bélanger
Date: Monday, October 22, 2012 @ 20:56:21
  Author: eric
Revision: 169518

upgpkg: dvdauthor 0.7.1-2

Rebuild against imagemagick 6.8.0

Modified:
  dvdauthor/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-22 21:49:11 UTC (rev 169517)
+++ PKGBUILD2012-10-23 00:56:21 UTC (rev 169518)
@@ -6,7 +6,7 @@
 
 pkgname=dvdauthor
 pkgver=0.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc=DVD authoring tools
 arch=('i686' 'x86_64')
 url=http://dvdauthor.sourceforge.net/;



[arch-commits] Commit in dvdauthor/repos (6 files)

2012-10-22 Thread Eric Bélanger
Date: Monday, October 22, 2012 @ 20:56:41
  Author: eric
Revision: 169519

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  dvdauthor/repos/staging-i686/
  dvdauthor/repos/staging-i686/PKGBUILD
(from rev 169518, dvdauthor/trunk/PKGBUILD)
  dvdauthor/repos/staging-i686/dvdauthor-0.7.0-libpng15.patch
(from rev 169518, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch)
  dvdauthor/repos/staging-x86_64/
  dvdauthor/repos/staging-x86_64/PKGBUILD
(from rev 169518, dvdauthor/trunk/PKGBUILD)
  dvdauthor/repos/staging-x86_64/dvdauthor-0.7.0-libpng15.patch
(from rev 169518, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch)

---+
 staging-i686/PKGBUILD |   31 
 staging-i686/dvdauthor-0.7.0-libpng15.patch   |   19 ++
 staging-x86_64/PKGBUILD   |   31 
 staging-x86_64/dvdauthor-0.7.0-libpng15.patch |   19 ++
 4 files changed, 100 insertions(+)

Copied: dvdauthor/repos/staging-i686/PKGBUILD (from rev 169518, 
dvdauthor/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-23 00:56:41 UTC (rev 169519)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Giovanni Scafora giova...@archlinux.org
+# Contributor: Travis Willard trav...@wmpub.ca 
+# Contributor: Jaroslaw Swierczynski swier...@juvepoland.com
+# Contributor: Nicolai Lissner nlis...@linux01.gwdg.de
+
+pkgname=dvdauthor
+pkgver=0.7.1
+pkgrel=2
+pkgdesc=DVD authoring tools
+arch=('i686' 'x86_64')
+url=http://dvdauthor.sourceforge.net/;
+license=('GPL')
+depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('2694a5a3ef460106ea3caf0f7f60ff80')
+
+build() {
+  cd ${srcdir}/${pkgname}
+
+  ./configure --prefix=/usr \
+  --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}
+
+  make DESTDIR=${pkgdir} install
+}

Copied: dvdauthor/repos/staging-i686/dvdauthor-0.7.0-libpng15.patch (from rev 
169518, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch)
===
--- staging-i686/dvdauthor-0.7.0-libpng15.patch (rev 0)
+++ staging-i686/dvdauthor-0.7.0-libpng15.patch 2012-10-23 00:56:41 UTC (rev 
169519)
@@ -0,0 +1,19 @@
+--- src/spuunmux.c
 src/spuunmux.c
+@@ -39,6 +39,7 @@
+ #include netinet/in.h
+ 
+ #include png.h
++#include zlib.h
+ 
+ #include rgb.h
+ #include common.h
+@@ -610,7 +611,7 @@
+ png_destroy_write_struct(png_ptr, (png_infopp)NULL);
+ return -1;
+   } /*if*/
+-if (setjmp(png_ptr-jmpbuf))
++if (setjmp(png_jmpbuf(png_ptr)))
+   {
+ png_destroy_write_struct(png_ptr, info_ptr);
+ fclose(fp);

Copied: dvdauthor/repos/staging-x86_64/PKGBUILD (from rev 169518, 
dvdauthor/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-10-23 00:56:41 UTC (rev 169519)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Giovanni Scafora giova...@archlinux.org
+# Contributor: Travis Willard trav...@wmpub.ca 
+# Contributor: Jaroslaw Swierczynski swier...@juvepoland.com
+# Contributor: Nicolai Lissner nlis...@linux01.gwdg.de
+
+pkgname=dvdauthor
+pkgver=0.7.1
+pkgrel=2
+pkgdesc=DVD authoring tools
+arch=('i686' 'x86_64')
+url=http://dvdauthor.sourceforge.net/;
+license=('GPL')
+depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('2694a5a3ef460106ea3caf0f7f60ff80')
+
+build() {
+  cd ${srcdir}/${pkgname}
+
+  ./configure --prefix=/usr \
+  --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}
+
+  make DESTDIR=${pkgdir} install
+}

Copied: dvdauthor/repos/staging-x86_64/dvdauthor-0.7.0-libpng15.patch (from rev 
169518, dvdauthor/trunk/dvdauthor-0.7.0-libpng15.patch)
===
--- staging-x86_64/dvdauthor-0.7.0-libpng15.patch   
(rev 0)
+++ staging-x86_64/dvdauthor-0.7.0-libpng15.patch   2012-10-23 00:56:41 UTC 
(rev 169519)
@@ -0,0 +1,19 @@
+--- src/spuunmux.c
 src/spuunmux.c
+@@ -39,6 +39,7 @@
+ #include netinet/in.h
+ 
+ #include png.h
++#include zlib.h
+ 
+ #include rgb.h
+ #include common.h
+@@ -610,7 +611,7 @@
+ png_destroy_write_struct(png_ptr, (png_infopp)NULL);
+ return -1;
+   } /*if*/
+-if (setjmp(png_ptr-jmpbuf))
++if (setjmp(png_jmpbuf(png_ptr)))
+   {
+ png_destroy_write_struct(png_ptr, info_ptr);
+ fclose(fp);



[arch-commits] Commit in systemd/trunk (PKGBUILD systemd.install)

2012-10-22 Thread Dave Reisner
Date: Monday, October 22, 2012 @ 20:58:20
  Author: dreisner
Revision: 169520

upgpkg: systemd 195-1

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-+
 PKGBUILD|   13 +++--
 systemd.install |8 
 2 files changed, 15 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-23 00:56:41 UTC (rev 169519)
+++ PKGBUILD2012-10-23 00:58:20 UTC (rev 169520)
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=194
-pkgrel=4
+pkgver=195
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -18,7 +18,7 @@
 'initcpio-install-timestamp'
 '0001-Reinstate-TIMEOUT-handling.patch'
 'use-split-usr-path.patch')
-md5sums=('0ebb73aea444693b9b86f7a76f5df23c'
+md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680'
  'e99e9189aa2f6084ac28b8ddf605aeb8'
  'fb37e34ea006c79be1c54cbb0f803414'
  'df69615503ad293c9ddf9d8b7755282d'
@@ -86,11 +86,12 @@
   install -dm755 $pkgdir/bin
   ln -s ../usr/lib/systemd/systemd $pkgdir/bin/systemd
 
-  # move bash-completion and symlink for loginctl
+  # move bash-completion and symlink for *ctl's
   install -Dm644 $pkgdir/etc/bash_completion.d/systemd-bash-completion.sh \
 $pkgdir/usr/share/bash-completion/completions/systemctl
-  ln -s systemctl $pkgdir/usr/share/bash-completion/completions/loginctl
-  ln -s systemctl $pkgdir/usr/share/bash-completion/completions/journalctl
+  for ctl in {login,journal,timedate,locale,hostname}ctl; do
+ln -s systemctl $pkgdir/usr/share/bash-completion/completions/$ctl
+  done
   rm -rf $pkgdir/etc/bash_completion.d
 
   # don't write units to /etc by default -- we'll enable this on post_install

Modified: systemd.install
===
--- systemd.install 2012-10-23 00:56:41 UTC (rev 169519)
+++ systemd.install 2012-10-23 00:58:20 UTC (rev 169520)
@@ -29,6 +29,14 @@
 printf '== journald now writes to /var/log/journal by default. This can 
be\n'
 printf 'controlled with the Storage setting in 
/etc/systemd/journald.conf\n'
   fi
+
+  # logind's protocol changed. kindly restart the daemon to avoid locking
+  # out further logins.
+  if [ $(vercmp 195 $2) -eq 1 ]; then
+if sd_booted; then
+  systemctl restart systemd-logind.service
+fi
+  fi
 }
 
 # vim:set ts=2 sw=2 et:



[arch-commits] Commit in systemd/repos (16 files)

2012-10-22 Thread Dave Reisner
Date: Monday, October 22, 2012 @ 20:58:51
  Author: dreisner
Revision: 169521

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  systemd/repos/testing-i686/
  systemd/repos/testing-i686/0001-Reinstate-TIMEOUT-handling.patch
(from rev 169520, systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch)
  systemd/repos/testing-i686/PKGBUILD
(from rev 169520, systemd/trunk/PKGBUILD)
  systemd/repos/testing-i686/initcpio-hook-udev
(from rev 169520, systemd/trunk/initcpio-hook-udev)
  systemd/repos/testing-i686/initcpio-install-timestamp
(from rev 169520, systemd/trunk/initcpio-install-timestamp)
  systemd/repos/testing-i686/initcpio-install-udev
(from rev 169520, systemd/trunk/initcpio-install-udev)
  systemd/repos/testing-i686/systemd.install
(from rev 169520, systemd/trunk/systemd.install)
  systemd/repos/testing-i686/use-split-usr-path.patch
(from rev 169520, systemd/trunk/use-split-usr-path.patch)
  systemd/repos/testing-x86_64/
  systemd/repos/testing-x86_64/0001-Reinstate-TIMEOUT-handling.patch
(from rev 169520, systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch)
  systemd/repos/testing-x86_64/PKGBUILD
(from rev 169520, systemd/trunk/PKGBUILD)
  systemd/repos/testing-x86_64/initcpio-hook-udev
(from rev 169520, systemd/trunk/initcpio-hook-udev)
  systemd/repos/testing-x86_64/initcpio-install-timestamp
(from rev 169520, systemd/trunk/initcpio-install-timestamp)
  systemd/repos/testing-x86_64/initcpio-install-udev
(from rev 169520, systemd/trunk/initcpio-install-udev)
  systemd/repos/testing-x86_64/systemd.install
(from rev 169520, systemd/trunk/systemd.install)
  systemd/repos/testing-x86_64/use-split-usr-path.patch
(from rev 169520, systemd/trunk/use-split-usr-path.patch)

--+
 testing-i686/0001-Reinstate-TIMEOUT-handling.patch   |  124 +
 testing-i686/PKGBUILD|  158 +
 testing-i686/initcpio-hook-udev  |   20 ++
 testing-i686/initcpio-install-timestamp  |   14 +
 testing-i686/initcpio-install-udev   |   28 +++
 testing-i686/systemd.install |   42 
 testing-i686/use-split-usr-path.patch|   14 +
 testing-x86_64/0001-Reinstate-TIMEOUT-handling.patch |  124 +
 testing-x86_64/PKGBUILD  |  158 +
 testing-x86_64/initcpio-hook-udev|   20 ++
 testing-x86_64/initcpio-install-timestamp|   14 +
 testing-x86_64/initcpio-install-udev |   28 +++
 testing-x86_64/systemd.install   |   42 
 testing-x86_64/use-split-usr-path.patch  |   14 +
 14 files changed, 800 insertions(+)

Copied: systemd/repos/testing-i686/0001-Reinstate-TIMEOUT-handling.patch (from 
rev 169520, systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch)
===
--- testing-i686/0001-Reinstate-TIMEOUT-handling.patch  
(rev 0)
+++ testing-i686/0001-Reinstate-TIMEOUT-handling.patch  2012-10-23 00:58:51 UTC 
(rev 169521)
@@ -0,0 +1,124 @@
+From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
+From: Dave Reisner dreis...@archlinux.org
+Date: Fri, 25 May 2012 19:43:24 -0400
+Subject: [PATCH] Reinstate TIMEOUT= handling
+
+This is mostly to deal with ipw2?00 drivers which have yet to be fixed
+in the kernel.
+---
+ src/libudev/libudev-device.c  |   19 +++
+ src/libudev/libudev-private.h |1 +
+ src/udev/udevd.c  |   13 ++---
+ 3 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
+index a8277d1..5966189 100644
+--- a/src/libudev/libudev-device.c
 b/src/libudev/libudev-device.c
+@@ -68,6 +68,7 @@ struct udev_device {
+ struct udev_list tags_list;
+ unsigned long long int seqnum;
+ unsigned long long int usec_initialized;
++int timeout;
+ int devlink_priority;
+ int refcount;
+ dev_t devnum;
+@@ -89,6 +90,21 @@ struct udev_device {
+ bool db_persist;
+ };
+ 
++int udev_device_get_timeout(struct udev_device *udev_device)
++{
++return udev_device-timeout;
++}
++
++static int udev_device_set_timeout(struct udev_device *udev_device, int 
timeout)
++{
++char num[32];
++
++udev_device-timeout = timeout;
++snprintf(num, sizeof(num), %u, timeout);
++udev_device_add_property(udev_device, TIMEOUT, num);
++return 0;
++}
++
+ /**
+  * udev_device_get_seqnum:
+  * @udev_device: udev device
+@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct 
udev_device *udev_device,
+ 
+ util_strscpyl(path, sizeof(path), TEST_PREFIX /sys, 
property[8], NULL);
+ udev_device_set_syspath(udev_device, path);
++ 

[arch-commits] Commit in psiconv/trunk (PKGBUILD)

2012-10-22 Thread Eric Bélanger
Date: Monday, October 22, 2012 @ 21:05:22
  Author: eric
Revision: 169522

upgpkg: psiconv 0.9.8-10

Rebuild against imagemagick 6.8.0

Modified:
  psiconv/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-23 00:58:51 UTC (rev 169521)
+++ PKGBUILD2012-10-23 01:05:22 UTC (rev 169522)
@@ -4,7 +4,7 @@
 
 pkgname=psiconv
 pkgver=0.9.8
-pkgrel=9
+pkgrel=10
 pkgdesc=Converts Psion 5(MX) files to more commonly used file formats
 arch=('i686' 'x86_64')
 url=http://software.frodo.looijaard.name/psiconv/;
@@ -17,7 +17,7 @@
 md5sums=('8d7548e3c6b9cd408544736133728acd')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
   --sysconfdir=/etc \
   --mandir=/usr/share/man
@@ -25,6 +25,6 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in psiconv/repos (4 files)

2012-10-22 Thread Eric Bélanger
Date: Monday, October 22, 2012 @ 21:05:39
  Author: eric
Revision: 169523

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  psiconv/repos/staging-i686/
  psiconv/repos/staging-i686/PKGBUILD
(from rev 169522, psiconv/trunk/PKGBUILD)
  psiconv/repos/staging-x86_64/
  psiconv/repos/staging-x86_64/PKGBUILD
(from rev 169522, psiconv/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   30 ++
 staging-x86_64/PKGBUILD |   30 ++
 2 files changed, 60 insertions(+)

Copied: psiconv/repos/staging-i686/PKGBUILD (from rev 169522, 
psiconv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-23 01:05:39 UTC (rev 169523)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Giovanni Scafora giova...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=psiconv
+pkgver=0.9.8
+pkgrel=10
+pkgdesc=Converts Psion 5(MX) files to more commonly used file formats
+arch=('i686' 'x86_64')
+url=http://software.frodo.looijaard.name/psiconv/;
+license=('GPL')
+depends=('imagemagick')
+makedepends=('bc')
+backup=('etc/psiconv/psiconv.conf')
+options=('!libtool')
+source=(http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('8d7548e3c6b9cd408544736133728acd')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+  --sysconfdir=/etc \
+  --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: psiconv/repos/staging-x86_64/PKGBUILD (from rev 169522, 
psiconv/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-10-23 01:05:39 UTC (rev 169523)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Giovanni Scafora giova...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=psiconv
+pkgver=0.9.8
+pkgrel=10
+pkgdesc=Converts Psion 5(MX) files to more commonly used file formats
+arch=('i686' 'x86_64')
+url=http://software.frodo.looijaard.name/psiconv/;
+license=('GPL')
+depends=('imagemagick')
+makedepends=('bc')
+backup=('etc/psiconv/psiconv.conf')
+options=('!libtool')
+source=(http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('8d7548e3c6b9cd408544736133728acd')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+  --sysconfdir=/etc \
+  --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in vim/trunk (vimrc)

2012-10-22 Thread Thomas Dziedzic
Date: Tuesday, October 23, 2012 @ 00:29:30
  Author: tdziedzic
Revision: 169524

update filepath location

Modified:
  vim/trunk/vimrc

---+
 vimrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: vimrc
===
--- vimrc   2012-10-23 01:05:39 UTC (rev 169523)
+++ vimrc   2012-10-23 04:29:30 UTC (rev 169524)
@@ -11,6 +11,6 @@
 runtime! archlinux.vim
 
  If you prefer the old-style vim functionalty, add 'runtime! 
vimrc_example.vim'
- Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual
+ Or better yet, read /usr/share/vim/vim73/vimrc_example.vim or the vim manual
  and configure vim to your own liking!
 



[arch-commits] Commit in usbview/trunk (3 files)

2012-10-22 Thread Giovanni Scafora
Date: Tuesday, October 23, 2012 @ 01:10:41
  Author: giovanni
Revision: 169525

upgpkg: usbview 2.0-1

upstream release

Modified:
  usbview/trunk/PKGBUILD
Deleted:
  usbview/trunk/usbview-1.1-gtk3-port.patch
  usbview/trunk/usbview-1.1-missing-usbfs.patch

-+
 PKGBUILD|   18 
 usbview-1.1-gtk3-port.patch |  802 --
 usbview-1.1-missing-usbfs.patch |   11 
 3 files changed, 5 insertions(+), 826 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-23 04:29:30 UTC (rev 169524)
+++ PKGBUILD2012-10-23 05:10:41 UTC (rev 169525)
@@ -3,21 +3,17 @@
 # Contributor: Jason Chu ja...@archlinux.org
 
 pkgname=usbview
-pkgver=1.1
-pkgrel=4
+pkgver=2.0
+pkgrel=1
 pkgdesc=Display the topology of devices on the USB bus
 arch=('i686' 'x86_64')
-url=http://www.kroah.com/linux-usb/;
+url=http://www.kroah.com/linux/usb/;
 license=('GPL')
 depends=('gtk3' 'desktop-file-utils')
 makedepends=('pkg-config' 'gendesk')
 install=${pkgname}.install
-source=(http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz;
-'usbview-1.1-gtk3-port.patch'
-'usbview-1.1-missing-usbfs.patch')
-md5sums=('8bf5e66351156356f3ad07454123affa'
- '578ed1099228f205b728ee2d46ed6f56'
- '02e4313887423d0057a7f4f15b7f37d4')
+source=(http://www.kroah.com/linux/usb/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('565f2e79f3924d14ab5b4d8aced557e5')
 
 build() {
   cd ${srcdir}
@@ -26,10 +22,6 @@
 
   cd ${pkgname}-${pkgver}
 
-  patch -Np1 -i ${srcdir}/usbview-1.1-gtk3-port.patch
-  patch -Np1 -i ${srcdir}/usbview-1.1-missing-usbfs.patch
-
-  autoreconf
   ./configure --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var

Deleted: usbview-1.1-gtk3-port.patch
===
--- usbview-1.1-gtk3-port.patch 2012-10-23 04:29:30 UTC (rev 169524)
+++ usbview-1.1-gtk3-port.patch 2012-10-23 05:10:41 UTC (rev 169525)
@@ -1,802 +0,0 @@
 a/Makefile.am  2009-03-11 03:25:46.0 +0100
-+++ b/Makefile.am  2012-06-14 20:33:10.641639573 +0200
-@@ -16,10 +16,8 @@
-   interface.c \
-   callbacks.c \
-   usbtree.c usbtree.h \
--  showmessage.c   \
-   usbparse.c usbparse.h   \
-   configure-dialog.c  \
--  about-dialog.c  \
-   usbview_logo.xpm\
-   usbview_logo.xcf\
-   usb_icon.xpm\
 a/callbacks.c  2008-06-25 23:03:13.0 +0200
-+++ b/callbacks.c  2012-06-14 21:06:05.000523489 +0200
-@@ -23,13 +23,13 @@
- #endif
- 
- #include gtk/gtk.h
--
- #include usbtree.h
-+#include usbview_logo.xpm   /* logo */
- 
- 
- void on_buttonClose_clicked (GtkButton *button, gpointer user_data)
- {
--  gtk_exit(0);
-+  gtk_main_quit();
- }
- 
- 
-@@ -55,7 +55,21 @@
- 
- void on_buttonAbout_clicked (GtkButton *button, gpointer user_data)
- {
--  about_dialog ();
-+  GdkPixbuf *logo;
-+  gchar *authors[] = { Greg Kroah-Hartman g...@kroah.com, NULL };
-+
-+  logo = gdk_pixbuf_new_from_xpm_data ((const char **)usbview_logo_xpm);
-+  gtk_show_about_dialog (GTK_WINDOW (windowMain),
-+  logo, logo,
-+  program-name, usbview,
-+  version, VERSION,
-+  comments, Display information on USB devices,
-+  website-label, http://www.kroah.com/linux-usb/;,
-+  website, http://www.kroah.com/linux-usb/;,
-+  copyright, Copyright © 1999-2012,
-+  authors, authors,
-+  NULL);
-+  g_object_unref (logo);
- }
- 
- 
 a/configure-dialog.c   2009-03-11 02:40:28.0 +0100
-+++ b/configure-dialog.c   2012-06-14 21:06:05.000523489 +0200
-@@ -24,264 +24,78 @@
- #endif
- 
- #include gtk/gtk.h
--#include stdio.h
--#include stdlib.h
- #include string.h
--#include ctype.h
--
- #include usbtree.h
- #include usbparse.h
- 
--
--
--
- staticGtkWidget   *fileEntry;
--staticGtkWidget   *filew;
--staticchar*sFilename;
--
--/* 
-- * Get the selected filename and print it to the console 
-- */
--static void file_ok_sel (GtkWidget *w, GtkFileSelection *fs)
--{
--  const char *sTempFile;
--
--  /* --- Get the name --- */
--  sTempFile = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs));
--
--  /* --- Allocate space and save it. --- */
--  sFilename = malloc (sizeof (char) * (strlen (sTempFile) + 1));
--  strcpy (sFilename, sTempFile);
--
--  /* --- Destroy the file selection --- */
--  gtk_widget_destroy (filew);
--}
--
--
--static void file_cancel_sel (GtkWidget *w, GtkFileSelection *fs)
--{
--  /* --- Destroy the file selection --- */
--  gtk_widget_destroy (filew);
--}
--
--
--/*
-- * DestroyDialog
-- *
-- * Destroy the dialog (obvious, eh?) but also remove the
-- * 

[arch-commits] Commit in usbview/repos (12 files)

2012-10-22 Thread Giovanni Scafora
Date: Tuesday, October 23, 2012 @ 01:11:09
  Author: giovanni
Revision: 169526

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  usbview/repos/extra-i686/PKGBUILD
(from rev 169525, usbview/trunk/PKGBUILD)
  usbview/repos/extra-i686/usbview.install
(from rev 169525, usbview/trunk/usbview.install)
  usbview/repos/extra-x86_64/PKGBUILD
(from rev 169525, usbview/trunk/PKGBUILD)
  usbview/repos/extra-x86_64/usbview.install
(from rev 169525, usbview/trunk/usbview.install)
Deleted:
  usbview/repos/extra-i686/PKGBUILD
  usbview/repos/extra-i686/usbview-1.1-gtk3-port.patch
  usbview/repos/extra-i686/usbview-1.1-missing-usbfs.patch
  usbview/repos/extra-i686/usbview.install
  usbview/repos/extra-x86_64/PKGBUILD
  usbview/repos/extra-x86_64/usbview-1.1-gtk3-port.patch
  usbview/repos/extra-x86_64/usbview-1.1-missing-usbfs.patch
  usbview/repos/extra-x86_64/usbview.install

--+
 extra-i686/PKGBUILD  |   94 +-
 extra-i686/usbview-1.1-gtk3-port.patch   |  802 -
 extra-i686/usbview-1.1-missing-usbfs.patch   |   11 
 extra-i686/usbview.install   |   22 
 extra-x86_64/PKGBUILD|   94 +-
 extra-x86_64/usbview-1.1-gtk3-port.patch |  802 -
 extra-x86_64/usbview-1.1-missing-usbfs.patch |   11 
 extra-x86_64/usbview.install |   22 
 8 files changed, 108 insertions(+), 1750 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 169525:169526 to see the changes.