[arch-commits] Commit in gimp-devel/repos (8 files)
Date: Saturday, January 21, 2012 @ 00:38:18
Author: eric
Revision: 147053
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
gimp-devel/repos/staging-i686/
gimp-devel/repos/staging-i686/PKGBUILD
(from rev 147052, gimp-devel/trunk/PKGBUILD)
gimp-devel/repos/staging-i686/gimp-devel.install
(from rev 147052, gimp-devel/trunk/gimp-devel.install)
gimp-devel/repos/staging-i686/linux.gpl
(from rev 147052, gimp-devel/trunk/linux.gpl)
gimp-devel/repos/staging-x86_64/
gimp-devel/repos/staging-x86_64/PKGBUILD
(from rev 147052, gimp-devel/trunk/PKGBUILD)
gimp-devel/repos/staging-x86_64/gimp-devel.install
(from rev 147052, gimp-devel/trunk/gimp-devel.install)
gimp-devel/repos/staging-x86_64/linux.gpl
(from rev 147052, gimp-devel/trunk/linux.gpl)
---+
staging-i686/PKGBUILD | 54
staging-i686/gimp-devel.install | 12
staging-i686/linux.gpl| 19
staging-x86_64/PKGBUILD | 54
staging-x86_64/gimp-devel.install | 12
staging-x86_64/linux.gpl | 19
6 files changed, 170 insertions(+)
Copied: gimp-devel/repos/staging-i686/PKGBUILD (from rev 147052,
gimp-devel/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-21 05:38:18 UTC (rev 147053)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Eric Bélanger
+
+pkgname=gimp-devel
+pkgver=2.7.4
+pkgrel=2
+pkgdesc="GNU Image Manipulation Program (Development Version)"
+arch=('i686' 'x86_64')
+url="http://www.gimp.org/";
+license=('GPL3' 'LGPL3')
+depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \
+ 'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes'
'curl')
+optdepends=('gutenprint: for sophisticated printing only as gimp has built-in
cups print support'
+'libwebkit: for the help browser or web-page plug-ins'
+'poppler-glib: for pdf support'
+'alsa-lib: for MIDI event controller module'
+'curl: for URI support')
+options=('!libtool' '!makeflags')
+conflicts=('gimp')
+provides=("gimp=${pkgver}")
+install=gimp-devel.install
+source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2
linux.gpl)
+md5sums=('bda95a29c3483b8ff458b06b1543f867'
+ 'bb27bc214261d36484093e857f015f38')
+
+build() {
+ cd "${srcdir}/gimp-${pkgver}"
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+--enable-mp --enable-gimp-console --enable-python --with-libcurl \
+--with-gif-compression=lzw --without-aa --without-gvfs
+ make
+}
+
+#check() {
+# cd "${srcdir}/gimp-${pkgver}"
+# make check
+#}
+
+package() {
+ cd "${srcdir}/gimp-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|'
"${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
+ install -D -m644 "${srcdir}/linux.gpl"
"${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
+
+ ln -sf gimp-console-${pkgver%.*}.1.gz
"${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
+ ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5.gz"
+ ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
+ ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz"
+
+ ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp"
+ ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console"
+ ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
+}
Copied: gimp-devel/repos/staging-i686/gimp-devel.install (from rev 147052,
gimp-devel/trunk/gimp-devel.install)
===
--- staging-i686/gimp-devel.install (rev 0)
+++ staging-i686/gimp-devel.install 2012-01-21 05:38:18 UTC (rev 147053)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: gimp-devel/repos/staging-i686/linux.gpl (from rev 147052,
gimp-devel/trunk/linux.gpl)
===
--- staging-i686/linux.gpl (rev 0)
+++ staging-i686/linux.gpl 2012-01-21 05:38:18 UTC (rev 147053)
@@ -0,0 +1,19 @@
+GIMP Palette
+Name: linux
+#
+ 0 0 0
+ 0 0 170
+ 0 170 0
+ 0 170 170
+170 0 0
+170 0 170
+170 85 0
+170 170 170
+ 85 85 85
+ 85 85 255
+ 85 255 85
+ 85 255 255
+255 85 85
+255 85 255
+255 255 85
+255 255 255
Copied: gimp-devel/repos/staging-x86_64/PKGBUILD (from rev 147052,
gimp-devel/trunk/PKGBUILD)
===
--- staging-x86_64/
[arch-commits] Commit in gimp-devel/trunk (PKGBUILD)
Date: Saturday, January 21, 2012 @ 00:37:57
Author: eric
Revision: 147052
upgpkg: gimp-devel 2.7.4-2
Rebuild against libpng 1.5 and libtiff 4.0
Modified:
gimp-devel/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-21 05:36:50 UTC (rev 147051)
+++ PKGBUILD2012-01-21 05:37:57 UTC (rev 147052)
@@ -3,7 +3,7 @@
pkgname=gimp-devel
pkgver=2.7.4
-pkgrel=1
+pkgrel=2
pkgdesc="GNU Image Manipulation Program (Development Version)"
arch=('i686' 'x86_64')
url="http://www.gimp.org/";
[arch-commits] Commit in opencv/repos (4 files)
Date: Saturday, January 21, 2012 @ 00:36:50
Author: schiv
Revision: 147051
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
opencv/repos/staging-i686/
opencv/repos/staging-i686/PKGBUILD
(from rev 147050, opencv/trunk/PKGBUILD)
opencv/repos/staging-x86_64/
opencv/repos/staging-x86_64/PKGBUILD
(from rev 147050, opencv/trunk/PKGBUILD)
-+
staging-i686/PKGBUILD | 119 ++
staging-x86_64/PKGBUILD | 119 ++
2 files changed, 238 insertions(+)
Copied: opencv/repos/staging-i686/PKGBUILD (from rev 147050,
opencv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-21 05:36:50 UTC (rev 147051)
@@ -0,0 +1,119 @@
+# $Id$
+# Maintainer: Ray Rashif
+# Contributor: Tobias Powalowski
+
+pkgbase=opencv
+pkgname=('opencv' 'opencv-docs' 'opencv-samples')
+_realname=OpenCV
+pkgver=2.3.1_a
+_realver=2.3.1
+pkgrel=4
+pkgdesc="Open Source Computer Vision Library"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://opencv.willowgarage.com/";
+depends=('jasper' 'gstreamer0.10-base' 'openexr'
+ 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
+makedepends=('pkg-config' '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-${_realver}a.tar.bz2";)
+md5sums=('82e4b6bfa349777233eea09b075e931e')
+
+_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-$_realver"
+
+ # 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-$_realver"
+
+ make DESTDIR="$pkgdir" install
+
+ # install license file
+ install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
+"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ 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 opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
+
+ # separate samples package
+ [ -d opencv/samples ] && mv opencv/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/opencv"
+
+ # install license file
+ install -Dm644 "$srcdir/$_realname-$_realver/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/opencv"
+ cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
+
+ # install license file
+ install -Dm644 "$srcdir/$_realname-$_realver/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 147050,
opencv/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-21 05:36:50 UTC (rev 147051)
@@ -0,0 +1,119 @@
+# $Id$
+# Maintainer: Ray Rashif
+# Contributor: Tobias Powalowski
+
+pkgbase=opencv
+pkgname=('opencv' 'opencv-docs' 'opencv-samples')
+_realname=OpenCV
+pkgver=2.3.1_a
+_realver=2.3.1
+pkgrel=4
+pkgdesc="Open Source Computer Vision Library"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://opencv.willowgarage.com/";
+depends=('jasper' 'gstreamer0.10-base' 'openexr'
+ 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
+makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
+optdepends=('opencv-docs'
+'opencv-samples'
+
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Saturday, January 21, 2012 @ 00:35:55
Author: schiv
Revision: 147050
upgpkg: opencv 2.3.1_a-4
libtiff/libpng rebuild
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-21 04:25:49 UTC (rev 147049)
+++ PKGBUILD2012-01-21 05:35:55 UTC (rev 147050)
@@ -7,7 +7,7 @@
_realname=OpenCV
pkgver=2.3.1_a
_realver=2.3.1
-pkgrel=3
+pkgrel=4
pkgdesc="Open Source Computer Vision Library"
arch=('i686' 'x86_64')
license=('BSD')
[arch-commits] Commit in poppler/repos (6 files)
Date: Friday, January 20, 2012 @ 23:25:49
Author: eric
Revision: 147049
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
poppler/repos/staging-i686/
poppler/repos/staging-i686/PKGBUILD
(from rev 147048, poppler/trunk/PKGBUILD)
poppler/repos/staging-i686/git-fixes.patch
(from rev 147048, poppler/trunk/git-fixes.patch)
poppler/repos/staging-x86_64/
poppler/repos/staging-x86_64/PKGBUILD
(from rev 147048, poppler/trunk/PKGBUILD)
poppler/repos/staging-x86_64/git-fixes.patch
(from rev 147048, poppler/trunk/git-fixes.patch)
+
staging-i686/PKGBUILD | 83 +
staging-i686/git-fixes.patch | 110 +++
staging-x86_64/PKGBUILD| 83 +
staging-x86_64/git-fixes.patch | 110 +++
4 files changed, 386 insertions(+)
Copied: poppler/repos/staging-i686/PKGBUILD (from rev 147048,
poppler/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-21 04:25:49 UTC (rev 147049)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgbase=poppler
+pkgname=('poppler' 'poppler-glib' 'poppler-qt')
+pkgver=0.18.2
+pkgrel=2
+arch=(i686 x86_64)
+license=('GPL')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt'
'pkgconfig' 'lcms' 'gobject-introspection')
+options=('!libtool' '!emptydirs')
+url="http://poppler.freedesktop.org/";
+_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
+source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
+
http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2
+git-fixes.patch)
+md5sums=('38616927823ef01937aab26872e957e4'
+ '9dc64c254a31e570507bdd4ad4ba629a'
+ 'af56b7b1b24a08f7498a0c7f5e862b93')
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ sed -i -e '/AC_PATH_XTRA/d' configure.ac
+ patch -Np1 -i "${srcdir}/git-fixes.patch"
+
+ autoreconf -fi
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-cairo-output \
+ --enable-xpdf-headers \
+ --enable-libjpeg --enable-zlib \
+ --enable-poppler-qt4 \
+ --enable-poppler-glib
+ make
+}
+
+check() {
+ cd "${srcdir}"
+ ln -sf test-${_testtag} test
+ cd ${pkgbase}-${pkgver}
+ LANG=en_US.UTF8 make check
+}
+
+package_poppler() {
+ pkgdesc="PDF rendering library based on xpdf 3.0"
+ depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms'
'poppler-data')
+ conflicts=("poppler-qt3<${pkgver}")
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ sed -e 's/^glib_subdir =.*/glib_subdir =/' \
+ -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
+ make DESTDIR="${pkgdir}" install
+
+ rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
+}
+
+package_poppler-glib() {
+ pkgdesc="Poppler glib bindings"
+ depends=("poppler=${pkgver}" 'glib2')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
+ make DESTDIR="${pkgdir}" install-libLTLIBRARIES
+ cd "${srcdir}/${pkgbase}-${pkgver}/glib"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+ install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
+ rm -f "${pkgdir}"/usr/lib/libpoppler.*
+ rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
+}
+
+package_poppler-qt() {
+ pkgdesc="Poppler Qt bindings"
+ depends=("poppler=${pkgver}" 'qt')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
+ make DESTDIR="${pkgdir}" install-libLTLIBRARIES
+ cd "${srcdir}/${pkgbase}-${pkgver}/qt4"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+ install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
+ rm -f "${pkgdir}"/usr/lib/libpoppler.*
+}
Copied: poppler/repos/staging-i686/git-fixes.patch (from rev 147048,
poppler/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2012-01-21 04:25:49 UTC (rev 147049)
@@ -0,0 +1,110 @@
+From 74f4299e8f9e2d204979479f6579dd784db678a4 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid
+Date: Sun, 04 Dec 2011 16:29:45 +
+Subject: Do not fail if we are trying to save a file with Encrypt but that we
have not modified at all
+
+Fixes KDE bug #288045
+(cherry picked from commit 63c942a45227ef28fb94ef4765171d9812fffafa)
+---
+diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
+index 01d2759..2758206 100644
+--- a/poppler/PDFDoc.cc
b/poppler/PDFDoc.cc
+@@ -707,35 +707,44 @@ int PDFDoc::saveAs(GooString *name, PDFWriteMode mode) {
+
+ int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) {
+
+- // we don't support files with Encrypt at the moment
++ // find if we have updated objects
++ GBool updated = gFalse;
++
[arch-commits] Commit in poppler/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 23:25:23
Author: eric
Revision: 147048
upgpkg: poppler 0.18.2-2
Rebuild against libpng 1.5 and libtiff 4.0
Modified:
poppler/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-21 03:09:06 UTC (rev 147047)
+++ PKGBUILD2012-01-21 04:25:23 UTC (rev 147048)
@@ -4,7 +4,7 @@
pkgbase=poppler
pkgname=('poppler' 'poppler-glib' 'poppler-qt')
pkgver=0.18.2
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
license=('GPL')
makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt'
'pkgconfig' 'lcms' 'gobject-introspection')
[arch-commits] Commit in mkinitcpio-busybox/trunk (config)
Date: Friday, January 20, 2012 @ 22:09:06 Author: dreisner Revision: 147047 revert accidental commit Modified: mkinitcpio-busybox/trunk/config + config | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) Modified: config === --- config 2012-01-21 03:05:17 UTC (rev 147046) +++ config 2012-01-21 03:09:06 UTC (rev 147047) @@ -486,14 +486,14 @@ # # Linux Module Utilities # -# CONFIG_MODINFO is not set +CONFIG_MODINFO=y # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -# CONFIG_INSMOD is not set -# CONFIG_RMMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y # CONFIG_MODPROBE is not set # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set # CONFIG_DEPMOD is not set @@ -508,11 +508,11 @@ # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y # CONFIG_FEATURE_MODUTILS_ALIAS is not set # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -# CONFIG_DEFAULT_MODULES_DIR is not set -# CONFIG_DEFAULT_DEPMOD_FILE is not set +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" # # Linux System Utilities @@ -570,15 +570,15 @@ # CONFIG_MKSWAP is not set # CONFIG_FEATURE_MKSWAP_UUID is not set # CONFIG_MORE is not set -CONFIG_MOUNT=n -# CONFIG_FEATURE_MOUNT_FAKE= is not set -# CONFIG_FEATURE_MOUNT_VERBOSE= is not set -# CONFIG_FEATURE_MOUNT_HELPERS= is not set -# CONFIG_FEATURE_MOUNT_LABEL= is not set -# CONFIG_FEATURE_MOUNT_NFS= is not set -# CONFIG_FEATURE_MOUNT_CIFS= is not set -# CONFIG_FEATURE_MOUNT_FLAGS= is not set -# CONFIG_FEATURE_MOUNT_FSTAB= is not set +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +CONFIG_FEATURE_MOUNT_VERBOSE=y +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set # CONFIG_RDEV is not set @@ -589,7 +589,7 @@ # CONFIG_SETARCH is not set # CONFIG_SWAPONOFF is not set # CONFIG_FEATURE_SWAPON_PRI is not set -CONFIG_SWITCH_ROOT=n +CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y
[arch-commits] Commit in (mkinitcpio-busybox/trunk/config module-init-tools)
Date: Friday, January 20, 2012 @ 22:05:17 Author: dreisner Revision: 147046 remove module-init-tools Modified: mkinitcpio-busybox/trunk/config Deleted: module-init-tools/ + config | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) Modified: mkinitcpio-busybox/trunk/config === --- mkinitcpio-busybox/trunk/config 2012-01-21 03:03:41 UTC (rev 147045) +++ mkinitcpio-busybox/trunk/config 2012-01-21 03:05:17 UTC (rev 147046) @@ -486,14 +486,14 @@ # # Linux Module Utilities # -CONFIG_MODINFO=y +# CONFIG_MODINFO is not set # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set # CONFIG_MODPROBE is not set # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set # CONFIG_DEPMOD is not set @@ -508,11 +508,11 @@ # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set # CONFIG_FEATURE_MODUTILS_ALIAS is not set # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="" -CONFIG_DEFAULT_DEPMOD_FILE="" +# CONFIG_DEFAULT_MODULES_DIR is not set +# CONFIG_DEFAULT_DEPMOD_FILE is not set # # Linux System Utilities @@ -570,15 +570,15 @@ # CONFIG_MKSWAP is not set # CONFIG_FEATURE_MKSWAP_UUID is not set # CONFIG_MORE is not set -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_MOUNT=n +# CONFIG_FEATURE_MOUNT_FAKE= is not set +# CONFIG_FEATURE_MOUNT_VERBOSE= is not set +# CONFIG_FEATURE_MOUNT_HELPERS= is not set +# CONFIG_FEATURE_MOUNT_LABEL= is not set +# CONFIG_FEATURE_MOUNT_NFS= is not set +# CONFIG_FEATURE_MOUNT_CIFS= is not set +# CONFIG_FEATURE_MOUNT_FLAGS= is not set +# CONFIG_FEATURE_MOUNT_FSTAB= is not set # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set # CONFIG_RDEV is not set @@ -589,7 +589,7 @@ # CONFIG_SETARCH is not set # CONFIG_SWAPONOFF is not set # CONFIG_FEATURE_SWAPON_PRI is not set -CONFIG_SWITCH_ROOT=y +CONFIG_SWITCH_ROOT=n CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y
[arch-commits] Commit in module-init-tools/repos (core-x86_64)
Date: Friday, January 20, 2012 @ 22:03:41 Author: dreisner Revision: 147045 db-remove: module-init-tools removed by dreisner Deleted: module-init-tools/repos/core-x86_64/
[arch-commits] Commit in module-init-tools/repos (core-i686)
Date: Friday, January 20, 2012 @ 22:03:36 Author: dreisner Revision: 147044 db-remove: module-init-tools removed by dreisner Deleted: module-init-tools/repos/core-i686/
[arch-commits] Commit in audacious-plugins/repos (4 files)
Date: Friday, January 20, 2012 @ 20:23:21
Author: bisson
Revision: 147043
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
audacious-plugins/repos/extra-i686/PKGBUILD
(from rev 147041, audacious-plugins/trunk/PKGBUILD)
audacious-plugins/repos/extra-x86_64/PKGBUILD
(from rev 147041, audacious-plugins/trunk/PKGBUILD)
Deleted:
audacious-plugins/repos/extra-i686/PKGBUILD
audacious-plugins/repos/extra-x86_64/PKGBUILD
---+
extra-i686/PKGBUILD | 126
extra-x86_64/PKGBUILD | 126
2 files changed, 126 insertions(+), 126 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-21 01:22:07 UTC (rev 147042)
+++ extra-i686/PKGBUILD 2012-01-21 01:23:21 UTC (rev 147043)
@@ -1,63 +0,0 @@
-# $Id$
-# Contributor: Alexander Fehr
-# Contributor: William Rea
-# Maintainer: Gaetan Bisson
-
-pkgname=audacious-plugins
-pkgver=3.1.2
-pkgrel=1
-pkgdesc='Plugins for Audacious'
-url='http://audacious-media-player.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-
-makedepends=("audacious>=${pkgver}"
- 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
- 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio'
'libsidplay' 'wavpack'
- 'libnotify' 'lirc-utils' 'curl' 'libmtp'
- 'neon' 'libmms' 'libcue')
-
-optdepends=('oss: Open Sound System v4 output'
-'alsa-lib: Advanced Linux Sound Arch. output'
-'pulseaudio: PulseAudio output'
-'jack2: Jack Audio Connection Kit output'
-'lame: FileWriter MP3 output'
-'libvorbis: Vorbis input, FileWriter Vorbis output'
-'flac: FLAC input, FileWriter FLAC output'
-
-'mpg123: MP3 input'
-'faad2: AAC input'
-'ffmpeg: ffaudio input'
-'libmodplug: modplug input'
-'fluidsynth: MIDI FluidSynth backend input'
-'libcdio: CD Digital Audio input'
-'libsidplay: Commodore 64 audio input'
-'wavpack: WavPack input'
-
-'libnotify: libnotify OSD'
-'lirc-utils: LIRC'
-'curl: AudioScrobbler Client'
-'libmtp: Upload to MTP device'
-
-'neon: neon-based http transport'
-'libmms: libmms-based mms transport'
-'libcue: CUE playlist format')
-
-source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2";)
-sha1sums=('1c45d75edf0ebf0704fa0c66a67aed742f42e47b')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure \
- --prefix=/usr \
- --enable-amidiplug \
- --disable-adplug \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: audacious-plugins/repos/extra-i686/PKGBUILD (from rev 147041,
audacious-plugins/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-21 01:23:21 UTC (rev 147043)
@@ -0,0 +1,63 @@
+# $Id$
+# Contributor: Alexander Fehr
+# Contributor: William Rea
+# Maintainer: Gaetan Bisson
+
+pkgname=audacious-plugins
+pkgver=3.2
+pkgrel=1
+pkgdesc='Plugins for Audacious'
+url='http://audacious-media-player.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+
+makedepends=("audacious>=${pkgver}"
+ 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
+ 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio'
'libsidplay' 'wavpack'
+ 'libnotify' 'lirc-utils' 'curl' 'libmtp'
+ 'neon' 'libmms' 'libcue')
+
+optdepends=('oss: Open Sound System v4 output'
+'alsa-lib: Advanced Linux Sound Arch. output'
+'pulseaudio: PulseAudio output'
+'jack2: Jack Audio Connection Kit output'
+'lame: FileWriter MP3 output'
+'libvorbis: Vorbis input, FileWriter Vorbis output'
+'flac: FLAC input, FileWriter FLAC output'
+
+'mpg123: MP3 input'
+'faad2: AAC input'
+'ffmpeg: ffaudio input'
+'libmodplug: modplug input'
+'fluidsynth: MIDI FluidSynth backend input'
+'libcdio: CD Digital Audio input'
+'libsidplay: Commodore 64 audio input'
+'wavpack: WavPack input'
+
+'libnotify: libnotify OSD'
+'lirc-utils: LIRC'
+'curl: AudioScrobbler Client'
+'libmtp: Upload to MTP device'
+
+'neon: neon-based http transport'
+'libmms: libmms-based mms transport'
+'libcue: CUE playlist format')
+
+source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2";)
+sha1sums=('49cc0a05fddef8b1730f08d0a0b
[arch-commits] Commit in audacious/repos (8 files)
Date: Friday, January 20, 2012 @ 20:22:07
Author: bisson
Revision: 147042
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
audacious/repos/extra-i686/PKGBUILD
(from rev 147041, audacious/trunk/PKGBUILD)
audacious/repos/extra-i686/install
(from rev 147041, audacious/trunk/install)
audacious/repos/extra-x86_64/PKGBUILD
(from rev 147041, audacious/trunk/PKGBUILD)
audacious/repos/extra-x86_64/install
(from rev 147041, audacious/trunk/install)
Deleted:
audacious/repos/extra-i686/PKGBUILD
audacious/repos/extra-i686/install
audacious/repos/extra-x86_64/PKGBUILD
audacious/repos/extra-x86_64/install
---+
extra-i686/PKGBUILD | 64
extra-i686/install| 26 +--
extra-x86_64/PKGBUILD | 64
extra-x86_64/install | 26 +--
4 files changed, 90 insertions(+), 90 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-21 01:21:18 UTC (rev 147041)
+++ extra-i686/PKGBUILD 2012-01-21 01:22:07 UTC (rev 147042)
@@ -1,32 +0,0 @@
-# $Id$
-# Contributor: Alexander Fehr
-# Contributor: Giovanni Scafora
-# Maintainer: Gaetan Bisson
-
-pkgname=audacious
-pkgver=3.1.2
-pkgrel=1
-pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality'
-url='http://audacious-media-player.org/'
-license=('GPL3')
-arch=('i686' 'x86_64')
-depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
- 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
-optdepends=('unzip: zipped skins support')
-source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2";)
-sha1sums=('ebaaefcfa291a1f97d2dae1b2d7f0cacb545dc7f')
-
-provides=('audacious-player')
-replaces=('audacious-player')
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: audacious/repos/extra-i686/PKGBUILD (from rev 147041,
audacious/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-21 01:22:07 UTC (rev 147042)
@@ -0,0 +1,32 @@
+# $Id$
+# Contributor: Alexander Fehr
+# Contributor: Giovanni Scafora
+# Maintainer: Gaetan Bisson
+
+pkgname=audacious
+pkgver=3.2
+pkgrel=1
+pkgdesc='Lightweight, advanced audio player focused on audio quality'
+url='http://audacious-media-player.org/'
+license=('GPL3')
+arch=('i686' 'x86_64')
+depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
+ 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
+optdepends=('unzip: zipped skins support')
+source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2";)
+sha1sums=('3ebc4dcdcf5da960ba400078023e167e02105e84')
+
+provides=('audacious-player')
+replaces=('audacious-player')
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/install
===
--- extra-i686/install 2012-01-21 01:21:18 UTC (rev 147041)
+++ extra-i686/install 2012-01-21 01:22:07 UTC (rev 147042)
@@ -1,13 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: audacious/repos/extra-i686/install (from rev 147041,
audacious/trunk/install)
===
--- extra-i686/install (rev 0)
+++ extra-i686/install 2012-01-21 01:22:07 UTC (rev 147042)
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2012-01-21 01:21:18 UTC (rev 147041)
+++ extra-x86_64/PKGBUILD 2012-01-21 01:22:07 UTC (rev 147042)
@@ -1,32 +0,0 @@
-# $Id$
-# Contributor: Alexander Fehr
-# Contributor: Giovanni Scafora
-# Maintainer: Gaetan Bisson
-
-pkgname=audacious
-pkgver=3.1.2
-pkgrel=1
-pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality'
-url='http://audacious-media-player.org/'
-license=('GPL3')
-arch=('i686' 'x86_64')
-depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
- 'hicolor-icon-the
[arch-commits] Commit in audacious/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 20:21:18
Author: bisson
Revision: 147041
upstream update
Modified:
audacious/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-21 01:21:06 UTC (rev 147040)
+++ PKGBUILD2012-01-21 01:21:18 UTC (rev 147041)
@@ -4,9 +4,9 @@
# Maintainer: Gaetan Bisson
pkgname=audacious
-pkgver=3.1.2
+pkgver=3.2
pkgrel=1
-pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality'
+pkgdesc='Lightweight, advanced audio player focused on audio quality'
url='http://audacious-media-player.org/'
license=('GPL3')
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
optdepends=('unzip: zipped skins support')
source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2";)
-sha1sums=('ebaaefcfa291a1f97d2dae1b2d7f0cacb545dc7f')
+sha1sums=('3ebc4dcdcf5da960ba400078023e167e02105e84')
provides=('audacious-player')
replaces=('audacious-player')
[arch-commits] Commit in audacious-plugins/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 20:21:06
Author: bisson
Revision: 147040
upstream update
Modified:
audacious-plugins/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-21 00:39:57 UTC (rev 147039)
+++ PKGBUILD2012-01-21 01:21:06 UTC (rev 147040)
@@ -4,7 +4,7 @@
# Maintainer: Gaetan Bisson
pkgname=audacious-plugins
-pkgver=3.1.2
+pkgver=3.2
pkgrel=1
pkgdesc='Plugins for Audacious'
url='http://audacious-media-player.org/'
@@ -44,7 +44,7 @@
'libcue: CUE playlist format')
source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2";)
-sha1sums=('1c45d75edf0ebf0704fa0c66a67aed742f42e47b')
+sha1sums=('49cc0a05fddef8b1730f08d0a0bf9e4797cd393d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in initscripts/repos (7 files)
Date: Friday, January 20, 2012 @ 19:39:57
Author: dreisner
Revision: 147039
db-move: moved initscripts from [testing] to [core] (any)
Added:
initscripts/repos/core-any/PKGBUILD
(from rev 147038, initscripts/repos/testing-any/PKGBUILD)
initscripts/repos/core-any/initscripts.install
(from rev 147038, initscripts/repos/testing-any/initscripts.install)
initscripts/repos/core-any/wireless.conf.d
(from rev 147038, initscripts/repos/testing-any/wireless.conf.d)
Deleted:
initscripts/repos/core-any/PKGBUILD
initscripts/repos/core-any/initscripts.install
initscripts/repos/core-any/wireless.conf.d
initscripts/repos/testing-any/
-+
PKGBUILD| 64 +-
initscripts.install | 38 ++---
wireless.conf.d | 24 +-
3 files changed, 63 insertions(+), 63 deletions(-)
Deleted: core-any/PKGBUILD
===
--- core-any/PKGBUILD 2012-01-21 00:32:06 UTC (rev 147038)
+++ core-any/PKGBUILD 2012-01-21 00:39:57 UTC (rev 147039)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen
-# Contributor: Thomas Bächler
-# Contributor: Aaron Griffin
-
-pkgname=initscripts
-pkgver=2012.01.2
-pkgrel=1
-pkgdesc="System initialization/bootup scripts"
-arch=('any')
-url="http://www.archlinux.org";
-license=('GPL2')
-groups=('base')
-backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown
etc/conf.d/wireless)
-depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=174' 'iproute2'
- 'ncurses' 'kbd' 'findutils' 'sysvinit')
-optdepends=('bridge-utils: Network bridging support'
-'dhcpcd: DHCP network configuration'
-'net-tools: legacy network support'
-'wireless_tools: Wireless networking')
-makedepends=(asciidoc)
-install=initscripts.install
-source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz";
-'wireless.conf.d')
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
-}
-md5sums=('14bb875e1d733e1fca4e61480ba71b4e'
- '027576534885b8d5dded9be546057b12')
Copied: initscripts/repos/core-any/PKGBUILD (from rev 147038,
initscripts/repos/testing-any/PKGBUILD)
===
--- core-any/PKGBUILD (rev 0)
+++ core-any/PKGBUILD 2012-01-21 00:39:57 UTC (rev 147039)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Tom Gundersen
+# Contributor: Thomas Bächler
+# Contributor: Aaron Griffin
+
+pkgname=initscripts
+pkgver=2012.01.3
+pkgrel=1
+pkgdesc="System initialization/bootup scripts"
+arch=('any')
+url="http://www.archlinux.org";
+license=('GPL2')
+groups=('base')
+backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown
etc/conf.d/wireless)
+depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=174' 'iproute2'
+ 'ncurses' 'kbd' 'findutils' 'sysvinit')
+optdepends=('bridge-utils: Network bridging support'
+'dhcpcd: DHCP network configuration'
+'net-tools: legacy network support'
+'wireless_tools: Wireless networking')
+makedepends=(asciidoc)
+install=initscripts.install
+source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz";
+'wireless.conf.d')
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+ install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
+}
+md5sums=('3d4e02ddefb0c7e8ae7000161ae89448'
+ '027576534885b8d5dded9be546057b12')
Deleted: core-any/initscripts.install
===
--- core-any/initscripts.install2012-01-21 00:32:06 UTC (rev 147038)
+++ core-any/initscripts.install2012-01-21 00:39:57 UTC (rev 147039)
@@ -1,19 +0,0 @@
-post_upgrade() {
- if [ "$(vercmp $2 2009.07)" -lt 0 ]; then
-echo "==> Adjusting /etc/inittab for transition to /dev/tty standard."
-echo "==> Original file saved as /etc/inittab.pacsave"
-sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab
- fi
- if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then
-echo "Blacklisting of modules is no longer supported in rc.conf,"
-echo "please add blacklist entries to /etc/modprobe.d/ instead."
- fi
- if [ "$(vercmp $2 2011.07.2)" -lt 0 ]; then
-echo "VERBOSE= in rc.conf no longer has any effect."
-echo "Please append 'quiet' to your kernel command line."
- fi
- if [ "$(vercmp $2 2011.10.1)" -lt 0 ]; then
-echo "If using non-bash-compatible shell, please set LANG in
/etc/locale.conf,"
-echo "as LOCALE in /etc/rc.conf no longer works."
- fi
-}
Copied: initscripts/repos/core-any/initscripts.install (from rev 147038,
initscripts/repos/testing-any/initscripts.install)
===
--- core-any
[arch-commits] Commit in udev/repos (7 files)
Date: Friday, January 20, 2012 @ 19:32:06
Author: dreisner
Revision: 147038
db-move: moved udev from [testing] to [core] (x86_64)
Added:
udev/repos/core-x86_64/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
(from rev 147033,
udev/repos/testing-x86_64/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch)
udev/repos/core-x86_64/PKGBUILD
(from rev 147033, udev/repos/testing-x86_64/PKGBUILD)
udev/repos/core-x86_64/udev.install
(from rev 147033, udev/repos/testing-x86_64/udev.install)
Deleted:
udev/repos/core-x86_64/81-arch.rules
udev/repos/core-x86_64/PKGBUILD
udev/repos/core-x86_64/udev.install
udev/repos/testing-x86_64/
+
0001-udevd-kill-hanging-event-processes-after-30-seconds.patch | 162 +++
81-arch.rules |9
PKGBUILD | 208
+-
udev.install | 127 +++---
4 files changed, 334 insertions(+), 172 deletions(-)
Copied:
udev/repos/core-x86_64/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
(from rev 147033,
udev/repos/testing-x86_64/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch)
===
--- core-x86_64/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
(rev 0)
+++ core-x86_64/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
2012-01-21 00:32:06 UTC (rev 147038)
@@ -0,0 +1,162 @@
+From e64fae5573e566ce4fd9b23c68ac8f3096603314 Mon Sep 17 00:00:00 2001
+From: Kay Sievers
+Date: Wed, 18 Jan 2012 05:06:18 +0100
+Subject: [PATCH] udevd: kill hanging event processes after 30 seconds
+
+Some broken kernel drivers load firmware synchronously in the module init
+path and block modprobe until the firmware request is fulfilled.
+
+The modprobe-generated firmware request is a direct child device of the
+device which caused modprobe to run. Child device event are blocked until
+the parent device is handled. This dead-locks until the kernel firmware
+loading timeout of 60 seconds is reached.
+
+The hanging modprobe event should now time-out and allow the firmware
+event to run before the 60 second kernel timeout.
+---
+ src/udev-event.c |2 +-
+ src/udevd.c | 62 +++--
+ 2 files changed, 51 insertions(+), 13 deletions(-)
+
+diff --git a/src/udev-event.c b/src/udev-event.c
+index 9bdc518..f0b9548 100644
+--- a/src/udev-event.c
b/src/udev-event.c
+@@ -49,7 +49,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
+ udev_list_init(udev, &event->run_list, false);
+ event->fd_signal = -1;
+ event->birth_usec = now_usec();
+-event->timeout_usec = 60 * 1000 * 1000;
++event->timeout_usec = 30 * 1000 * 1000;
+ dbg(event->udev, "allocated event %p\n", event);
+ return event;
+ }
+diff --git a/src/udevd.c b/src/udevd.c
+index 11ab19a..77a1e79 100644
+--- a/src/udevd.c
b/src/udevd.c
+@@ -133,6 +133,7 @@ struct worker {
+ struct udev_monitor *monitor;
+ enum worker_state state;
+ struct event *event;
++unsigned long long event_start_usec;
+ };
+
+ /* passed from worker to main process */
+@@ -372,6 +373,7 @@ out:
+ close(fd_inotify);
+ close(worker_watch[WRITE_END]);
+ udev_rules_unref(rules);
++udev_builtin_exit(udev);
+ udev_monitor_unref(worker_monitor);
+ udev_unref(udev);
+ udev_log_close();
+@@ -389,6 +391,7 @@ out:
+ worker->monitor = worker_monitor;
+ worker->pid = pid;
+ worker->state = WORKER_RUNNING;
++worker->event_start_usec = now_usec();
+ worker->event = event;
+ event->state = EVENT_RUNNING;
+ udev_list_node_append(&worker->node, &worker_list);
+@@ -419,6 +422,7 @@ static void event_run(struct event *event)
+ worker_ref(worker);
+ worker->event = event;
+ worker->state = WORKER_RUNNING;
++worker->event_start_usec = now_usec();
+ event->state = EVENT_RUNNING;
+ return;
+ }
+@@ -610,9 +614,11 @@ static void worker_returned(int fd_worker)
+ continue;
+
+ /* worker returned */
+-worker->event->exitcode = msg.exitcode;
+-event_queue_delete(worker->event, true);
+-worker->event = NULL;
++if (worker->event) {
++worker->event->exitcode = msg.exitcode;
++event_queue_delete(worker->event, tru
[arch-commits] Commit in udev/repos (7 files)
Date: Friday, January 20, 2012 @ 19:32:04
Author: dreisner
Revision: 147037
db-move: moved udev from [testing] to [core] (i686)
Added:
udev/repos/core-i686/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
(from rev 147033,
udev/repos/testing-i686/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch)
udev/repos/core-i686/PKGBUILD
(from rev 147033, udev/repos/testing-i686/PKGBUILD)
udev/repos/core-i686/udev.install
(from rev 147033, udev/repos/testing-i686/udev.install)
Deleted:
udev/repos/core-i686/81-arch.rules
udev/repos/core-i686/PKGBUILD
udev/repos/core-i686/udev.install
udev/repos/testing-i686/
+
0001-udevd-kill-hanging-event-processes-after-30-seconds.patch | 162 +++
81-arch.rules |9
PKGBUILD | 208
+-
udev.install | 127 +++---
4 files changed, 334 insertions(+), 172 deletions(-)
Copied:
udev/repos/core-i686/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
(from rev 147033,
udev/repos/testing-i686/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch)
===
--- core-i686/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
(rev 0)
+++ core-i686/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
2012-01-21 00:32:04 UTC (rev 147037)
@@ -0,0 +1,162 @@
+From e64fae5573e566ce4fd9b23c68ac8f3096603314 Mon Sep 17 00:00:00 2001
+From: Kay Sievers
+Date: Wed, 18 Jan 2012 05:06:18 +0100
+Subject: [PATCH] udevd: kill hanging event processes after 30 seconds
+
+Some broken kernel drivers load firmware synchronously in the module init
+path and block modprobe until the firmware request is fulfilled.
+
+The modprobe-generated firmware request is a direct child device of the
+device which caused modprobe to run. Child device event are blocked until
+the parent device is handled. This dead-locks until the kernel firmware
+loading timeout of 60 seconds is reached.
+
+The hanging modprobe event should now time-out and allow the firmware
+event to run before the 60 second kernel timeout.
+---
+ src/udev-event.c |2 +-
+ src/udevd.c | 62 +++--
+ 2 files changed, 51 insertions(+), 13 deletions(-)
+
+diff --git a/src/udev-event.c b/src/udev-event.c
+index 9bdc518..f0b9548 100644
+--- a/src/udev-event.c
b/src/udev-event.c
+@@ -49,7 +49,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
+ udev_list_init(udev, &event->run_list, false);
+ event->fd_signal = -1;
+ event->birth_usec = now_usec();
+-event->timeout_usec = 60 * 1000 * 1000;
++event->timeout_usec = 30 * 1000 * 1000;
+ dbg(event->udev, "allocated event %p\n", event);
+ return event;
+ }
+diff --git a/src/udevd.c b/src/udevd.c
+index 11ab19a..77a1e79 100644
+--- a/src/udevd.c
b/src/udevd.c
+@@ -133,6 +133,7 @@ struct worker {
+ struct udev_monitor *monitor;
+ enum worker_state state;
+ struct event *event;
++unsigned long long event_start_usec;
+ };
+
+ /* passed from worker to main process */
+@@ -372,6 +373,7 @@ out:
+ close(fd_inotify);
+ close(worker_watch[WRITE_END]);
+ udev_rules_unref(rules);
++udev_builtin_exit(udev);
+ udev_monitor_unref(worker_monitor);
+ udev_unref(udev);
+ udev_log_close();
+@@ -389,6 +391,7 @@ out:
+ worker->monitor = worker_monitor;
+ worker->pid = pid;
+ worker->state = WORKER_RUNNING;
++worker->event_start_usec = now_usec();
+ worker->event = event;
+ event->state = EVENT_RUNNING;
+ udev_list_node_append(&worker->node, &worker_list);
+@@ -419,6 +422,7 @@ static void event_run(struct event *event)
+ worker_ref(worker);
+ worker->event = event;
+ worker->state = WORKER_RUNNING;
++worker->event_start_usec = now_usec();
+ event->state = EVENT_RUNNING;
+ return;
+ }
+@@ -610,9 +614,11 @@ static void worker_returned(int fd_worker)
+ continue;
+
+ /* worker returned */
+-worker->event->exitcode = msg.exitcode;
+-event_queue_delete(worker->event, true);
+-worker->event = NULL;
++if (worker->event) {
++worker->event->exitcode = msg.exitcode;
++event_queue_delete(worker->event, true);
++
[arch-commits] Commit in mkinitcpio/repos (4 files)
Date: Friday, January 20, 2012 @ 19:32:02
Author: dreisner
Revision: 147036
db-move: moved mkinitcpio from [testing] to [core] (any)
Added:
mkinitcpio/repos/core-any/PKGBUILD
(from rev 147033, mkinitcpio/repos/testing-any/PKGBUILD)
Deleted:
mkinitcpio/repos/core-any/0001-init_functions-redirect-poll_device-output-to-stderr.patch
mkinitcpio/repos/core-any/PKGBUILD
mkinitcpio/repos/testing-any/
-+
0001-init_functions-redirect-poll_device-output-to-stderr.patch | 28
PKGBUILD| 70
--
2 files changed, 30 insertions(+), 68 deletions(-)
Deleted:
core-any/0001-init_functions-redirect-poll_device-output-to-stderr.patch
===
--- core-any/0001-init_functions-redirect-poll_device-output-to-stderr.patch
2012-01-21 00:32:01 UTC (rev 147035)
+++ core-any/0001-init_functions-redirect-poll_device-output-to-stderr.patch
2012-01-21 00:32:02 UTC (rev 147036)
@@ -1,28 +0,0 @@
-From 7effc762a2de2029ccedb659f25426c80b04cf4d Mon Sep 17 00:00:00 2001
-From: Dave Reisner
-Date: Thu, 1 Dec 2011 11:58:40 -0500
-Subject: [PATCH] init_functions: redirect poll_device output to stderr
-
-Fixes FS#27385
-
-Signed-off-by: Dave Reisner
- init_functions |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/init_functions b/init_functions
-index 69cd8fb..787b925 100644
a/init_functions
-+++ b/init_functions
-@@ -15,7 +15,7 @@ poll_device() {
- [ -b "$device" ] && return 0
-
- if [ "$udevd_running" -eq 1 ]; then
--msg "Waiting $seconds seconds for device $device ..."
-+msg "Waiting $seconds seconds for device $device ..." >&2
- while [ ! -b "$device" -a "$seconds" -gt 0 ]; do
- sleep 1
- seconds=$(( $seconds - 1 ))
---
-1.7.8
-
Deleted: core-any/PKGBUILD
===
--- core-any/PKGBUILD 2012-01-21 00:32:01 UTC (rev 147035)
+++ core-any/PKGBUILD 2012-01-21 00:32:02 UTC (rev 147036)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner
-# Maintainer: Thomas Bächler
-
-pkgname=mkinitcpio
-pkgver=0.8.0
-pkgrel=3
-pkgdesc="Modular initramfs image creation utility"
-arch=('any')
-url="http://www.archlinux.org/";
-license=('GPL')
-depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19'
'libarchive' 'coreutils'
- 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=174-1'
'file' 'gzip')
-optdepends=('xz: Use lzma or xz compression for the initramfs image'
-'bzip2: Use bzip2 compression for the initramfs image'
-'lzop: Use lzo compression for the initramfs image'
-'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
-replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd'
- 'klibc-module-init-tools' 'klibc-udev')
-backup=(etc/mkinitcpio.conf)
-source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz";
-'0001-init_functions-redirect-poll_device-output-to-stderr.patch')
-sha256sums=('097faaf23aaa6d442e7cc6add7238698abfea4185e7d125dcffd74d0ea159246'
-'00248a66c5a2964e3a5e4e344f5679e5866857aa53b645cc5308ab8af8152e57')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # backport fix for FS#27385
- patch -Np1 <
"$srcdir"/0001-init_functions-redirect-poll_device-output-to-stderr.patch
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- mkdir "$pkgdir/sbin"
- ln -s /usr/bin/mkinitcpio "$pkgdir/sbin/mkinitcpio"
-}
Copied: mkinitcpio/repos/core-any/PKGBUILD (from rev 147033,
mkinitcpio/repos/testing-any/PKGBUILD)
===
--- core-any/PKGBUILD (rev 0)
+++ core-any/PKGBUILD 2012-01-21 00:32:02 UTC (rev 147036)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Dave Reisner
+# Maintainer: Thomas Bächler
+
+pkgname=mkinitcpio
+pkgver=0.8.2
+pkgrel=1
+pkgdesc="Modular initramfs image creation utility"
+arch=('any')
+url="http://www.archlinux.org/";
+license=('GPL')
+depends=('mkinitcpio-busybox>=1.16.1-2' 'kmod>=3' 'util-linux>=2.20.1-2'
'libarchive' 'coreutils'
+ 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=177-1'
'file' 'gzip')
+optdepends=('xz: Use lzma or xz compression for the initramfs image'
+'bzip2: Use bzip2 compression for the initramfs image'
+'lzop: Use lzo compression for the initramfs image'
+'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
+backup=(etc/mkinitcpio.conf)
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz";)
+md5sums=('2e0ac0c657ca7a78aa0583b3368c0e44')
+sha256sums=('9a951f9e2a158b65840f476c1b9e1e45c7b06383a90f182f76eab64bd3a398cb')
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" i
[arch-commits] Commit in kmod/repos (4 files)
Date: Friday, January 20, 2012 @ 19:32:01
Author: dreisner
Revision: 147035
db-move: moved kmod from [testing] to [core] (x86_64)
Added:
kmod/repos/core-x86_64/
kmod/repos/core-x86_64/PKGBUILD
(from rev 147033, kmod/repos/testing-x86_64/PKGBUILD)
kmod/repos/core-x86_64/depmod-search.conf
(from rev 147033, kmod/repos/testing-x86_64/depmod-search.conf)
Deleted:
kmod/repos/testing-x86_64/
+
PKGBUILD | 56 +++
depmod-search.conf |5
2 files changed, 61 insertions(+)
Copied: kmod/repos/core-x86_64/PKGBUILD (from rev 147033,
kmod/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2012-01-21 00:32:01 UTC (rev 147035)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Dave Reisner
+
+pkgname=kmod
+pkgver=4
+pkgrel=1
+pkgdesc="Linux kernel module handling"
+arch=('i686' 'x86_64')
+url="http://git.profusion.mobi/cgit.cgi/kmod.git";
+license=('GPL2')
+depends=('glibc' 'zlib')
+makedepends=('docbook2x')
+options=('!libtool')
+provides=('module-init-tools=3.16')
+conflicts=('module-init-tools')
+replaces=('module-init-tools')
+source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz";
+"depmod-search.conf")
+md5sums=('e14450a066a48accd0af1995b3c0232d'
+ '4b8cbcbc54b9029c99fd730e257d4436')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure \
+--sysconfdir=/etc \
+--with-rootprefix= \
+--with-zlib
+
+ make
+}
+
+check() {
+ make -C "$pkgname-$pkgver" check
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+ # binary directories
+ install -dm755 "$pkgdir"/{,s}bin
+
+ # configuration directories
+ install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d
+
+ # add symlinks to kmod
+ ln -s /usr/bin/kmod "$pkgdir/bin/lsmod"
+ for tool in {ins,rm,dep}mod mod{info,probe}; do
+ln -s ../usr/bin/kmod "$pkgdir/sbin/$tool"
+ done
+
+ # install depmod.d file for search/ dir
+ install -Dm644 "$srcdir/depmod-search.conf"
"$pkgdir/lib/depmod.d/search.conf"
+}
+
+# vim: ft=sh syn=sh et
Copied: kmod/repos/core-x86_64/depmod-search.conf (from rev 147033,
kmod/repos/testing-x86_64/depmod-search.conf)
===
--- core-x86_64/depmod-search.conf (rev 0)
+++ core-x86_64/depmod-search.conf 2012-01-21 00:32:01 UTC (rev 147035)
@@ -0,0 +1,5 @@
+#
+# /etc/depmod.d/depmod.conf
+#
+
+search updates extramodules built-in
[arch-commits] Commit in kmod/repos (4 files)
Date: Friday, January 20, 2012 @ 19:32:00
Author: dreisner
Revision: 147034
db-move: moved kmod from [testing] to [core] (i686)
Added:
kmod/repos/core-i686/
kmod/repos/core-i686/PKGBUILD
(from rev 147033, kmod/repos/testing-i686/PKGBUILD)
kmod/repos/core-i686/depmod-search.conf
(from rev 147033, kmod/repos/testing-i686/depmod-search.conf)
Deleted:
kmod/repos/testing-i686/
+
PKGBUILD | 56 +++
depmod-search.conf |5
2 files changed, 61 insertions(+)
Copied: kmod/repos/core-i686/PKGBUILD (from rev 147033,
kmod/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-01-21 00:32:00 UTC (rev 147034)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Dave Reisner
+
+pkgname=kmod
+pkgver=4
+pkgrel=1
+pkgdesc="Linux kernel module handling"
+arch=('i686' 'x86_64')
+url="http://git.profusion.mobi/cgit.cgi/kmod.git";
+license=('GPL2')
+depends=('glibc' 'zlib')
+makedepends=('docbook2x')
+options=('!libtool')
+provides=('module-init-tools=3.16')
+conflicts=('module-init-tools')
+replaces=('module-init-tools')
+source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz";
+"depmod-search.conf")
+md5sums=('e14450a066a48accd0af1995b3c0232d'
+ '4b8cbcbc54b9029c99fd730e257d4436')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure \
+--sysconfdir=/etc \
+--with-rootprefix= \
+--with-zlib
+
+ make
+}
+
+check() {
+ make -C "$pkgname-$pkgver" check
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+ # binary directories
+ install -dm755 "$pkgdir"/{,s}bin
+
+ # configuration directories
+ install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d
+
+ # add symlinks to kmod
+ ln -s /usr/bin/kmod "$pkgdir/bin/lsmod"
+ for tool in {ins,rm,dep}mod mod{info,probe}; do
+ln -s ../usr/bin/kmod "$pkgdir/sbin/$tool"
+ done
+
+ # install depmod.d file for search/ dir
+ install -Dm644 "$srcdir/depmod-search.conf"
"$pkgdir/lib/depmod.d/search.conf"
+}
+
+# vim: ft=sh syn=sh et
Copied: kmod/repos/core-i686/depmod-search.conf (from rev 147033,
kmod/repos/testing-i686/depmod-search.conf)
===
--- core-i686/depmod-search.conf(rev 0)
+++ core-i686/depmod-search.conf2012-01-21 00:32:00 UTC (rev 147034)
@@ -0,0 +1,5 @@
+#
+# /etc/depmod.d/depmod.conf
+#
+
+search updates extramodules built-in
[arch-commits] Commit in perl-libwww/repos (extra-any)
Date: Friday, January 20, 2012 @ 19:18:14 Author: juster Revision: 147033 archrelease: copy trunk to extra-any Added: perl-libwww/repos/extra-any/
[arch-commits] Commit in perl-libwww/repos (extra-any)
Date: Friday, January 20, 2012 @ 19:18:05 Author: juster Revision: 147032 archrelease: remove extra-any Deleted: perl-libwww/repos/extra-any/
[arch-commits] Commit in perl-libwww/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 19:13:59 Author: juster Revision: 147031 Bump pkgrel to 2. Modified: perl-libwww/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2012-01-21 00:13:20 UTC (rev 147030) +++ PKGBUILD2012-01-21 00:13:59 UTC (rev 147031) @@ -3,7 +3,7 @@ pkgname=perl-libwww pkgver=6.03 -pkgrel=1 +pkgrel=2 pkgdesc="The World-Wide Web library for Perl" arch=(any) license=(PerlArtistic GPL)
[arch-commits] Commit in perl-libwww/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 19:13:20
Author: juster
Revision: 147030
Bug in generator caused missing dependencies.
See: https://bugs.archlinux.org/task/27998
Modified:
perl-libwww/trunk/PKGBUILD
--+
PKGBUILD | 23 +--
1 file changed, 13 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 22:37:53 UTC (rev 147029)
+++ PKGBUILD2012-01-21 00:13:20 UTC (rev 147030)
@@ -8,8 +8,11 @@
arch=(any)
license=(PerlArtistic GPL)
options=(!emptydirs)
-depends=('perl>=5.8.8' 'perl-encode>=2.12' 'perl-encode-locale'
- 'perl-html-parser' 'perl-libnet' 'perl-mime-base64>=2.1' 'perl-uri')
+depends=('perl>=5.8.8' 'perl-encode-locale' 'perl-file-listing>=6'
+ 'perl-html-parser' 'perl-http-cookies>=6' 'perl-http-daemon>=6'
+ 'perl-http-date>=6' 'perl-http-negotiate>=6' 'perl-lwp-mediatypes>=6'
+ 'perl-net-http>=6' 'perl-uri>=1.10' 'perl-www-robotrules>=6'
+ 'perl-http-message>=6')
optdepends=('perl-lwp-protocol-https: for https:// url schemes')
url=https://metacpan.org/release/libwww-perl
source=("http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${pkgver}.tar.gz";)
@@ -17,8 +20,9 @@
sha512sums=(1be85a3129724aee25bed7e3b80ccf66488fc9e50f095426635e8d2aaa80e29ee6a18e034d715320b9ea6f2f619c7821b3326c85426749a48a1187467acc9076)
_distdir="${srcdir}/libwww-perl-${pkgver}"
-build() {
- ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \
+build()
+(
+export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \
PERL_AUTOINSTALL=--skipdeps\
PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \
PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
@@ -27,15 +31,14 @@
cd "$_distdir"
/usr/bin/perl Makefile.PL
make
- )
-}
+)
-check() {
- ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
+check()
+(
+export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
cd "$_distdir"
make test
- )
-}
+)
package() {
cd "$_distdir"
[arch-commits] Commit in colord/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 17:37:53 Author: heftig Revision: 147029 Add systemd unit Modified: colord/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2012-01-20 21:33:04 UTC (rev 147028) +++ PKGBUILD2012-01-20 22:37:53 UTC (rev 147029) @@ -19,7 +19,8 @@ cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ ---localstatedir=/var --disable-static +--localstatedir=/var --disable-static \ +--with-systemdsystemunitdir=/lib/systemd/system make }
[arch-commits] Commit in nxserver/repos (10 files)
Date: Friday, January 20, 2012 @ 16:33:04
Author: andyrtr
Revision: 147028
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
nxserver/repos/staging-i686/
nxserver/repos/staging-i686/NXproto.h.64bit.diff
(from rev 147027, nxserver/trunk/NXproto.h.64bit.diff)
nxserver/repos/staging-i686/PKGBUILD
(from rev 147027, nxserver/trunk/PKGBUILD)
nxserver/repos/staging-i686/nx-3.5.0-libpng15.patch
(from rev 147027, nxserver/trunk/nx-3.5.0-libpng15.patch)
nxserver/repos/staging-i686/nxcompsh-gcc43.patch
(from rev 147027, nxserver/trunk/nxcompsh-gcc43.patch)
nxserver/repos/staging-x86_64/
nxserver/repos/staging-x86_64/NXproto.h.64bit.diff
(from rev 147027, nxserver/trunk/NXproto.h.64bit.diff)
nxserver/repos/staging-x86_64/PKGBUILD
(from rev 147027, nxserver/trunk/PKGBUILD)
nxserver/repos/staging-x86_64/nx-3.5.0-libpng15.patch
(from rev 147027, nxserver/trunk/nx-3.5.0-libpng15.patch)
nxserver/repos/staging-x86_64/nxcompsh-gcc43.patch
(from rev 147027, nxserver/trunk/nxcompsh-gcc43.patch)
+
staging-i686/NXproto.h.64bit.diff | 66 +
staging-i686/PKGBUILD | 95 +++
staging-i686/nx-3.5.0-libpng15.patch | 30 +
staging-i686/nxcompsh-gcc43.patch | 19 ++
staging-x86_64/NXproto.h.64bit.diff| 66 +
staging-x86_64/PKGBUILD| 95 +++
staging-x86_64/nx-3.5.0-libpng15.patch | 30 +
staging-x86_64/nxcompsh-gcc43.patch| 19 ++
8 files changed, 420 insertions(+)
Copied: nxserver/repos/staging-i686/NXproto.h.64bit.diff (from rev 147027,
nxserver/trunk/NXproto.h.64bit.diff)
===
--- staging-i686/NXproto.h.64bit.diff (rev 0)
+++ staging-i686/NXproto.h.64bit.diff 2012-01-20 21:33:04 UTC (rev 147028)
@@ -0,0 +1,66 @@
+--- nxcomp.old/NXproto.h 2006-06-19 19:55:56.0 +0200
nxcomp/NXproto.h 2007-02-12 18:17:41.0 +0100
+@@ -26,6 +26,30 @@
+ #include
+ #include
+
++/*
++ Copied from Xproto.h
++ */
++
++/* For the purpose of the structure definitions in this file,
++we must redefine the following types in terms of Xmd.h's types, which may
++include bit fields. All of these are #undef'd at the end of this file,
++restoring the definitions in X.h. */
++
++#define Window CARD32
++#define Drawable CARD32
++#define Font CARD32
++#define Pixmap CARD32
++#define Cursor CARD32
++#define Colormap CARD32
++#define GContext CARD32
++#define Atom CARD32
++#define VisualID CARD32
++#define Time CARD32
++#define KeyCode CARD8
++#define KeySym CARD32
++
++/* End copied from Xproto.h */
++
+ #define sz_xNXGetControlParametersReq 4
+ #define sz_xNXGetCleanupParametersReq 4
+ #define sz_xNXGetImageParametersReq 4
+@@ -343,9 +367,9 @@
+ CARD8dstDepth;
+ CARD32 srcLength B32;
+ CARD32 dstLength B32;
+-INT16srcX B16, srcY B16;
++CARD16srcX B16, srcY B16;
+ CARD16 srcWidth B16, srcHeight B16;
+-INT16dstX B16, dstY B16;
++CARD16dstX B16, dstY B16;
+ CARD16 dstWidth B16, dstHeight B16;
+ } xNXPutPackedImageReq;
+
+@@ -463,4 +487,20 @@
+ }
+ #endif
+
++/* Copied from Xproto.h */
++
++/* restore these definitions back to the typedefs in X.h */
++#undef Window
++#undef Drawable
++#undef Font
++#undef Pixmap
++#undef Cursor
++#undef Colormap
++#undef GContext
++#undef Atom
++#undef VisualID
++#undef Time
++#undef KeyCode
++#undef KeySym
++
+ #endif /* NXproto_H */
Copied: nxserver/repos/staging-i686/PKGBUILD (from rev 147027,
nxserver/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-20 21:33:04 UTC (rev 147028)
@@ -0,0 +1,95 @@
+# $Id$
+# Maintainer: Tobias Powalowski
+# Contributed: eliott , Andre Naumann
+
+pkgname=nxserver
+pkgver=3.5.0
+pkgrel=5
+pkgdesc="NoMachine NX is the next-generation X compression and roundtrip
suppression scheme."
+arch=(i686 x86_64)
+url="http://nomachine.com/";
+license=('GPL')
+depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8'
#>=$pkgver
+'libxpm' 'libpng>=1.5.7' 'libxdamage' 'libxrandr' 'libxcomposite'
'libxtst' 'freetype2'
+ 'xorg-sessreg')
+makedepends=('imake')
+source=(
+#X11 support programs and libraries
+http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-2.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-2.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz # needed
to provide NX.h and -LXcomp - part of nx-common
+#X11 Agent sources
+http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-7.tar.gz
+ht
[arch-commits] Commit in nxserver/trunk (PKGBUILD nx-3.5.0-libpng15.patch)
Date: Friday, January 20, 2012 @ 16:32:17
Author: andyrtr
Revision: 147027
upgpkg: nxserver 3.5.0-5
libpng rebuild
Added:
nxserver/trunk/nx-3.5.0-libpng15.patch
Modified:
nxserver/trunk/PKGBUILD
-+
PKGBUILD| 11 +++
nx-3.5.0-libpng15.patch | 30 ++
2 files changed, 37 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 21:25:43 UTC (rev 147026)
+++ PKGBUILD2012-01-20 21:32:17 UTC (rev 147027)
@@ -4,13 +4,13 @@
pkgname=nxserver
pkgver=3.5.0
-pkgrel=4
+pkgrel=5
pkgdesc="NoMachine NX is the next-generation X compression and roundtrip
suppression scheme."
arch=(i686 x86_64)
url="http://nomachine.com/";
license=('GPL')
depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8'
#>=$pkgver
-'libxpm' 'libpng>=1.4.0' 'libxdamage' 'libxrandr' 'libxcomposite'
'libxtst' 'freetype2'
+'libxpm' 'libpng>=1.5.7' 'libxdamage' 'libxrandr' 'libxcomposite'
'libxtst' 'freetype2'
'xorg-sessreg')
makedepends=('imake')
source=(
@@ -27,7 +27,8 @@
http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz
http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz
# gcc 43 fix
-nxcompsh-gcc43.patch)
+nxcompsh-gcc43.patch
+nx-3.5.0-libpng15.patch)
options=(!libtool)
md5sums=('12060433a74ac61a1c776d1d6d136117'
'84c7f1575d9a1506370125ed050514ab'
@@ -38,13 +39,15 @@
'488bb4d9b8e9f82dc272b4e6e9c57d30'
'abde2ccc33e31fc695031c2cfb60f3dd'
'90a762dd9eb19c8c97876ad837923857'
- 'b6c279654dac421fc3dd1a27d66ff53c')
+ 'b6c279654dac421fc3dd1a27d66ff53c'
+ '2966353cabb96829eab291212ef078dc')
build() {
cd ${srcdir}
# nxcomp
cd ${srcdir}/nxcomp
+ patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
./configure --prefix=/opt/NX
make
# nxcompshad
Added: nx-3.5.0-libpng15.patch
===
--- nx-3.5.0-libpng15.patch (rev 0)
+++ nx-3.5.0-libpng15.patch 2012-01-20 21:32:17 UTC (rev 147027)
@@ -0,0 +1,30 @@
+diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
+--- nxcomp.orig/Pgn.cpp2010-03-01 19:18:59.0 +0200
nxcomp/Pgn.cpp 2011-09-13 16:35:12.0 +0300
+@@ -414,7 +414,7 @@
+
+ png_read_info(pngPtr, infoPtr);
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
+@@ -565,7 +565,7 @@
+
+ png_read_info( pngPtr, infoPtr ) ;
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
+@@ -709,7 +709,7 @@
+ png_read_info(pngPtr, infoPtr) ;
+
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
[arch-commits] Commit in libwebkit/repos (6 files)
Date: Friday, January 20, 2012 @ 16:25:43
Author: eric
Revision: 147026
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libwebkit/repos/staging-i686/
libwebkit/repos/staging-i686/PKGBUILD
(from rev 147025, libwebkit/trunk/PKGBUILD)
libwebkit/repos/staging-i686/libwebkit.install
(from rev 147025, libwebkit/trunk/libwebkit.install)
libwebkit/repos/staging-x86_64/
libwebkit/repos/staging-x86_64/PKGBUILD
(from rev 147025, libwebkit/trunk/PKGBUILD)
libwebkit/repos/staging-x86_64/libwebkit.install
(from rev 147025, libwebkit/trunk/libwebkit.install)
--+
staging-i686/PKGBUILD| 52 +
staging-i686/libwebkit.install | 11 +++
staging-x86_64/PKGBUILD | 52 +
staging-x86_64/libwebkit.install | 11 +++
4 files changed, 126 insertions(+)
Copied: libwebkit/repos/staging-i686/PKGBUILD (from rev 147025,
libwebkit/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-20 21:25:43 UTC (rev 147026)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Andreas Radke
+
+pkgbase=libwebkit
+pkgname=(libwebkit libwebkit3)
+pkgver=1.6.1
+pkgrel=2
+pkgdesc="An opensource web content engine"
+arch=('i686' 'x86_64')
+url="http://webkitgtk.org/";
+license=('custom')
+depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup'
'enchant')
+makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
+options=('!libtool' '!emptydirs')
+install=libwebkit.install
+source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
+md5sums=('c11743694b1b71dad287b2e7a9e73b05')
+
+build() {
+ cd "${srcdir}/webkit-${pkgver}"
+ mkdir build-gtk{2,3}
+
+ ( cd build-gtk2 && _build --with-gtk=2.0 )
+ ( cd build-gtk3 && _build --with-gtk=3.0 )
+}
+
+_build() {
+ PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+--enable-introspection \
+--with-font-backend=freetype --enable-gtk-doc \
+--with-unicode-backend=icu \
+--enable-spellcheck "$@"
+ make all stamp-po
+}
+
+package_libwebkit() {
+ pkgdesc+=" (for GTK2)"
+ depends+=(gtk2)
+
+ cd "$srcdir/webkit-$pkgver/build-gtk2"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 ../Source/WebKit/LICENSE
"${pkgdir}/usr/share/licenses/libwebkit/LICENSE"
+}
+
+package_libwebkit3() {
+ pkgdesc+=" (for GTK3)"
+ depends+=(gtk3)
+
+ cd "${srcdir}/webkit-${pkgver}/build-gtk3"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 ../Source/WebKit/LICENSE
"${pkgdir}/usr/share/licenses/libwebkit3/LICENSE"
+}
Copied: libwebkit/repos/staging-i686/libwebkit.install (from rev 147025,
libwebkit/trunk/libwebkit.install)
===
--- staging-i686/libwebkit.install (rev 0)
+++ staging-i686/libwebkit.install 2012-01-20 21:25:43 UTC (rev 147026)
@@ -0,0 +1,11 @@
+post_install() {
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: libwebkit/repos/staging-x86_64/PKGBUILD (from rev 147025,
libwebkit/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-20 21:25:43 UTC (rev 147026)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Andreas Radke
+
+pkgbase=libwebkit
+pkgname=(libwebkit libwebkit3)
+pkgver=1.6.1
+pkgrel=2
+pkgdesc="An opensource web content engine"
+arch=('i686' 'x86_64')
+url="http://webkitgtk.org/";
+license=('custom')
+depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup'
'enchant')
+makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
+options=('!libtool' '!emptydirs')
+install=libwebkit.install
+source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
+md5sums=('c11743694b1b71dad287b2e7a9e73b05')
+
+build() {
+ cd "${srcdir}/webkit-${pkgver}"
+ mkdir build-gtk{2,3}
+
+ ( cd build-gtk2 && _build --with-gtk=2.0 )
+ ( cd build-gtk3 && _build --with-gtk=3.0 )
+}
+
+_build() {
+ PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+--enable-introspection \
+--with-font-backend=freetype --enable-gtk-doc \
+--with-unicode-backend=icu \
+--enable-spellcheck "$@"
+ make all stamp-po
+}
+
+package_libwebkit() {
+ pkgdesc+=" (for GTK2)"
+ depends+=(gtk2)
+
+ cd "$srcdir/webkit-$pkgver/build-gtk2"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 ../Source/WebKit/LICENSE
"${pkgdir}/usr/share/licenses/libwebkit/LICENSE"
+}
+
+package_libwebkit3() {
+ pkgdesc+=" (for GTK3)"
+ depends+=(gtk3)
+
+ cd "${srcdir}/webkit-${pkgver}/build-gtk3"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 ../Source/WebKit/LICENSE
"${pkgdir}/usr/share/licenses/libwebkit3/LICENSE"
+}
C
[arch-commits] Commit in libwebkit/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 16:25:18
Author: eric
Revision: 147025
upgpkg: libwebkit 1.6.1-2
Rebuild against libpng 1.5 and libtiff 4.0
Modified:
libwebkit/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 21:12:16 UTC (rev 147024)
+++ PKGBUILD2012-01-20 21:25:18 UTC (rev 147025)
@@ -4,7 +4,7 @@
pkgbase=libwebkit
pkgname=(libwebkit libwebkit3)
pkgver=1.6.1
-pkgrel=1
+pkgrel=2
pkgdesc="An opensource web content engine"
arch=('i686' 'x86_64')
url="http://webkitgtk.org/";
[arch-commits] Commit in nx-common/repos (10 files)
Date: Friday, January 20, 2012 @ 16:12:16
Author: andyrtr
Revision: 147024
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
nx-common/repos/staging-i686/
nx-common/repos/staging-i686/NXproto.h.64bit.diff
(from rev 147023, nx-common/trunk/NXproto.h.64bit.diff)
nx-common/repos/staging-i686/PKGBUILD
(from rev 147023, nx-common/trunk/PKGBUILD)
nx-common/repos/staging-i686/nx-3.5.0-libpng15.patch
(from rev 147023, nx-common/trunk/nx-3.5.0-libpng15.patch)
nx-common/repos/staging-i686/nxcompsh-gcc43.patch
(from rev 147023, nx-common/trunk/nxcompsh-gcc43.patch)
nx-common/repos/staging-x86_64/
nx-common/repos/staging-x86_64/NXproto.h.64bit.diff
(from rev 147023, nx-common/trunk/NXproto.h.64bit.diff)
nx-common/repos/staging-x86_64/PKGBUILD
(from rev 147023, nx-common/trunk/PKGBUILD)
nx-common/repos/staging-x86_64/nx-3.5.0-libpng15.patch
(from rev 147023, nx-common/trunk/nx-3.5.0-libpng15.patch)
nx-common/repos/staging-x86_64/nxcompsh-gcc43.patch
(from rev 147023, nx-common/trunk/nxcompsh-gcc43.patch)
+
staging-i686/NXproto.h.64bit.diff | 66 +++
staging-i686/PKGBUILD | 59 +++
staging-i686/nx-3.5.0-libpng15.patch | 30 ++
staging-i686/nxcompsh-gcc43.patch | 19
staging-x86_64/NXproto.h.64bit.diff| 66 +++
staging-x86_64/PKGBUILD| 59 +++
staging-x86_64/nx-3.5.0-libpng15.patch | 30 ++
staging-x86_64/nxcompsh-gcc43.patch| 19
8 files changed, 348 insertions(+)
Copied: nx-common/repos/staging-i686/NXproto.h.64bit.diff (from rev 147023,
nx-common/trunk/NXproto.h.64bit.diff)
===
--- staging-i686/NXproto.h.64bit.diff (rev 0)
+++ staging-i686/NXproto.h.64bit.diff 2012-01-20 21:12:16 UTC (rev 147024)
@@ -0,0 +1,66 @@
+--- nxcomp.old/NXproto.h 2006-06-19 19:55:56.0 +0200
nxcomp/NXproto.h 2007-02-12 18:17:41.0 +0100
+@@ -26,6 +26,30 @@
+ #include
+ #include
+
++/*
++ Copied from Xproto.h
++ */
++
++/* For the purpose of the structure definitions in this file,
++we must redefine the following types in terms of Xmd.h's types, which may
++include bit fields. All of these are #undef'd at the end of this file,
++restoring the definitions in X.h. */
++
++#define Window CARD32
++#define Drawable CARD32
++#define Font CARD32
++#define Pixmap CARD32
++#define Cursor CARD32
++#define Colormap CARD32
++#define GContext CARD32
++#define Atom CARD32
++#define VisualID CARD32
++#define Time CARD32
++#define KeyCode CARD8
++#define KeySym CARD32
++
++/* End copied from Xproto.h */
++
+ #define sz_xNXGetControlParametersReq 4
+ #define sz_xNXGetCleanupParametersReq 4
+ #define sz_xNXGetImageParametersReq 4
+@@ -343,9 +367,9 @@
+ CARD8dstDepth;
+ CARD32 srcLength B32;
+ CARD32 dstLength B32;
+-INT16srcX B16, srcY B16;
++CARD16srcX B16, srcY B16;
+ CARD16 srcWidth B16, srcHeight B16;
+-INT16dstX B16, dstY B16;
++CARD16dstX B16, dstY B16;
+ CARD16 dstWidth B16, dstHeight B16;
+ } xNXPutPackedImageReq;
+
+@@ -463,4 +487,20 @@
+ }
+ #endif
+
++/* Copied from Xproto.h */
++
++/* restore these definitions back to the typedefs in X.h */
++#undef Window
++#undef Drawable
++#undef Font
++#undef Pixmap
++#undef Cursor
++#undef Colormap
++#undef GContext
++#undef Atom
++#undef VisualID
++#undef Time
++#undef KeyCode
++#undef KeySym
++
+ #endif /* NXproto_H */
Copied: nx-common/repos/staging-i686/PKGBUILD (from rev 147023,
nx-common/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-20 21:12:16 UTC (rev 147024)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Tobias Powalowski
+# Contributed: eliott , Andre Naumann
+
+pkgname=nx-common
+pkgver=3.5.0
+pkgrel=3
+pkgdesc="NoMachine NX common package for client and server"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://nomachine.com/";
+depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.5.7' 'openssl>=1.0.0' 'gcc-libs'
'bash')
+makedepends=('xorg-server-devel')
+source=( #Compression libs and proxy sources
+ http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz
+ http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
+ http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
+ nxcompsh-gcc43.patch
+ nx-3.5.0-libpng15.patch)
+options=(!libtool)
+md5sums=('ad8c0f133122c6d07732ca69c8759410'
+ '84ade443b79ea079380b754aba9d392e'
+ 'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
+ 'b6c279654dac421fc3dd1a27d66ff53c'
+ '2966353cabb96829eab291212
[arch-commits] Commit in nx-common/trunk (PKGBUILD nx-3.5.0-libpng15.patch)
Date: Friday, January 20, 2012 @ 16:11:29
Author: andyrtr
Revision: 147023
upgpkg: nx-common 3.5.0-3
libpng rebuild
Added:
nx-common/trunk/nx-3.5.0-libpng15.patch
Modified:
nx-common/trunk/PKGBUILD
-+
PKGBUILD| 13 +
nx-3.5.0-libpng15.patch | 30 ++
2 files changed, 39 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 20:50:51 UTC (rev 147022)
+++ PKGBUILD2012-01-20 21:11:29 UTC (rev 147023)
@@ -4,32 +4,37 @@
pkgname=nx-common
pkgver=3.5.0
-pkgrel=2
+pkgrel=3
pkgdesc="NoMachine NX common package for client and server"
arch=('i686' 'x86_64')
license=('GPL')
url="http://nomachine.com/";
-depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.4.5' 'openssl>=1.0.0' 'gcc-libs'
'bash')
+depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.5.7' 'openssl>=1.0.0' 'gcc-libs'
'bash')
makedepends=('xorg-server-devel')
source=( #Compression libs and proxy sources
http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz
http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
- nxcompsh-gcc43.patch)
+ nxcompsh-gcc43.patch
+ nx-3.5.0-libpng15.patch)
options=(!libtool)
md5sums=('ad8c0f133122c6d07732ca69c8759410'
'84ade443b79ea079380b754aba9d392e'
'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
- 'b6c279654dac421fc3dd1a27d66ff53c')
+ 'b6c279654dac421fc3dd1a27d66ff53c'
+ '2966353cabb96829eab291212ef078dc')
build() {
# nxcomp
cd ${srcdir}/nxcomp
+ patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
+
./configure --prefix=/opt/NX
make
# nxcompsh
cd ${srcdir}/nxcompsh
patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
+
./configure --prefix=/opt/NX
make
# nxssh
Added: nx-3.5.0-libpng15.patch
===
--- nx-3.5.0-libpng15.patch (rev 0)
+++ nx-3.5.0-libpng15.patch 2012-01-20 21:11:29 UTC (rev 147023)
@@ -0,0 +1,30 @@
+diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
+--- nxcomp.orig/Pgn.cpp2010-03-01 19:18:59.0 +0200
nxcomp/Pgn.cpp 2011-09-13 16:35:12.0 +0300
+@@ -414,7 +414,7 @@
+
+ png_read_info(pngPtr, infoPtr);
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
+@@ -565,7 +565,7 @@
+
+ png_read_info( pngPtr, infoPtr ) ;
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
+@@ -709,7 +709,7 @@
+ png_read_info(pngPtr, infoPtr) ;
+
+
+- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_set_expand(pngPtr);
+ }
[arch-commits] Commit in freeglut/repos (4 files)
Date: Friday, January 20, 2012 @ 15:50:51
Author: heftig
Revision: 147022
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
freeglut/repos/testing-i686/
freeglut/repos/testing-i686/PKGBUILD
(from rev 147021, freeglut/trunk/PKGBUILD)
freeglut/repos/testing-x86_64/
freeglut/repos/testing-x86_64/PKGBUILD
(from rev 147021, freeglut/trunk/PKGBUILD)
-+
testing-i686/PKGBUILD | 31 +++
testing-x86_64/PKGBUILD | 31 +++
2 files changed, 62 insertions(+)
Copied: freeglut/repos/testing-i686/PKGBUILD (from rev 147021,
freeglut/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-20 20:50:51 UTC (rev 147022)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Eric Belanger
+# Contributor: Tom Newsom
+
+pkgname=freeglut
+pkgver=2.8.0
+pkgrel=1
+pkgdesc="Provides functionality for small OpenGL programs"
+arch=('i686' 'x86_64')
+url="http://freeglut.sourceforge.net/";
+license=('MIT')
+depends=('libxxf86vm' 'mesa' 'libxi')
+replaces=('glut')
+provides=('glut')
+conflicts=('glut')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5db8651af306bc403fbfd36934a20e1d')
+sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --disable-static
+ make all
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: freeglut/repos/testing-x86_64/PKGBUILD (from rev 147021,
freeglut/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-01-20 20:50:51 UTC (rev 147022)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Eric Belanger
+# Contributor: Tom Newsom
+
+pkgname=freeglut
+pkgver=2.8.0
+pkgrel=1
+pkgdesc="Provides functionality for small OpenGL programs"
+arch=('i686' 'x86_64')
+url="http://freeglut.sourceforge.net/";
+license=('MIT')
+depends=('libxxf86vm' 'mesa' 'libxi')
+replaces=('glut')
+provides=('glut')
+conflicts=('glut')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5db8651af306bc403fbfd36934a20e1d')
+sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --disable-static
+ make all
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
[arch-commits] Commit in freeglut/trunk (2.6.0-GFX_radeon.patch ChangeLog PKGBUILD)
Date: Friday, January 20, 2012 @ 15:49:40
Author: heftig
Revision: 147021
2.8.0
Modified:
freeglut/trunk/PKGBUILD
Deleted:
freeglut/trunk/2.6.0-GFX_radeon.patch
freeglut/trunk/ChangeLog
+
2.6.0-GFX_radeon.patch | 28
ChangeLog |8
PKGBUILD | 23 +++
3 files changed, 11 insertions(+), 48 deletions(-)
Deleted: 2.6.0-GFX_radeon.patch
===
--- 2.6.0-GFX_radeon.patch 2012-01-20 20:01:07 UTC (rev 147020)
+++ 2.6.0-GFX_radeon.patch 2012-01-20 20:49:40 UTC (rev 147021)
@@ -1,28 +0,0 @@
-Index: src/freeglut_window.c
-===
src/freeglut_window.c (Revision 832)
-+++ src/freeglut_window.c (Arbeitskopie)
-@@ -594,10 +594,9 @@
- #if TARGET_HOST_POSIX_X11
- if ( window )
- {
--glXMakeContextCurrent(
-+glXMakeCurrent(
- fgDisplay.Display,
- window->Window.Handle,
--window->Window.Handle,
- window->Window.Context
- );
-
-@@ -932,10 +932,9 @@
- XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
- &fgDisplay.DeleteWindow, 1 );
-
--glXMakeContextCurrent(
-+glXMakeCurrent(
- fgDisplay.Display,
- window->Window.Handle,
--window->Window.Handle,
- window->Window.Context
- );
-
Deleted: ChangeLog
===
--- ChangeLog 2012-01-20 20:01:07 UTC (rev 147020)
+++ ChangeLog 2012-01-20 20:49:40 UTC (rev 147021)
@@ -1,8 +0,0 @@
-2009-12-30 Eric Belanger
-
- * freeglut 2.6.0-1
- * Upstream update
- * Added libxi depends
- * Changed license to MIT
- * Added patch to fix an issue with the radeon[hd] ATI opensource drivers
- * Added ChangeLog
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 20:01:07 UTC (rev 147020)
+++ PKGBUILD2012-01-20 20:49:40 UTC (rev 147021)
@@ -3,7 +3,7 @@
# Contributor: Tom Newsom
pkgname=freeglut
-pkgver=2.6.0
+pkgver=2.8.0
pkgrel=1
pkgdesc="Provides functionality for small OpenGL programs"
arch=('i686' 'x86_64')
@@ -14,19 +14,18 @@
provides=('glut')
conflicts=('glut')
options=('!libtool')
-source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz \
-2.6.0-GFX_radeon.patch)
-md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3')
-sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b'
'2e392c7d0b60016ec89e6a5edf504f5722351b95')
+source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5db8651af306bc403fbfd36934a20e1d')
+sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
-# fixes an issue with the radeon[hd] ATI opensource drivers
-# ref: http://bugs.gentoo.org/show_bug.cgi?id=295163
- patch -p0 -i "${srcdir}/2.6.0-GFX_radeon.patch" || return 1
+ ./configure --prefix=/usr --disable-static
+ make all
+}
- ./configure --prefix=/usr || return 1
- make all || return 1
- make DESTDIR="${pkgdir}" install || return 1
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|| return 1
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
[arch-commits] Commit in transcode/repos (8 files)
Date: Friday, January 20, 2012 @ 15:01:07
Author: giovanni
Revision: 147020
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
transcode/repos/staging-i686/
transcode/repos/staging-i686/PKGBUILD
(from rev 147019, transcode/trunk/PKGBUILD)
transcode/repos/staging-i686/subtitleripper-0.3.4-linkingorder.patch
(from rev 147019, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
transcode/repos/staging-i686/subtitleripper-0.3.4-respect-ldflags.patch
(from rev 147019,
transcode/trunk/subtitleripper-0.3.4-respect-ldflags.patch)
transcode/repos/staging-x86_64/
transcode/repos/staging-x86_64/PKGBUILD
(from rev 147019, transcode/trunk/PKGBUILD)
transcode/repos/staging-x86_64/subtitleripper-0.3.4-linkingorder.patch
(from rev 147019, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
transcode/repos/staging-x86_64/subtitleripper-0.3.4-respect-ldflags.patch
(from rev 147019,
transcode/trunk/subtitleripper-0.3.4-respect-ldflags.patch)
---+
staging-i686/PKGBUILD | 57
staging-i686/subtitleripper-0.3.4-linkingorder.patch | 28 +
staging-i686/subtitleripper-0.3.4-respect-ldflags.patch | 28 +
staging-x86_64/PKGBUILD | 57
staging-x86_64/subtitleripper-0.3.4-linkingorder.patch| 28 +
staging-x86_64/subtitleripper-0.3.4-respect-ldflags.patch | 28 +
6 files changed, 226 insertions(+)
Copied: transcode/repos/staging-i686/PKGBUILD (from rev 147019,
transcode/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-20 20:01:07 UTC (rev 147020)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer:
+# Contributor: Sarah Hay
+# Contributor: roberto
+
+pkgname=transcode
+_sripver=0.3-4
+pkgver=1.1.7
+pkgrel=2
+pkgdesc="A video/DVD ripper and encoder for the terminal/console"
+arch=('i686' 'x86_64')
+url="http://tcforge.berlios.de/";
+license=('GPL')
+depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
+'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
+makedepends=('nasm')
+options=('!libtool')
+source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
+
http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
+subtitleripper-0.3.4-linkingorder.patch
subtitleripper-0.3.4-respect-ldflags.patch)
+sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
+ 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
+ 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
+ '591943a33235342a66c3df0625a164a1479c09ae')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr \
+--disable-sse --disable-sse2 --disable-altivec --enable-mmx \
+--enable-lame --enable-ogg --enable-vorbis --enable-theora \
+--enable-libdv --enable-libxml2 --enable-v4l \
+--enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
+--enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
+--enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2
--enable-libmpeg2convert
+ make
+
+ cd "${srcdir}/subtitleripper"
+ patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
+ patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
+ sed -e 's|^\(.*lppm.*\)$|#\1|' \
+ -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
+ -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
+ -i Makefile
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ cd "${srcdir}/subtitleripper"
+ install -m 755 pgm2txt "${pkgdir}/usr/bin/"
+ install -m 755 srttool "${pkgdir}/usr/bin/"
+ install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
+ install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
+ install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
+}
Copied: transcode/repos/staging-i686/subtitleripper-0.3.4-linkingorder.patch
(from rev 147019, transcode/trunk/subtitleripper-0.3.4-linkingorder.patch)
===
--- staging-i686/subtitleripper-0.3.4-linkingorder.patch
(rev 0)
+++ staging-i686/subtitleripper-0.3.4-linkingorder.patch2012-01-20
20:01:07 UTC (rev 147020)
@@ -0,0 +1,28 @@
+Index: subtitleripper/Makefile
+===
+--- subtitleripper.orig/Makefile
subtitleripper/Makefile
+@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
+ # Target
+ subtitle2pgm: subtitle2pgm.o spudec.o
+ @echo "Linking $@"
+- @$(CC) $(LIBS) $^ -o $@
++ @$(CC) $^ -o $@ $(LIBS)
+
+ subtitle2vobsub: subtitle2vobsub.o vobsub.o
+ @echo "Linking $@"
+- @$(CC) $(LIBS) $^ -o $@
++ @$(CC) $^ -o $
[arch-commits] Commit in transcode/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 15:00:43
Author: giovanni
Revision: 147019
upgpkg: transcode 1.1.7-2
libpng 1.5 rebuild
Modified:
transcode/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 19:49:39 UTC (rev 147018)
+++ PKGBUILD2012-01-20 20:00:43 UTC (rev 147019)
@@ -6,7 +6,7 @@
pkgname=transcode
_sripver=0.3-4
pkgver=1.1.7
-pkgrel=1
+pkgrel=2
pkgdesc="A video/DVD ripper and encoder for the terminal/console"
arch=('i686' 'x86_64')
url="http://tcforge.berlios.de/";
[arch-commits] Commit in tuxpuck/repos (8 files)
Date: Friday, January 20, 2012 @ 14:49:39
Author: giovanni
Revision: 147018
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
tuxpuck/repos/staging-i686/
tuxpuck/repos/staging-i686/PKGBUILD
(from rev 147017, tuxpuck/trunk/PKGBUILD)
tuxpuck/repos/staging-i686/tuxpuck-0.8.2-ldflags.patch
(from rev 147017, tuxpuck/trunk/tuxpuck-0.8.2-ldflags.patch)
tuxpuck/repos/staging-i686/tuxpuck-0.8.2-libpng15.patch
(from rev 147017, tuxpuck/trunk/tuxpuck-0.8.2-libpng15.patch)
tuxpuck/repos/staging-x86_64/
tuxpuck/repos/staging-x86_64/PKGBUILD
(from rev 147017, tuxpuck/trunk/PKGBUILD)
tuxpuck/repos/staging-x86_64/tuxpuck-0.8.2-ldflags.patch
(from rev 147017, tuxpuck/trunk/tuxpuck-0.8.2-ldflags.patch)
tuxpuck/repos/staging-x86_64/tuxpuck-0.8.2-libpng15.patch
(from rev 147017, tuxpuck/trunk/tuxpuck-0.8.2-libpng15.patch)
-+
staging-i686/PKGBUILD | 41
staging-i686/tuxpuck-0.8.2-ldflags.patch| 11
staging-i686/tuxpuck-0.8.2-libpng15.patch | 63 ++
staging-x86_64/PKGBUILD | 41
staging-x86_64/tuxpuck-0.8.2-ldflags.patch | 11
staging-x86_64/tuxpuck-0.8.2-libpng15.patch | 63 ++
6 files changed, 230 insertions(+)
Copied: tuxpuck/repos/staging-i686/PKGBUILD (from rev 147017,
tuxpuck/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-20 19:49:39 UTC (rev 147018)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Tobias Powalowski
+
+pkgname=tuxpuck
+pkgver=0.8.2
+pkgrel=5
+pkgdesc="Airhockey with tux"
+arch=('i686' 'x86_64')
+url="http://home.no.net/munsuun/tuxpuck/";
+license=('GPL2')
+depends=('libjpeg' 'sdl' 'libpng' 'libvorbis')
+makedepends=('freetype2')
+options=('!makeflags')
+source=("http://ftp.de.debian.org/debian/pool/main/t/${pkgname}/${pkgname}_$pkgver.orig.tar.gz";
+'tuxpuck-0.8.2-ldflags.patch'
+'tuxpuck-0.8.2-libpng15.patch')
+md5sums=('fc839abc2b1f3eafae397e1ed6487079'
+ 'cb914d211bf3f519b7700fda180612b0'
+ 'a4da530d670a0c30ac0840aab1db0dca')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ sed -i 's|usr/man|usr/share/man|' Makefile
+ sed -i -e 's/-Werror//' \
+ -e '/^CC/d' \
+ Makefile \
+ utils/Makefile \
+ data/Makefile
+
+ patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-ldflags.patch"
+ patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-libpng15.patch"
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR=$pkgdir install
+}
Copied: tuxpuck/repos/staging-i686/tuxpuck-0.8.2-ldflags.patch (from rev
147017, tuxpuck/trunk/tuxpuck-0.8.2-ldflags.patch)
===
--- staging-i686/tuxpuck-0.8.2-ldflags.patch(rev 0)
+++ staging-i686/tuxpuck-0.8.2-ldflags.patch2012-01-20 19:49:39 UTC (rev
147018)
@@ -0,0 +1,11 @@
+--- Makefile.old 2010-10-05 10:34:57.0 +0200
Makefile 2010-10-05 10:35:28.0 +0200
+@@ -20,7 +20,7 @@
+
+ $(NAME) : $(OBJS)
+ cd data; $(MAKE)
+- $(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
++ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs`
-lm -lpng \
+ -ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
+
+ w32icon.o : data/icons/tuxpuck.ico
Copied: tuxpuck/repos/staging-i686/tuxpuck-0.8.2-libpng15.patch (from rev
147017, tuxpuck/trunk/tuxpuck-0.8.2-libpng15.patch)
===
--- staging-i686/tuxpuck-0.8.2-libpng15.patch (rev 0)
+++ staging-i686/tuxpuck-0.8.2-libpng15.patch 2012-01-20 19:49:39 UTC (rev
147018)
@@ -0,0 +1,63 @@
+--- png.c.old 2011-09-14 16:25:54.415338149 +0200
png.c 2011-09-14 17:41:02.190803110 +0200
+@@ -38,6 +38,8 @@
+ png_color_16 *transv;
+ SDL_RWops *src = NULL;
+ Uint32 size;
++ int num_palette;
++ png_colorp png_palette;
+
+ memcpy(&size, data, sizeof(Uint32));
+ if (memcounter)
+@@ -74,7 +76,7 @@
+* the normal method of doing things with libpng). REQUIRED unless you
+* set up your own error handlers in png_create_read_struct() earlier.
+*/
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ SDL_SetError("Error reading the PNG file.");
+ goto done;
+ }
+@@ -142,9 +144,9 @@
+ Rmask = 0x00FF;
+ Gmask = 0xFF00;
+ Bmask = 0x00FF;
+- Amask = (info_ptr->channels == 4) ? 0xFF00 : 0;
++ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF00 : 0;
+ } else {
+- int s = (info_ptr->channels == 4) ? 0 : 8;
++ int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+ Rmask = 0xFF00 >> s;
+ Gmask = 0x00FF >> s;
+
[arch-commits] Commit in tuxpuck/trunk (3 files)
Date: Friday, January 20, 2012 @ 14:49:14
Author: giovanni
Revision: 147017
upgpkg: tuxpuck 0.8.2-5
libpng 1.5 rebuild
Added:
tuxpuck/trunk/tuxpuck-0.8.2-ldflags.patch
tuxpuck/trunk/tuxpuck-0.8.2-libpng15.patch
Modified:
tuxpuck/trunk/PKGBUILD
--+
PKGBUILD | 33 -
tuxpuck-0.8.2-ldflags.patch | 11 +++
tuxpuck-0.8.2-libpng15.patch | 63 +
3 files changed, 100 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 19:27:51 UTC (rev 147016)
+++ PKGBUILD2012-01-20 19:49:14 UTC (rev 147017)
@@ -3,20 +3,39 @@
pkgname=tuxpuck
pkgver=0.8.2
-pkgrel=4
+pkgrel=5
pkgdesc="Airhockey with tux"
arch=('i686' 'x86_64')
url="http://home.no.net/munsuun/tuxpuck/";
license=('GPL2')
-depends=('libjpeg>=8' 'sdl' 'libpng>=1.4.0' 'libvorbis')
+depends=('libjpeg' 'sdl' 'libpng' 'libvorbis')
makedepends=('freetype2')
options=('!makeflags')
-source=(http://ftp.de.debian.org/debian/pool/main/t/${pkgname}/${pkgname}_$pkgver.orig.tar.gz)
-md5sums=('fc839abc2b1f3eafae397e1ed6487079')
+source=("http://ftp.de.debian.org/debian/pool/main/t/${pkgname}/${pkgname}_$pkgver.orig.tar.gz";
+'tuxpuck-0.8.2-ldflags.patch'
+'tuxpuck-0.8.2-libpng15.patch')
+md5sums=('fc839abc2b1f3eafae397e1ed6487079'
+ 'cb914d211bf3f519b7700fda180612b0'
+ 'a4da530d670a0c30ac0840aab1db0dca')
build() {
cd $srcdir/$pkgname-$pkgver
- sed -i 's|usr/man|usr/share/man|' Makefile || return 1
- make || return 1
- make DESTDIR=$pkgdir install || return 1
+
+ sed -i 's|usr/man|usr/share/man|' Makefile
+ sed -i -e 's/-Werror//' \
+ -e '/^CC/d' \
+ Makefile \
+ utils/Makefile \
+ data/Makefile
+
+ patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-ldflags.patch"
+ patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-libpng15.patch"
+
+ make
}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR=$pkgdir install
+}
Added: tuxpuck-0.8.2-ldflags.patch
===
--- tuxpuck-0.8.2-ldflags.patch (rev 0)
+++ tuxpuck-0.8.2-ldflags.patch 2012-01-20 19:49:14 UTC (rev 147017)
@@ -0,0 +1,11 @@
+--- Makefile.old 2010-10-05 10:34:57.0 +0200
Makefile 2010-10-05 10:35:28.0 +0200
+@@ -20,7 +20,7 @@
+
+ $(NAME) : $(OBJS)
+ cd data; $(MAKE)
+- $(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
++ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs`
-lm -lpng \
+ -ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
+
+ w32icon.o : data/icons/tuxpuck.ico
Added: tuxpuck-0.8.2-libpng15.patch
===
--- tuxpuck-0.8.2-libpng15.patch(rev 0)
+++ tuxpuck-0.8.2-libpng15.patch2012-01-20 19:49:14 UTC (rev 147017)
@@ -0,0 +1,63 @@
+--- png.c.old 2011-09-14 16:25:54.415338149 +0200
png.c 2011-09-14 17:41:02.190803110 +0200
+@@ -38,6 +38,8 @@
+ png_color_16 *transv;
+ SDL_RWops *src = NULL;
+ Uint32 size;
++ int num_palette;
++ png_colorp png_palette;
+
+ memcpy(&size, data, sizeof(Uint32));
+ if (memcounter)
+@@ -74,7 +76,7 @@
+* the normal method of doing things with libpng). REQUIRED unless you
+* set up your own error handlers in png_create_read_struct() earlier.
+*/
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ SDL_SetError("Error reading the PNG file.");
+ goto done;
+ }
+@@ -142,9 +144,9 @@
+ Rmask = 0x00FF;
+ Gmask = 0xFF00;
+ Bmask = 0x00FF;
+- Amask = (info_ptr->channels == 4) ? 0xFF00 : 0;
++ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF00 : 0;
+ } else {
+- int s = (info_ptr->channels == 4) ? 0 : 8;
++ int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+ Rmask = 0xFF00 >> s;
+ Gmask = 0x00FF >> s;
+ Bmask = 0xFF00 >> s;
+@@ -152,7 +154,7 @@
+ }
+ }
+ surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+- bit_depth * info_ptr->channels, Rmask, Gmask,
++ bit_depth * png_get_channels(png_ptr, info_ptr),
Rmask, Gmask,
+Bmask, Amask);
+ if (surface == NULL) {
+ SDL_SetError("Out of memory");
+@@ -197,12 +199,15 @@
+ palette->colors[i].g = i;
+ palette->colors[i].b = i;
+ }
+-} else if (info_ptr->num_palette > 0) {
+- palette->ncolors = info_ptr->num_palette;
+- for (i = 0; i < info_ptr->num_palette; ++i) {
+- palette->colors[i].b = info_ptr->palette[i].blue;
+- palette->colors[i].g = info_ptr->palette[i].green;
+- palette->colors[i].r = info_ptr->palette[i].red;
++} else {
++ png_get_PLTE(png_ptr, info_
[arch-commits] Commit in gnutls/repos (8 files)
Date: Friday, January 20, 2012 @ 14:27:51
Author: andyrtr
Revision: 147016
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnutls/repos/extra-i686/PKGBUILD
(from rev 147015, gnutls/trunk/PKGBUILD)
gnutls/repos/extra-i686/gnutls.install
(from rev 147015, gnutls/trunk/gnutls.install)
gnutls/repos/extra-x86_64/PKGBUILD
(from rev 147015, gnutls/trunk/PKGBUILD)
gnutls/repos/extra-x86_64/gnutls.install
(from rev 147015, gnutls/trunk/gnutls.install)
Deleted:
gnutls/repos/extra-i686/PKGBUILD
gnutls/repos/extra-i686/gnutls.install
gnutls/repos/extra-x86_64/PKGBUILD
gnutls/repos/extra-x86_64/gnutls.install
-+
extra-i686/PKGBUILD | 80 +-
extra-i686/gnutls.install | 40 ++---
extra-x86_64/PKGBUILD | 80 +-
extra-x86_64/gnutls.install | 40 ++---
4 files changed, 120 insertions(+), 120 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-20 19:27:14 UTC (rev 147015)
+++ extra-i686/PKGBUILD 2012-01-20 19:27:51 UTC (rev 147016)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot
-
-pkgname=gnutls
-pkgver=3.0.11
-pkgrel=1
-pkgdesc="A library which provides a secure layer over a reliable transport
layer"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/gnutls/";
-install=gnutls.install
-options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
-makedepends=('valgrind')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('ca3370b39f7910538a0d6c02bec7a142')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --with-zlib \
- --disable-static \
- --disable-guile \
- --enable-valgrind-tests # x86_64 test are all passed. some fail in i686
chroot
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make check # passes all || /bin/true
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- # lots of .png files are put into infodir and are gzipped by makepkg! this
may need to be fixed by using !zipman
- # gzip -9 all files in infodir and manpages manually
- find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
- find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
-}
Copied: gnutls/repos/extra-i686/PKGBUILD (from rev 147015,
gnutls/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-20 19:27:51 UTC (rev 147016)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot
+
+pkgname=gnutls
+pkgver=3.0.12
+pkgrel=1
+pkgdesc="A library which provides a secure layer over a reliable transport
layer"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+url="http://www.gnu.org/software/gnutls/";
+install=gnutls.install
+options=('!libtool' '!zipman' '!makeflags')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
+makedepends=('valgrind')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
+md5sums=('685fe5c00786c04b39e9aac362fa0cac')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr \
+ --with-zlib \
+ --disable-static \
+ --disable-guile \
+ --enable-valgrind-tests # x86_64 test are all passed. some fail in i686
chroot
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check # passes all || /bin/true
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ # lots of .png files are put into infodir and are gzipped by makepkg! this
may need to be fixed by using !zipman
+ # gzip -9 all files in infodir and manpages manually
+ find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
+ find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
+}
Deleted: extra-i686/gnutls.install
===
--- extra-i686/gnutls.install 2012-01-20 19:27:14 UTC (rev 147015)
+++ extra-i686/gnutls.install 2012-01-20 19:27:51 UTC (rev 147016)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info.gz)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-install-info $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
Copied: gnutls/repos/extra-i686/gnutls.install (from rev 147015,
gnutls/trunk/gnutls.install)
===
--- ex
[arch-commits] Commit in gnutls/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 14:27:14
Author: andyrtr
Revision: 147015
upgpkg: gnutls 3.0.12-1
upstream update 3.0.12
Modified:
gnutls/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 18:50:13 UTC (rev 147014)
+++ PKGBUILD2012-01-20 19:27:14 UTC (rev 147015)
@@ -2,18 +2,18 @@
# Maintainer: Jan de Groot
pkgname=gnutls
-pkgver=3.0.11
+pkgver=3.0.12
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport
layer"
arch=('i686' 'x86_64')
license=('GPL3' 'LGPL')
url="http://www.gnu.org/software/gnutls/";
install=gnutls.install
-options=('!libtool' '!zipman')
+options=('!libtool' '!zipman' '!makeflags')
depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
makedepends=('valgrind')
source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('ca3370b39f7910538a0d6c02bec7a142')
+md5sums=('685fe5c00786c04b39e9aac362fa0cac')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in streamtuner/repos (8 files)
Date: Friday, January 20, 2012 @ 13:50:13
Author: andyrtr
Revision: 147014
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
streamtuner/repos/staging-i686/
streamtuner/repos/staging-i686/PKGBUILD
(from rev 147013, streamtuner/trunk/PKGBUILD)
streamtuner/repos/staging-i686/shoutcast-redesign-patch.diff
(from rev 147013, streamtuner/trunk/shoutcast-redesign-patch.diff)
streamtuner/repos/staging-i686/streamtuner-0.99.99-shoutcast.diff
(from rev 147013, streamtuner/trunk/streamtuner-0.99.99-shoutcast.diff)
streamtuner/repos/staging-x86_64/
streamtuner/repos/staging-x86_64/PKGBUILD
(from rev 147013, streamtuner/trunk/PKGBUILD)
streamtuner/repos/staging-x86_64/shoutcast-redesign-patch.diff
(from rev 147013, streamtuner/trunk/shoutcast-redesign-patch.diff)
streamtuner/repos/staging-x86_64/streamtuner-0.99.99-shoutcast.diff
(from rev 147013, streamtuner/trunk/streamtuner-0.99.99-shoutcast.diff)
---+
staging-i686/PKGBUILD | 49
staging-i686/shoutcast-redesign-patch.diff| 12
staging-i686/streamtuner-0.99.99-shoutcast.diff | 41
staging-x86_64/PKGBUILD | 49
staging-x86_64/shoutcast-redesign-patch.diff | 12
staging-x86_64/streamtuner-0.99.99-shoutcast.diff | 41
6 files changed, 204 insertions(+)
Copied: streamtuner/repos/staging-i686/PKGBUILD (from rev 147013,
streamtuner/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-20 18:50:13 UTC (rev 147014)
@@ -0,0 +1,49 @@
+# $Id$
+# Contributor: Greg Grabinski
+# Maintainer: ndreas Radke
+
+pkgname=streamtuner
+pkgver=0.99.99
+pkgrel=12
+pkgdesc="A stream directory browser"
+arch=('i686' 'x86_64')
+url="http://www.nongnu.org/streamtuner/";
+license=('custom')
+depends=('taglib' 'libxml2' 'gtk2' 'curl>=7.16.2' 'pygtk>=2.13.0-2')
+conflicts=('streamtuner-live365')
+replaces=('streamtuner-live365')
+source=(http://savannah.nongnu.org/download/streamtuner/$pkgname-$pkgver.tar.gz
\
+
http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-live365.diff
\
+
http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-pygtk-2.6.diff
+ streamtuner-0.99.99-shoutcast.diff
+ shoutcast-redesign-patch.diff)
+options=('!libtool' '!emptydirs')
+md5sums=('2027b7c34e85b594524b0b4351c14362'
+ '8aa1994a849b05d2b8fffbda702b8a25'
+ '7aff45a41c60358cb2332c7ce644f661'
+ '1eab6edce130e1a1e5f208cd3ed6766a'
+ '8a3a17a1719a79353d6ad7ac8564947b')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff
+ # fix http://bugs.archlinux.org/task/10308
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff
+ # fix http://bugs.archlinux.org/task/11463
+ patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff
+
+ # python2 fixes
+ sed -i "s:^for ac_prog in python:for ac_prog in python2:"
${srcdir}/${pkgname}-${pkgver}/configure
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make prefix=${pkgdir}/usr install
+
+ #Add license file
+ install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/COPYING
${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
Copied: streamtuner/repos/staging-i686/shoutcast-redesign-patch.diff (from rev
147013, streamtuner/trunk/shoutcast-redesign-patch.diff)
===
--- staging-i686/shoutcast-redesign-patch.diff (rev 0)
+++ staging-i686/shoutcast-redesign-patch.diff 2012-01-20 18:50:13 UTC (rev
147014)
@@ -0,0 +1,12 @@
+diff -uar streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c
streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c
+--- streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c 2008-09-12
18:04:00.229785732 -0400
streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c
2008-09-12 18:05:56.716440720 -0400
+@@ -37,7 +37,7 @@
+
+ /*** cpp
*/
+
+-#define SHOUTCAST_ROOT"http://www.shoutcast.com/";
++#define SHOUTCAST_ROOT"http://classic.shoutcast.com/";
+
+ #define MAX_STREAMS_PER_PAGE 100 /* enforced by SHOUTcast */
+
Copied: streamtuner/repos/staging-i686/streamtuner-0.99.99-shoutcast.diff (from
rev 147013, streamtuner/trunk/streamtuner-0.99.99-shoutcast.diff)
===
--- staging-i686/streamtuner-0.99.99-shoutcast.diff
(rev 0)
+++ staging-i686/streamtuner-0.99.99-shoutcast.diff 2012-01-20 18:50:1
[arch-commits] Commit in streamtuner/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 13:49:36
Author: andyrtr
Revision: 147013
upgpkg: streamtuner 0.99.99-12
#libpng rebuild
Modified:
streamtuner/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 18:44:12 UTC (rev 147012)
+++ PKGBUILD2012-01-20 18:49:36 UTC (rev 147013)
@@ -4,7 +4,7 @@
pkgname=streamtuner
pkgver=0.99.99
-pkgrel=11
+pkgrel=12
pkgdesc="A stream directory browser"
arch=('i686' 'x86_64')
url="http://www.nongnu.org/streamtuner/";
@@ -26,12 +26,12 @@
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff || return 1
- patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff || return 1
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff
# fix http://bugs.archlinux.org/task/10308
- patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff || return 1
+ patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff
# fix http://bugs.archlinux.org/task/11463
- patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff || return 1
+ patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff
# python2 fixes
sed -i "s:^for ac_prog in python:for ac_prog in python2:"
${srcdir}/${pkgname}-${pkgver}/configure
[arch-commits] Commit in xkeyboard-config/repos/extra-any (3 files)
Date: Friday, January 20, 2012 @ 13:44:12 Author: andyrtr Revision: 147012 archrelease: copy trunk to extra-any Added: xkeyboard-config/repos/extra-any/PKGBUILD (from rev 147011, xkeyboard-config/trunk/PKGBUILD) Deleted: xkeyboard-config/repos/extra-any/PKGBUILD xkeyboard-config/repos/extra-any/git-fixes.patch -+ PKGBUILD| 77 - git-fixes.patch | 2386 -- 2 files changed, 35 insertions(+), 2428 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 147011:147012 to see the changes.
[arch-commits] Commit in xkeyboard-config/trunk (PKGBUILD git-fixes.patch)
Date: Friday, January 20, 2012 @ 13:43:48 Author: andyrtr Revision: 147011 upgpkg: xkeyboard-config 2.5-1 upstream update 2.5 Modified: xkeyboard-config/trunk/PKGBUILD Deleted: xkeyboard-config/trunk/git-fixes.patch -+ PKGBUILD| 25 git-fixes.patch | 2386 -- 2 files changed, 9 insertions(+), 2402 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 147010:147011 to see the changes.
[arch-commits] Commit in java7-openjdk/repos (26 files)
Date: Friday, January 20, 2012 @ 13:19:59 Author: andyrtr Revision: 147010 archrelease: copy trunk to staging-i686, staging-x86_64 Added: java7-openjdk/repos/staging-i686/ java7-openjdk/repos/staging-i686/PKGBUILD (from rev 147009, java7-openjdk/trunk/PKGBUILD) java7-openjdk/repos/staging-i686/fix_corba_cmds_path.diff (from rev 147009, java7-openjdk/trunk/fix_corba_cmds_path.diff) java7-openjdk/repos/staging-i686/fontconfig-paths.diff (from rev 147009, java7-openjdk/trunk/fontconfig-paths.diff) java7-openjdk/repos/staging-i686/glibc2_15.diff (from rev 147009, java7-openjdk/trunk/glibc2_15.diff) java7-openjdk/repos/staging-i686/jdk7-openjdk.profile (from rev 147009, java7-openjdk/trunk/jdk7-openjdk.profile) java7-openjdk/repos/staging-i686/jdk7-openjdk.profile.csh (from rev 147009, java7-openjdk/trunk/jdk7-openjdk.profile.csh) java7-openjdk/repos/staging-i686/jre7-openjdk-headless.install (from rev 147009, java7-openjdk/trunk/jre7-openjdk-headless.install) java7-openjdk/repos/staging-i686/jre7-openjdk.install (from rev 147009, java7-openjdk/trunk/jre7-openjdk.install) java7-openjdk/repos/staging-i686/jre7-openjdk.profile (from rev 147009, java7-openjdk/trunk/jre7-openjdk.profile) java7-openjdk/repos/staging-i686/jre7-openjdk.profile.csh (from rev 147009, java7-openjdk/trunk/jre7-openjdk.profile.csh) java7-openjdk/repos/staging-i686/openjdk7_fix_jdk_cmds_path.diff (from rev 147009, java7-openjdk/trunk/openjdk7_fix_jdk_cmds_path.diff) java7-openjdk/repos/staging-i686/openjdk7_nonreparenting-wm.diff (from rev 147009, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff) java7-openjdk/repos/staging-x86_64/ java7-openjdk/repos/staging-x86_64/PKGBUILD (from rev 147009, java7-openjdk/trunk/PKGBUILD) java7-openjdk/repos/staging-x86_64/fix_corba_cmds_path.diff (from rev 147009, java7-openjdk/trunk/fix_corba_cmds_path.diff) java7-openjdk/repos/staging-x86_64/fontconfig-paths.diff (from rev 147009, java7-openjdk/trunk/fontconfig-paths.diff) java7-openjdk/repos/staging-x86_64/glibc2_15.diff (from rev 147009, java7-openjdk/trunk/glibc2_15.diff) java7-openjdk/repos/staging-x86_64/jdk7-openjdk.profile (from rev 147009, java7-openjdk/trunk/jdk7-openjdk.profile) java7-openjdk/repos/staging-x86_64/jdk7-openjdk.profile.csh (from rev 147009, java7-openjdk/trunk/jdk7-openjdk.profile.csh) java7-openjdk/repos/staging-x86_64/jre7-openjdk-headless.install (from rev 147009, java7-openjdk/trunk/jre7-openjdk-headless.install) java7-openjdk/repos/staging-x86_64/jre7-openjdk.install (from rev 147009, java7-openjdk/trunk/jre7-openjdk.install) java7-openjdk/repos/staging-x86_64/jre7-openjdk.profile (from rev 147009, java7-openjdk/trunk/jre7-openjdk.profile) java7-openjdk/repos/staging-x86_64/jre7-openjdk.profile.csh (from rev 147009, java7-openjdk/trunk/jre7-openjdk.profile.csh) java7-openjdk/repos/staging-x86_64/openjdk7_fix_jdk_cmds_path.diff (from rev 147009, java7-openjdk/trunk/openjdk7_fix_jdk_cmds_path.diff) java7-openjdk/repos/staging-x86_64/openjdk7_nonreparenting-wm.diff (from rev 147009, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff) + staging-i686/PKGBUILD | 346 +++ staging-i686/fix_corba_cmds_path.diff | 33 ++ staging-i686/fontconfig-paths.diff | 134 staging-i686/glibc2_15.diff| 232 +++ staging-i686/jdk7-openjdk.profile |6 staging-i686/jdk7-openjdk.profile.csh |1 staging-i686/jre7-openjdk-headless.install | 15 staging-i686/jre7-openjdk.install | 18 + staging-i686/jre7-openjdk.profile |5 staging-i686/jre7-openjdk.profile.csh |5 staging-i686/openjdk7_fix_jdk_cmds_path.diff | 24 + staging-i686/openjdk7_nonreparenting-wm.diff | 58 +++ staging-x86_64/PKGBUILD| 346 +++ staging-x86_64/fix_corba_cmds_path.diff| 33 ++ staging-x86_64/fontconfig-paths.diff | 134 staging-x86_64/glibc2_15.diff | 232 +++ staging-x86_64/jdk7-openjdk.profile|6 staging-x86_64/jdk7-openjdk.profile.csh|1 staging-x86_64/jre7-openjdk-headless.install | 15 staging-x86_64/jre7-openjdk.install| 18 + staging-x86_64/jre7-openjdk.profile|5 staging-x86_64/jre7-openjdk.profile.csh|5 staging-x86_64/openjdk7_fix_jdk_cmds_path.diff | 24 + staging-x86_64/openjdk7_nonreparenting-wm.diff | 58 +++ 24 files changed, 1754 insertions(+) The diff is longer than the limit of 200KB. Use svn diff -r 147009:147010 to see the changes.
[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 13:18:06
Author: andyrtr
Revision: 147009
upgpkg: java7-openjdk 7.b147_2.0-6
libtiff/libpng rebuild; fix source urls, add some missing makedeps
Modified:
java7-openjdk/trunk/PKGBUILD
--+
PKGBUILD | 60 ++--
1 file changed, 30 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 17:00:22 UTC (rev 147008)
+++ PKGBUILD2012-01-20 18:18:06 UTC (rev 147009)
@@ -30,19 +30,19 @@
license=('custom')
options=('!emptydirs')
makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
- 'alsa-lib' 'apache-ant>=1.8.1' 'giflib'
+ 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') #
fastjar`?
[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0
source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
-${_url}/${_OPENJDK_CHANGESET}.tar.gz
# openjdk.tar.gz
-${_url}/corba/${_CORBA_CHANGESET}.tar.gz
# corba.tar.gz
-${_url}/jaxp/${_JAXP_CHANGESET}.tar.gz
# jaxp.tar.gz
-${_url}/jaxws/${_JAXWS_CHANGESET}.tar.gz
# jaxws.tar.gz
-${_url}/jdk/${_JDK_CHANGESET}.tar.gz
# jdk.tar.gz
-${_url}/langtools/${_LANGTOOLS_CHANGESET}.tar.gz
# langtools.tar.gz
-${_url}/hotspot/${_HOTSPOT_CHANGESET}.tar.gz
# hotspot.tar.gz
+${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz
# openjdk.tar.gz
+${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz
# corba.tar.gz
+${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz
# jaxp.tar.gz
+${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz
# jaxws.tar.gz
+${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz
# jdk.tar.gz
+${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz
# langtools.tar.gz
+${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz
# hotspot.tar.gz
fontconfig-paths.diff
fix_corba_cmds_path.diff
openjdk7_fix_jdk_cmds_path.diff
@@ -51,25 +51,15 @@
jdk7-openjdk.profile.csh
jre7-openjdk.profile
jre7-openjdk.profile.csh
- glibc2_15.diff)
-
-#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
-
-noextract=("${_OPENJDK_CHANGESET}.tar.gz"
- "${_CORBA_CHANGESET}.tar.gz"
- "${_JAXP_CHANGESET}.tar.gz"
- "${_JAXWS_CHANGESET}.tar.gz"
- "${_JDK_CHANGESET}.tar.gz"
- "${_LANGTOOLS_CHANGESET}.tar.gz"
- "${_HOTSPOT_CHANGESET}.tar.gz")
+glibc2_15.diff)
md5sums=('752721a037a625001fad7a5fc2013f60'
- '02f31f5e31a12414adab36c5c6e95a8c'
- '382fee08ce3b78271cefd8bed0563f63'
- 'e3e212704d3911a519095b7c28894e9e'
- 'ebed93ff644684a91cb2be7accc0ff84'
- '523f7d111b2c18374b38157e3c539911'
- '5c5910970244cf22b92c54ceec076075'
- '4138cfbde475d28ff69001fd89298650'
+ '4c34ddf70124ea90c79201c1afede3e3'
+ '8f8d222d0a6d363d06b40576da5f1ea2'
+ '4abf34372e34cccd74ad337e487ed790'
+ 'f2f40590a83889b8aa1d4631b705092d'
+ 'd3beed0118bbd93d4651af762eb748c7'
+ 'c8617700b4bd6cd5de1257bc36509bed'
+ 'f10b711b0c784df8707808d9d0f52abd'
'ee1afda124d5927345014ab382ef581e'
'f7e7a212e50abb56a6ef1a2b1bd27405'
'c195c4865b84d9e2e0fd71ac6d88eadb'
@@ -80,6 +70,16 @@
'62443459da0cb28181feb260dc0e5ce7'
'a4293acadff03bdccbc9b412ad288549')
+#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
+
+noextract=("${_OPENJDK_CHANGESET}.tar.gz"
+ "${_CORBA_CHANGESET}.tar.gz"
+ "${_JAXP_CHANGESET}.tar.gz"
+ "${_JAXWS_CHANGESET}.tar.gz"
+ "${_JDK_CHANGESET}.tar.gz"
+ "${_LANGTOOLS_CHANGESET}.tar.gz"
+ "${_HOTSPOT_CHANGESET}.tar.gz")
+
_jvmdir=/usr/lib/jvm/java-7-openjdk
[ "$CARCH" = "x86_64" ] && _JARCH=amd64
@@ -123,7 +123,7 @@
--with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
--enable-pulse-java \
--enable-nss \
-
[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 12:00:22
Author: andyrtr
Revision: 147008
fix download url
Modified:
java7-openjdk/trunk/PKGBUILD
--+
PKGBUILD | 29 ++---
1 file changed, 14 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 16:16:53 UTC (rev 147007)
+++ PKGBUILD2012-01-20 17:00:22 UTC (rev 147008)
@@ -34,16 +34,15 @@
'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') #
fastjar`?
[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive
-#_url=http://icedtea.classpath.org/hg/icedtea7-forest/archive
+_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0
source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
${_url}/${_OPENJDK_CHANGESET}.tar.gz
# openjdk.tar.gz
-${_url}/${_CORBA_CHANGESET}.tar.gz
# corba.tar.gz
-${_url}/${_JAXP_CHANGESET}.tar.gz
# jaxp.tar.gz
-${_url}/${_JAXWS_CHANGESET}.tar.gz
# jaxws.tar.gz
-${_url}/${_JDK_CHANGESET}.tar.gz
# jdk.tar.gz
-${_url}/${_LANGTOOLS_CHANGESET}.tar.gz
# langtools.tar.gz
-${_url}/${_HOTSPOT_CHANGESET}.tar.gz
# hotspot.tar.gz
+${_url}/corba/${_CORBA_CHANGESET}.tar.gz
# corba.tar.gz
+${_url}/jaxp/${_JAXP_CHANGESET}.tar.gz
# jaxp.tar.gz
+${_url}/jaxws/${_JAXWS_CHANGESET}.tar.gz
# jaxws.tar.gz
+${_url}/jdk/${_JDK_CHANGESET}.tar.gz
# jdk.tar.gz
+${_url}/langtools/${_LANGTOOLS_CHANGESET}.tar.gz
# langtools.tar.gz
+${_url}/hotspot/${_HOTSPOT_CHANGESET}.tar.gz
# hotspot.tar.gz
fontconfig-paths.diff
fix_corba_cmds_path.diff
openjdk7_fix_jdk_cmds_path.diff
@@ -64,13 +63,13 @@
"${_LANGTOOLS_CHANGESET}.tar.gz"
"${_HOTSPOT_CHANGESET}.tar.gz")
md5sums=('752721a037a625001fad7a5fc2013f60'
- 'ffb12013564794e9abbffbbbd0c58502'
- '8f8d222d0a6d363d06b40576da5f1ea2'
- '4abf34372e34cccd74ad337e487ed790'
- 'f2f40590a83889b8aa1d4631b705092d'
- 'd3beed0118bbd93d4651af762eb748c7'
- 'c8617700b4bd6cd5de1257bc36509bed'
- 'f10b711b0c784df8707808d9d0f52abd'
+ '02f31f5e31a12414adab36c5c6e95a8c'
+ '382fee08ce3b78271cefd8bed0563f63'
+ 'e3e212704d3911a519095b7c28894e9e'
+ 'ebed93ff644684a91cb2be7accc0ff84'
+ '523f7d111b2c18374b38157e3c539911'
+ '5c5910970244cf22b92c54ceec076075'
+ '4138cfbde475d28ff69001fd89298650'
'ee1afda124d5927345014ab382ef581e'
'f7e7a212e50abb56a6ef1a2b1bd27405'
'c195c4865b84d9e2e0fd71ac6d88eadb'
[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 11:16:53
Author: andyrtr
Revision: 147007
prepare libpng rebuild and fix FS#27959
Modified:
java7-openjdk/trunk/PKGBUILD
--+
PKGBUILD | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 16:11:11 UTC (rev 147006)
+++ PKGBUILD2012-01-20 16:16:53 UTC (rev 147007)
@@ -24,12 +24,12 @@
_bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org";
license=('custom')
options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
+makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
'alsa-lib' 'apache-ant>=1.8.1' 'giflib'
'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') #
fastjar`?
[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
@@ -124,7 +124,7 @@
--with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
--enable-pulse-java \
--enable-nss \
---with-rhino
+--with-rhino --enable-system-png
#--help
# --enable-systemtap Enable inclusion of SystemTap trace support -
needs systemtab from AUR + --with-abs-install-dir=/usr/lib/jvm/java-7-openjdk
The absolute path where the j2sdk-image dir will be installed
@@ -144,7 +144,7 @@
optdepends=('libcups: needed for Java Mauve support - libmawt.so'
'fontconfig: needed for Java Mauve support - libmawt.so')
provides=('java-runtime=7')
- conflicts=('java-runtime')
+ conflicts=('java-runtime' 'openjdk6')
# replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
backup=(etc/profile.d/jre.sh
etc/profile.d/jre.csh
@@ -267,7 +267,8 @@
'libpulse: for advanced sound support'
'gtk2: for the Gtk+ look and feel - desktop usage')
install=jre7-openjdk.install
-
+ conflicts=('openjdk6')
+
mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}
# Link binaries into /usr/bin
pushd ${pkgdir}/${_jvmdir}/jre/bin
[arch-commits] Commit in python-gdata/repos/extra-any (PKGBUILD PKGBUILD)
Date: Friday, January 20, 2012 @ 11:11:11
Author: angvp
Revision: 147006
archrelease: copy trunk to extra-any
Added:
python-gdata/repos/extra-any/PKGBUILD
(from rev 147005, python-gdata/trunk/PKGBUILD)
Deleted:
python-gdata/repos/extra-any/PKGBUILD
--+
PKGBUILD | 46 +++---
1 file changed, 23 insertions(+), 23 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2012-01-20 16:10:39 UTC (rev 147005)
+++ PKGBUILD2012-01-20 16:11:11 UTC (rev 147006)
@@ -1,23 +0,0 @@
-#$Id$
-# Maintainer: Angel Velasquez
-# Contributor: Jan de Groot
-# Contributor: Alessio 'mOLOk' Bolognino
-# Contributor: Christophe Gueret
-pkgname=python-gdata
-pkgver=2.0.15
-pkgrel=1
-arch=(any)
-pkgdesc="Python client library for Google data APIs"
-url="http://code.google.com/p/gdata-python-client/";
-license=('APACHE')
-depends=('python2')
-provides=('gdata_py')
-replaces=('gdata_py')
-conflicts=('gdata_py')
-source=(http://gdata-python-client.googlecode.com/files/gdata-${pkgver}.tar.gz)
-md5sums=('a0cb04be31c836cf654c3b17d3e3f8ae')
-
-build() {
- cd "${srcdir}/gdata-${pkgver}"
- python2 setup.py install --prefix=/usr --root "${pkgdir}"
-}
Copied: python-gdata/repos/extra-any/PKGBUILD (from rev 147005,
python-gdata/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-01-20 16:11:11 UTC (rev 147006)
@@ -0,0 +1,23 @@
+#$Id$
+# Maintainer: Angel Velasquez
+# Contributor: Jan de Groot
+# Contributor: Alessio 'mOLOk' Bolognino
+# Contributor: Christophe Gueret
+pkgname=python-gdata
+pkgver=2.0.16
+pkgrel=1
+arch=(any)
+pkgdesc="Python client library for Google data APIs"
+url="http://code.google.com/p/gdata-python-client/";
+license=('APACHE')
+depends=('python2')
+provides=('gdata_py')
+replaces=('gdata_py')
+conflicts=('gdata_py')
+source=(http://gdata-python-client.googlecode.com/files/gdata-${pkgver}.tar.gz)
+md5sums=('10e78a7f3bbccbaec266590f412e833e')
+
+build() {
+ cd "${srcdir}/gdata-${pkgver}"
+ python2 setup.py install --prefix=/usr --root "${pkgdir}"
+}
[arch-commits] Commit in python-gdata/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 11:10:39
Author: angvp
Revision: 147005
upgpkg: python-gdata 2.0.16-1
Version bump to 2.0.16
Modified:
python-gdata/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 15:47:29 UTC (rev 147004)
+++ PKGBUILD2012-01-20 16:10:39 UTC (rev 147005)
@@ -4,7 +4,7 @@
# Contributor: Alessio 'mOLOk' Bolognino
# Contributor: Christophe Gueret
pkgname=python-gdata
-pkgver=2.0.15
+pkgver=2.0.16
pkgrel=1
arch=(any)
pkgdesc="Python client library for Google data APIs"
@@ -15,7 +15,7 @@
replaces=('gdata_py')
conflicts=('gdata_py')
source=(http://gdata-python-client.googlecode.com/files/gdata-${pkgver}.tar.gz)
-md5sums=('a0cb04be31c836cf654c3b17d3e3f8ae')
+md5sums=('10e78a7f3bbccbaec266590f412e833e')
build() {
cd "${srcdir}/gdata-${pkgver}"
[arch-commits] Commit in openjdk6/repos (20 files)
Date: Friday, January 20, 2012 @ 10:47:29 Author: andyrtr Revision: 147004 archrelease: copy trunk to staging-i686, staging-x86_64 Added: openjdk6/repos/staging-i686/ openjdk6/repos/staging-i686/PKGBUILD (from rev 147003, openjdk6/trunk/PKGBUILD) openjdk6/repos/staging-i686/fix_corba_cmds_path.diff (from rev 147003, openjdk6/trunk/fix_corba_cmds_path.diff) openjdk6/repos/staging-i686/fix_jdk_cmds_path.diff (from rev 147003, openjdk6/trunk/fix_jdk_cmds_path.diff) openjdk6/repos/staging-i686/fontconfig-paths.diff (from rev 147003, openjdk6/trunk/fontconfig-paths.diff) openjdk6/repos/staging-i686/glibc2_15.diff (from rev 147003, openjdk6/trunk/glibc2_15.diff) openjdk6/repos/staging-i686/nonreparenting-wm.diff (from rev 147003, openjdk6/trunk/nonreparenting-wm.diff) openjdk6/repos/staging-i686/openjdk6.install (from rev 147003, openjdk6/trunk/openjdk6.install) openjdk6/repos/staging-i686/openjdk6.profile (from rev 147003, openjdk6/trunk/openjdk6.profile) openjdk6/repos/staging-i686/openjdk6.profile.csh (from rev 147003, openjdk6/trunk/openjdk6.profile.csh) openjdk6/repos/staging-x86_64/ openjdk6/repos/staging-x86_64/PKGBUILD (from rev 147003, openjdk6/trunk/PKGBUILD) openjdk6/repos/staging-x86_64/fix_corba_cmds_path.diff (from rev 147003, openjdk6/trunk/fix_corba_cmds_path.diff) openjdk6/repos/staging-x86_64/fix_jdk_cmds_path.diff (from rev 147003, openjdk6/trunk/fix_jdk_cmds_path.diff) openjdk6/repos/staging-x86_64/fontconfig-paths.diff (from rev 147003, openjdk6/trunk/fontconfig-paths.diff) openjdk6/repos/staging-x86_64/glibc2_15.diff (from rev 147003, openjdk6/trunk/glibc2_15.diff) openjdk6/repos/staging-x86_64/nonreparenting-wm.diff (from rev 147003, openjdk6/trunk/nonreparenting-wm.diff) openjdk6/repos/staging-x86_64/openjdk6.install (from rev 147003, openjdk6/trunk/openjdk6.install) openjdk6/repos/staging-x86_64/openjdk6.profile (from rev 147003, openjdk6/trunk/openjdk6.profile) openjdk6/repos/staging-x86_64/openjdk6.profile.csh (from rev 147003, openjdk6/trunk/openjdk6.profile.csh) -+ staging-i686/PKGBUILD | 183 +++ staging-i686/fix_corba_cmds_path.diff | 33 staging-i686/fix_jdk_cmds_path.diff | 33 staging-i686/fontconfig-paths.diff | 134 + staging-i686/glibc2_15.diff | 236 ++ staging-i686/nonreparenting-wm.diff | 60 +++ staging-i686/openjdk6.install | 24 +++ staging-i686/openjdk6.profile |6 staging-i686/openjdk6.profile.csh |6 staging-x86_64/PKGBUILD | 183 +++ staging-x86_64/fix_corba_cmds_path.diff | 33 staging-x86_64/fix_jdk_cmds_path.diff | 33 staging-x86_64/fontconfig-paths.diff| 134 + staging-x86_64/glibc2_15.diff | 236 ++ staging-x86_64/nonreparenting-wm.diff | 60 +++ staging-x86_64/openjdk6.install | 24 +++ staging-x86_64/openjdk6.profile |6 staging-x86_64/openjdk6.profile.csh |6 18 files changed, 1430 insertions(+) The diff is longer than the limit of 200KB. Use svn diff -r 147003:147004 to see the changes.
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 10:46:02
Author: andyrtr
Revision: 147003
upgpkg: openjdk6 6.b22_1.10.5-2
libtiff/libpng rebuild
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 14:21:18 UTC (rev 147002)
+++ PKGBUILD2012-01-20 15:46:02 UTC (rev 147003)
@@ -9,7 +9,7 @@
_openjdk_version=b22
_openjdk_date=28_feb_2011
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=2
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
@@ -84,7 +84,7 @@
package_openjdk6() {
pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing
binary plugs.'
backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java'
'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng')
+ depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java'
'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
optdepends=('icedtea-web: web browser plugin + Java Web Start'
'alsa-lib: for sound'
'giflib: for gif format support')
[arch-commits] Commit in vigra/repos (6 files)
Date: Friday, January 20, 2012 @ 09:21:18
Author: andyrtr
Revision: 147002
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
vigra/repos/staging-i686/
vigra/repos/staging-i686/PKGBUILD
(from rev 147001, vigra/trunk/PKGBUILD)
vigra/repos/staging-i686/vigra-1.7.1.gcc460.patch
(from rev 147001, vigra/trunk/vigra-1.7.1.gcc460.patch)
vigra/repos/staging-x86_64/
vigra/repos/staging-x86_64/PKGBUILD
(from rev 147001, vigra/trunk/PKGBUILD)
vigra/repos/staging-x86_64/vigra-1.7.1.gcc460.patch
(from rev 147001, vigra/trunk/vigra-1.7.1.gcc460.patch)
-+
staging-i686/PKGBUILD | 69 ++
staging-i686/vigra-1.7.1.gcc460.patch | 33 ++
staging-x86_64/PKGBUILD | 69 ++
staging-x86_64/vigra-1.7.1.gcc460.patch | 33 ++
4 files changed, 204 insertions(+)
Copied: vigra/repos/staging-i686/PKGBUILD (from rev 147001,
vigra/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-20 14:21:18 UTC (rev 147002)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: AndyRTR
+# Contributor: Lukas Jirkovsky
+
+pkgbase=vigra
+pkgname=('vigra' 'vigra-doc')
+pkgver=1.8.0
+pkgrel=3
+arch=('i686' 'x86_64')
+url="http://hci.iwr.uni-heidelberg.de/vigra/";
+license=('custom:MIT')
+makedepends=(# runtime deps
+ 'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7'
'fftw'
+# additional makedeps
+ 'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost'
'python-numpy')
+options=('!libtool')
+source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
+ vigra-1.7.1.gcc460.patch)
+md5sums=('15c558e529ee60020758ab6be264'
+ '25ef8bc26bc38ee67e5b512d2acd0166')
+sha1sums=('09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2'
+ '1de6381a74dd136ea25df5a27f249187b0dbd17e')
+
+build() {
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+ -DWITH_VIGRANUMPY=1 \
+ -DDOCINSTALL=share/doc
+ make
+}
+
+check() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make -k check || /bin/true # i686 fails
+}
+
+package_vigra() {
+ pkgdesc="Computer vision library"
+ depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7'
'fftw')
+ optdepends=('python2: for python bindings'
+ 'boost-libs: for python bindings')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ # license
+ install -D -m644 LICENSE.txt
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+ # remove doc
+ rm -rf "${pkgdir}"/usr/share/doc
+
+ #fix shebang for python2
+ sed -i 's|python$|python2|' "$pkgdir"/usr/bin/vigra-config
+}
+
+package_vigra-doc() {
+ pkgdesc="Computer vision library - documentation and examples"
+ #depends=('vigra')
+ #arch=('any')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ # cleanup
+ rm -rf "${pkgdir}"/usr/{bin,include,lib}
+
+ # license
+ install -D -m644 LICENSE.txt
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Copied: vigra/repos/staging-i686/vigra-1.7.1.gcc460.patch (from rev 147001,
vigra/trunk/vigra-1.7.1.gcc460.patch)
===
--- staging-i686/vigra-1.7.1.gcc460.patch (rev 0)
+++ staging-i686/vigra-1.7.1.gcc460.patch 2012-01-20 14:21:18 UTC (rev
147002)
@@ -0,0 +1,33 @@
+diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx
vigra-1.7.1/include/vigra/random_forest.hxx
+--- vigra-1.7.1.old/include/vigra/random_forest.hxx2010-12-03
17:40:34.0 +
vigra-1.7.1/include/vigra/random_forest.hxx2011-01-28
00:16:32.0 +
+@@ -43,6 +43,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "mathutil.hxx"
+ #include "array_vector.hxx"
+ #include "sized_int.hxx"
+diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx
vigra-1.7.1/include/vigra/sifImport.hxx
+--- vigra-1.7.1.old/include/vigra/sifImport.hxx2010-12-03
17:40:34.0 +
vigra-1.7.1/include/vigra/sifImport.hxx2011-01-28 00:23:31.0
+
+@@ -57,6 +57,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "vigra/multi_array.hxx"
+
+ namespace vigra {
+diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx
vigra-1.7.1/include/vigra/multi_iterator.hxx
+--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03
17:40:34.0 +
vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28
00:23:31.0 +
+@@ -41,6 +41,7 @@
+ #define VIGRA_MULTI_ITERATOR_HXX
+
+ #include
++#include
+ #include "tinyvector.hxx"
+ #include "iteratort
[arch-commits] Commit in vigra/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 08:57:07
Author: andyrtr
Revision: 147001
upgpkg: vigra 1.8.0-3
libtiff/libpng rebuild
Modified:
vigra/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 13:40:09 UTC (rev 147000)
+++ PKGBUILD2012-01-20 13:57:07 UTC (rev 147001)
@@ -5,12 +5,12 @@
pkgbase=vigra
pkgname=('vigra' 'vigra-doc')
pkgver=1.8.0
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://hci.iwr.uni-heidelberg.de/vigra/";
license=('custom:MIT')
makedepends=(# runtime deps
- 'libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
+ 'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7'
'fftw'
# additional makedeps
'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost'
'python-numpy')
options=('!libtool')
@@ -38,7 +38,7 @@
package_vigra() {
pkgdesc="Computer vision library"
- depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw')
+ depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7'
'fftw')
optdepends=('python2: for python bindings'
'boost-libs: for python bindings')
[arch-commits] Commit in mdadm/repos (20 files)
Date: Friday, January 20, 2012 @ 08:40:09
Author: tpowa
Revision: 147000
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
mdadm/repos/testing-i686/
mdadm/repos/testing-i686/PKGBUILD
(from rev 146999, mdadm/trunk/PKGBUILD)
mdadm/repos/testing-i686/disable-werror.patch
(from rev 146999, mdadm/trunk/disable-werror.patch)
mdadm/repos/testing-i686/linux-3.0.patch
(from rev 146999, mdadm/trunk/linux-3.0.patch)
mdadm/repos/testing-i686/mdadm
(from rev 146999, mdadm/trunk/mdadm)
mdadm/repos/testing-i686/mdadm.conf
(from rev 146999, mdadm/trunk/mdadm.conf)
mdadm/repos/testing-i686/mdadm.install
(from rev 146999, mdadm/trunk/mdadm.install)
mdadm/repos/testing-i686/mdadm_hook
(from rev 146999, mdadm/trunk/mdadm_hook)
mdadm/repos/testing-i686/mdadm_install
(from rev 146999, mdadm/trunk/mdadm_install)
mdadm/repos/testing-i686/mdadm_udev_install
(from rev 146999, mdadm/trunk/mdadm_udev_install)
mdadm/repos/testing-x86_64/
mdadm/repos/testing-x86_64/PKGBUILD
(from rev 146999, mdadm/trunk/PKGBUILD)
mdadm/repos/testing-x86_64/disable-werror.patch
(from rev 146999, mdadm/trunk/disable-werror.patch)
mdadm/repos/testing-x86_64/linux-3.0.patch
(from rev 146999, mdadm/trunk/linux-3.0.patch)
mdadm/repos/testing-x86_64/mdadm
(from rev 146999, mdadm/trunk/mdadm)
mdadm/repos/testing-x86_64/mdadm.conf
(from rev 146999, mdadm/trunk/mdadm.conf)
mdadm/repos/testing-x86_64/mdadm.install
(from rev 146999, mdadm/trunk/mdadm.install)
mdadm/repos/testing-x86_64/mdadm_hook
(from rev 146999, mdadm/trunk/mdadm_hook)
mdadm/repos/testing-x86_64/mdadm_install
(from rev 146999, mdadm/trunk/mdadm_install)
mdadm/repos/testing-x86_64/mdadm_udev_install
(from rev 146999, mdadm/trunk/mdadm_udev_install)
-+
testing-i686/PKGBUILD | 53 ++
testing-i686/disable-werror.patch | 11 +
testing-i686/linux-3.0.patch| 45 ++
testing-i686/mdadm | 37 ++
testing-i686/mdadm.conf | 67 ++
testing-i686/mdadm.install | 10 +
testing-i686/mdadm_hook | 44 ++
testing-i686/mdadm_install | 45 ++
testing-i686/mdadm_udev_install | 23 +++
testing-x86_64/PKGBUILD | 53 ++
testing-x86_64/disable-werror.patch | 11 +
testing-x86_64/linux-3.0.patch | 45 ++
testing-x86_64/mdadm| 37 ++
testing-x86_64/mdadm.conf | 67 ++
testing-x86_64/mdadm.install| 10 +
testing-x86_64/mdadm_hook | 44 ++
testing-x86_64/mdadm_install| 45 ++
testing-x86_64/mdadm_udev_install | 23 +++
18 files changed, 670 insertions(+)
Copied: mdadm/repos/testing-i686/PKGBUILD (from rev 146999,
mdadm/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-20 13:40:09 UTC (rev 147000)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Tobias Powalowski
+# Contributor: Judd Vinet
+pkgname=mdadm
+pkgver=3.2.3
+pkgrel=1
+pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as
Software RAID"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://neil.brown.name/blog/mdadm";
+groups=('base')
+conflicts=('mkinitcpio<0.7')
+depends=('glibc')
+backup=('etc/mdadm.conf')
+source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
+mdadm
+mdadm.conf
+mdadm_install
+mdadm_hook
+mdadm_udev_install
+disable-werror.patch)
+
+install=mdadm.install
+replaces=('raidtools')
+md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
+ '6df172c8f77b280018cf87eb3d313f29'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '9b01e96b6c3c218fb61628c9281fe688'
+ 'c8c0713f5c7da51822ee6f3911473a1c'
+ 'cd258e1bf430c02a25f40b4329df9f57'
+ '4ad87b74a4bc9a34621280abe0e0c3e4')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np0 -i ../disable-werror.patch
+ make CXFLAGS="$CFLAGS"
+ # build static mdassemble for Arch's initramfs
+ make MDASSEMBLE_AUTO=1 mdassemble
+
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make INSTALL=/bin/install DESTDIR=$pkgdir install
+ install -D -m755 mdassemble $pkgdir/sbin/mdassemble
+ install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
+ install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
+ install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm
+ install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm
+ install -D -m644 ../mdadm_udev_install
$pkgdir/lib/initcpio/install/mdadm_udev
+ # symlin
[arch-commits] Commit in mdadm/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 08:38:55
Author: tpowa
Revision: 146999
upgpkg: mdadm 3.2.3-1
bump to 3.2.3
Modified:
mdadm/trunk/PKGBUILD
--+
PKGBUILD | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 11:30:17 UTC (rev 146998)
+++ PKGBUILD2012-01-20 13:38:55 UTC (rev 146999)
@@ -2,8 +2,8 @@
# Maintainer: Tobias Powalowski
# Contributor: Judd Vinet
pkgname=mdadm
-pkgver=3.2.2
-pkgrel=4
+pkgver=3.2.3
+pkgrel=1
pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as
Software RAID"
arch=(i686 x86_64)
license=('GPL')
@@ -18,23 +18,21 @@
mdadm_install
mdadm_hook
mdadm_udev_install
-disable-werror.patch
-linux-3.0.patch)
+disable-werror.patch)
+
install=mdadm.install
replaces=('raidtools')
-md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
+md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
'6df172c8f77b280018cf87eb3d313f29'
'00cbed931db4f15b6ce49e3e7d433966'
'9b01e96b6c3c218fb61628c9281fe688'
'c8c0713f5c7da51822ee6f3911473a1c'
'cd258e1bf430c02a25f40b4329df9f57'
- '4ad87b74a4bc9a34621280abe0e0c3e4'
- 'c499b3edbf2c400c8a1984e18c7ce7fa')
+ '4ad87b74a4bc9a34621280abe0e0c3e4')
build() {
cd $srcdir/$pkgname-$pkgver
patch -Np0 -i ../disable-werror.patch
- patch -Np1 -i ../linux-3.0.patch
make CXFLAGS="$CFLAGS"
# build static mdassemble for Arch's initramfs
make MDASSEMBLE_AUTO=1 mdassemble
[arch-commits] Commit in gnome-shell/repos (10 files)
Date: Friday, January 20, 2012 @ 06:30:17
Author: ibiru
Revision: 146998
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnome-shell/repos/extra-i686/PKGBUILD
(from rev 146997, gnome-shell/trunk/PKGBUILD)
gnome-shell/repos/extra-i686/gnome-shell.install
(from rev 146997, gnome-shell/trunk/gnome-shell.install)
gnome-shell/repos/extra-x86_64/PKGBUILD
(from rev 146997, gnome-shell/trunk/PKGBUILD)
gnome-shell/repos/extra-x86_64/gnome-shell.install
(from rev 146997, gnome-shell/trunk/gnome-shell.install)
Deleted:
gnome-shell/repos/extra-i686/PKGBUILD
gnome-shell/repos/extra-i686/gnome-shell.install
gnome-shell/repos/extra-i686/revert-notificationdaemon-group-based-on-pid-and-titles.patch
gnome-shell/repos/extra-x86_64/PKGBUILD
gnome-shell/repos/extra-x86_64/gnome-shell.install
gnome-shell/repos/extra-x86_64/revert-notificationdaemon-group-based-on-pid-and-titles.patch
+
extra-i686/PKGBUILD|
80 +--
extra-i686/gnome-shell.install |
44 -
extra-i686/revert-notificationdaemon-group-based-on-pid-and-titles.patch |
224 --
extra-x86_64/PKGBUILD |
80 +--
extra-x86_64/gnome-shell.install |
44 -
extra-x86_64/revert-notificationdaemon-group-based-on-pid-and-titles.patch |
224 --
6 files changed, 120 insertions(+), 576 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-20 10:27:24 UTC (rev 146997)
+++ extra-i686/PKGBUILD 2012-01-20 11:30:17 UTC (rev 146998)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru
-# Contributor: Flamelab http://live.gnome.org/GnomeShell";
-license=('GPL2')
-depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'gnome-desktop'
'gnome-menus' 'libpulse' 'folks' 'telepathy-logger' 'networkmanager' 'caribou'
'nautilus' 'telepathy-mission-control' 'unzip')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('network-manager-applet: shell integration for networkmanager')
-options=('!libtool' '!emptydirs')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-revert-notificationdaemon-group-based-on-pid-and-titles.patch)
-sha256sums=('68967b9d58ad0551d7d3d28a276526a15faf1fc1d27f4624eb405663910e2eb8'
-'9e0337cd25d29d7215561d6fa30612d69c89fe7c27aa563a0c0b8a5b6f6cf12a')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- patch -Np1 -R -i
"$srcdir/revert-notificationdaemon-group-based-on-pid-and-titles.patch"
-
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/gnome-shell \
- --localstatedir=/var --disable-static \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
- install -m755 -d "$pkgdir/usr/share/gconf/schemas"
- gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas"
--domain gnome-shell "$pkgdir"/etc/gconf/schemas/*.schemas
- rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
Copied: gnome-shell/repos/extra-i686/PKGBUILD (from rev 146997,
gnome-shell/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-20 11:30:17 UTC (rev 146998)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Ionut Biru
+# Contributor: Flamelab http://live.gnome.org/GnomeShell";
+license=('GPL2')
+depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'gnome-desktop'
'gnome-menus' 'libpulse' 'folks' 'telepathy-logger' 'networkmanager' 'caribou'
'nautilus' 'telepathy-mission-control' 'unzip')
+makedepends=('intltool' 'gnome-doc-utils')
+optdepends=('network-manager-applet: shell integration for networkmanager')
+options=('!libtool' '!emptydirs')
+install=gnome-shell.install
+groups=(gnome)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('209363084ef2d58777d70d8430e4659b058cf854c4b9766f3019d69ffea34d6f')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/gnome-shell \
+ --localstatedir=/var --disable-static \
+ --disable-schemas-compile
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+
+ install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+ gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas"
--domain gnome-shell "$pkgdir"/etc/gconf/schemas/*.schemas
+ rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+}
Del
[arch-commits] Commit in gnome-shell/trunk (2 files)
Date: Friday, January 20, 2012 @ 05:27:24
Author: ibiru
Revision: 146997
update to 3.2.2.1
Modified:
gnome-shell/trunk/PKGBUILD
Deleted:
gnome-shell/trunk/revert-notificationdaemon-group-based-on-pid-and-titles.patch
---+
PKGBUILD | 12
revert-notificationdaemon-group-based-on-pid-and-titles.patch | 224 --
2 files changed, 4 insertions(+), 232 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 06:47:36 UTC (rev 146996)
+++ PKGBUILD2012-01-20 10:27:24 UTC (rev 146997)
@@ -3,8 +3,8 @@
# Contributor: Flamelab http://live.gnome.org/GnomeShell";
@@ -15,16 +15,12 @@
options=('!libtool' '!emptydirs')
install=gnome-shell.install
groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-revert-notificationdaemon-group-based-on-pid-and-titles.patch)
-sha256sums=('68967b9d58ad0551d7d3d28a276526a15faf1fc1d27f4624eb405663910e2eb8'
-'9e0337cd25d29d7215561d6fa30612d69c89fe7c27aa563a0c0b8a5b6f6cf12a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('209363084ef2d58777d70d8430e4659b058cf854c4b9766f3019d69ffea34d6f')
build() {
cd "$srcdir/$pkgname-$pkgver"
- patch -Np1 -R -i
"$srcdir/revert-notificationdaemon-group-based-on-pid-and-titles.patch"
-
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gnome-shell \
--localstatedir=/var --disable-static \
Deleted: revert-notificationdaemon-group-based-on-pid-and-titles.patch
===
--- revert-notificationdaemon-group-based-on-pid-and-titles.patch
2012-01-20 06:47:36 UTC (rev 146996)
+++ revert-notificationdaemon-group-based-on-pid-and-titles.patch
2012-01-20 10:27:24 UTC (rev 146997)
@@ -1,224 +0,0 @@
-From 7e654ab3ca6e8ac75ba5e45c2a411eb1c2904b26 Mon Sep 17 00:00:00 2001
-From: Marina Zhurakhinskaya
-Date: Tue, 20 Dec 2011 05:51:35 +
-Subject: notificationDaemon: group sources based on a combination of pid and
title
-
-That way different system notifications, such as the ones about battery power
-and the ones about software updates, are shown with separate message tray
-sources.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664138
-diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
-index f40205d..c691efe 100644
a/js/ui/notificationDaemon.js
-+++ b/js/ui/notificationDaemon.js
-@@ -92,7 +92,7 @@ NotificationDaemon.prototype = {
- _init: function() {
- DBus.session.exportObject('/org/freedesktop/Notifications', this);
-
--this._sources = {};
-+this._sources = [];
- this._senderToPid = {};
- this._notifications = {};
- this._busProxy = new Bus();
-@@ -150,14 +150,30 @@ NotificationDaemon.prototype = {
- }
- },
-
-+_lookupSource: function(title, pid, trayIcon) {
-+for (let i = 0; i < this._sources.length; i++) {
-+let source = this._sources[i];
-+if (source.pid == pid &&
-+(source.initialTitle == title || source.trayIcon || trayIcon))
-+return source;
-+}
-+return null;
-+},
-+
- // Returns the source associated with ndata.notification if it is set.
--// Otherwise, returns the source associated with the pid if one is
--// stored in this._sources and the notification is not transient.
--// Otherwise, creates a new source as long as pid is provided.
-+// Otherwise, returns the source associated with the title and pid if
-+// such source is stored in this._sources and the notification is not
-+// transient. If the existing or requested source is associated with
-+// a tray icon and passed in pid matches a pid of an existing source,
-+// the title match is ignored to enable representing a tray icon and
-+// notifications from the same application with a single source.
-+//
-+// If no existing source is found, a new source is created as long as
-+// pid is provided.
- //
- // Either a pid or ndata.notification is needed to retrieve or
- // create a source.
--_getSource: function(title, pid, ndata, sender) {
-+_getSource: function(title, pid, ndata, sender, trayIcon) {
- if (!pid && !(ndata && ndata.notification))
- return null;
-
-@@ -174,20 +190,24 @@ NotificationDaemon.prototype = {
- // with a transient one from the same sender, so we
- // always create a new source object for new transient notifications
- // and never add it to this._sources .
--if (!isForTransientNotification && this._sources[pid]) {
--let source = this._sources[pid];
--source.setTitle(ti
