diff options
49 files changed, 521 insertions, 380 deletions
diff --git a/community/arpwatch/ChangeLog b/community/arpwatch/ChangeLog deleted file mode 100644 index d22a5592c..000000000 --- a/community/arpwatch/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-07-02 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community/arpwatch/LICENSE b/community/arpwatch/LICENSE new file mode 100644 index 000000000..be49954d9 --- /dev/null +++ b/community/arpwatch/LICENSE @@ -0,0 +1,18 @@ +Copyright (c) 1992, 1993, 1994, 1995, 1996, 1998, 2000 + The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that: (1) source code distributions +retain the above copyright notice and this paragraph in its entirety, (2) +distributions including binary code include the above copyright notice and +this paragraph in its entirety in the documentation or other materials +provided with the distribution, and (3) all advertising materials mentioning +features or use of this software display the following acknowledgement: +``This product includes software developed by the University of California, +Lawrence Berkeley Laboratory and its contributors.'' Neither the name of +the University nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior +written permission. +THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD index 1a81aae7d..79f4bd51d 100644 --- a/community/arpwatch/PKGBUILD +++ b/community/arpwatch/PKGBUILD @@ -1,29 +1,48 @@ -# $Id: PKGBUILD 65045 2012-02-20 02:17:24Z spupykin $ +# $Id: PKGBUILD 87787 2013-04-06 15:38:17Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sébastien Luttringer pkgname=arpwatch pkgver=2.1a15 -pkgrel=8 -pkgdesc="arpwatch and arpsnmp network monitoring tools" -arch=(i686 x86_64) -url="ftp://ftp.ee.lbl.gov/" -license=("GPL") -depends=(libpcap) -source=(ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz) -md5sums=('cebfeb99c4a7c2a6cee2564770415fe7') - -build() { - cd $srcdir/$pkgname-$pkgver +pkgrel=10 +pkgdesc='Ethernet/FDDI station activity monitor' +arch=('i686' 'x86_64') +url='ftp://ftp.ee.lbl.gov/' +license=('BSD') +depends=('libpcap' 'smtp-forwarder') +source=("ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz" + 'LICENSE' + "$pkgname.service") +md5sums=('cebfeb99c4a7c2a6cee2564770415fe7' + '9359518c500562281e76cdb0b2fa9062' + '2324a202222303daa1a41d8abd7a7e4a') +prepare() { + cd $pkgname-$pkgver + # move arp database in /var/lib/arpwatch sed -i 's|ARPDIR = $(prefix)/arpwatch|ARPDIR = /var/lib/arpwatch|' Makefile.in + # binary ownership to root + sed -i 's/-\(o\|g\) bin/-\1 root/g' Makefile.in +} - ./configure --prefix=/usr +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man make SENDMAIL=/usr/sbin/sendmail - install -d -m 0755 $pkgdir/usr/sbin - make DESTDIR=$pkgdir install - install -D -m 0644 arpwatch.8 $pkgdir/usr/share/man/man8/arpwatch.8 - install -D -m 0644 arpsnmp.8 $pkgdir/usr/share/man/man8/arpsnmp.8 - install -d -m 0755 $pkgdir/var/lib/arpwatch - touch $pkgdir/var/lib/arpwatch/arp.dat } + +package() { + cd $pkgname-$pkgver + install -d -m 0755 "$pkgdir"/usr/{sbin,share/man} + make DESTDIR="$pkgdir" install install-man + # install ether prefix database + install -Dm644 ethercodes.dat "$pkgdir/var/lib/$pkgname/ethercodes.dat" + cd "$srcdir" + # license + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # systemd + install -Dm644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname@.service" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/arpwatch/arpwatch.service b/community/arpwatch/arpwatch.service new file mode 100644 index 000000000..570f93852 --- /dev/null +++ b/community/arpwatch/arpwatch.service @@ -0,0 +1,11 @@ +[Unit] +Description=Watch ARP on interface %I +After=network.target + +[Service] +Type=forking +ExecStartPre=/usr/bin/touch /var/lib/arpwatch/%I.dat +ExecStart=/usr/sbin/arpwatch -f /var/lib/arpwatch/%I.dat -i %I + +[Install] +WantedBy=multi-user.target diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD index 9d71d347b..7925992d9 100644 --- a/community/avrdude/PKGBUILD +++ b/community/avrdude/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 81870 2013-01-02 15:51:02Z jelle $ +# $Id: PKGBUILD 87805 2013-04-06 19:56:39Z jelle $ # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=avrdude pkgver=5.11.1 -pkgrel=2 +pkgrel=3 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers" arch=('i686' 'x86_64') url="http://www.nongnu.org/avrdude/" license=('GPL') -depends=('libusb-compat' 'readline') +depends=('libusb-compat' 'readline' 'libftdi') source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig}) md5sums=('3a43e288cb32916703b6945e3f260df9' '0c23b005d4090aef4e081476aabc1958') diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD index 7abc25c16..5029f8157 100644 --- a/community/blueman/PKGBUILD +++ b/community/blueman/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 78176 2012-10-17 10:22:59Z allan $ +# $Id: PKGBUILD 87809 2013-04-06 22:04:55Z bgyorgy $ # Maintainer : Ionut Biru <ibiru@archlinux.org # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=blueman pkgver=1.23 -pkgrel=5 +pkgrel=6 pkgdesc="GTK+ bluetooth manager" arch=('i686' 'x86_64') license=('GPL') -url="http://blueman-project.org" -depends=('python2-notify' 'bluez' 'python2-dbus' 'gtk2' 'python2-gobject2' 'startup-notification' - 'obex-data-server' 'polkit-gnome' 'xdg-utils' 'hicolor-icon-theme' 'libpulse' - 'notification-daemon') +url="https://launchpad.net/blueman" +depends=('bluez' 'gnome-icon-theme' 'libpulse' 'obex-data-server' 'python2-dbus' + 'python2-notify' 'startup-notification' 'xdg-utils') makedepends=('pyrex' 'intltool') optdepends=('dnsmasq: For creating PAN network' - 'gconf: For gconf configuration support' + 'modemmanager: For modem management service' + 'notification-daemon: For desktop notifications' + 'polkit-gnome: For privileged actions' 'pulseaudio: To use the pulseaudio plugin' - 'notification-daemon: for desktop notifications' - 'libnotify: for desktop notifications' - 'modemmanager: for modem management service' - 'gnome-icon-theme: icon theme') + 'python2-gconf: For gconf configuration support') options=('!libtool') install=$pkgname.install -source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz) +source=(https://launchpad.net/${pkgname}/1.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) md5sums=('f0bee59589f4c23e35bf08c2ef8acaef') build() { @@ -44,5 +42,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - echo "OnlyShowIn=GNOME;XFCE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop + echo "NotShowIn=KDE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop } diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD index 3099f6c74..c79d02162 100755 --- a/community/cairo-dock-plugins/PKGBUILD +++ b/community/cairo-dock-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87222 2013-03-28 18:48:03Z alucryd $ +# $Id: PKGBUILD 87793 2013-04-06 17:02:52Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Tofe <chris.chapuis@gmail.com> # Contributor: zhuqin <zhuqin83@gmail.com> @@ -7,52 +7,43 @@ pkgname=cairo-dock-plugins pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for Cairo-Dock" url="https://launchpad.net/cairo-dock" license=('GPL') arch=('i686' 'x86_64') -groups=('cairo-dock') depends=('cairo-dock') -makedepends=('cmake' 'alsa-lib' 'fftw' 'gnome-menus' 'gtk-sharp-2' 'gvfs' 'libetpan' 'libexif' 'libical' 'libpulse' 'libxklavier' 'libxxf86vm' 'libzeitgeist' 'lm_sensors' 'ndesk-dbus-glib' 'python' 'ruby' 'upower' 'vala' 'vte3' 'webkitgtk3') -optdepends=('alsa-lib: Alsa-Mixer applet' - 'gnome-menus: GMenu applet' +makedepends=('cmake' 'alsa-lib' 'fftw' 'gnome-menus' 'gtk-sharp-2' 'gvfs' 'libetpan' 'libexif' 'libical' 'libpulse' 'libxklavier' 'libzeitgeist' 'lm_sensors' 'ndesk-dbus-glib' 'python' 'ruby' 'upower' 'vala' 'vte3' 'webkitgtk3') +optdepends=('alsa-lib: AlsaMixer, Sound Effects applets' 'fftw: Impulse applet' - 'libpulse: Impulse applet' - 'libxklavier: Keyboard-indicator applet' + 'gnome-menus: GMenu applet' + 'gtk-sharp-2: Mono API' + 'gvfs: GVFS integration' 'libetpan: Mail applet' - 'libzeitgeist: Recent-Events applet' + 'libexif: Slider applet' + 'libical: Clock applet' + 'libpulse: Impulse applet' + 'libxklavier: Keyboard Indicator applet' + 'libzeitgeist: Recent Events applet' + 'lm_sensors: System Monitor applet' + 'ndesk-dbus-glib: Mono API' + 'python: Python API' + 'ruby: Ruby API' + 'upower: Logout, PowerManager applets' 'vte3: Terminal applet' - 'webkitgtk3: Weblets applet' - 'libxxf86vm: XGamma applet' - 'gvfs: GVFS integration' - 'lm_sensors: Sensors support' - 'upower: UPower support' - 'libical: iCal support' - 'libexif: exif support' - 'python: Python interface' - 'gtk-sharp-2: Mono interface' - 'ndesk-dbus-glib: Mono interface' - 'ruby: Ruby interface' - 'vala: Vala interface') + 'webkitgtk3: Weblets applet') options=('!libtool') -source=("http://launchpad.net/cairo-dock-plug-ins/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz" 'alsa-mixer-applet.patch' 'applet-host-ias.patch') -sha256sums=('e407e1c0d54ae37815726d0f2a66f12ec8263499df99198646bcecccfc688b5c' - 'e474314037fe85dfb9e90c17b18f87936a911699d97fee5470ccd812ff6697c1' - '28be6144e9006f5c166d8f0119de1747ee2caf8e13072177a8d0dab23fd964b3') +source=("http://launchpad.net/cairo-dock-plug-ins/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") +sha256sums=('e407e1c0d54ae37815726d0f2a66f12ec8263499df99198646bcecccfc688b5c') build() { cd "${srcdir}"/${pkgname}-${pkgver} -# Patch - patch -Np1 -i ../alsa-mixer-applet.patch - patch -Np1 -i ../applet-host-ias.patch - -# Build if [[ -d build ]]; then rm -rf build fi mkdir build && cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr make } @@ -60,7 +51,6 @@ build() { package() { cd "${srcdir}"/${pkgname}-${pkgver}/build -# Install make DESTDIR=${pkgdir} install } diff --git a/community/cairo-dock/PKGBUILD b/community/cairo-dock/PKGBUILD index 221a7b11f..5c742b33d 100755 --- a/community/cairo-dock/PKGBUILD +++ b/community/cairo-dock/PKGBUILD @@ -1,43 +1,44 @@ -# $Id: PKGBUILD 87221 2013-03-28 18:43:22Z alucryd $ +# $Id: PKGBUILD 87791 2013-04-06 16:56:43Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Tofe <chris.chapuis@gmail.com> # Contributor: erm67 <erm67@yahoo.it> pkgname=cairo-dock pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Light eye-candy fully themable animated dock" arch=('i686' 'x86_64') url="https://launchpad.net/cairo-dock-core" license=('GPL') -groups=('cairo-dock') -depends=('curl' 'dbus-glib' 'gtk3' 'gtkglext' 'librsvg') -makedepends=('cmake' 'curl' 'dbus-glib' 'gtk3' 'gtkglext' 'inputproto' 'librsvg') +depends=('curl' 'dbus-glib' 'gtk3' 'librsvg') +makedepends=('cmake') +optdepends=('cairo-dock-plugins: Plugins for Cairo-Dock') options=('!libtool') source=("http://launchpad.net/${pkgname}-core/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz" 'gldit-rpath.patch') sha256sums=('69d57dab16e70bb0683ba91f1dfd19a9ee0de0b1642ca6480fef9dacbb9c2fd2' '5a5fbc67aaa210387ef4410701747fe741942c99c4bd84ae771b96a3bdd1c4cc') -build() { +prepare() { cd "${srcdir}"/${pkgname}-${pkgver} -# Patch patch -Np1 -i ../gldit-rpath.patch - sed -i 's|themes3.2|themes|' CMakeLists.txt +} + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} -# Build if [[ -d build ]]; then rm -rf build fi mkdir build && cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr make } -package_cairo-dock() { +package() { cd "${srcdir}"/${pkgname}-${pkgver}/build -# Install make DESTDIR="${pkgdir}" install } diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index dd8e8f3ed..fe50cb4ca 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,15 +1,23 @@ -# $Id: PKGBUILD 84281 2013-02-15 14:20:17Z lfleischer $ +# $Id: PKGBUILD 87789 2013-04-06 16:50:31Z bgyorgy $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity pkgver=0.6.21 -pkgrel=1 +pkgrel=2 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' arch=('i686' 'x86_64') url='http://www.nongnu.org/duplicity/' license=('GPL') -depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko') +depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko') +optdepends=('lftp: FTPS backend' + 'python2-boto: Amazon S3 backend' + 'python2-gobject: GIO backend' + 'gvfs: GIO backend' + 'python2-gdata: Google Docs backend' + 'python2-httplib2: Ubuntu One backend' + 'python2-oauthlib: Ubuntu One backend' + 'rsync: rsync backend') source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) md5sums=('4ade1de475e0af64211bb6933b593057' '3521d679ba7dff46653313aa3b3e6855') @@ -19,8 +27,8 @@ build() { # python2 fix for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + sed -i 's_^#!.*/usr/bin/python$_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python$_#!/usr/bin/env python2_' $file done } diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 0893cf878..f2e0d699c 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 84499 2013-02-19 13:15:06Z stativ $ +# $Id: PKGBUILD 87801 2013-04-06 19:27:42Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=12.0.4 -_pkgver=123.169 +pkgver=12.1 +_pkgver=129.161 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('eb7c86893ad138a9c3bb034dae2dc296') +md5sums=('687ba6aea524099f10605bb50569864d') package() { cd "$srcdir" diff --git a/community/lksctp-tools/PKGBUILD b/community/lksctp-tools/PKGBUILD index 8df17f34f..9bb4bd729 100644 --- a/community/lksctp-tools/PKGBUILD +++ b/community/lksctp-tools/PKGBUILD @@ -1,9 +1,9 @@ # $Id$ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# Maintainer: Sébastien Luttringer # Contributer: Nicolas Martyanoff <khaelin@gmail.com> pkgname=lksctp-tools -pkgver=1.0.13 +pkgver=1.0.14 pkgrel=1 pkgdesc='An implementation of the SCTP protocol' arch=('i686' 'x86_64') @@ -11,15 +11,11 @@ url='http://lksctp.sourceforge.net/' license=('GPL2' 'LGPL2.1') depends=('bash') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/lksctp/$pkgname-$pkgver.tar.gz" - '0001-Modernize-autotools.patch') -md5sums=('96436a1b0d30ae588d0a13f6b646549a' - '84635abc83bcd85ef263160b6f435336') +source=("http://downloads.sourceforge.net/sourceforge/lksctp/$pkgname-$pkgver.tar.gz") +md5sums=('12bc67f9b47ea631328a592ce7a53ca1') build() { cd $pkgname-$pkgver - # fix autotools - patch -p1 -i "$srcdir/0001-Modernize-autotools.patch" ./bootstrap ./configure --prefix=/usr make diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index db855d9d0..b466757ed 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87259 2013-03-29 09:42:40Z bpiotrowski $ +# $Id: PKGBUILD 87751 2013-04-06 09:18:35Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.10.2 +pkgver=0.10.3 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ depends=('openssl' 'python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('4eb642897fdb945b49720f2604afc493587aec7a9ff1537e882df659e4dd8aa2') +sha256sums=('bc8796ff6414231fa0603e0383404f14648dfd2fe9fb0fa4d4a6043dfddbb328') build() { cd node-v${pkgver} diff --git a/community/partclone/PKGBUILD b/community/partclone/PKGBUILD index 4f51db0de..35162ec52 100644 --- a/community/partclone/PKGBUILD +++ b/community/partclone/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83480 2013-02-01 21:35:48Z eric $ +# $Id: PKGBUILD 87807 2013-04-06 20:01:09Z jsteel $ # Maintainer: Jonathan Steel <mail at jsteel dot org> # Contrinutor: Dan Serban # Contributor: Franz Burgmann @@ -6,15 +6,15 @@ # Contributor: Ivan Sichmann Freitas pkgname=partclone -pkgver=0.2.48 -pkgrel=5 -pkgdesc="Back up and restore used-blocks of a partition" +pkgver=0.2.58 +pkgrel=1 +pkgdesc="Utilities to save and restore used blocks on a partition" arch=('i686' 'x86_64') url="http://partclone.org" license=('GPL') depends=('progsreiserfs' 'ntfs-3g') -source=(https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/${pkgname}_$pkgver.tar.gz) -md5sums=('c873588f26185d6ce8db7b4c5470aa00') +source=(https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/${pkgname}_$pkgver.orig.tar.gz) +md5sums=('8d8edeab8a0ce430d2e00efcc25f4ce7') build() { cd "$srcdir"/$pkgname-$pkgver @@ -28,5 +28,5 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir"/ install } diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD index 3b8299727..cd5fa8149 100644 --- a/community/pidgin-libnotify/PKGBUILD +++ b/community/pidgin-libnotify/PKGBUILD @@ -4,14 +4,14 @@ pkgname=pidgin-libnotify pkgver=0.14 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') pkgdesc="pidgin plugin that enables popups when someone logs in or messages you." url="http://gaim-libnotify.sourceforge.net/" license=('GPL') -depends=('pidgin' 'libnotify' 'perlxml' 'gettext' 'notification-daemon') -makedepends=('libtool' 'intltool') -replaces=('gaim-libnotify') +depends=('pidgin' 'libnotify') +makedepends=('intltool') +optdepends=('notification-daemon') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/gaim-libnotify/$pkgname-$pkgver.tar.gz language_fixes.patch pidgin-libnotify-0.14-libnotify-0.7.patch pidgin-libnotify-showbutton.patch) diff --git a/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch b/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch new file mode 100644 index 000000000..3119e34ac --- /dev/null +++ b/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch @@ -0,0 +1,57 @@ +From 9e26f1c5a00c93b7a5dadb634d4452c769e48048 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Fri, 22 Mar 2013 11:54:44 +0200 +Subject: [PATCH] doc: fix makeinfo errors and one warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +commit 4afa50b added few lines that are syntactically incorrect +with leading plus sign. + +Cc: Denis Ovsienko <infrastation@yandex.ru> +Signed-off-by: Timo Teräs <timo.teras@iki.fi> +--- + doc/ipv6.texi | 4 ++-- + doc/quagga.texi | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/doc/ipv6.texi b/doc/ipv6.texi +index b6cc437..2482c1c 100644 +--- a/doc/ipv6.texi ++++ b/doc/ipv6.texi +@@ -136,8 +136,8 @@ for the lowest preference possible. + Default: 0 + @end deffn + +-+@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {} +-+@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {} ++@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {} ++@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {} + The value to be placed in Home Agent Option, when Home Agent config flag is set, + which indicates to hosts Home Agent Lifetime. The default value of 0 means to + place the current Router Lifetime value. +diff --git a/doc/quagga.texi b/doc/quagga.texi +index ff913aa..b4105ac 100644 +--- a/doc/quagga.texi ++++ b/doc/quagga.texi +@@ -1,13 +1,13 @@ + \input texinfo @c -*- texinfo -*- ++@c Set variables - sourced from defines.texi ++@include defines.texi ++ + @c %**start of header + @setchapternewpage odd + @settitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}} + @setfilename quagga.info + @c %**end of header + +-@c Set variables - sourced from defines.texi +-@include defines.texi +- + @c automake will automatically generate version.texi + @c and set EDITION, VERSION, UPDATED and UPDATED-MONTH + @include version.texi +-- +1.8.2 + diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index feb494344..5167a45b6 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85920 2013-03-08 23:40:45Z foutrelis $ +# $Id: PKGBUILD 87783 2013-04-06 13:02:55Z seblu $ # Maintainer: Sébastien Luttringer pkgname=quagga pkgver=0.99.22 -pkgrel=2 +pkgrel=3 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' @@ -19,24 +19,30 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar 'ospfd.service' 'ripd.service' 'ripngd.service' - 'zebra.service') + 'zebra.service' + '0001-doc-fix-makeinfo-errors-and-one-warning.patch') md5sums=('3057bf3a91116a1017dd0df7e5e8ef93' - '45d8bf56a426b0e7ebe429547be8a27a' - 'ab31ed8dafd7a92137f4f00ad0937b4f' - '4c05d0105cd0db23a2583bd75a1bde4d' - 'd087dce5eeba78ac64541157c7e04dfd' - 'c5f8a729685cebf8fc5b1a1552d37b6d' - 'e721b334bb0b31983642b307033c63d0' - 'effeb26ff78ffcafe7808596ddc5d3fc' - 'f0c0b99346b2c373a74158e45f04cf91') + '87bf4ae8aca3b3cf70e3986bc669aa78' + '9b14110bed4982baa801808db6ac9135' + 'b685b5c12637cb963e1fb78ecd926e14' + '1fee8cdf03f87b9bb129948058246c88' + '4d95a4af1ddb4ae21b867bebbedc77d5' + '7e33c2a2e1c12309ba28d75a34294ed0' + '6c682c0cd06c109bc10d29c1d9af3e38' + '18964536b7ed012aa5b22f2fa9fb3e87' + '214ed8ae0d58d080dcba9a176a94eb51') -build() { +prepare() { cd $pkgname-$pkgver shopt -s nullglob for _p in "$srcdir"/*.patch; do msg2 "Applying ${_p##*/}" patch -p 1 -i "$_p" done +} + +build() { + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc/quagga \ @@ -74,7 +80,6 @@ package() { done install -D -m 644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" echo "d /run/$pkgname 0750 $pkgname $pkgname" > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" - } # vim:set ts=2 sw=2 et: diff --git a/community/quagga/babeld.service b/community/quagga/babeld.service index 5b2848042..aa107afca 100644 --- a/community/quagga/babeld.service +++ b/community/quagga/babeld.service @@ -1,11 +1,15 @@ [Unit] Description=Babel routing daemon +Documentation=man:zebra(8) BindTo=zebra.service After=network.target zebra.service ConditionPathExists=/etc/quagga/babeld.conf [Service] -ExecStart=/usr/sbin/babeld +Type=forking +PIDFile=/run/quagga/babeld.pid +ExecStart=/usr/sbin/babeld -d +ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort [Install] diff --git a/community/quagga/bgpd.service b/community/quagga/bgpd.service index 21ac18c8a..aae58be2c 100644 --- a/community/quagga/bgpd.service +++ b/community/quagga/bgpd.service @@ -1,11 +1,15 @@ [Unit] Description=BGP routing daemon +Documentation=man:bgpd(8) man:zebra(8) BindTo=zebra.service After=network.target zebra.service ConditionPathExists=/etc/quagga/bgpd.conf [Service] -ExecStart=/usr/sbin/bgpd +Type=forking +PIDFile=/run/quagga/bgpd.pid +ExecStart=/usr/sbin/bgpd -d +ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort [Install] diff --git a/community/quagga/isisd.service b/community/quagga/isisd.service index 298946998..fa5a716e8 100644 --- a/community/quagga/isisd.service +++ b/community/quagga/isisd.service @@ -1,11 +1,15 @@ [Unit] Description=IS-IS routing daemon +Documentation=man:isis(8) man:zebra(8) BindTo=zebra.service After=network.target zebra.service ConditionPathExists=/etc/quagga/isisd.conf [Service] -ExecStart=/usr/sbin/isisd +Type=forking +PIDFile=/run/quagga/isisd.pid +ExecStart=/usr/sbin/isisd -d +ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort [Install] diff --git a/community/quagga/ospf6d.service b/community/quagga/ospf6d.service index 31194fc6e..eacb89159 100644 --- a/community/quagga/ospf6d.service +++ b/community/quagga/ospf6d.service @@ -1,11 +1,15 @@ [Unit] Description=OSPF routing daemon for IPv6 +Documentation=man:ospfd(8) man:zebra(8) BindTo=zebra.service After=network.target zebra.service ConditionPathExists=/etc/quagga/ospf6d.conf [Service] -ExecStart=/usr/sbin/ospf6d +Type=forking +PIDFile=/run/quagga/ospf6d.pid +ExecStart=/usr/sbin/ospf6d -d +ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort [Install] diff --git a/community/quagga/ospfd.service b/community/quagga/ospfd.service index f864aa258..57a946f8e 100644 --- a/community/quagga/ospfd.service +++ b/community/quagga/ospfd.service @@ -1,11 +1,15 @@ [Unit] Description=OSPF routing daemon +Documentation=man:ospfd(8) man:zebra(8) BindTo=zebra.service After=network.target zebra.service ConditionPathExists=/etc/quagga/ospfd.conf [Service] -ExecStart=/usr/sbin/ospfd +Type=forking +PIDFile=/run/quagga/ospfd.pid +ExecStart=/usr/sbin/ospfd -d +ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort [Install] diff --git a/community/quagga/ripd.service b/community/quagga/ripd.service index 22716e2c9..bf7c5ac6f 100644 --- a/community/quagga/ripd.service +++ b/community/quagga/ripd.service @@ -1,11 +1,15 @@ [Unit] Description=RIP routing daemon +Documentation=man:ripd(8) man:zebra(8) BindTo=zebra.service After=network.target zebra.service ConditionPathExists=/etc/quagga/ripd.conf [Service] -ExecStart=/usr/sbin/ripd +Type=forking +PIDFile=/run/quagga/ripd.pid +ExecStart=/usr/sbin/ripd -d +ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort [Install] diff --git a/community/quagga/ripngd.service b/community/quagga/ripngd.service index 9ac51bd1c..465263ba3 100644 --- a/community/quagga/ripngd.service +++ b/community/quagga/ripngd.service @@ -1,11 +1,15 @@ [Unit] Description=RIP routing daemon for IPv6 +Documentation=man:ripngd(8) man:zebra(8) BindTo=zebra.service After=network.target zebra.service ConditionPathExists=/etc/quagga/ripngd.conf [Service] -ExecStart=/usr/sbin/ripngd +Type=forking +PIDFile=/run/quagga/ripngd.pid +ExecStart=/usr/sbin/ripngd -d +ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort [Install] diff --git a/community/quagga/zebra.service b/community/quagga/zebra.service index 0bba03972..c8707083e 100644 --- a/community/quagga/zebra.service +++ b/community/quagga/zebra.service @@ -1,11 +1,15 @@ [Unit] Description=GNU Zebra routing manager +Documentation=man:zebra(8) After=network.target ConditionPathExists=/etc/quagga/zebra.conf [Service] -ExecStartPre=/usr/sbin/ip route flush proto zebra -ExecStart=/usr/sbin/zebra +Type=forking +PIDFile=/run/quagga/zebra.pid +ExecStartPre=/sbin/ip route flush proto zebra +ExecStart=/usr/sbin/zebra -d +ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort [Install] diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD new file mode 100644 index 000000000..11a5af15f --- /dev/null +++ b/community/rust/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 87747 2013-04-05 23:21:32Z thestinger $ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +pkgname=rust +pkgver=0.6 +pkgrel=3 +arch=('i686' 'x86_64') +pkgdesc='A safe, concurrent, practical language' +url='http://www.rust-lang.org/' +license=('MIT' 'Apache') +depends=(gcc-libs shared-mime-info) +makedepends=(libffi perl python2 curl chrpath emacs) +optdepends=('haskell-pandoc: documentation generator (rustdoc)') +source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz") +sha256sums=('e11cb529a1e20f27d99033181a9e0e131817136b46d2742f0fa1afa1210053e5') +install=rust.install + +build() { + cd rust-$pkgver + + ./configure --prefix=/usr --disable-docs + + # avoid python makedepend (force fallback to python2) + sed -i 's/^PYTHONVERSION.*/PYTHONVERSION := 3/' src/llvm/Makefile.rules + + make +} + +check() { + cd rust-$pkgver + make check +} + +package() { + cd rust-$pkgver + make DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir/usr/share/vim" "$pkgdir/usr/share/licenses/rust" + + cp -a src/etc/vim "$pkgdir/usr/share/vim/vimfiles" + find "$pkgdir/usr/share/vim" -type f -exec chmod 644 {} + + find "$pkgdir/usr/share/vim" -type d -exec chmod 755 {} + + + install -Dm644 src/etc/kate/rust.xml "$pkgdir/usr/share/apps/katepart/syntax/rust.xml" + install -Dm644 src/etc/gedit/share/mime/packages/rust.xml \ + "$pkgdir/usr/share/mime/packages/rust.xml" + install -Dm644 src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang \ + "$pkgdir/usr/share/gtksourceview-3.0/language-specs/rust.lang" + + install -m644 LICENSE-APACHE "$pkgdir/usr/share/licenses/rust" + install -m644 LICENSE-MIT "$pkgdir/usr/share/licenses/rust" + + cd src/etc/emacs + make + mkdir -p "$pkgdir/usr/share/emacs/site-lisp/" + install -Dm644 cm-mode.el{,c} rust-mode.el{,c} "$pkgdir/usr/share/emacs/site-lisp/" + + cd "$pkgdir/usr" + + # https://github.com/mozilla/rust/issues/5219 + chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so + + cp lib/rustc/*/lib/{librustdoc-*-0.6.so,librustpkg-*-0.6.so} lib/ +} diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index 3d092e90f..90b22198d 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86929 2013-03-24 23:26:26Z seblu $ +# $Id: PKGBUILD 87749 2013-04-06 00:49:20Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> @@ -6,7 +6,7 @@ pkgname=rxvt-unicode pkgver=9.18 -pkgrel=1 +pkgrel=2 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' arch=('i686' 'x86_64') url='http://software.schmorp.de/pkg/rxvt-unicode.html' @@ -20,9 +20,9 @@ source=( 'urxvt-tabbed.desktop' ) md5sums=('963ccc748fe5bca925e7b92c0404d68b' - 'c2b828d37d06cbf4c32937a2959f2fc2' - '10e80aebaef042fb63d2585440dc3637' - '830abe6f31fb926a1bcd2650731be15e') + 'fec94dc986fa37ec380079d81de3e0b2' + 'fac55f0a8404c86dad3e702146762332' + '8a5599197568c63720e282b9722a7990') build() { cd $pkgname-$pkgver diff --git a/community/rxvt-unicode/urxvt-tabbed.desktop b/community/rxvt-unicode/urxvt-tabbed.desktop index bd48c0a72..172006b4a 100644 --- a/community/rxvt-unicode/urxvt-tabbed.desktop +++ b/community/rxvt-unicode/urxvt-tabbed.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=urxvt (tabbed) Comment=An unicode capable and tabbed rxvt clone Exec=urxvt-tabbed -Icon=terminal +Icon=utilities-terminal Terminal=false Type=Application Categories=System;TerminalEmulator; diff --git a/community/rxvt-unicode/urxvt.desktop b/community/rxvt-unicode/urxvt.desktop index d90c182e2..762291870 100644 --- a/community/rxvt-unicode/urxvt.desktop +++ b/community/rxvt-unicode/urxvt.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=urxvt Comment=An unicode capable rxvt clone Exec=urxvt -Icon=terminal +Icon=utilities-terminal Terminal=false Type=Application Categories=System;TerminalEmulator; diff --git a/community/rxvt-unicode/urxvtc.desktop b/community/rxvt-unicode/urxvtc.desktop index 67751095b..3a2df410f 100644 --- a/community/rxvt-unicode/urxvtc.desktop +++ b/community/rxvt-unicode/urxvtc.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=urxvt (client) Comment=An unicode capable rxvt clone client for urxvtd Exec=urxvtc -Icon=terminal +Icon=utilities-terminal Terminal=false Type=Application Categories=System;TerminalEmulator; diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 1f6510404..116d6f41d 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87437 2013-03-31 19:18:53Z stephane $ +# $Id: PKGBUILD 87797 2013-04-06 18:59:06Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil pkgver=0.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="WYSIWYG ebook editor" arch=('i686' 'x86_64') url="http://code.google.com/p/sigil/" diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD index 28e7909ec..97b1a5d3b 100644 --- a/core/psmisc/PKGBUILD +++ b/core/psmisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162759 2012-06-29 18:27:42Z eric $ +# $Id: PKGBUILD 182101 2013-04-06 21:59:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=psmisc -pkgver=22.19 +pkgver=22.20 pkgrel=1 pkgdesc="Miscellaneous procfs tools" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') groups=('base') depends=('ncurses') source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) -sha1sums=('4c8fb774449f966f78c4c6e1d77d1a24b4187410') +sha1sums=('abdddc8d5c91251bba0f3190956ae9d05c058745') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/systemd/0001-Fix-vacuum-logic-error.patch b/core/systemd/0001-Fix-vacuum-logic-error.patch deleted file mode 100644 index a0a6e85ee..000000000 --- a/core/systemd/0001-Fix-vacuum-logic-error.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6c142648aaced56ab681fcc97a71b06d588122a9 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Wed, 20 Mar 2013 21:32:05 +0100 -Subject: [PATCH] Fix vacuum logic error - -The vacuum code used to stop vacuuming after one deletion, even -when max_use was still exceeded. - -Also make usage a uint64_t, as the code already pretends it is one. - -Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> ---- - src/journal/journal-vacuum.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c -index 731f6c7..4a3a5a9 100644 ---- a/src/journal/journal-vacuum.c -+++ b/src/journal/journal-vacuum.c -@@ -36,7 +36,7 @@ - #include "util.h" - - struct vacuum_info { -- off_t usage; -+ uint64_t usage; - char *filename; - - uint64_t realtime; -@@ -293,7 +293,7 @@ int journal_directory_vacuum( - if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) { - log_debug("Deleted archived journal %s/%s.", directory, list[i].filename); - -- if ((uint64_t) list[i].usage > sum) -+ if (list[i].usage < sum) - sum -= list[i].usage; - else - sum = 0; --- -1.8.2 - diff --git a/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch b/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch deleted file mode 100644 index cd2d70756..000000000 --- a/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 83d7d83bcc6c462ecbb4c8003e3a8b41f3b88d46 Mon Sep 17 00:00:00 2001 -From: Kay Sievers <kay@vrfy.org> -Date: Sat, 16 Mar 2013 16:10:22 +0100 -Subject: [PATCH] journal: pass the *pid* to sd_pid_get_owner_uid() - ---- - src/journal/journald-server.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index ac565c7..364ab0f 100644 ---- a/src/journal/journald-server.c -+++ b/src/journal/journald-server.c -@@ -593,7 +593,7 @@ static void dispatch_message_real( - IOVEC_SET_STRING(iovec[n++], session); - } - -- if (sd_pid_get_owner_uid(ucred->uid, &owner) >= 0) { -+ if (sd_pid_get_owner_uid(ucred->pid, &owner) >= 0) { - owner_valid = true; - if (asprintf(&owner_uid, "_SYSTEMD_OWNER_UID=%lu", (unsigned long) owner) >= 0) - IOVEC_SET_STRING(iovec[n++], owner_uid); --- -1.8.2 - diff --git a/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch b/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch deleted file mode 100644 index 88dabe9d3..000000000 --- a/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 34b99a8bf7b769b31ad59ff0d60f8572bd0adab5 Mon Sep 17 00:00:00 2001 -From: Kay Sievers <kay@vrfy.org> -Date: Wed, 20 Mar 2013 01:26:17 +0100 -Subject: [PATCH] rules: move builtin calls before the permissions section - -<heftig> kay: systemd commit 22582bb broke cups usb printing for me -<heftig> because the "lp" group isn't applied anymore -<heftig> SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" -<heftig> moving this line to the end of 50-udev-default.rules restores correct behavior, as it's after usb_id - -Conflicts: - rules/50-udev-default.rules ---- - rules/50-udev-default.rules | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules -index 5d8bde5..ce0a4ef 100644 ---- a/rules/50-udev-default.rules -+++ b/rules/50-udev-default.rules -@@ -1,5 +1,13 @@ - # do not edit this file, it will be overwritten on update - -+SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc" -+SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" -+ -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" -+SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" -+SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware" -+ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" -+ - ACTION!="add", GOTO="default_permissions_end" - - SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666" -@@ -8,6 +16,8 @@ SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620" - SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" - KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" - -+SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644" -+ - SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" - - SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640" -@@ -59,10 +69,3 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" - KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" - - LABEL="default_permissions_end" --SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644", SYMLINK+="rtc" --SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" -- --SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" --SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" --SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware" --ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" --- -1.8.2 - diff --git a/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch b/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch deleted file mode 100644 index 6d8d9aad4..000000000 --- a/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 961e4526925b7b1e1d3582f2fc9fb38035e2b5fb Mon Sep 17 00:00:00 2001 -From: Lennart Poettering <lennart@poettering.net> -Date: Fri, 15 Mar 2013 16:41:13 +0100 -Subject: [PATCH] strv: fix STRV_FOREACH_PAIR macro definition - ---- - src/shared/strv.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/shared/strv.h b/src/shared/strv.h -index da9fae6..49058f8 100644 ---- a/src/shared/strv.h -+++ b/src/shared/strv.h -@@ -77,7 +77,7 @@ bool strv_overlap(char **a, char **b); - for (; (l) && ((s) >= (l)); (s)--) - - #define STRV_FOREACH_PAIR(x, y, l) \ -- for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2) -+ for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1)) - - - char **strv_sort(char **l); --- -1.8.2 - diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 0e03a7707..3c77f53ed 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=198 -pkgrel=2 +pkgver=200 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -16,19 +16,11 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' - '0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch' - '0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch' - '0001-rules-move-builtin-calls-before-the-permissions-sect.patch' - '0001-Fix-vacuum-logic-error.patch' 'use-split-usr-path.patch') -md5sums=('26a75e2a310f8c1c1ea9ec26ddb171c5' +md5sums=('5584b96e55c46217dab4c1768d10a472' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' - 'c93785560cd33e25013224ac84689aa3' - '80db2672a49667a3add02fb07dee9dca' - 'a0d3aca35ff7f71d1a5a79022b715ae0' - '7ae8e22cef30e57de02ca623b0673f76' '76bf83fe34c5b40533abc5dc940576a6') build() { @@ -37,19 +29,6 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - # upstream commit 83d7d83bcc6c462ecbb4c8003e3a8b41f3b88d46 - patch -Np1 <"$srcdir"/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch - - # upstream commit 961e4526925b7b1e1d3582f2fc9fb38035e2b5fb - patch -Np1 <"$srcdir"/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch - - # upstream commit bbb7f2ae5035105575365750592caa87213d7072 - # - modified to avoid pulling in disabling of firmware loading - patch -Np1 <"$srcdir"/0001-rules-move-builtin-calls-before-the-permissions-sect.patch - - # upstream commit 6c142648aaced56ab681fcc97a71b06d588122a9 - patch -Np1 <"$srcdir"/0001-Fix-vacuum-logic-error.patch - ./configure \ --enable-static \ --libexecdir=/usr/lib \ @@ -60,14 +39,15 @@ build() { --disable-audit \ --disable-ima \ --with-sysvinit-path= \ - --with-sysvrcnd-path= + --with-sysvrcnd-path= \ + --with-firmware-path="/usr/lib/firmware/updates:/usr/lib/firmware" make } -check() { - make -C "$pkgname-$pkgver" check -} +#check() { +# make -C "$pkgname-$pkgver" check +#} package_systemd() { pkgdesc="system and service manager" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index c5a381df5..cb897bcbb 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181859 2013-04-04 18:56:27Z andyrtr $ +# $Id: PKGBUILD 182085 2013-04-06 18:07:38Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.2.2 pkgver=4.0.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -152,9 +152,9 @@ md5sums=('2c92879fa8c50d0071c4703afb7d10bf' '107a3d18f637b342684b3c21eb0fcd7d' '881c4628ec5f54d47f35d5d19e335662' '92bde158f249b9b27f76f48cc65a0242' - '97bf43dda273d79ff90c848ab53b0e3c' - 'abcb1b0a7deaffe13ab3d7ca70becb49' - '72790a4103da259a55cadd66db931d00' + '07d2bf5ad839a394cca008b3ec6e7bb1' + '4195735a80876ae812fca5736b50192a' + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' '941aab11a42c8052cc1999434ae82bcd' 'caf426e9eefb99108adba6cf231de348' 'c367454b402720eea064280d0dfb291b' @@ -190,7 +190,7 @@ build() { popd # fix not upstreamable pyuno paths - patch taken from Debian -# patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do @@ -300,7 +300,7 @@ package_libreoffice-common() { install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.2" - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2') + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'libcups: adds printing support' @@ -347,7 +347,7 @@ package_libreoffice-common() { cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ ln -vsf /etc/libreoffice/psprint.conf . - # set VLC and if needed python-uno PYTHON path + # allow to preset desired VLC install -dm755 ${pkgdir}/etc/profile.d install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ @@ -361,6 +361,11 @@ package_libreoffice-common() { rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb + # make pyuno find its modules + install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py + # workaround all packages now depend on that file cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd } diff --git a/extra/libreoffice/libreoffice-common.csh b/extra/libreoffice/libreoffice-common.csh index 5efa39404..502512189 100644 --- a/extra/libreoffice/libreoffice-common.csh +++ b/extra/libreoffice/libreoffice-common.csh @@ -1,5 +1,3 @@ -#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program - # to force a certain look'n feel #setenv SAL_USE_VCLPLUGIN gen diff --git a/extra/libreoffice/libreoffice-common.sh b/extra/libreoffice/libreoffice-common.sh index 795867125..7bfdcf7f6 100644 --- a/extra/libreoffice/libreoffice-common.sh +++ b/extra/libreoffice/libreoffice-common.sh @@ -1,5 +1,3 @@ -#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program" - # to force a certain look'n feel #export SAL_USE_VCLPLUGIN=gen diff --git a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff index e86548136..3317b3ca5 100644 --- a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff +++ b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff @@ -17,9 +17,9 @@ index f93ac5e..92a2891 100644 --- a/pyuno/source/module/uno.py +++ b/pyuno/source/module/uno.py @@ -26,8 +26,12 @@ - # for a copy of the LGPLv3 License. + # except in compliance with the License. You may obtain a copy of + # the License at http://www.apache.org/licenses/LICENSE-2.0 . # - #************************************************************************* +import os import sys @@ -33,12 +33,12 @@ diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/o index 610ac5f..df243d0 100755 --- a/scripting/source/pyprov/officehelper.py +++ b/scripting/source/pyprov/officehelper.py -@@ -53,7 +53,7 @@ def bootstrap(): +@@ -44,7 +44,7 @@ def bootstrap(): if "UNO_PATH" in os.environ: sOffice = os.environ["UNO_PATH"] else: - sOffice = "" # lets hope for the best + sOffice = "/usr/lib/libreoffice/program" sOffice = os.path.join(sOffice, "soffice") - if platform.startswith("win"): + if platform.startswith("win"): sOffice += ".exe" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 6b59f6a50..105be2a57 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181249 2013-04-02 15:45:47Z giovanni $ +# $Id: PKGBUILD 182095 2013-04-06 19:27:44Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.04.01 +pkgver=2013.04.06 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('9a19e8301c3c0b93de03282c6a6144aa') +md5sums=('1cd8e5181a1ddd29537cb16ad3cb0138') build() { cd ${srcdir}/live diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 71258a605..d6edcf95e 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173791 2012-12-23 03:50:49Z stephane $ +# $Id: PKGBUILD 182098 2013-04-06 21:41:54Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.8 +pkgver=1.7.9 pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') @@ -25,16 +25,14 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} svnserve.conf svnserve.tmpfiles svnserve.service - subversion-kwallet.patch subversion.rpath.fix.patch) -sha1sums=('12c7d8d5414bba74c9777c4d1dae74f152df63c2' - '24f8e82fa131c1a1b924d71046f8d38cb00645a7' +sha1sums=('453757bae78a800997559f2232483ab99238ec1e' + '5ce5adc5f5cae5a2d569a89b5e4498623feae84a' '64ba3e6ebafc08ac62f59d788f7a825fdce69573' '73b36c046c09cec2093354911c89e3ba8056af6c' 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' '9f6790d842cf3e0228b007483a43e39a42724068' - 'f2aed28a2e34b8631ee9b69175bac1bac59327ce' '3d1e28408a9abb42af2e531adc0d01ce21acfad6') build() { @@ -44,9 +42,6 @@ build() { patch -Np0 -i ../subversion.rpath.fix.patch sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - # FS#33081 - patch -Np0 -i ../subversion-kwallet.patch - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \ --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ diff --git a/extra/subversion/subversion-kwallet.patch b/extra/subversion/subversion-kwallet.patch deleted file mode 100644 index d2bf17101..000000000 --- a/extra/subversion/subversion-kwallet.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: subversion/libsvn_auth_kwallet/kwallet.cpp -=================================================================== ---- subversion/libsvn_auth_kwallet/kwallet.cpp (revision 1421011) -+++ subversion/libsvn_auth_kwallet/kwallet.cpp (working copy) -@@ -253,7 +253,7 @@ kwallet_password_get(svn_boolean_t *done, - } - } - -- apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL); -+ apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null); - - return SVN_NO_ERROR; - } -@@ -327,7 +327,7 @@ kwallet_password_set(svn_boolean_t *done, - } - } - -- apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL); -+ apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null); - - return SVN_NO_ERROR; - }
\ No newline at end of file diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD index 833069ff2..aff067a94 100644 --- a/libre/bumblebee-libre/PKGBUILD +++ b/libre/bumblebee-libre/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=bumblebee pkgname=bumblebee-libre pkgver=3.1 -pkgrel=5 +pkgrel=5.1 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support" arch=('i686' 'x86_64') depends=('virtualgl' 'libbsd' 'glib2' 'mesa-libgl') @@ -24,12 +24,21 @@ license=("GPL3") install='bumblebee.install' backup=('etc/bumblebee/bumblebee.conf' 'etc/bumblebee/xorg.conf.nouveau') -source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz") -md5sums=('de515ef51b1e0714c2f1b2a95f83e77e') +source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz" + 'libre.patch') +md5sums=('de515ef51b1e0714c2f1b2a95f83e77e' + 'f8b6044310039911236f53a625c611a6') build() { cd "${srcdir}/${_pkgname}-${pkgver}" + # Remove nonfree references to nonfree nvidia driver and unnecessaries files + rm -rv "README.markdown" + rm -rv "conf/"{99-remove-nvidia-dev.rules,xorg.conf.nvidia} + rm -rv "doc" + rm -rv "scripts/bumblebee-bugreport.in" + patch -Np1 -i "${srcdir}/libre.patch" + ./configure \ CONF_DRIVER=nouveau \ --prefix=/usr \ diff --git a/libre/bumblebee-libre/libre.patch b/libre/bumblebee-libre/libre.patch new file mode 100644 index 000000000..0952b1d11 --- /dev/null +++ b/libre/bumblebee-libre/libre.patch @@ -0,0 +1,130 @@ +diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am +--- bumblebee-3.1.orig/Makefile.am 2013-02-24 21:29:35.055167554 -0200 ++++ bumblebee-3.1/Makefile.am 2013-04-06 07:25:37.798457580 -0300 +@@ -1,7 +1,6 @@ + # -*- Makefile -*- + + GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)") +-relnotes = doc/RELEASE_NOTES_3_1 + + bumblebeedconfdir=$(sysconfdir)/bumblebee + +@@ -19,19 +18,12 @@ + noinst_SCRIPTS += scripts/sysvinit/bumblebeed + endif + +-bin_SCRIPTS = scripts/bumblebee-bugreport +- + CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS) + EXTRA_DIST = scripts/systemd/bumblebeed.service.in \ + scripts/upstart/bumblebeed.conf.in \ +- conf/99-remove-nvidia-dev.rules \ + conf/bumblebee.conf.in \ +- conf/xorg.conf.nvidia \ + conf/xorg.conf.nouveau \ +- README.markdown \ + scripts/bash_completion/bumblebee \ +- scripts/bumblebee-bugreport.in \ +- $(relnotes) \ + version.sh + # for laziness include all headers found + EXTRA_DIST += src/*.h src/*/switching.h +@@ -52,8 +44,7 @@ + src/driver.c src/bumblebeed.c + bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt + +-dist_doc_DATA = $(relnotes) README.markdown +-bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau conf/xorg.conf.nvidia ++bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau + + completiondir = $(sysconfdir)/bash_completion.d + completion_DATA = scripts/bash_completion/bumblebee +@@ -91,10 +82,6 @@ + mkdir -p scripts/systemd + $(do_subst) < $< > $@ + +-scripts/bumblebee-bugreport: $(srcdir)/scripts/bumblebee-bugreport.in +- mkdir -p scripts +- $(do_subst) < $< > $@ +- + if WITH_PIDFILE + scripts/sysvinit/bumblebeed: $(srcdir)/scripts/sysvinit/bumblebeed.in + mkdir -p scripts/sysvinit +diff -Nur bumblebee-3.1.orig/Makefile.in bumblebee-3.1/Makefile.in +--- bumblebee-3.1.orig/Makefile.in 2013-02-24 21:34:57.103561881 -0200 ++++ bumblebee-3.1/Makefile.in 2013-04-06 07:23:01.600417658 -0300 +@@ -315,7 +315,6 @@ + x11_CFLAGS = @x11_CFLAGS@ + x11_LIBS = @x11_LIBS@ + GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)") +-relnotes = doc/RELEASE_NOTES_3_1 + bumblebeedconfdir = $(sysconfdir)/bumblebee + AM_CPPFLAGS = ${regular_CPPFLAGS} \ + -DCONFIG_FILE='"$(bumblebeedconfdir)/bumblebee.conf"' \ +@@ -327,16 +326,15 @@ + + noinst_SCRIPTS = scripts/systemd/bumblebeed.service \ + scripts/upstart/bumblebeed.conf $(am__append_1) +-bin_SCRIPTS = scripts/bumblebee-bugreport + CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS) \ + $(am__append_3) + # for laziness include all headers found + EXTRA_DIST = scripts/systemd/bumblebeed.service.in \ + scripts/upstart/bumblebeed.conf.in \ +- conf/99-remove-nvidia-dev.rules conf/bumblebee.conf.in \ +- conf/xorg.conf.nvidia conf/xorg.conf.nouveau README.markdown \ ++ conf/bumblebee.conf.in \ ++ conf/xorg.conf.nouveau \ + scripts/bash_completion/bumblebee \ +- scripts/bumblebee-bugreport.in $(relnotes) version.sh src/*.h \ ++ scripts/bumblebee-bugreport.in version.sh src/*.h \ + src/*/switching.h $(am__append_2) + bin_optirun_SOURCES = src/module.c src/bbconfig.c src/bblogger.c src/bbrun.c \ + src/bbsocket.c src/driver.c src/optirun.c src/bbsocketclient.c +@@ -348,12 +346,9 @@ + src/driver.c src/bumblebeed.c + + bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt +-dist_doc_DATA = $(relnotes) README.markdown +-bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau conf/xorg.conf.nvidia ++bumblebeedconf_DATA = conf/bumblebee.conf conf/xorg.conf.nouveau + completiondir = $(sysconfdir)/bash_completion.d + completion_DATA = scripts/bash_completion/bumblebee +-@WITH_UDEV_RULES_TRUE@udevrulesdir = $(UDEV_RULES_DIR) +-@WITH_UDEV_RULES_TRUE@udevrules_DATA = conf/99-remove-nvidia-dev.rules + do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \ + -e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \ + -e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \ +diff -Nur bumblebee-3.1.orig/conf/bumblebee.conf.in bumblebee-3.1/conf/bumblebee.conf.in +--- bumblebee-3.1.orig/conf/bumblebee.conf.in 2013-02-21 17:03:35.526542613 -0200 ++++ bumblebee-3.1/conf/bumblebee.conf.in 2013-04-06 06:28:48.124159386 -0300 +@@ -17,8 +17,8 @@ + # be ignored. + NoEcoModeOverride=false + # The Driver used by Bumblebee server. If this value is not set (or empty), +-# auto-detection is performed. The available drivers are nvidia and nouveau +-# (See also the driver-specific sections below) ++# auto-detection is performed. The available driver is nouveau ++# (See also the driver-specific section below) + Driver=@CONF_DRIVER@ + + ## Client options. Will take effect on the next optirun executed. +@@ -44,18 +44,6 @@ + # none - disable PM completely + # https://github.com/Bumblebee-Project/Bumblebee/wiki/Comparison-of-PM-methods + +-## Section with nvidia driver specific options, only parsed if Driver=nvidia +-[driver-nvidia] +-# Module name to load, defaults to Driver if empty or unset +-KernelDriver=@CONF_DRIVER_MODULE_NVIDIA@ +-PMMethod=@CONF_PM_METHOD@ +-# colon-separated path to the nvidia libraries +-LibraryPath=@CONF_LDPATH_NVIDIA@ +-# comma-separated path of the directory containing nvidia_drv.so and the +-# default Xorg modules path +-XorgModulePath=@CONF_MODPATH_NVIDIA@ +-XorgConfFile=@BBCONFDIR@/xorg.conf.nvidia +- + ## Section with nouveau driver specific options, only parsed if Driver=nouveau + [driver-nouveau] + KernelDriver=nouveau diff --git a/extra/mediastreamer/PKGBUILD b/pcr/mediastreamer/PKGBUILD index 0fb057092..e55ace473 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/pcr/mediastreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178928 2013-02-28 19:31:23Z eric $ +# $Id$ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,12 +6,12 @@ pkgname=mediastreamer pkgver=2.8.2 -pkgrel=4 +pkgrel=4.1 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64') url="http://www.linphone.org/" license=('GPL') -depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') +depends=('ortp' 'speex' 'ffmpeg=1:1.2' 'v4l-utils' 'libxv' 'libpulse') makedepends=('intltool') options=('!libtool') source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/pcr/mediastreamer/mediastreamer-ffmpeg.patch index 3304e9f56..3304e9f56 100644 --- a/extra/mediastreamer/mediastreamer-ffmpeg.patch +++ b/pcr/mediastreamer/mediastreamer-ffmpeg.patch diff --git a/~lukeshu/maildirproc/PKGBUILD b/~lukeshu/maildirproc/PKGBUILD index 9197fc6e3..bb98fa112 100644 --- a/~lukeshu/maildirproc/PKGBUILD +++ b/~lukeshu/maildirproc/PKGBUILD @@ -2,7 +2,7 @@ pkgname="maildirproc" pkgver="0.5.0" -pkgrel="1" +pkgrel="2" pkgdesc="Sorts mail based on a Python configuration file" arch=("any") url="http://joel.rosdahl.net/maildirproc/" diff --git a/~lukeshu/wdiff/PKGBUILD b/~lukeshu/wdiff/PKGBUILD index e321065a9..41bee9679 100644 --- a/~lukeshu/wdiff/PKGBUILD +++ b/~lukeshu/wdiff/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> pkgname=wdiff -pkgver=1.1.2 +pkgver=1.2.1 pkgrel=1 pkgdesc="A front end to diff for comparing files on a word per word basis." arch=('i686' 'x86_64') @@ -26,4 +26,4 @@ package() { make DESTDIR="$pkgdir/" install } -md5sums=('ac51497a2b33094c484237049803a697') +md5sums=('fc54e044b229a23c1cfa8e5689196f24') |