diff options
31 files changed, 180 insertions, 702 deletions
diff --git a/community/gpsim/PKGBUILD b/community/gpsim/PKGBUILD index 311a70a32..ebdf3d253 100644 --- a/community/gpsim/PKGBUILD +++ b/community/gpsim/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 63608 2012-02-05 12:00:08Z ibiru $ +# $Id: PKGBUILD 98438 2013-10-10 13:31:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: mickael9 <mickael9 at gmail dot com> pkgname=gpsim -pkgver=0.26.1 -pkgrel=2 +pkgver=0.27.0 +pkgrel=1 pkgdesc="A full-featured software simulator for Microchip PIC microcontrollers" arch=(i686 x86_64) url="http://gpsim.sourceforge.net/" license=(GPL) depends=('gtk2+extra' 'popt') -makedepends=('gtk2+extra') +makedepends=('gtk2+extra' 'gputils') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('c994c23d2d75056dbefcf5d1d63596d7') +md5sums=('b3ded17f1c8c6134f2381d6e6925b231') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/community/lgi/PKGBUILD b/community/lgi/PKGBUILD index 0c03956a1..4eb8fb661 100644 --- a/community/lgi/PKGBUILD +++ b/community/lgi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85686 2013-03-04 23:40:53Z seblu $ +# $Id: PKGBUILD 98427 2013-10-10 07:57:51Z seblu $ # Maintainer: speps <speps at aur dot archlinux dot org> # Maintainer: Sébastien Luttringer pkgbase=lgi pkgname=(lua-lgi) -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=1 pkgdesc='Lua bindings for gnome/gobject using gobject-introspection library' arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=('glibc' 'glib2' 'libffi' 'lua' 'gobject-introspection') replaces=('lgi') conflicts=('lgi') source=("$pkgbase-$pkgver.tar.gz::https://github.com/pavouk/$pkgbase/archive/$pkgver.tar.gz") -md5sums=('de7367aee8e39f7df7c2229675c5ff2d') +md5sums=('f41902695c3d8ef40312d7c654885bf3') build() { cd $pkgbase-$pkgver diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD index fe1c0a16e..0734e08f7 100755 --- a/community/lightdm-gtk2-greeter/PKGBUILD +++ b/community/lightdm-gtk2-greeter/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92267 2013-06-03 13:05:16Z alucryd $ +# $Id: PKGBUILD 98452 2013-10-10 20:04:45Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk2-greeter -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 epoch=1 pkgdesc="GTK+ greeter for LightDM" @@ -16,17 +16,17 @@ provides=("${pkgname/2/}") conflicts=("${pkgname/2/3}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz") -sha256sums=('69df6199a7e62b07a1865b0319a7c031abc2b06dc3eb193b8b7b453f536283ac') +sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9') build() { - cd "${srcdir}"/${pkgname/2/}-${pkgver} + cd ${pkgname/2/}-${pkgver} - ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static --with-gtk2 + ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --libexecdir='/usr/lib/lightdm' --disable-static --with-gtk2 make } package() { - cd "${srcdir}"/${pkgname/2/}-${pkgver} + cd ${pkgname/2/}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD index 6455f5383..974539f2b 100755 --- a/community/lightdm-gtk3-greeter/PKGBUILD +++ b/community/lightdm-gtk3-greeter/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92265 2013-06-03 12:53:06Z alucryd $ +# $Id: PKGBUILD 98450 2013-10-10 19:59:15Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk3-greeter -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 epoch=1 pkgdesc="GTK+ greeter for LightDM" @@ -16,17 +16,17 @@ provides=("${pkgname/3/}") conflicts=("${pkgname/3/2}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz") -sha256sums=('69df6199a7e62b07a1865b0319a7c031abc2b06dc3eb193b8b7b453f536283ac') +sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9') build() { - cd "${srcdir}"/${pkgname/3/}-${pkgver} + cd ${pkgname/3/}-${pkgver} - ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static + ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --libexecdir='/usr/lib/lightdm' --disable-static make } package() { - cd "${srcdir}"/${pkgname/3/}-${pkgver} + cd ${pkgname/3/}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index 6f494e7e6..49b1e9cec 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 98119 2013-10-06 08:35:43Z alucryd $ +# $Id: PKGBUILD 98444 2013-10-10 16:19:18Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') -pkgver=1.6.2 -pkgrel=2 +pkgver=1.8.1 +pkgrel=1 epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64') @@ -13,36 +13,27 @@ url="https://launchpad.net/lightdm" license=('GPL3' 'LGPL3') makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base') options=('!libtool') -source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz" +source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz" 'lightdm.service' 'lightdm.tmpfiles' 'lightdm.pam' 'lightdm-autologin.pam' 'lightdm.rules' - 'lightdm-corrupt-x-authority.patch' 'lightdm-default-config.patch' - 'lightdm-lock-screen-before-switch.patch' - 'lightdm-use-login1.patch' 'Xsession') -sha256sums=('b0de1dc81bb5ce81800feafb9fbc7806ef4dfc83733f0df058568e55b8a045f3' +sha256sums=('e749ea72ac2517f592a8dfcd8bbdf7aba6729cb75c569c03347751d87f99305a' '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a' 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a' 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' - '420aac58151bc441696db0bf234123b934ca8a8798e90db8a59252258e82b5d5' - '15f75ffe122fa86c0c4b3558b9d73e151ba89355093036ffc64110c5e306216b' - '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822' - 'a760c7b4d8c0b54bb204b5d6e574c82360a90464ac06042409a17f950d2c1194' + '0b2f740616110887d5c8662e40f1a8350fc0dfa6c7e99f6e3a5636c6b0ca714f' '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4') prepare() { cd ${pkgbase}-${pkgver} - patch -Np0 -i ../lightdm-corrupt-x-authority.patch patch -Np1 -i ../lightdm-default-config.patch - patch -Np1 -i ../lightdm-lock-screen-before-switch.patch - patch -Np0 -i ../lightdm-use-login1.patch } build() { diff --git a/community/lightdm/lightdm-corrupt-x-authority.patch b/community/lightdm/lightdm-corrupt-x-authority.patch deleted file mode 100755 index f994b394c..000000000 --- a/community/lightdm/lightdm-corrupt-x-authority.patch +++ /dev/null @@ -1,21 +0,0 @@ -=== modified file 'src/xauthority.c' ---- src/xauthority.c 2013-09-10 23:14:12 +0000 -+++ src/xauthority.c 2013-09-30 02:59:01 +0000 -@@ -237,7 +237,7 @@ - gboolean - x_authority_write (XAuthority *auth, XAuthWriteMode mode, const gchar *filename, GError **error) - { -- gchar *input; -+ gchar *input = NULL; - gsize input_length = 0, input_offset = 0; - GList *link, *records = NULL; - XAuthority *a; -@@ -328,6 +328,7 @@ - } - - errno = 0; -+ result = TRUE; - for (link = records; link && result; link = link->next) - { - XAuthority *a = link->data; - diff --git a/community/lightdm/lightdm-default-config.patch b/community/lightdm/lightdm-default-config.patch index 7c7b421b6..54963c689 100755 --- a/community/lightdm/lightdm-default-config.patch +++ b/community/lightdm/lightdm-default-config.patch @@ -17,29 +17,29 @@ +log-directory=/var/log/lightdm +run-directory=/run/lightdm #cache-directory=/var/cache/lightdm - #xsessions-directory=/usr/share/xsessions + #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions #remote-sessions-directory=/usr/share/lightdm/remote-sessions -@@ -71,7 +71,7 @@ - #xdmcp-manager= - #xdmcp-port=177 +@@ -81,7 +81,7 @@ #xdmcp-key= + #unity-compositor-command=unity-system-compositor + #unity-compositor-timeout=60 -#greeter-session=example-gtk-gnome +greeter-session=lightdm-gtk-greeter #greeter-hide-users=false #greeter-allow-guest=true #greeter-show-manual-login=false -@@ -79,7 +79,7 @@ +@@ -89,7 +89,7 @@ #user-session=default #allow-guest=true #guest-session=UNIMPLEMENTED -#session-wrapper=lightdm-session +session-wrapper=/etc/lightdm/Xsession + #greeter-wrapper= #display-setup-script= #greeter-setup-script= - #session-setup-script= -@@ -88,6 +88,7 @@ - #autologin-user= +@@ -100,6 +100,7 @@ #autologin-user-timeout=0 + #autologin-in-background=false #autologin-session=UNIMPLEMENTED +pam-service=lightdm-autologin #exit-on-failure=false diff --git a/community/lightdm/lightdm-lock-screen-before-switch.patch b/community/lightdm/lightdm-lock-screen-before-switch.patch deleted file mode 100755 index b8b1d559c..000000000 --- a/community/lightdm/lightdm-lock-screen-before-switch.patch +++ /dev/null @@ -1,55 +0,0 @@ -# HG changeset patch -# Parent b329fa1badaa454239690c3feb93d53324134915 -try to lock the screen before switching users - -diff --git a/utils/gdmflexiserver b/utils/gdmflexiserver ---- a/utils/gdmflexiserver -+++ b/utils/gdmflexiserver -@@ -9,9 +9,47 @@ - # - # See http://www.gnu.org/copyleft/gpl.html for the full text of the license. - -+PATH=/usr/local/bin:/bin:/usr/bin -+export PATH -+ - if [ -z "$XDG_SEAT_PATH" ]; then - # something went wrong - exit 1 - fi - -+find_command () { -+ cmd="$1" -+ oIFS="${IFS}"; IFS=: -+ set -- ${PATH} -+ IFS="${oIFS}" -+ -+ for part; do -+ [ -x "${part}/${cmd}" ] && return 0 -+ done -+ return 1 -+} -+ -+lock_screen () { -+ for lock_cmd in \ -+ "xscreensaver-command -lock" \ -+ "gnome-screensaver-command --lock" \ -+ "dbus-send --session --dest=org.freedesktop.ScreenSaver --type=method_call /ScreenSaver org.freedesktop.ScreenSaver.Lock" -+ do -+ ${lock_cmd} >/dev/null 2>&1 && return -+ done -+ -+ for lock_cmd in \ -+ "slock" \ -+ "xlock -mode blank" -+ do -+ set -- ${lock_cmd} -+ if find_command "$1"; then -+ ${lock_cmd} >/dev/null 2>&1 & -+ return -+ fi -+ done -+} -+ -+lock_screen -+ - dbus-send --system --type=method_call --print-reply --dest=org.freedesktop.DisplayManager $XDG_SEAT_PATH org.freedesktop.DisplayManager.Seat.SwitchToGreeter diff --git a/community/lightdm/lightdm-use-login1.patch b/community/lightdm/lightdm-use-login1.patch deleted file mode 100755 index cc3d5a5fd..000000000 --- a/community/lightdm/lightdm-use-login1.patch +++ /dev/null @@ -1,505 +0,0 @@ -=== modified file 'liblightdm-gobject/power.c' ---- liblightdm-gobject/power.c 2013-01-31 20:56:09 +0000 -+++ liblightdm-gobject/power.c 2013-04-15 02:21:06 +0000 -@@ -17,6 +17,7 @@ - - static GDBusProxy *upower_proxy = NULL; - static GDBusProxy *ck_proxy = NULL; -+static GDBusProxy *login1_proxy = NULL; - - static gboolean - upower_call_function (const gchar *function, gboolean default_result, GError **error) -@@ -109,11 +110,10 @@ - return upower_call_function ("Hibernate", TRUE, error); - } - --static gboolean --ck_call_function (const gchar *function, gboolean default_result, GError **error) -+static GVariant * -+ck_call_function (const gchar *function, GError **error) - { -- GVariant *result; -- gboolean function_result = FALSE; -+ GVariant *r; - - if (!ck_proxy) - { -@@ -129,22 +129,46 @@ - return FALSE; - } - -- result = g_dbus_proxy_call_sync (ck_proxy, -- function, -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, -- NULL, -- error); -- -- if (!result) -- return default_result; -- -- if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(b)"))) -- g_variant_get (result, "(b)", &function_result); -- -- g_variant_unref (result); -- return function_result; -+ r = g_dbus_proxy_call_sync (ck_proxy, -+ function, -+ NULL, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ NULL, -+ error); -+ -+ return r; -+} -+ -+static GVariant * -+login1_call_function (const gchar *function, GVariant *parameters, GError **error) -+{ -+ GVariant *r; -+ gchar *str_result; -+ -+ if (!login1_proxy) -+ { -+ login1_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -+ G_DBUS_PROXY_FLAGS_NONE, -+ NULL, -+ "org.freedesktop.login1", -+ "/org/freedesktop/login1", -+ "org.freedesktop.login1.Manager", -+ NULL, -+ error); -+ if (!login1_proxy) -+ return NULL; -+ } -+ -+ r = g_dbus_proxy_call_sync (login1_proxy, -+ function, -+ parameters, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ NULL, -+ error); -+ -+ return r; - } - - /** -@@ -157,7 +181,29 @@ - gboolean - lightdm_get_can_restart (void) - { -- return ck_call_function ("CanRestart", FALSE, NULL); -+ gboolean can_restart = FALSE; -+ GVariant *r; -+ -+ r = login1_call_function ("CanReboot", NULL, NULL); -+ if (r) -+ { -+ gchar *result; -+ if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)"))) -+ { -+ g_variant_get (r, "(&s)", &result); -+ can_restart = g_strcmp0 (result, "yes") == 0; -+ } -+ } -+ else -+ { -+ r = ck_call_function ("CanRestart", NULL); -+ if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)"))) -+ g_variant_get (r, "(b)", &can_restart); -+ } -+ if (r) -+ g_variant_unref (r); -+ -+ return can_restart; - } - - /** -@@ -171,7 +217,20 @@ - gboolean - lightdm_restart (GError **error) - { -- return ck_call_function ("Restart", TRUE, error); -+ GVariant *r; -+ gboolean restarted; -+ -+ r = login1_call_function ("Reboot", g_variant_new("(b)", FALSE), error); -+ if (!r) -+ { -+ g_clear_error (error); -+ r = ck_call_function ("Restart", error); -+ } -+ restarted = r != NULL; -+ if (r) -+ g_variant_unref (r); -+ -+ return restarted; - } - - /** -@@ -184,7 +243,29 @@ - gboolean - lightdm_get_can_shutdown (void) - { -- return ck_call_function ("CanStop", FALSE, NULL); -+ gboolean can_shutdown = FALSE; -+ GVariant *r; -+ -+ r = login1_call_function ("CanPowerOff", NULL, NULL); -+ if (r) -+ { -+ gchar *result; -+ if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)"))) -+ { -+ g_variant_get (r, "(&s)", &result); -+ can_shutdown = g_strcmp0 (result, "yes") == 0; -+ } -+ } -+ else -+ { -+ r = ck_call_function ("CanStop", NULL); -+ if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)"))) -+ g_variant_get (r, "(b)", &can_shutdown); -+ } -+ if (r) -+ g_variant_unref (r); -+ -+ return can_shutdown; - } - - /** -@@ -198,5 +279,18 @@ - gboolean - lightdm_shutdown (GError **error) - { -- return ck_call_function ("Stop", TRUE, error); -+ GVariant *r; -+ gboolean shutdown; -+ -+ r = login1_call_function ("PowerOff", g_variant_new("(b)", FALSE), error); -+ if (!r) -+ { -+ g_clear_error (error); -+ r = ck_call_function ("Stop", error); -+ } -+ shutdown = r != NULL; -+ if (r) -+ g_variant_unref (r); -+ -+ return shutdown; - } - -=== modified file 'liblightdm-qt/power.cpp' ---- liblightdm-qt/power.cpp 2013-02-06 14:08:25 +0000 -+++ liblightdm-qt/power.cpp 2013-04-14 23:00:34 +0000 -@@ -15,6 +15,7 @@ - #include <QtCore/QVariant> - #include <QtDBus/QDBusInterface> - #include <QtDBus/QDBusReply> -+#include <QDebug> - - #include "config.h" - -@@ -26,11 +27,13 @@ - PowerInterfacePrivate(); - QScopedPointer<QDBusInterface> powerManagementInterface; - QScopedPointer<QDBusInterface> consoleKitInterface; -+ QScopedPointer<QDBusInterface> login1Interface; - }; - - PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate() : - powerManagementInterface(new QDBusInterface("org.freedesktop.UPower","/org/freedesktop/UPower", "org.freedesktop.UPower", QDBusConnection::systemBus())), -- consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())) -+ consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())), -+ login1Interface(new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus())) - { - } - -@@ -80,34 +83,54 @@ - - bool PowerInterface::canShutdown() - { -+ if (d->login1Interface->isValid()) { -+ QDBusReply<QString> reply1 = d->login1Interface->call("CanPowerOff"); -+ if (reply1.isValid()) { -+ return reply1.value() == "yes"; -+ } -+ } -+ qWarning() << d->login1Interface->lastError(); -+ - QDBusReply<bool> reply = d->consoleKitInterface->call("CanStop"); - if (reply.isValid()) { - return reply.value(); - } -- else { -- return false; -- } -+ -+ return false; - } - - void PowerInterface::shutdown() - { -- d->consoleKitInterface->call("Stop"); -+ if (d->login1Interface->isValid()) -+ d->login1Interface->call("PowerOff", false); -+ else -+ d->consoleKitInterface->call("Stop"); - } - - bool PowerInterface::canRestart() - { -+ if (d->login1Interface->isValid()) { -+ QDBusReply<QString> reply1 = d->login1Interface->call("CanReboot"); -+ if (reply1.isValid()) { -+ return reply1.value() == "yes"; -+ } -+ } -+ qWarning() << d->login1Interface->lastError(); -+ - QDBusReply<bool> reply = d->consoleKitInterface->call("CanRestart"); - if (reply.isValid()) { - return reply.value(); - } -- else { -- return false; -- } -+ -+ return false; - } - - void PowerInterface::restart() - { -- d->consoleKitInterface->call("Restart"); -+ if (d->login1Interface->isValid()) -+ d->login1Interface->call("Reboot", false); -+ else -+ d->consoleKitInterface->call("Restart"); - } - - #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - -=== modified file 'tests/Makefile.am' ---- tests/Makefile.am 2013-04-12 03:46:06 +0000 -+++ tests/Makefile.am 2013-04-14 22:54:54 +0000 -@@ -135,6 +135,8 @@ - test-no-accounts-service \ - test-console-kit \ - test-no-console-kit \ -+ test-no-login1 \ -+ test-no-console-kit-or-login1 \ - test-open-file-descriptors \ - test-xdmcp-open-file-descriptors - -@@ -284,8 +286,10 @@ - scripts/no-accounts-service.conf \ - scripts/no-config.conf \ - scripts/no-console-kit.conf \ -+ scripts/no-console-kit-or-login1.conf \ - scripts/no-keyboard-layout.conf \ - scripts/no-language.conf \ -+ scripts/no-login1.conf \ - scripts/open-file-descriptors.conf \ - scripts/pam.conf \ - scripts/plymouth-active-vt.conf \ - -=== added file 'tests/scripts/no-console-kit-or-login1.conf' ---- tests/scripts/no-console-kit-or-login1.conf 1970-01-01 00:00:00 +0000 -+++ tests/scripts/no-console-kit-or-login1.conf 2013-04-14 22:54:54 +0000 -@@ -0,0 +1,34 @@ -+# -+# Check still works when neither ConsoleKit or login1 is available -+# -+ -+[test-runner-config] -+disable-console-kit=true -+disable-login1=true -+ -+[LightDM] -+minimum-display-number=50 -+ -+[SeatDefaults] -+autologin-user=have-password1 -+ -+#?RUNNER DAEMON-START -+ -+# X server starts -+#?XSERVER :50 START -+#?XSERVER :50 INDICATE-READY -+ -+# LightDM connects to X server -+#?XSERVER :50 ACCEPT-CONNECT -+ -+# Session starts -+#?SESSION :50 START USER=have-password1 -+#?XSERVER :50 ACCEPT-CONNECT -+#?SESSION :50 CONNECT-XSERVER -+ -+# Cleanup -+#?*STOP-DAEMON -+# Don't know what order they will terminate -+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -+#?RUNNER DAEMON-EXIT STATUS=0 - -=== added file 'tests/scripts/no-login1.conf' ---- tests/scripts/no-login1.conf 1970-01-01 00:00:00 +0000 -+++ tests/scripts/no-login1.conf 2013-04-14 22:54:54 +0000 -@@ -0,0 +1,33 @@ -+# -+# Check still works when login1 is not available -+# -+ -+[test-runner-config] -+disable-login1=true -+ -+[LightDM] -+minimum-display-number=50 -+ -+[SeatDefaults] -+autologin-user=have-password1 -+ -+#?RUNNER DAEMON-START -+ -+# X server starts -+#?XSERVER :50 START -+#?XSERVER :50 INDICATE-READY -+ -+# LightDM connects to X server -+#?XSERVER :50 ACCEPT-CONNECT -+ -+# Session starts -+#?SESSION :50 START USER=have-password1 -+#?XSERVER :50 ACCEPT-CONNECT -+#?SESSION :50 CONNECT-XSERVER -+ -+# Cleanup -+#?*STOP-DAEMON -+# Don't know what order they will terminate -+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -+#?RUNNER DAEMON-EXIT STATUS=0 - -=== modified file 'tests/src/test-runner.c' ---- tests/src/test-runner.c 2013-03-27 00:48:48 +0000 -+++ tests/src/test-runner.c 2013-04-14 22:54:54 +0000 -@@ -1464,6 +1464,101 @@ accounts_user_set_hidden (AccountsUser * - } - - static void -+handle_login1_call (GDBusConnection *connection, -+ const gchar *sender, -+ const gchar *object_path, -+ const gchar *interface_name, -+ const gchar *method_name, -+ GVariant *parameters, -+ GDBusMethodInvocation *invocation, -+ gpointer user_data) -+{ -+ if (strcmp (method_name, "CanReboot") == 0) -+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", "yes")); -+ else if (strcmp (method_name, "Reboot") == 0) -+ { -+ gboolean interactive; -+ g_variant_get (parameters, "(b)", &interactive); -+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("()")); -+ } -+ if (strcmp (method_name, "CanPowerOff") == 0) -+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", "yes")); -+ else if (strcmp (method_name, "PowerOff") == 0) -+ { -+ gboolean interactive; -+ g_variant_get (parameters, "(b)", &interactive); -+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("()")); -+ } -+ else -+ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name); -+} -+ -+static void -+login1_name_acquired_cb (GDBusConnection *connection, -+ const gchar *name, -+ gpointer user_data) -+{ -+ const gchar *login1_interface = -+ "<node>" -+ " <interface name='org.freedesktop.login1.Manager'>" -+ " <method name='CanReboot'>" -+ " <arg name='result' direction='out' type='s'/>" -+ " </method>" -+ " <method name='Reboot'>" -+ " <arg name='interactive' direction='in' type='b'/>" -+ " </method>" -+ " <method name='CanPowerOff'>" -+ " <arg name='result' direction='out' type='s'/>" -+ " </method>" -+ " <method name='PowerOff'>" -+ " <arg name='interactive' direction='in' type='b'/>" -+ " </method>" -+ " </interface>" -+ "</node>"; -+ static const GDBusInterfaceVTable login1_vtable = -+ { -+ handle_login1_call, -+ }; -+ GDBusNodeInfo *login1_info; -+ GError *error = NULL; -+ -+ login1_info = g_dbus_node_info_new_for_xml (login1_interface, &error); -+ if (error) -+ g_warning ("Failed to parse D-Bus interface: %s", error->message); -+ g_clear_error (&error); -+ if (!login1_info) -+ return; -+ g_dbus_connection_register_object (connection, -+ "/org/freedesktop/login1", -+ login1_info->interfaces[0], -+ &login1_vtable, -+ NULL, NULL, -+ &error); -+ if (error) -+ g_warning ("Failed to register login1 service: %s", error->message); -+ g_clear_error (&error); -+ g_dbus_node_info_unref (login1_info); -+ -+ service_count--; -+ if (service_count == 0) -+ run_lightdm (); -+} -+ -+static void -+start_login1_daemon () -+{ -+ service_count++; -+ g_bus_own_name (G_BUS_TYPE_SYSTEM, -+ "org.freedesktop.login1", -+ G_BUS_NAME_OWNER_FLAGS_NONE, -+ login1_name_acquired_cb, -+ NULL, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void - load_passwd_file (void) - { - gchar *path, *data, **lines; - -=== added file 'tests/test-no-console-kit-or-login1' ---- tests/test-no-console-kit-or-login1 1970-01-01 00:00:00 +0000 -+++ tests/test-no-console-kit-or-login1 2013-04-14 22:54:54 +0000 -@@ -0,0 +1,2 @@ -+#!/bin/sh -+./src/dbus-env ./src/test-runner no-console-kit-or-login1 test-gobject-greeter - -=== added file 'tests/test-no-login1' ---- tests/test-no-login1 1970-01-01 00:00:00 +0000 -+++ tests/test-no-login1 2013-04-14 22:54:54 +0000 -@@ -0,0 +1,2 @@ -+#!/bin/sh -+./src/dbus-env ./src/test-runner no-login1 test-gobject-greeter - diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index d5ac06175..a8f8a83b3 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 96815 2013-09-05 20:15:59Z seblu $ +# $Id: PKGBUILD 98429 2013-10-10 07:58:09Z seblu $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Maintainer: Sébastien Luttringer # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> pkgname=nginx -pkgver=1.4.2 -pkgrel=4 +pkgver=1.4.3 +pkgrel=1 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') url='http://nginx.org' @@ -26,7 +26,7 @@ install=install source=("http://nginx.org/download/nginx-$pkgver.tar.gz" 'service' 'logrotate') -sha256sums=('5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611' +sha256sums=('ae123885c923a6c3f5bab0a8b7296ef21c4fdf6087834667ebbc16338177de84' '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b' '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98') diff --git a/extra/ogle/PKGBUILD b/community/ogle/PKGBUILD index 240daa30b..8653aa453 100644 --- a/extra/ogle/PKGBUILD +++ b/community/ogle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137878 2011-09-12 06:26:48Z eric $ +# $Id: PKGBUILD 98421 2013-10-10 01:44:06Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=ogle diff --git a/extra/ogle/dvdread-4.1.3.patch b/community/ogle/dvdread-4.1.3.patch index d928ac2aa..d928ac2aa 100644 --- a/extra/ogle/dvdread-4.1.3.patch +++ b/community/ogle/dvdread-4.1.3.patch diff --git a/extra/ogle/gcc34alsafix.patch b/community/ogle/gcc34alsafix.patch index 76de3462d..76de3462d 100644 --- a/extra/ogle/gcc34alsafix.patch +++ b/community/ogle/gcc34alsafix.patch diff --git a/extra/ogle/gcc4.patch b/community/ogle/gcc4.patch index b6a10a325..b6a10a325 100644 --- a/extra/ogle/gcc4.patch +++ b/community/ogle/gcc4.patch diff --git a/extra/ogle/ogle-vuln-scripts-makefile.patch b/community/ogle/ogle-vuln-scripts-makefile.patch index f25964378..f25964378 100644 --- a/extra/ogle/ogle-vuln-scripts-makefile.patch +++ b/community/ogle/ogle-vuln-scripts-makefile.patch diff --git a/extra/ogle/xvideofix.patch b/community/ogle/xvideofix.patch index aafde447a..aafde447a 100644 --- a/extra/ogle/xvideofix.patch +++ b/community/ogle/xvideofix.patch diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD index 62f4e2f7a..d6c9dac0f 100644 --- a/community/python-matplotlib/PKGBUILD +++ b/community/python-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95128 2013-08-05 23:48:54Z eric $ +# $Id: PKGBUILD 98442 2013-10-10 15:29:19Z fyan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -6,7 +6,7 @@ pkgbase=python-matplotlib pkgname=('python2-matplotlib' 'python-matplotlib') -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64') @@ -21,7 +21,6 @@ optdepends=('pygtk: for use with the GTK or GTKAgg backend' 'ghostscript: usetex dependencies' 'texlive-bin: usetex dependencies') source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz") -sha1sums=('4bcf177bbe2a1a576fbc0896e69c2de2cf7429ae') prepare() { cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3 @@ -66,3 +65,4 @@ package_python-matplotlib() { install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib } +sha512sums=('04877aa15b6d52a6f813e8377098d13c432f66ae2522c544575440180944c9b73a2164ae63edd3a0eff807883bf7b39cd55f28454ccee8c76146567ff4a6fd40') diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index e2d673dc9..3e3408638 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 96120 2013-08-20 06:32:54Z lcarlier $ +# $Id: PKGBUILD 98418 2013-10-09 22:50:40Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') -pkgver=1.0.1 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://code.google.com/p/psutil/' license=('custom: BSD') makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools') -source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") -sha1sums=('3d3abb8b7a5479b7299a8d170ec25179410f24d1') +source=("https://pypi.python.org/packages/source/p/psutil/psutil-$pkgver.tar.gz") +md5sums=('24430ee6486be2f1a960d9ce4dc87ad0') build() { cd psutil-$pkgver diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD index cdba8f23c..ed0920ac3 100644 --- a/community/sk1/PKGBUILD +++ b/community/sk1/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 97887 2013-09-30 13:21:30Z bgyorgy $ +# $Id: PKGBUILD 98434 2013-10-10 11:32:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ConnorBehan <connor.behan@gmail.com> pkgname=sk1 pkgver=0.9.1 -pkgrel=11 +pkgrel=12 pkgdesc="Fork of skencil with improved CMYK support" arch=(i686 x86_64) url="http://sk1project.org/modules.php?name=Products&product=sk1" -depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'pyxml' 'zenity' 'sk1libs') +depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'zenity' 'sk1libs') license=('GPL' 'LGPL') source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz sk1.desktop diff --git a/community/stella/PKGBUILD b/community/stella/PKGBUILD index 9b903cd2c..ea68ee2ce 100644 --- a/community/stella/PKGBUILD +++ b/community/stella/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=stella -pkgver=3.9 +pkgver=3.9.2 pkgrel=1 pkgdesc="A multi-platform Atari 2600 VCS emulator" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('sdl' 'hicolor-icon-theme' 'gtk-update-icon-cache') install=$pkgname.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.gz) -md5sums=('a0b1dbfef4f7b5e6ff9273c15cf4ba7d') +md5sums=('49d2accab82601ad0ad04536e8400266') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD index 4fd53e435..a77b965fb 100644 --- a/extra/alsaplayer/PKGBUILD +++ b/extra/alsaplayer/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 170547 2012-11-08 15:28:30Z heftig $ +# $Id: PKGBUILD 196265 2013-10-10 02:58:34Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=alsaplayer pkgver=0.99.81 -pkgrel=5 +pkgrel=6 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit" arch=('i686' 'x86_64') -url="http://www.alsaplayer.org/" +url="http://alsaplayer.sourceforge.net/" license=('GPL') depends=('gcc-libs' 'desktop-file-utils') makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack' 'mesa' 'audiofile' 'doxygen') @@ -22,7 +22,7 @@ optdepends=('gtk2: for the gtk2 GUI interface' \ 'libmikmod: for mod, s3m, it and xm formats supports') options=('!libtool') install=alsaplayer.install -source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2) +source=(http://alsaplayer.sourceforge.net/${pkgname}-${pkgver}.tar.bz2) sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd') build() { diff --git a/extra/aterm/PKGBUILD b/extra/aterm/PKGBUILD deleted file mode 100644 index 0dafc580a..000000000 --- a/extra/aterm/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 135001 2011-08-09 20:47:19Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=aterm -pkgver=1.0.1 -pkgrel=3 -pkgdesc="An xterm replacement with transparency support" -arch=('i686' 'x86_64') -url="http://aterm.sourceforge.net/" -license=('GPL') -depends=('libx11') -makedepends=('libxt') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('c2eede028e1011e0ec7035cf319c9b5a') -sha1sums=('a975753b415306a0734efc3773de8a86129bb54b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-transparency=yes \ - --enable-background-image --enable-fading --enable-menubar \ - --enable-graphics - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/celt0.5.1/PKGBUILD b/extra/celt0.5.1/PKGBUILD index f2a4fa2e5..fa7e927b3 100644 --- a/extra/celt0.5.1/PKGBUILD +++ b/extra/celt0.5.1/PKGBUILD @@ -5,13 +5,12 @@ pkgname=celt0.5.1 _basename=celt pkgver=0.5.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Low-latency audio communication codec - SPICE version" arch=(i686 x86_64) url="http://www.celt-codec.org" license=('BSD') depends=('libogg') -provides=('celt=0.5.1') options=('!libtool') source=(http://downloads.us.xiph.org/releases/celt/celt-$pkgver.tar.gz) md5sums=('67e7b5e45db57a6f1f0a6962f5ecb190') diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD index 9cb76d7cd..d1c37bc3b 100644 --- a/extra/dssi/PKGBUILD +++ b/extra/dssi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178955 2013-03-01 10:20:10Z andrea $ +# $Id: PKGBUILD 196279 2013-10-10 13:13:50Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Pajaro pkgname=dssi pkgver=1.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="An API for audio processing plugins & softsynths with UIs" arch=('i686' 'x86_64') url="http://dssi.sourceforge.net/" @@ -20,7 +20,6 @@ md5sums=('619ab73c883b02dc37ddb37001591f8b' '258ca4d0ca28c5c4d4675147621fac18') build() { - . /etc/profile.d/qt4.sh cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD index ef0f43f6f..cbc7f8fdf 100644 --- a/extra/libdvbpsi/PKGBUILD +++ b/extra/libdvbpsi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 195173 2013-09-26 15:48:02Z foutrelis $ +# $Id: PKGBUILD 196290 2013-10-10 15:39:09Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=libdvbpsi -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 epoch=1 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables" @@ -15,7 +15,7 @@ replaces=('libdvbpsi4' 'libdvbpsi5') conflicts=('libdvbpsi4' 'libdvbpsi5') url="http://developers.videolan.org/libdvbpsi/" source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('1f84f9d1de08e15f94e6ff9957278064') +md5sums=('0c7c355201f325ea99c522d8ec97bf86') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD index d1a09155e..9510acf06 100644 --- a/extra/libffado/PKGBUILD +++ b/extra/libffado/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168113 2012-10-06 05:43:33Z schiv $ +# $Id: PKGBUILD 196292 2013-10-10 19:31:03Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado pkgver=2.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64') url="http://www.ffado.org/" @@ -17,9 +17,11 @@ optdepends=('python2: ffado-diag' 'python2-pyqt: mixer applet') provides=('ffado') source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz" - 'python2-qt.patch') + 'python2-qt.patch' + 'rules.patch') md5sums=('26bce2be0b9c1fa4e614f2f494edf388' - '10aa837f5521da213caa93e1ddc58c0e') + '10aa837f5521da213caa93e1ddc58c0e' + 'da1102bfb02e67b3dfcb3947435a81e9') _scons-conf() { scons DEBUG=False \ @@ -29,13 +31,21 @@ _scons-conf() { COMPILE_FLAGS="$CFLAGS" $@ } -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # python2 fix patch -Np1 -i "$srcdir/python2-qt.patch" - # build! + # rule comments must be on their own line + # see https://bugs.archlinux.org/task/36949 + # and http://subversion.ffado.org/ticket/373 + patch -Np0 -i "$srcdir/rules.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + if [ "$CARCH" = 'x86_64' ]; then _scons-conf ENABLE_OPTIMIZATIONS=True else @@ -53,7 +63,7 @@ package() { "$pkgdir/usr/share/applications/ffadomixer.desktop" install -Dm644 support/xdg/hi64-apps-ffado.png \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" + "$pkgdir/usr/share/pixmaps/ffado.png" } # vim:set ts=2 sw=2 et: diff --git a/extra/libffado/rules.patch b/extra/libffado/rules.patch new file mode 100644 index 000000000..8e37c164a --- /dev/null +++ b/extra/libffado/rules.patch @@ -0,0 +1,84 @@ +--- libffado/60-ffado.rules ++++ libffado/60-ffado.rules +@@ -1,35 +1,58 @@ + SUBSYSTEM!="firewire", GOTO="ffado_end" + +-ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S +-ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc. (aka MOTU) +-ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp. +-ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation +-ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG +-ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation +-ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH +-ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio +-ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc. +-ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc. +-ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc. +-ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited +-ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation +-ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1" # Phonic Corporation +-ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH +-ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems +-ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd. +-ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION +-ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1" # DnR ++# TC GROUP A/S ++ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" ++# Mark of the Unicorn, Inc. (aka MOTU) ++ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" ++# Apogee Electronics Corp. ++ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" ++# Alesis Corporation ++ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" ++# Bridgeco Co AG ++ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" ++# Presonus Corporation ++ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" ++# TerraTec Electronic GmbH ++ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" ++# M-Audio ++ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" ++# Ego Systems Inc. ++ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" ++# Loud Technologies Inc. ++ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" ++# Stanton Magnetics,inc. ++ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" ++# Focusrite Audio Engineering Limited ++ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" ++# Echo Digital Audio Corporation ++ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" ++# Phonic Corporation ++ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1" ++# BEHRINGER Spezielle Studiotechnik GmbH ++ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" ++# FlexRadio Systems ++ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" ++# Weiss Engineering Ltd. ++ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" ++# ROLAND DG CORPORATION ++ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" ++# DnR ++ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1" + + # The devices below are by vendors who make other firewire devices in + # addition to their audio interfaces. They need more specific rules to + # ensure only audio interfaces are covered here. + +-ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1" # Tascam, a subsiduary of TEAC (the OUI is TEAC's) ++# Tascam, a subsiduary of TEAC (the OUI is TEAC's) ++ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1" + + # The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those. + +-ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW +-ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire +-ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME ++# CME, Matrix K FW ++ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" ++# Mackie, Onyx Firewire ++ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" ++# RME ++ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" + + LABEL="ffado_end" diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index dad45d5e7..4e086ad51 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193933 2013-09-07 05:53:52Z giovanni $ +# $Id: PKGBUILD 196286 2013-10-10 15:22:37Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.7.1 +pkgver=2.7.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('3313de3667902ae4dc82f29f5280294d' +md5sums=('ec00ddc6aadfea1e11b23650cb741d53' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 13b7dcc97..c2c60c5a9 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191907 2013-08-01 06:53:40Z bpiotrowski $ +# $Id: PKGBUILD 196269 2013-10-10 11:00:54Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV pkgver=2.4.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 4bbef63c2..282bc6307 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196197 2013-10-08 07:36:04Z tpowa $ +# $Id: PKGBUILD 196267 2013-10-10 06:36:39Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=('qemu' 'libcacard') -pkgver=1.6.0 -pkgrel=6 +pkgver=1.6.1 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" @@ -73,5 +73,5 @@ package_libcacard() { cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/ cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/ } -md5sums=('f3f39308472d629aca57a255a0c91ba9' +md5sums=('3a897d722457c5a895cd6ac79a28fda0' '9d6de26867a05c306157e3d3c612b28a') diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index d1e7aa333..4d1fc5827 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 193946 2013-09-07 16:40:23Z andrea $ +# $Id: PKGBUILD 196288 2013-10-10 15:27:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.4.1 -pkgrel=4 +pkgver=0.4.2 +pkgrel=1 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64') url="http://www.weechat.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' ' optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') options=('!libtool') source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('071d6f1cd21c892cae126af21095c43f') +md5sums=('fbbb4c319474d4a3b123fea7e8402fa2') prepare() { mkdir build |