diff options
-rw-r--r-- | community/jemalloc/PKGBUILD | 6 | ||||
-rw-r--r-- | community/lazarus/PKGBUILD | 6 | ||||
-rwxr-xr-x | community/lightdm/PKGBUILD | 8 | ||||
-rwxr-xr-x | community/lightdm/lightdm-use-login1.patch | 639 | ||||
-rw-r--r-- | community/lua-zlib/PKGBUILD | 17 | ||||
-rw-r--r-- | community/pgadmin3/PKGBUILD | 7 | ||||
-rw-r--r-- | core/libpipeline/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/attica/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/bluez/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/bluez4/PKGBUILD | 7 | ||||
-rw-r--r-- | extra/leveldb/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/link-grammar/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/live-media/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/python-lxml/PKGBUILD | 22 | ||||
-rw-r--r-- | extra/sonata/PKGBUILD | 7 |
15 files changed, 453 insertions, 306 deletions
diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD index e5ccd4fea..1cdca27a1 100644 --- a/community/jemalloc/PKGBUILD +++ b/community/jemalloc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88096 2013-04-11 13:54:05Z mtorromeo $ +# $Id: PKGBUILD 92707 2013-06-13 08:34:56Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Kovivchak Evgen <oneonfire@gmail.com> pkgname=jemalloc -pkgver=3.3.1 +pkgver=3.4.0 pkgrel=1 pkgdesc="General-purpose scalable concurrent malloc implementation" arch=('i686' 'x86_64') @@ -27,4 +27,4 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -sha256sums=('35c433cc1df5cdf9eb58b7980338552fc1d7aa64f89fe5643a972ccedb7cf20a') +sha256sums=('f60802c4c2c60bc24598fd052494aea96f4426f3d4decd832eadeed520ff81c0') diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index c950baff8..cf23fcf60 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86718 2013-03-21 12:30:37Z spupykin $ +# $Id: PKGBUILD 92718 2013-06-13 12:56:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') -pkgver=1.0.8 +pkgver=1.0.10 _pkgsubver=0 pkgrel=1 url='http://www.lazarus.freepascal.org/' @@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz" 'lazcontrols2.diff') -md5sums=('ef5085859be265a189db4aa20c648c2d' +md5sums=('60d3b297079ca4151f690245295a8708' '288bca6ad5ade79deec34c3602daaaa9') build() { diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index 923c2efc5..e86a8fccd 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92562 2013-06-08 15:00:39Z alucryd $ +# $Id: PKGBUILD 92709 2013-06-13 08:52:31Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') pkgver=1.6.0 -pkgrel=4 +pkgrel=5 epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64') @@ -32,7 +32,7 @@ sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419' 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' '6d5a754f41e9c7e52c51d2ff018b926ddaabb807e9a0b88c4a7bde1acffa3b1c' '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822' - 'bac646accb407c02c9cebf0b087b7a47f6353bc3829de4e82e10b2e4396a87e6' + '3247aa1e5e7c2c2f8653cfbb22e1f74252c556b6159ff4ec47c1c7d5ea6883ac' '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4') prepare() { @@ -40,7 +40,7 @@ prepare() { patch -Np1 -i ../lightdm-default-config.patch patch -Np1 -i ../lightdm-lock-screen-before-switch.patch - patch -Np1 -i ../lightdm-use-login1.patch + patch -Np0 -i ../lightdm-use-login1.patch sed -i 's/MOC5 --qt=qt5/MOC5/' configure } diff --git a/community/lightdm/lightdm-use-login1.patch b/community/lightdm/lightdm-use-login1.patch index e8e9a7c2a..89adbdbb7 100755 --- a/community/lightdm/lightdm-use-login1.patch +++ b/community/lightdm/lightdm-use-login1.patch @@ -1,271 +1,93 @@ -diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c lightdm-1.6.0/liblightdm-gobject/power.c ---- lightdm-1.6.0.orig/liblightdm-gobject/power.c 2013-03-06 03:40:10.000000000 +0100 -+++ lightdm-1.6.0/liblightdm-gobject/power.c 2013-06-08 00:45:07.411183727 +0200 -@@ -15,44 +15,67 @@ +=== 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 @@ - #include "lightdm/power.h" + static GDBusProxy *upower_proxy = NULL; + static GDBusProxy *ck_proxy = NULL; ++static GDBusProxy *login1_proxy = NULL; --static GDBusProxy *upower_proxy = NULL; --static GDBusProxy *ck_proxy = NULL; -+/* static GDBusProxy *upower_proxy = NULL; -+ static GDBusProxy *ck_proxy = NULL; -+ static GDBusProxy *login1_proxy = NULL; -+ */ -+ -+struct proxy_info { -+ /* proxy reference */ -+ GDBusProxy *proxy; -+ -+ /* arguments to g_dbus_proxy_new_for_bus_sync() */ -+ const char *name; -+ const char *object_path; -+ const char *interface_name; -+ -+}; -+ -+static struct proxy_info upower_proxy = { -+ .proxy = NULL, -+ .name = "org.freedesktop.UPower", -+ .object_path = "/org/freedesktop/UPower", -+ .interface_name = "org.freedesktop.UPower", -+}; -+ -+static struct proxy_info ck_proxy = { -+ .proxy = NULL, -+ .name = "org.freedesktop.ConsoleKit", -+ .object_path = "/org/freedesktop/ConsoleKit/Manager", -+ .interface_name = "org.freedesktop.ConsoleKit.Manager", -+}; -+ -+static struct proxy_info login1_proxy = { -+ .proxy = NULL, -+ .name = "org.freedesktop.login1", -+ .object_path = "/org/freedesktop/login1", -+ .interface_name = "org.freedesktop.login1.Manager", -+}; + 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 --upower_call_function (const gchar *function, gboolean default_result, GError **error) +-ck_call_function (const gchar *function, gboolean default_result, GError **error) +static GVariant * -+do_call_function (const gchar *function, GVariant *parameters, GError **error, struct proxy_info *proxy) ++ck_call_function (const gchar *function, GError **error) { - GVariant *result; - gboolean function_result = FALSE; -- -- if (!upower_proxy) -+ if (!proxy->proxy) ++ GVariant *r; + + if (!ck_proxy) { -- upower_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_NONE, -- NULL, -- "org.freedesktop.UPower", -- "/org/freedesktop/UPower", -- "org.freedesktop.UPower", -- NULL, -- error); -- if (!upower_proxy) -- return FALSE; -- } -- -- result = g_dbus_proxy_call_sync (upower_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); -+ proxy->proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, -+ G_DBUS_PROXY_FLAGS_NONE, -+ NULL, -+ proxy->name, -+ proxy->object_path, -+ proxy->interface_name, -+ NULL, -+ error); -+ if (!proxy->proxy) -+ return NULL; -+ } - +- - g_variant_unref (result); - return function_result; -+ return g_dbus_proxy_call_sync(proxy->proxy, -+ function, -+ parameters, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ NULL, -+ error); - } - - /** -@@ -65,7 +88,29 @@ upower_call_function (const gchar *funct - gboolean - lightdm_get_can_suspend (void) - { -- return upower_call_function ("SuspendAllowed", FALSE, NULL); -+ gboolean can_suspend = FALSE; -+ GVariant *r; -+ -+ r = do_call_function ("CanSuspend", NULL, NULL, &login1_proxy); -+ if (r) -+ { -+ gchar *result; -+ if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)"))) -+ { -+ g_variant_get (r, "(&s)", &result); -+ can_suspend = g_strcmp0 (result, "yes") == 0; -+ } -+ } -+ else -+ { -+ r = do_call_function ("SuspendAllowed", NULL, NULL, &upower_proxy); -+ if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)"))) -+ g_variant_get (r, "(b)", &can_suspend); -+ } -+ if (r) -+ g_variant_unref (r); -+ -+ return can_suspend; - } - - /** -@@ -73,13 +118,29 @@ lightdm_get_can_suspend (void) - * @error: return location for a #GError, or %NULL - * - * Triggers a system suspend. -- * -+ * - * Return value: #TRUE if suspend initiated. - **/ - gboolean - lightdm_suspend (GError **error) - { -- return upower_call_function ("Suspend", TRUE, error); -+ GVariant *result; -+ gboolean suspended; -+ -+ result = do_call_function ("Suspend", g_variant_new("(b)", FALSE), error, &login1_proxy); -+ if (!result) -+ { -+ if (error) -+ g_debug ("Can't suspend using logind; falling back to UPower: %s", (*error)->message); -+ g_clear_error (error); -+ result = do_call_function ("Suspend", NULL, error, &upower_proxy); -+ } ++ r = g_dbus_proxy_call_sync (ck_proxy, ++ function, ++ NULL, ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ error); + -+ suspended = result != NULL; -+ if (result) -+ g_variant_unref (result); ++ return r; ++} + -+ return suspended; - } - - /** -@@ -92,7 +153,29 @@ lightdm_suspend (GError **error) - gboolean - lightdm_get_can_hibernate (void) - { -- return upower_call_function ("HibernateAllowed", FALSE, NULL); -+ gboolean can_hibernate = FALSE; ++static GVariant * ++login1_call_function (const gchar *function, GVariant *parameters, GError **error) ++{ + GVariant *r; ++ gchar *str_result; + -+ r = do_call_function ("CanHibernate", NULL, NULL, &login1_proxy); -+ if (r) -+ { -+ gchar *result; -+ if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)"))) -+ { -+ g_variant_get (r, "(&s)", &result); -+ can_hibernate = g_strcmp0 (result, "yes") == 0; -+ } -+ } -+ else ++ if (!login1_proxy) + { -+ r = do_call_function ("HibernateAllowed", NULL, NULL, &upower_proxy); -+ if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)"))) -+ g_variant_get (r, "(b)", &can_hibernate); ++ 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; + } -+ if (r) -+ g_variant_unref (r); + -+ return can_hibernate; - } - - /** -@@ -100,53 +183,32 @@ lightdm_get_can_hibernate (void) - * @error: return location for a #GError, or %NULL - * - * Triggers a system hibernate. -- * -+ * - * Return value: #TRUE if hibernate initiated. - **/ - gboolean - lightdm_hibernate (GError **error) - { -- return upower_call_function ("Hibernate", TRUE, error); --} -- --static gboolean --ck_call_function (const gchar *function, gboolean default_result, GError **error) --{ - GVariant *result; -- gboolean function_result = FALSE; -- -- if (!ck_proxy) -- { -- ck_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_NONE, -- NULL, -- "org.freedesktop.ConsoleKit", -- "/org/freedesktop/ConsoleKit/Manager", -- "org.freedesktop.ConsoleKit.Manager", -- NULL, -- error); -- if (!ck_proxy) -- return FALSE; -- } -- -- result = g_dbus_proxy_call_sync (ck_proxy, -- function, -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, -- NULL, -- error); -+ gboolean hibernated; - -+ result = do_call_function ("Hibernate", g_variant_new("(b)", FALSE), error, &login1_proxy); - if (!result) -- return default_result; -+ { -+ if (error) -+ g_debug ("Can't hibernate using logind; falling back to UPower: %s", (*error)->message); -+ g_clear_error (error); -+ result = do_call_function ("Hibernate", NULL, error, &upower_proxy); -+ } - -- if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(b)"))) -- g_variant_get (result, "(b)", &function_result); -+ hibernated = result != NULL; -+ if (result) -+ g_variant_unref (result); - -- g_variant_unref (result); -- return function_result; -+ return hibernated; ++ r = g_dbus_proxy_call_sync (login1_proxy, ++ function, ++ parameters, ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ error); ++ ++ return r; } -+ /** - * lightdm_get_can_restart: - * -@@ -157,7 +219,29 @@ ck_call_function (const gchar *function, +@@ -157,7 +181,29 @@ gboolean lightdm_get_can_restart (void) { @@ -273,7 +95,7 @@ diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c lightdm-1.6.0/liblight + gboolean can_restart = FALSE; + GVariant *r; + -+ r = do_call_function ("CanReboot", NULL, NULL, &login1_proxy); ++ r = login1_call_function ("CanReboot", NULL, NULL); + if (r) + { + gchar *result; @@ -285,7 +107,7 @@ diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c lightdm-1.6.0/liblight + } + else + { -+ r = do_call_function ("CanRestart", NULL, NULL, &ck_proxy); ++ 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); + } @@ -296,7 +118,7 @@ diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c lightdm-1.6.0/liblight } /** -@@ -171,7 +255,20 @@ lightdm_get_can_restart (void) +@@ -171,7 +217,20 @@ gboolean lightdm_restart (GError **error) { @@ -304,11 +126,11 @@ diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c lightdm-1.6.0/liblight + GVariant *r; + gboolean restarted; + -+ r = do_call_function ("Reboot", g_variant_new("(b)", FALSE), error, &login1_proxy); ++ r = login1_call_function ("Reboot", g_variant_new("(b)", FALSE), error); + if (!r) + { + g_clear_error (error); -+ r = do_call_function ("Restart", NULL, error, &ck_proxy); ++ r = ck_call_function ("Restart", error); + } + restarted = r != NULL; + if (r) @@ -318,15 +140,15 @@ diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c lightdm-1.6.0/liblight } /** -@@ -184,7 +281,29 @@ lightdm_restart (GError **error) +@@ -184,7 +243,29 @@ gboolean lightdm_get_can_shutdown (void) { - return ck_call_function ("CanStop", FALSE, NULL); + gboolean can_shutdown = FALSE; + GVariant *r; -+ -+ r = do_call_function ("CanPowerOff", NULL, NULL, &login1_proxy); ++ ++ r = login1_call_function ("CanPowerOff", NULL, NULL); + if (r) + { + gchar *result; @@ -338,7 +160,7 @@ diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c lightdm-1.6.0/liblight + } + else + { -+ r = do_call_function ("CanStop", NULL, NULL, &ck_proxy); ++ 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); + } @@ -349,7 +171,7 @@ diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c lightdm-1.6.0/liblight } /** -@@ -198,5 +317,18 @@ lightdm_get_can_shutdown (void) +@@ -198,5 +279,18 @@ gboolean lightdm_shutdown (GError **error) { @@ -357,11 +179,11 @@ diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c lightdm-1.6.0/liblight + GVariant *r; + gboolean shutdown; + -+ r = do_call_function ("PowerOff", g_variant_new("(b)", FALSE), error, &login1_proxy); ++ r = login1_call_function ("PowerOff", g_variant_new("(b)", FALSE), error); + if (!r) + { + g_clear_error (error); -+ r = do_call_function ("Stop", NULL, error, &ck_proxy); ++ r = ck_call_function ("Stop", error); + } + shutdown = r != NULL; + if (r) @@ -369,3 +191,324 @@ diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c lightdm-1.6.0/liblight + + 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 +@@ -838,6 +838,101 @@ + } + + 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 () + { + gchar *path, *data, **lines; +@@ -1474,6 +1569,8 @@ + /* Start D-Bus services */ + if (!g_key_file_get_boolean (config, "test-runner-config", "disable-console-kit", NULL)) + start_console_kit_daemon (); ++ if (!g_key_file_get_boolean (config, "test-runner-config", "disable-login1", NULL)) ++ start_login1_daemon (); + if (!g_key_file_get_boolean (config, "test-runner-config", "disable-accounts-service", NULL)) + start_accounts_service_daemon (); + + +=== 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/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD index b2c4c5bb0..4b1d715ac 100644 --- a/community/lua-zlib/PKGBUILD +++ b/community/lua-zlib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86219 2013-03-13 13:38:07Z spupykin $ +# $Id: PKGBUILD 92720 2013-06-13 12:58:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=(lua-zlib lua51-zlib) pkgbase=lua-zlib pkgver=0.2 -pkgrel=4 +pkgrel=5 _gitver=8d07669 url="http://github.com/brimworks/lua-zlib" pkgdesc='Simple streaming interface to zlib for Lua.' @@ -13,7 +13,7 @@ license=('MIT') makedepends=('cmake' 'lua' 'lua51' 'zlib') conflicts=('lua-lzlib') source=("lua-zlib-$pkgver.zip::https://github.com/brimworks/lua-zlib/zipball/v$pkgver") -md5sums=('28ce556fccb2d364bc5392f63c6f89ee') +md5sums=('e6c780c0c4b6dcb88cf16949bb751be7') build() { cp -a $srcdir/brimworks-lua-zlib-${_gitver} $srcdir/brimworks-lua51-zlib-${_gitver} @@ -22,11 +22,13 @@ build() { sed -i "s#share/lua/cmod#lib/lua/5.2#" CMakeLists.txt cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr . + make cd $srcdir/brimworks-lua51-zlib-${_gitver} - sed -i "s#share/lua/cmod#lib/lua/5.1#" CMakeLists.txt - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr . +# sed -i "s#share/lua/cmod#lib/lua/5.1#" CMakeLists.txt +# cmake -DCMAKE_BUILD_TYPE=Release \ +# -DCMAKE_INSTALL_PREFIX=/usr . + make linux } package_lua-zlib() { @@ -41,6 +43,7 @@ package_lua51-zlib() { depends=('zlib' 'lua51') cd $srcdir/brimworks-lua51-zlib-${_gitver} - make DESTDIR="$pkgdir" install + mkdir -p $pkgdir/usr/lib/lua/5.1 + make DESTDIR="$pkgdir" LUACPATH=$pkgdir/usr/lib/lua/5.1 install install -D -m644 "README" "$pkgdir/usr/share/licenses/$pkgname/README" } diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index cdb46c450..ea7a1a81e 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81020 2012-12-10 10:17:38Z spupykin $ +# $Id: PKGBUILD 92722 2013-06-13 12:58:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> @@ -6,13 +6,14 @@ pkgname=pgadmin3 pkgver=1.16.1 -pkgrel=1 +pkgrel=2 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64') url="http://www.pgadmin.org" license=('custom') depends=('wxgtk' 'postgresql-libs' 'libxslt') makedepends=('libpqxx' 'krb5' 'postgresql' 'gendesk' 'imagemagick') +_categories="Development;Application" source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz) md5sums=('f3bc59630f0dc9600d4ad125097ce2fa') @@ -20,7 +21,7 @@ build() { cd "$srcdir" convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png cp pgadmin3-3.png pgadmin3.png - gendesk + gendesk $startdir/PKGBUILD cd "pgadmin3-${pkgver}" [ -f Makefile ] || ./configure --prefix=/usr diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD index 758228297..5984e24b0 100644 --- a/core/libpipeline/PKGBUILD +++ b/core/libpipeline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184997 2013-05-09 19:48:45Z andyrtr $ +# $Id: PKGBUILD 188248 2013-06-13 13:32:04Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libpipeline -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('glibc') options=('!libtool') source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('f4866aa3a84f2852c78f87ff619dfc60' +md5sums=('a98b07f6f487fa268d1ebd99806b85ff' 'SKIP') build() { diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD index 6fb142cef..e407cd70e 100644 --- a/extra/attica/PKGBUILD +++ b/extra/attica/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178948 2013-03-01 10:19:16Z andrea $ +# $Id: PKGBUILD 188216 2013-06-13 06:07:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=attica -pkgver=0.4.1 -pkgrel=2 +pkgver=0.4.2 +pkgrel=1 pkgdesc='A Qt library that implements the Open Collaboration Services API' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kdesupport/attica' @@ -11,11 +11,9 @@ license=('LGPL') depends=('qt4') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b90983ec5d79e5ddcbc9146fa23cab72') +md5sums=('d62c5c9489a68432e8d990dde7680c24') build() { - . /etc/profile.d/qt4.sh - mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 422ba049b..88dbce5f1 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187857 2013-06-07 09:24:54Z tomegun $ +# $Id: PKGBUILD 188424 2013-06-13 21:55:40Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=bluez pkgname=('bluez' 'bluez-utils' 'bluez-libs') pkgver=5.5 -pkgrel=2 +pkgrel=3 url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') @@ -68,7 +68,7 @@ package_bluez-utils() { depends=('systemd' 'libusb-compat') conflicts=('bluez-hcidump') provides=('bluez-hcidump') - replaces=('bluez-hcidump') + replaces=('bluez-hcidump' 'bluez<=4.101') mv "$srcdir/_utils"/* "$pkgdir" } diff --git a/extra/bluez4/PKGBUILD b/extra/bluez4/PKGBUILD index 79e2945bf..4d95290c3 100644 --- a/extra/bluez4/PKGBUILD +++ b/extra/bluez4/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 187858 2013-06-07 09:24:54Z tomegun $ +# $Id: PKGBUILD 188425 2013-06-13 21:55:41Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez4 pkgver=4.101 -pkgrel=1 +pkgrel=3 pkgdesc="Deprecated daemon and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') -depends=('dbus' 'python2') +depends=('dbus' 'bluez-utils') conflicts=('bluez') replaces=("bluez<=$pkgver") makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx') optdepends=("gstreamer0.10-base: bluetooth GStreamer support" "alsa-lib: Audio bluetooth devices support" + "python2: to run bluez-simple-agent" "dbus-python: to run bluez-simple-agent" "pygobject: to run bluez-simple-agent" "libusb-compat: USB adapters support" diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD index abce75267..1fbc25589 100644 --- a/extra/leveldb/PKGBUILD +++ b/extra/leveldb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178002 2013-02-13 01:27:04Z dreisner $ +# $Id: PKGBUILD 188250 2013-06-13 13:52:03Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: feydaykyn <feydaykyn@yahoo.fr> pkgname=leveldb -pkgver=1.9.0 +pkgver=1.10.0 pkgrel=1 pkgdesc="A fast and lightweight key/value database library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="https://code.google.com/p/leveldb/" license=('BSD') depends=('gperftools' 'snappy') source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha1sums=('4d832277120912211998a2334fb975b995d51885') +sha1sums=('d5b234658138d07f6edc2de24e01d9b0585c03cb') build() { make -C "$pkgname-$pkgver" diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index 810031ba3..a6cc5b6af 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183248 2013-04-19 14:20:16Z giovanni $ +# $Id: PKGBUILD 188255 2013-06-13 15:52:39Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.7.11 +pkgver=4.7.12 pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('aspell') options=('!libtool' '!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('1a990ecf0b517813a4c7b3b6f9c01f00') +md5sums=('f4f0b731dc0bbd1c7adfe9a8ef7ab116') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 5fa762982..0b5d30a84 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186968 2013-06-01 19:28:52Z giovanni $ +# $Id: PKGBUILD 188257 2013-06-13 16:04:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.05.30 +pkgver=2013.06.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=('c3f776e18b3aa5f1cafc7a551fcf8059') +md5sums=('81431f6217725e2b1c3f1a16fca19221') build() { cd ${srcdir}/live diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 2f15e1618..d0f72cac4 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 183648 2013-04-26 02:48:29Z angvp $ +# $Id: PKGBUILD 188212 2013-06-13 03:55:11Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> pkgbase=python-lxml pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs') -pkgver=3.1.2 +pkgver=3.2.1 pkgrel=1 arch=('i686' 'x86_64') license=('BSD' 'custom') url="http://lxml.de/" -makedepends=('python2' 'python' 'libxslt') +makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -md5sums=('6f2173f4fd5b13fbc9f8a5096d23d524' +md5sums=('d183ccd6bbd5ca139e9db9e9a675787e' 'SKIP') -check() { - cd lxml-$pkgver - make PYTHON=python2 test - make PYTHON=python test -} +# Temporary commented due a conflict with devtools and lxml +#check() { +# cd lxml-$pkgver +# make PYTHON=python2 test +# make PYTHON=python test +#} package_python2-lxml() { pkgdesc="Python2 binding for the libxml2 and libxslt libraries" @@ -39,8 +40,7 @@ package_python2-lxml() { package_python-lxml() { pkgdesc="Python3 binding for the libxml2 and libxslt libraries" depends=('python' 'libxslt') - optdepends=('python-cssselect' - 'python-lxml-docs: offline docs') + optdepends=('python-lxml-docs: offline docs') cd lxml-$pkgver python setup.py install --root="${pkgdir}" --optimize=1 diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD index f6d08d300..246a7b6ef 100644 --- a/extra/sonata/PKGBUILD +++ b/extra/sonata/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 175943 2013-01-25 08:23:07Z andrea $ +# $Id: PKGBUILD 188210 2013-06-13 03:01:29Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=sonata pkgver=1.6.2.1 -pkgrel=9 +pkgrel=10 pkgdesc="Elegant GTK+ music client for MPD" arch=('i686' 'x86_64') url="http://sonata.berlios.de/" license=('GPL3') depends=('pygtk' 'python2-mpd') -optdepends=('gnome-python-extras: Enhanced system tray support' +optdepends=('python2-egg: Enhanced system tray support' 'python2-tagpy: Metadata editing support' 'python2-dbus: Various extra functionality (e.g. multimedia keys support)') +provides=('python2-mmkeys') source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz info.py.patch) md5sums=('0b912325e7175abad3bf6c0edc071e05' |