diff options
56 files changed, 1004 insertions, 1105 deletions
diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD index b99a70eda..526fbc6f2 100644 --- a/community/arpwatch/PKGBUILD +++ b/community/arpwatch/PKGBUILD @@ -1,40 +1,44 @@ -# $Id: PKGBUILD 91484 2013-05-23 10:11:13Z spupykin $ +# $Id: PKGBUILD 94834 2013-07-31 01:12:04Z 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=11 +pkgrel=12 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" + 'ethercodes.dat.xz' 'LICENSE' "$pkgname.service") md5sums=('cebfeb99c4a7c2a6cee2564770415fe7' + '0a47a4e7a0f2ede5c8c7f22ec678fa72' '9359518c500562281e76cdb0b2fa9062' '43e2358ba0532da38e5296250a7fcfd8') prepare() { cd $pkgname-$pkgver # move arp database in /var/lib/arpwatch + # /var is used because arpwatch write its learned mac into this folder 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 + # Update ethercodes with recent OUI. See gen_ethercodes.sh + cp -f "$srcdir/ethercodes.dat" ethercodes.dat } build() { cd $pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin - make SENDMAIL=`which sendmail` + make SENDMAIL=/usr/bin/sendmail } package() { cd $pkgname-$pkgver - install -d -m 0755 "$pkgdir"/usr/{bin,share/man} + install -d -m 0755 "$pkgdir"/usr/{bin,share/man/man8} make DESTDIR="$pkgdir" install install-man # install ether prefix database install -Dm644 ethercodes.dat "$pkgdir/var/lib/$pkgname/ethercodes.dat" diff --git a/community/arpwatch/ethercodes.dat.xz b/community/arpwatch/ethercodes.dat.xz Binary files differnew file mode 100644 index 000000000..1838c8194 --- /dev/null +++ b/community/arpwatch/ethercodes.dat.xz diff --git a/community/arpwatch/gen_ethercode.sh b/community/arpwatch/gen_ethercode.sh new file mode 100755 index 000000000..a5cdeeebe --- /dev/null +++ b/community/arpwatch/gen_ethercode.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# Copyright © 2013 Sébastien Luttringer + +# This script is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This script is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this script. If not, see <http://www.gnu.org/licenses/>. + +# Get and format official OUI +wget -O- 'http://standards.ieee.org/regauth/oui/oui.txt' | \ +sed -nr 's/[ \t]+(..)-(..)-(..)[ \t]+\(hex\)[ \t]+(.*)/\L\1:\2:\3\E\t\4/p' > ethercodes.dat + +# Add private OUI +cat >> ethercodes.dat <<EOF +52:54:00 QEMU Virtual NIC +b0:c4:20 Bochs Virtual NIC +de:ad:ca PearPC Virtual NIC +00:ff:d1 Cooperative Linux virtual NIC +EOF + +# Sort and compress +sort ethercodes.dat | xz -9 > ethercodes.dat.xz +rm ethercodes.dat diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD index 299e7908c..33e2a59ce 100644 --- a/community/audit/PKGBUILD +++ b/community/audit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92644 2013-06-10 11:55:07Z mtorromeo $ +# $Id: PKGBUILD 94856 2013-07-31 10:33:01Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> # Contributor: henning mueller <henning@orgizm.net> pkgname=audit pkgver=2.2.3 -pkgrel=3 +pkgrel=4 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' url=http://people.redhat.com/sgrubb/$pkgname arch=(i686 x86_64) @@ -57,6 +57,8 @@ package() { etc/audit/*.conf \ etc/audisp/plugins.d/*.conf \ usr/lib/systemd/system/auditd.service + + chmod 644 usr/lib/systemd/system/auditd.service } sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02' diff --git a/community/libkkc-data/PKGBUILD b/community/libkkc-data/PKGBUILD index 0a235cb22..cce108c2b 100644 --- a/community/libkkc-data/PKGBUILD +++ b/community/libkkc-data/PKGBUILD @@ -1,8 +1,9 @@ +# $Id: PKGBUILD 94837 2013-07-31 03:58:38Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> pkgname=libkkc-data -pkgver=0.2.5 +pkgver=0.2.7 pkgrel=1 pkgdesc="Language model data package for libkkc" arch=('i686' 'x86_64') @@ -23,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('bb31dca814e72dfcddf88f2da3fc37c5') +sha512sums=('61c0cd8c0fa41ed8df49cac6709eebb245cc965d7e192b1ba945e95f2fc46aca8aa48c16e1977a12c157c55dab6b9f4c30f4905806725eca6e697b762eb7cbd7') diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD index c80ee65ec..91970093b 100644 --- a/community/libkkc/PKGBUILD +++ b/community/libkkc/PKGBUILD @@ -1,8 +1,9 @@ +# $Id: PKGBUILD 94838 2013-07-31 03:58:39Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> pkgname=libkkc -pkgver=0.2.6 +pkgver=0.2.7 pkgrel=1 pkgdesc="Japanese Kana Kanji conversion library" arch=('i686' 'x86_64') @@ -11,6 +12,7 @@ license=('GPL') options=(!libtool) depends=('marisa' 'json-glib' 'libgee06') makedepends=('vala' 'gobject-introspection' 'intltool' 'python2-marisa') +optdepends=('sh: to use kkc-package-data') source=(https://bitbucket.org/libkkc/libkkc/downloads/${pkgname}-${pkgver}.tar.gz) build() { @@ -29,4 +31,4 @@ package() { "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/" } -md5sums=('b50f0341596a4e290188a7bf5195cd26') +sha512sums=('2bb056cf00b6212a18462a5f952d4557944b29f49a92b0701abed5f5d6601fdb3b57c4e09a0b3db8ff39be01e91ab658656b89f576663046e53478ed07fe87af') diff --git a/community/linuxsampler/PKGBUILD b/community/linuxsampler/PKGBUILD deleted file mode 100644 index 44be22aac..000000000 --- a/community/linuxsampler/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 67532 2012-03-13 11:02:12Z lcarlier $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: svoufff <svoufff at gmail dot com> -# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> - -pkgname=linuxsampler -pkgver=1.0.0 -pkgrel=2 -pkgdesc="Professional-grade audio sampler alternative to Gigasampler" -arch=(i686 x86_64) -url="http://www.linuxsampler.org/" -license=('GPL' 'custom') -depends=('libgig' 'jack' 'sqlite3') -makedepends=('dssi' 'lv2core') -options=('libtool') # do NOT slay libtool; required by gigedit -source=(http://download.linuxsampler.org/packages/$pkgname-$pkgver.tar.bz2 - license.txt) -md5sums=('a97136791a3228d840b006e5481fc39d' - '746c1421eb9f6812b5fa411bfb923c75') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - # install GPL exception statement - install -Dm644 ../license.txt \ - "$pkgdir/usr/share/licenses/$pkgname/GPL-EXCEPTION" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/linuxsampler/license.txt b/community/linuxsampler/license.txt deleted file mode 100644 index 98031bc95..000000000 --- a/community/linuxsampler/license.txt +++ /dev/null @@ -1,7 +0,0 @@ -LinuxSampler is licensed under the GNU GPL with the exception that -USAGE of the source code, libraries and applications -FOR COMMERCIAL HARDWARE OR SOFTWARE PRODUCTS IS NOT ALLOWED without -prior written permission by the LinuxSampler authors. - -If you have questions on the subject, that are not yet covered by -the FAQ, please contact us. diff --git a/community/lxsession/PKGBUILD b/community/lxsession/PKGBUILD index 178291ceb..75a03cecb 100644 --- a/community/lxsession/PKGBUILD +++ b/community/lxsession/PKGBUILD @@ -1,33 +1,30 @@ -# $Id: PKGBUILD 80231 2012-11-18 09:34:03Z bpiotrowski $ +# $Id: PKGBUILD 94864 2013-07-31 19:43:04Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxsession -pkgver=0.4.6.1 -pkgrel=3 +pkgver=0.4.9.2 +pkgrel=1 pkgdesc='Lightweight X11 session manager' arch=('i686' 'x86_64') url="http://lxde.org/" license=('GPL2') groups=('lxde') -depends=('gtk2' 'dbus') -makedepends=('pkgconfig' 'intltool') +depends=('gtk2' 'dbus' 'libgee06' 'dbus-glib' 'polkit') +makedepends=('pkgconfig' 'intltool' 'vala') replaces=('lxde-settings-daemon' 'lxsession-lite') conflicts=('lxsession-lite' 'lxde-settings-daemon') -source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz - lxsession-0.4.6.1-logind-support.patch) -md5sums=('e456b64c5ab3652a4dec661ec706dc6e' - '7459321f5dc263493837768dcb03f852') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) +md5sums=('bc3eb71936dbdf813e9ac2f00ab948f0') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np2 -i $srcdir/lxsession-0.4.6.1-logind-support.patch + cd $pkgname-$pkgver ./configure --sysconfdir=/etc --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/lxsession/lxsession-0.4.6.1-logind-support.patch b/community/lxsession/lxsession-0.4.6.1-logind-support.patch deleted file mode 100644 index 44829e615..000000000 --- a/community/lxsession/lxsession-0.4.6.1-logind-support.patch +++ /dev/null @@ -1,608 +0,0 @@ ---- src/lxsession-0.4.6.1/lxsession-logout/dbus-interface.c 2011-07-27 21:26:36.000000000 +0200 -+++ src/lxsession-0.4.6.1/lxsession-logout-logind/dbus-interface.c 2012-11-13 17:26:30.807070976 +0100 -@@ -51,13 +51,20 @@ - char * dbus_HAL_Reboot(void); - char * dbus_HAL_Suspend(void); - char * dbus_HAL_Hibernate(void); -+gboolean dbus_logind_CanPowerOff(void); -+gboolean dbus_logind_CanReboot(void); -+gboolean dbus_logind_CanSuspend(void); -+gboolean dbus_logind_CanHibernate(void); -+char * dbus_logind_PowerOff(void); -+char * dbus_logind_Reboot(void); -+char * dbus_logind_Suspend(void); -+char * dbus_logind_Hibernate(void); -+char * dbus_LXDE_Logout(void); - /* End FORWARDS */ - - /* Connect to the system bus. Once a connection is made, it is saved for reuse. */ --static DBusConnection * dbus_connect(void) -+static DBusConnection * dbus_connect_system(void) - { -- if ((dbus_context.connection == NULL) && ( ! dbus_context.connection_tried)) -- { - DBusError error; - dbus_error_init(&error); - dbus_context.connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -@@ -67,16 +74,57 @@ - dbus_error_free(&error); - } - dbus_context.connection_tried = TRUE; -- } - - return dbus_context.connection; - } - -+static DBusConnection * dbus_connect_session(void) -+{ -+ DBusError error; -+ dbus_error_init(&error); -+ dbus_context.connection = dbus_bus_get(DBUS_BUS_SESSION, &error); -+ if (dbus_context.connection == NULL) -+ { -+ g_warning(G_STRLOC ": Failed to connect to the session message bus: %s", error.message); -+ dbus_error_free(&error); -+ } -+ dbus_context.connection_tried = TRUE; -+ -+ return dbus_context.connection; -+} -+ -+ - /* Send a message. */ --static DBusMessage * dbus_send_message(DBusMessage * message, char * * error_text) -+static DBusMessage * dbus_send_message_system(DBusMessage * message, char * * error_text) - { - /* Get a connection handle. */ -- DBusConnection * connection = dbus_connect(); -+ DBusConnection * connection = dbus_connect_system(); -+ if (connection == NULL) -+ return FALSE; -+ -+ /* Send the message. */ -+ DBusError error; -+ dbus_error_init(&error); -+ DBusMessage * reply = dbus_connection_send_with_reply_and_block(connection, message, DBUS_TIMEOUT, &error); -+ dbus_message_unref(message); -+ if (reply == NULL) -+ { -+ if ((error.name == NULL) || (strcmp(error.name, DBUS_ERROR_NO_REPLY) != 0)) -+ { -+ if (error_text != NULL) -+ *error_text = g_strdup(error.message); -+ g_warning(G_STRLOC ": DBUS: %s", error.message); -+ } -+ dbus_error_free(&error); -+ } -+ return reply; -+} -+ -+/* Send a message. */ -+static DBusMessage * dbus_send_message_session(DBusMessage * message, char * * error_text) -+{ -+ /* Get a connection handle. */ -+ DBusConnection * connection = dbus_connect_session(); - if (connection == NULL) - return FALSE; - -@@ -132,6 +180,36 @@ - } - return result; - } -+ -+/* Read a result for a method that returns a string encoded boolean. */ -+static gboolean dbus_read_result_sboolean(DBusMessage * reply) -+{ -+ gboolean result = FALSE; -+ char* string_result; -+ if (reply != NULL) -+ { -+ /* Get the string result. */ -+ DBusError error; -+ dbus_error_init(&error); -+ dbus_bool_t status = dbus_message_get_args( -+ reply, -+ &error, -+ DBUS_TYPE_STRING, &string_result, -+ DBUS_TYPE_INVALID); -+ if ( ! status) -+ { -+ g_warning(G_STRLOC ": DBUS: %s", error.message); -+ dbus_error_free(&error); -+ } -+ else -+ { -+ if (!strcmp(string_result, "yes")) -+ result = TRUE; -+ } -+ dbus_message_unref(reply); -+ } -+ return result; -+} - #endif - - /*** ConsoleKit mechanism ***/ -@@ -152,7 +230,7 @@ - static gboolean dbus_ConsoleKit_query(const char * const query) - { - #ifdef HAVE_DBUS -- return dbus_read_result_boolean(dbus_send_message(dbus_ConsoleKit_formulate_message(query), NULL)); -+ return dbus_read_result_boolean(dbus_send_message_system(dbus_ConsoleKit_formulate_message(query), NULL)); - #else - return FALSE; - #endif -@@ -163,7 +241,7 @@ - { - #ifdef HAVE_DBUS - char * error = NULL; -- dbus_read_result_void(dbus_send_message(dbus_ConsoleKit_formulate_message(command), &error)); -+ dbus_read_result_void(dbus_send_message_system(dbus_ConsoleKit_formulate_message(command), &error)); - return error; - #else - return NULL; -@@ -225,7 +303,7 @@ - DBUS_TYPE_INVALID); - - /* Send the message. */ -- DBusMessage * reply = dbus_send_message(message, NULL); -+ DBusMessage * reply = dbus_send_message_system(message, NULL); - if (reply == NULL) - return FALSE; - -@@ -252,7 +330,7 @@ - { - #ifdef HAVE_DBUS - char * error = NULL; -- dbus_read_result_void(dbus_send_message(dbus_UPower_formulate_command(command), &error)); -+ dbus_read_result_void(dbus_send_message_system(dbus_UPower_formulate_command(command), &error)); - return error; - #else - return NULL; -@@ -329,7 +407,7 @@ - DBusMessage * message = dbus_HAL_formulate_string_property_query(property); - if (message == NULL) - return FALSE; -- DBusMessage * reply = dbus_send_message(message, NULL); -+ DBusMessage * reply = dbus_send_message_system(message, NULL); - if (reply == NULL) - return FALSE; - dbus_message_unref(reply); -@@ -343,7 +421,7 @@ - static gboolean dbus_HAL_boolean_query(const char * const property) - { - #ifdef HAVE_DBUS -- return dbus_read_result_boolean(dbus_send_message(dbus_HAL_formulate_boolean_property_query(property), NULL)); -+ return dbus_read_result_boolean(dbus_send_message_system(dbus_HAL_formulate_boolean_property_query(property), NULL)); - #else - return FALSE; - #endif -@@ -367,7 +445,7 @@ - - /* Send the message and wait for a reply. */ - char * error = NULL; -- dbus_read_result_void(dbus_send_message(message, &error)); -+ dbus_read_result_void(dbus_send_message_system(message, &error)); - return error; - #else - return NULL; -@@ -421,3 +499,185 @@ - { - return dbus_HAL_command("Hibernate"); - } -+ -+/*** logind mechanism ***/ -+ -+#ifdef HAVE_DBUS -+/* Formulate a message to the logind Manager interface to query a property. */ -+static DBusMessage * dbus_logind_formulate_query(const char * const query) -+{ -+ return dbus_message_new_method_call( -+ "org.freedesktop.login1", -+ "/org/freedesktop/login1", -+ "org.freedesktop.login1.Manager", -+ query); -+} -+ -+/* Formulate a message to the logind Manager interface. */ -+static DBusMessage * dbus_logind_formulate_message(const char * const method) -+{ -+ static dbus_bool_t interactive = FALSE; -+ DBusMessage * message = dbus_message_new_method_call( -+ "org.freedesktop.login1", -+ "/org/freedesktop/login1", -+ "org.freedesktop.login1.Manager", -+ method); -+ if (message != NULL) -+ dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &interactive, DBUS_TYPE_INVALID); -+ return message; -+} -+#endif -+ -+/* Send a specified query to the logind interface and process a boolean result. */ -+static gboolean dbus_logind_query(const char * const query) -+{ -+#ifdef HAVE_DBUS -+ return dbus_read_result_sboolean(dbus_send_message_system(dbus_logind_formulate_query(query), NULL)); -+#else -+ return FALSE; -+#endif -+} -+ -+/* Send a specified command to the logind interface and process a void result. */ -+static char * dbus_logind_command(const char * const command) -+{ -+#ifdef HAVE_DBUS -+ char * error = NULL; -+ dbus_read_result_void(dbus_send_message_system(dbus_logind_formulate_message(command), &error)); -+ return error; -+#else -+ return NULL; -+#endif -+} -+ -+/* Read the can-poweroff property of logind. */ -+gboolean dbus_logind_CanPowerOff(void) -+{ -+ return dbus_logind_query("CanPowerOff"); -+} -+ -+/* Read the can-reboot property of logind. */ -+gboolean dbus_logind_CanReboot(void) -+{ -+ return dbus_logind_query("CanReboot"); -+} -+ -+/* Read the can-suspend property of logind. */ -+gboolean dbus_logind_CanSuspend(void) -+{ -+ return dbus_logind_query("CanSuspend"); -+} -+ -+/* Read the can-hibernate property of logind. */ -+gboolean dbus_logind_CanHibernate(void) -+{ -+ return dbus_logind_query("CanHibernate"); -+} -+ -+/* Invoke the PowerOff method on logind. */ -+char * dbus_logind_PowerOff(void) -+{ -+ return dbus_logind_command("PowerOff"); -+} -+ -+/* Invoke the Reboot method on logind. */ -+char * dbus_logind_Reboot(void) -+{ -+ return dbus_logind_command("Reboot"); -+} -+ -+/* Invoke the Suspend method on logind. */ -+char * dbus_logind_Suspend(void) -+{ -+ return dbus_logind_command("Suspend"); -+} -+ -+/* Invoke the Hibernate method on logind. */ -+char * dbus_logind_Hibernate(void) -+{ -+ return dbus_logind_command("Hibernate"); -+} -+ -+/*** LXDE mechanism ***/ -+ -+#ifdef HAVE_DBUS -+/* Formulate a message to the LXDE Session Manager interface. */ -+static DBusMessage * dbus_LXDE_formulate_message(const char * const query) -+{ -+ return dbus_message_new_method_call( -+ "org.lxde.SessionManager", -+ "/org/lxde/SessionManager", -+ "org.lxde.SessionManager", -+ query); -+} -+#endif -+ -+/* Send a specified message to the LXDE interface and process a boolean result. */ -+static gboolean dbus_LXDE_query(const char * const query) -+{ -+#ifdef HAVE_DBUS -+ return dbus_read_result_boolean(dbus_send_message_session(dbus_LXDE_formulate_message(query), NULL)); -+#else -+ return FALSE; -+#endif -+} -+ -+/* Send a specified message to the LXDE interface and process a void result. */ -+static char * dbus_LXDE_command(const char * const command) -+{ -+#ifdef HAVE_DBUS -+ char * error = NULL; -+ dbus_read_result_void(dbus_send_message_session(dbus_LXDE_formulate_message(command), &error)); -+ return error; -+#else -+ return NULL; -+#endif -+} -+ -+/* Invoke the Logout method on LXDE. */ -+char * dbus_LXDE_Logout(void) -+{ -+ return dbus_LXDE_command("Logout"); -+} -+ -+/*** Lightdm mechanism ***/ -+ -+#ifdef HAVE_DBUS -+/* Formulate a message to the Lightdm interface. */ -+static DBusMessage * dbus_Lightdm_formulate_message(const char * const query) -+{ -+ return dbus_message_new_method_call( -+ "org.freedesktop.DisplayManager", -+ g_getenv ("XDG_SEAT_PATH"), -+ "org.freedesktop.DisplayManager.Seat", -+ query); -+} -+#endif -+ -+/* Send a specified message to the Lightdm interface and process a boolean result. */ -+static gboolean dbus_Lightdm_query(const char * const query) -+{ -+#ifdef HAVE_DBUS -+ return dbus_read_result_boolean(dbus_send_message_session(dbus_Lightdm_formulate_message(query), NULL)); -+#else -+ return FALSE; -+#endif -+} -+ -+/* Send a specified message to the Lightdm interface and process a void result. */ -+static char * dbus_Lightdm_command(const char * const command) -+{ -+#ifdef HAVE_DBUS -+ char * error = NULL; -+ dbus_read_result_void(dbus_send_message_session(dbus_Lightdm_formulate_message(command), &error)); -+ return error; -+#else -+ return NULL; -+#endif -+} -+ -+/* Invoke the Logout method on LXDE. */ -+char * dbus_Lightdm_SwitchToGreeter(void) -+{ -+ return dbus_Lightdm_command("SwitchToGreeter"); -+} ---- src/lxsession-0.4.6.1/lxsession-logout/dbus-interface.h 2011-07-27 21:26:36.000000000 +0200 -+++ src/lxsession-0.4.6.1/lxsession-logout-logind/dbus-interface.h 2012-11-13 17:26:30.807070976 +0100 -@@ -44,4 +44,18 @@ - extern char * dbus_HAL_Suspend(void); - extern char * dbus_HAL_Hibernate(void); - -+/* Interface to logind for shutdown, reboot, suspend, and hibernate. */ -+extern gboolean dbus_logind_CanPowerOff(void); -+extern gboolean dbus_logind_CanRestart(void); -+extern char * dbus_logind_PowerOff(void); -+extern char * dbus_logind_Restart(void); -+extern gboolean dbus_logind_CanSuspend(void); -+extern gboolean dbus_logind_CanHibernate(void); -+extern char * dbus_logind_Suspend(void); -+extern char * dbus_logind_Hibernate(void); -+ -+extern char * dbus_LXDE_Logout(void); -+ -+extern char * dbus_Lightdm_SwitchToGreeter(); -+ - #endif ---- src/lxsession-0.4.6.1/lxsession-logout/lxsession-logout.c 2011-07-27 21:26:36.000000000 +0200 -+++ src/lxsession-0.4.6.1/lxsession-logout-logind/lxsession-logout.c 2012-11-13 17:26:30.807070976 +0100 -@@ -69,12 +69,21 @@ - int reboot_HAL : 1; /* Reboot is available via HAL */ - int suspend_HAL : 1; /* Suspend is available via HAL */ - int hibernate_HAL : 1; /* Hibernate is available via HAL */ -+ int shutdown_logind : 1; /* Shutdown is available via logind */ -+ int reboot_logind : 1; /* Reboot is available via logind */ -+ int suspend_logind : 1; /* Suspend is available via logind */ -+ int hibernate_logind : 1; /* Hibernate is available via logind */ - int switch_user_GDM : 1; /* Switch User is available via GDM */ -- int switch_user_KDM : 1; /* Switch User is available via KDM */ -+ int switch_user_LIGHTDM : 1; /* Switch User is available via GDM */ -+ int switch_user_KDM : 1; /* Switch User is available via LIGHTDM */ - int ltsp : 1; /* Shutdown and reboot is accomplished via LTSP */ -+ -+ int lock_screen : 1; /* Lock screen available */ -+ - } HandlerContext; - - static gboolean lock_screen(void); -+static const gchar* determine_lock_screen(void); - static gboolean verify_running(const char * display_manager, const char * executable); - static void logout_clicked(GtkButton * button, HandlerContext * handler_context); - static void change_root_property(GtkWidget* w, const char* prop_name, const char* value); -@@ -93,13 +102,32 @@ - */ - static gboolean lock_screen(void) - { -- if (!g_spawn_command_line_async("lxlock", NULL)) -+ const gchar* program = determine_lock_screen(); -+ -+ if (program) - { -+ g_spawn_command_line_async(program, NULL); - return TRUE; - } - return FALSE; - } - -+static const gchar* determine_lock_screen(void) -+{ -+ const gchar* program = NULL; -+ -+ if (g_find_program_in_path("xdg-screensaver")) -+ { -+ program = "xdg-screensaver lock"; -+ } -+ else if (g_find_program_in_path("lxlock")) -+ { -+ program = "lxlock"; -+ } -+ return program; -+} -+ -+ - /* Verify that a program is running and that an executable is available. */ - static gboolean verify_running(const char * display_manager, const char * executable) - { -@@ -187,6 +215,8 @@ - error_result = dbus_ConsoleKit_Stop(); - else if (handler_context->shutdown_HAL) - error_result = dbus_HAL_Shutdown(); -+ else if (handler_context->shutdown_logind) -+ error_result = dbus_logind_PowerOff(); - - if (error_result != NULL) - gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); -@@ -208,6 +238,8 @@ - error_result = dbus_ConsoleKit_Restart(); - else if (handler_context->reboot_HAL) - error_result = dbus_HAL_Reboot(); -+ else if (handler_context->reboot_logind) -+ error_result = dbus_logind_Reboot(); - - if (error_result != NULL) - gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); -@@ -225,6 +257,8 @@ - error_result = dbus_UPower_Suspend(); - else if (handler_context->suspend_HAL) - error_result = dbus_HAL_Suspend(); -+ else if (handler_context->suspend_logind) -+ error_result = dbus_logind_Suspend(); - - if (error_result != NULL) - gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); -@@ -242,6 +276,8 @@ - error_result = dbus_UPower_Hibernate(); - else if (handler_context->hibernate_HAL) - error_result = dbus_HAL_Hibernate(); -+ else if (handler_context->hibernate_logind) -+ error_result = dbus_logind_Hibernate(); - - if (error_result != NULL) - gtk_label_set_text(GTK_LABEL(handler_context->error_label), error_result); -@@ -258,6 +294,17 @@ - g_spawn_command_line_sync("gdmflexiserver --startnew", NULL, NULL, NULL, NULL); - else if (handler_context->switch_user_KDM) - g_spawn_command_line_sync("kdmctl reserve", NULL, NULL, NULL, NULL); -+ else if (handler_context->switch_user_LIGHTDM) -+ dbus_Lightdm_SwitchToGreeter(); -+ gtk_main_quit(); -+} -+ -+/* Handler for "clicked" signal on Lock button. */ -+static void lock_screen_clicked(GtkButton * button, HandlerContext * handler_context) -+{ -+ gtk_label_set_text(GTK_LABEL(handler_context->error_label), NULL); -+ -+ lock_screen(); - gtk_main_quit(); - } - -@@ -435,6 +482,28 @@ - handler_context.hibernate_HAL = TRUE; - } - -+ /* Initialize capabilities of the logind mechanism. */ -+ if (!handler_context.shutdown_available && dbus_logind_CanPowerOff()) -+ { -+ handler_context.shutdown_available = TRUE; -+ handler_context.shutdown_logind = TRUE; -+ } -+ if (!handler_context.reboot_available && dbus_logind_CanReboot()) -+ { -+ handler_context.reboot_available = TRUE; -+ handler_context.reboot_logind = TRUE; -+ } -+ if (!handler_context.suspend_available && dbus_logind_CanSuspend()) -+ { -+ handler_context.suspend_available = TRUE; -+ handler_context.suspend_logind = TRUE; -+ } -+ if (!handler_context.hibernate_available && dbus_logind_CanHibernate()) -+ { -+ handler_context.hibernate_available = TRUE; -+ handler_context.hibernate_logind = TRUE; -+ } -+ - /* If we are under GDM, its "Switch User" is available. */ - if (verify_running("gdm", "gdmflexiserver")) - { -@@ -442,6 +511,34 @@ - handler_context.switch_user_GDM = TRUE; - } - -+ /* If we are under GDM3, its "Switch User" is available. */ -+ if (verify_running("gdm3", "gdmflexiserver")) -+ { -+ handler_context.switch_user_available = TRUE; -+ handler_context.switch_user_GDM = TRUE; -+ } -+ -+ /* lightdm also use gdmflexiserver */ -+ if (verify_running("lightdm", "gdmflexiserver")) -+ { -+ handler_context.switch_user_available = TRUE; -+ handler_context.switch_user_GDM = TRUE; -+ } -+ -+ /* lightdm also use gdmflexiserver */ -+ if (verify_running("lightdm", "gdmflexiserver")) -+ { -+ handler_context.switch_user_available = TRUE; -+ handler_context.switch_user_GDM = TRUE; -+ } -+ -+ /* lightdm can also be find by the env */ -+ if (g_getenv("XDG_SEAT_PATH")) -+ { -+ handler_context.switch_user_available = TRUE; -+ handler_context.switch_user_LIGHTDM = TRUE; -+ } -+ - /* If we are under KDM, its "Switch User" is available. */ - if (verify_running("kdm", "kdmctl")) - { -@@ -451,7 +548,18 @@ - - /* LTSP support */ - if (g_getenv("LTSP_CLIENT")) -+ { - handler_context.ltsp = TRUE; -+ handler_context.shutdown_available = TRUE; -+ handler_context.reboot_available = TRUE; -+ } -+ -+ /* Lock screen */ -+ const gchar* very_lock_screen = determine_lock_screen(); -+ if (very_lock_screen) -+ { -+ handler_context.lock_screen = TRUE; -+ } - - /* Make the button images accessible. */ - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR "/lxsession/images"); -@@ -596,6 +704,17 @@ - gtk_box_pack_start(GTK_BOX(controls), switch_user_button, FALSE, FALSE, 4); - } - -+ /* Create the Lock Screen button. */ -+ if (handler_context.lock_screen && !handler_context.ltsp) -+ { -+ GtkWidget * lock_screen_button = gtk_button_new_with_mnemonic(_("L_ock Screen")); -+ GtkWidget * image = gtk_image_new_from_icon_name("system-lock-screen", GTK_ICON_SIZE_BUTTON); -+ gtk_button_set_image(GTK_BUTTON(lock_screen_button), image); -+ gtk_button_set_alignment(GTK_BUTTON(lock_screen_button), 0.0, 0.5); -+ g_signal_connect(G_OBJECT(lock_screen_button), "clicked", G_CALLBACK(lock_screen_clicked), &handler_context); -+ gtk_box_pack_start(GTK_BOX(controls), lock_screen_button, FALSE, FALSE, 4); -+ } -+ - /* Create the Logout button. */ - GtkWidget * logout_button = gtk_button_new_with_mnemonic(_("_Logout")); - GtkWidget * image = gtk_image_new_from_icon_name("system-log-out", GTK_ICON_SIZE_BUTTON); diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 1bd0ccd5a..91eb292f0 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 94425 2013-07-24 14:45:02Z fyan $ +# $Id: PKGBUILD 94850 2013-07-31 09:33:45Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.1f.20130724 -_commit=ba985662bffa0fe5ec36f276f13fc3d870b11ecf +pkgver=0.2a +#_commit=ba985662bffa0fe5ec36f276f13fc3d870b11ecf pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64') url="https://github.com/xiehuc/pidgin-lwqq" license=('GPL3') -depends=('libpurple' 'curl' 'libev' 'hicolor-icon-theme' 'gtk-update-icon-cache') +depends=('libpurple' 'curl' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'libev') optdepends=('pidgin: Multi-protocol instant messaging client' 'telepathy-haze: Empathy plugin support') makedepends=('git' 'cmake') install=$pkgname.install -source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit" +#source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit" +source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver" "git://github.com/xiehuc/lwqq.git") prepare() { diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index d52fc06ea..ed36c0ca8 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90540 2013-05-13 00:51:44Z seblu $ +# $Id: PKGBUILD 94860 2013-07-31 13:09:35Z seblu $ # Maintainer: Sébastien Luttringer pkgname=quagga -pkgver=0.99.22.1 -pkgrel=2 +pkgver=0.99.22.3 +pkgrel=1 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' @@ -20,7 +20,7 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar 'ripd.service' 'ripngd.service' 'zebra.service') -md5sums=('d9ab848661720d6da2551c7a4a19c731' +md5sums=('1467b6828842af59b31252515729bb09' '20a8e36ad851d4e06467aeb56a84b245' 'cc90c234aac9098c5132d653037d5269' '67d0ada0f3000b9a86351798786c5256' diff --git a/community/skktools/PKGBUILD b/community/skktools/PKGBUILD new file mode 100644 index 000000000..4ea438a52 --- /dev/null +++ b/community/skktools/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 94840 2013-07-31 05:14:59Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: noonov <noonov@gmail.com> + +pkgname=skktools +pkgver=1.3.3 +pkgrel=2 +pkgdesc="Dictionary maintenance tools for the SKK Japanese input method" +arch=('i686' 'x86_64') +url="http://openlab.ring.gr.jp/skk/" +license=('GPL2') +depends=('gdbm' 'glib2') +optdepends=('ruby' 'python2' 'perl') +source=(http://openlab.ring.gr.jp/skk/tools/${pkgname}-${pkgver}.tar.gz) +md5sums=('9011bf096ea3a408169729b54ca605f5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --with-gdbm + make + + sed -i '1s|python|&2|' skk2cdb.py +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/usr/share/skktools" + cp -a -t "${pkgdir}/usr/share/skktools" \ + convert2skk dbm filters \ + saihenkan.rb skk2cdb.py skkdic-diff.scm unannotation.awk + + install -D -m644 skk-xml.el "${pkgdir}/usr/share/emacs/site-lisp/skk-xml.el" +} diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 5a40fc5fd..813d6c0bd 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92284 2013-06-03 13:56:49Z spupykin $ +# $Id: PKGBUILD 94846 2013-07-31 07:46:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd -pkgver=3.2.10 -pkgrel=5 +pkgver=3.2.10.1 +pkgrel=1 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64') url="http://unrealircd.com" @@ -17,7 +17,7 @@ backup=('etc/unrealircd/unrealircd.conf' source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.service arch-fixes.patch) -md5sums=('05b0bbdbfab9ffc2304f7595951d7cec' +md5sums=('97b4bd68a804e517355efa756f401a90' '93276a1cd426e4a811c072c35fc31e94' '77807313c4578f2c30286b9f9e3fb21c') diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD new file mode 100644 index 000000000..093f938c0 --- /dev/null +++ b/community/uwsgi/PKGBUILD @@ -0,0 +1,235 @@ +# $Id: PKGBUILD 94832 2013-07-30 22:31:20Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Kevin Zuber <uKev@knet.eu> +# Contributor: Vsevolod Balashov <vsevolod@balashov.name> + +pkgbase=uwsgi +pkgname=(uwsgi + uwsgi-plugin-common + uwsgi-plugin-rack + uwsgi-plugin-python2 + uwsgi-plugin-python + uwsgi-plugin-nagios + uwsgi-plugin-router + uwsgi-plugin-admin + uwsgi-plugin-ruby + uswgi-plugin-greenlet + uswgi-plugin-php + uwsgi-plugin-carbon + uwsgi-plugin-rrdtool + uwsgi-plugin-erlang + uwsgi-plugin-pam + uwsgi-plugin-jvm + uwsgi-plugin-zergpool + ) +pkgver=1.9.14 +pkgrel=1 +arch=(i686 x86_64) +url="http://projects.unbit.it/$pkgbase" +license=(GPL2) +conflicts=(python-$pkgbase) +makedepends=(gcc python python2 ruby python2-greenlet php curl libxml2 libyaml + perl lua51 pcre libedit openssl bzip2 gmp erlang pam java-environment=7 + jansson) +source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz + archlinux.ini + tmpfilesd + uwsgi@.service + uwsgi@.socket + uwsgi_fix_rpath.patch + uwsgi_ruby20_compatibility.patch + uwsgi_trick_chroot.patch) + +prepare(){ + cd $srcdir/$pkgbase-$pkgver + cp $srcdir/archlinux.ini buildconf/archlinux.ini + sed -i 's/LIBS .*-lphp5.*/LIBS = []/' plugins/php/uwsgiplugin.py + for patch in uwsgi_fix_rpath.patch uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch; do + patch -Np1 -i $srcdir/$patch + done + rm -rf plugins/ruby + mv plugins/ruby{19,} + cp -a plugins/python{,2} + sed -i 's:\(ruby\)19:\1:' plugins/ruby/uwsgiplugin.py + +} +build() { + pushd $srcdir/$pkgbase-$pkgver + python uwsgiconfig.py --build archlinux.ini +} + +package_uwsgi() { + backup=(etc/uwsgi/archlinux.ini) + pkgdesc="A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C" + depends=(python2 libxml2 jansson libyaml systemd) + install=uwsgi.install + cd $srcdir/$pkgbase-$pkgver + install -Dm755 uwsgi $pkgdir/usr/bin/uwsgi + install -Dm644 $srcdir/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini + install -Dm644 $srcdir/uwsgi@.service $pkgdir/usr/lib/systemd/system/uwsgi@.service + install -Dm644 $srcdir/uwsgi@.socket $pkgdir/usr/lib/systemd/system/uwsgi@.socket + install -Dm755 systemd_logger_plugin.so $pkgdir/usr/lib/uwsgi/systemd_logger_plugin.so + install -Dm644 $srcdir/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini + install -Dm644 $srcdir/tmpfilesd $pkgdir/usr/lib/tmpfiles.d/uwsgi.conf +} + +package_uwsgi-plugin-common(){ + depends=(uwsgi) + pkgdesc="Common plugins for uWSGI" + install -dm755 $pkgdir/usr/bin + for plugin in cache cgi rpc ugreen; do + ln -s uwsgi $pkgdir/usr/bin/uwsgi_${plugin} + install -Dm755 $pkgbase-$pkgver/${plugin}_plugin.so $pkgdir/usr/lib/uwsgi/${plugin}_plugin.so + done +} + +package_uwsgi-plugin-rack(){ + depends=(ruby uwsgi-plugin-common) + pkgdesc="Ruby rack plugin" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_rack + install -Dm755 $pkgbase-$pkgver/rack_plugin.so $pkgdir/usr/lib/uwsgi/rack_plugin.so +} + +package_uwsgi-plugin-python2(){ + depends=(uwsgi-plugin-common) + pkgdesc="Plugin for Python2 support" + cd $srcdir/$pkgbase-$pkgver + python2 uwsgiconfig.py --plugin plugins/python archlinux python + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_python2 + install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so +} + +package_uwsgi-plugin-python(){ + depends=(python uwsgi-plugin-common) + pkgdesc="Plugin for Python support" + install -dm755 $pkgdir/usr/bin + cd $srcdir/$pkgbase-$pkgver + python3 uwsgiconfig.py --plugin plugins/python archlinux python + ln -s uwsgi $pkgdir/usr/bin/uwsgi_python + install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python_plugin.so +} + +package_uwsgi-plugin-nagios(){ + depends=( uwsgi-plugin-common) + pkgdesc="Plugin for Nagios support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_nagios + install -Dm755 $pkgbase-$pkgver/nagios_plugin.so $pkgdir/usr/lib/uwsgi/nagios_plugin.so +} + +package_uwsgi-plugin-router(){ + depends=( uwsgi-plugin-common) + pkgdesc="Plugin for Router support" + install -dm755 $pkgdir/usr/lib/uwsgi + install -dm755 $pkgdir/usr/bin + cd $pkgbase-$pkgver + for file in *router*_plugin.so; do + install -Dm755 $file $pkgdir/usr/lib/uwsgi/$file + ln -s uwsgi $pkgdir/usr/bin/uwsgi_${file%_plugin.so} + done +} + +package_uwsgi-plugin-admin(){ + depends=( uwsgi-plugin-common) + pkgdesc="Plugin for Admin support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_admin + install -Dm755 $pkgbase-$pkgver/admin_plugin.so $pkgdir/usr/lib/uwsgi/admin_plugin.so +} + +package_uwsgi-plugin-ruby(){ + depends=(ruby uwsgi-plugin-common) + pkgdesc="Plugin for Ruby support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_ruby + install -Dm755 $pkgbase-$pkgver/ruby_plugin.so $pkgdir/usr/lib/uwsgi/ruby_plugin.so +} + + +package_uswgi-plugin-lua51(){ + depends=(lua uwsgi-plugin-common) + pkgdesc="Plugin for Lua support" + install -dm755 $pkgdir/usr/bin + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_lua51 + install -Dm755 $pkgbase-$pkgver/lua_plugin.so $pkgdir/usr/lib/uwsgi/lua51_plugin.so +} + +package_uswgi-plugin-greenlet(){ + depends=(python2-greenlet uwsgi-plugin-common) + pkgdesc="Plugin for Python Greenlet support" + cd $srcdir/$pkgbase-$pkgver + python2 uwsgiconfig.py --plugin plugins/greenlet archlinux.ini greenlet + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_greenlet + install -Dm755 greenlet_plugin.so $pkgdir/usr/lib/uwsgi/greenlet_plugin.so +} + +package_uswgi-plugin-php(){ + depends=(uwsgi-plugin-common) + pkgdesc="Plugin for PHP support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_php + install -Dm755 $pkgbase-$pkgver/php_plugin.so $pkgdir/usr/lib/uwsgi/php_plugin.so +} + +package_uwsgi-plugin-carbon(){ + depends=(uwsgi-plugin-common) + pkgdesc="Plugin for Carbon support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_carbon + install -Dm755 $pkgbase-$pkgver/carbon_plugin.so $pkgdir/usr/lib/uwsgi/carbon_plugin.so +} + +package_uwsgi-plugin-rrdtool(){ + depends=(uwsgi-plugin-common rrdtool) + pkgdesc="Plugin for Rrdtool support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_rrdtool + install -Dm755 $pkgbase-$pkgver/rrdtool_plugin.so $pkgdir/usr/lib/uwsgi/rrdtool_plugin.so +} + +package_uwsgi-plugin-erlang(){ + depends=(uwsgi-plugin-common erlang) + pkgdesc="Plugin for Erlang support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_erlang + install -Dm755 $pkgbase-$pkgver/erlang_plugin.so $pkgdir/usr/lib/uwsgi/erlang_plugin.so +} + + +package_uwsgi-plugin-pam(){ + depends=(uwsgi-plugin-common) + pkgdesc="Plugin for Pam support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_pam + install -Dm755 $pkgbase-$pkgver/pam_plugin.so $pkgdir/usr/lib/uwsgi/pam_plugin.so +} + +package_uwsgi-plugin-jvm(){ + depends=(uwsgi-plugin-common java-runtime=7) + pkgdesc="Plugin for Jvm support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_jvm + install -Dm755 $pkgbase-$pkgver/jvm_plugin.so $pkgdir/usr/lib/uwsgi/jvm_plugin.so +} + +package_uwsgi-plugin-zergpool(){ + depends=(uwsgi-plugin-common) + pkgdesc="Plugin for zergpool support" + install -dm755 $pkgdir/usr/bin + ln -s uwsgi $pkgdir/usr/bin/uwsgi_zergpool + install -Dm755 $pkgbase-$pkgver/zergpool_plugin.so $pkgdir/usr/lib/uwsgi/zergpool_plugin.so +} +md5sums=('ec9cf333534604f17ef4e24051d9d65d' + '1816524eb13705c20f6abc00557f4ea9' + 'b05ba1d796e1ea608a40635bc4f3ec67' + '0b79320fbae92715c96086cf51e60bc8' + 'db70315bbc8cb886a278ba59d5fd8d57' + '1a4516d5cdcf5b95b036f4eae2d0c152' + '4d09535ce379c8acd76160f35d5d6b55' + '0c09a52fdb88f08c36a8b380f451ce6d') diff --git a/community/uwsgi/archlinux.ini b/community/uwsgi/archlinux.ini new file mode 100644 index 000000000..791d4208f --- /dev/null +++ b/community/uwsgi/archlinux.ini @@ -0,0 +1,17 @@ +[uwsgi] +inherit = core +bin_name = uwsgi +xml = true +yaml = true +json = true +pcre = true +routing = true +debug = true +sqlite3 = true +ssl = true +xml_implementation = libxml2 +yaml_implementation = auto +malloc_implementation = libc +embedded_plugins = echo, ping, corerouter, http +plugin_dir = /usr/lib/uwsgi +plugins = rack, python2, python, nagios, fastrouter, admin, lua, ruby, cache, cgi, rpc, ugreen, php, carbon, rrdtool, erlang, pam, jvm, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter, systemd_logger diff --git a/community/uwsgi/tmpfilesd b/community/uwsgi/tmpfilesd new file mode 100644 index 000000000..8609b38f0 --- /dev/null +++ b/community/uwsgi/tmpfilesd @@ -0,0 +1 @@ +d /run/uwsgi 0755 - - - - diff --git a/community/uwsgi/uwsgi.install b/community/uwsgi/uwsgi.install new file mode 100644 index 000000000..605d7fe2d --- /dev/null +++ b/community/uwsgi/uwsgi.install @@ -0,0 +1,11 @@ +post_install(){ + systemd-tmpfiles --create /usr/lib/tmpfiles.d/uwsgi.conf +} +post_update(){ + echo "To use uwsgi@.socket and uwsgi@.service:" + echo "\tAll you need to do is put the name of your .ini file after the @ sign" + echo "\tYou can use either the .socket or .service, but if you use the .socket" + echo "\tuwsgi@<sameinifile>.service won't be started until the first time your http" + echo "\tserver touches the socket. You will also not need to specify the socket in" + echo "\tthe .ini file or in the .service file. Systemd will handle listening to" + echo "\tthe socket for you." diff --git a/community/uwsgi/uwsgi@.service b/community/uwsgi/uwsgi@.service new file mode 100644 index 000000000..c9e9789a0 --- /dev/null +++ b/community/uwsgi/uwsgi@.service @@ -0,0 +1,13 @@ +[Unit] +Description=uWSGI Emperor +After=syslog.target + +[Service] +ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/%I.ini +Restart=always +Type=notify +StandardError=syslog +NotifyAccess=main + +[Install] +WantedBy=multi-user.target diff --git a/community/uwsgi/uwsgi@.socket b/community/uwsgi/uwsgi@.socket new file mode 100644 index 000000000..012b33a7a --- /dev/null +++ b/community/uwsgi/uwsgi@.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Socket for uWSGI Cgit + +[Socket] +# Change this to your uwsgi application port or unix socket location +ListenStream=/run/uwsgi/%I.sock + +[Install] +WantedBy=sockets.target diff --git a/community/uwsgi/uwsgi_fix_rpath.patch b/community/uwsgi/uwsgi_fix_rpath.patch new file mode 100644 index 000000000..3de66a771 --- /dev/null +++ b/community/uwsgi/uwsgi_fix_rpath.patch @@ -0,0 +1,66 @@ +diff --git a/plugins/jvm/uwsgiplugin.py b/plugins/jvm/uwsgiplugin.py +index ac7eb3e..0911288 100644 +--- a/plugins/jvm/uwsgiplugin.py ++++ b/plugins/jvm/uwsgiplugin.py +@@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH: + + GCC_LIST = ['jvm_plugin'] + +-if 'LD_RUN_PATH' in os.environ: +- os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:] +-else: +- os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:] +- + def post_build(config): + if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0: + os._exit(1) +diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py +index fb9e5bb..fd12c91 100644 +--- a/plugins/php/uwsgiplugin.py ++++ b/plugins/php/uwsgiplugin.py +@@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-error=sign-co + LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split() + if ld_run_path: + LDFLAGS.append('-L%s' % ld_run_path) +- os.environ['LD_RUN_PATH'] = ld_run_path + + LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5'] + +diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py +index c4f03e1..8d4b2e0 100644 +--- a/plugins/python/uwsgiplugin.py ++++ b/plugins/python/uwsgiplugin.py +@@ -45,10 +45,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ: + else: + try: + LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR')) +- os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR')) + except: + LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX) +- os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX + + LIBS.append('-lpython%s' % get_python_version()) + else: +diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py +index 8dee214..2375bc9 100644 +--- a/plugins/rack/uwsgiplugin.py ++++ b/plugins/rack/uwsgiplugin.py +@@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBS']\"" + + if has_shared == 'yes': + LDFLAGS.append('-L' + libpath ) +- os.environ['LD_RUN_PATH'] = libpath + LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip()) + else: + GCC_LIST.append("%s/%s" % (libpath, os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBRUBY_A']\"" % rbconfig).read().rstrip())) +diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py +index ecea48d..4f35984 100644 +--- a/plugins/ruby19/uwsgiplugin.py ++++ b/plugins/ruby19/uwsgiplugin.py +@@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LDFLAG + + libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip() + LDFLAGS.append('-L' + libpath ) +-os.environ['LD_RUN_PATH'] = libpath + LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split() + diff --git a/community/uwsgi/uwsgi_ruby20_compatibility.patch b/community/uwsgi/uwsgi_ruby20_compatibility.patch new file mode 100644 index 000000000..b4bf20d38 --- /dev/null +++ b/community/uwsgi/uwsgi_ruby20_compatibility.patch @@ -0,0 +1,42 @@ +diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py +index 2375bc9..b908417 100644 +--- a/plugins/rack/uwsgiplugin.py ++++ b/plugins/rack/uwsgiplugin.py +@@ -10,13 +10,14 @@ except: + rbconfig = 'Config' + + version = os.popen(RUBYPATH + " -e \"print RUBY_VERSION\"").read().rstrip() +-v = version.split('.') + + GCC_LIST = ['rack_plugin', 'rack_api'] + +-if (v[0] == '1' and v[1] == '9') or v[0] >= '2': ++if version >= '1.9': + CFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['CFLAGS']\"").read().rstrip().split() + CFLAGS.append('-DRUBY19') ++ if version >= '2.0': ++ CFLAGS.append('-DRUBY20') + CFLAGS.append('-Wno-unused-parameter') + rbconfig = 'RbConfig' + else: +diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py +index 4f35984..156018f 100644 +--- a/plugins/ruby19/uwsgiplugin.py ++++ b/plugins/ruby19/uwsgiplugin.py +@@ -10,13 +10,14 @@ except: + rbconfig = 'Config' + + version = os.popen(RUBYPATH + " -e \"print RUBY_VERSION\"").read().rstrip() +-v = version.split('.') + + GCC_LIST = ['../rack/rack_plugin', '../rack/rack_api'] + +-if v[0] == '1' and v[1] == '9': ++if version >= '1.9': + CFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['CFLAGS']\"").read().rstrip().split() + CFLAGS.append('-DRUBY19') ++ if version >= '2.0': ++ CFLAGS.append('-DRUBY20') + CFLAGS.append('-Wno-unused-parameter') + rbconfig = 'RbConfig' + else: diff --git a/community/uwsgi/uwsgi_trick_chroot.patch b/community/uwsgi/uwsgi_trick_chroot.patch new file mode 100644 index 000000000..3bfb1ac22 --- /dev/null +++ b/community/uwsgi/uwsgi_trick_chroot.patch @@ -0,0 +1,16 @@ +diff --git a/uwsgiconfig.py b/uwsgiconfig.py +index e447123..4d55f2c 100644 +--- a/uwsgiconfig.py ++++ b/uwsgiconfig.py +@@ -1129,10 +1129,7 @@ def build_plugin(path, uc, cflags, ldflags, libs, name = None): + except: + pass + +- if uc: +- plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin' +- else: +- plugin_dest = name + '_plugin' ++ plugin_dest = name + '_plugin' + + shared_flag = '-shared' + diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD index d3eb3854f..7d20a28e2 100644 --- a/extra/eclipse/PKGBUILD +++ b/extra/eclipse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179518 2013-03-05 19:33:11Z ioni $ +# $Id: PKGBUILD 191838 2013-07-31 09:34:14Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Andrew Wright <andreww@photism.org> @@ -6,24 +6,24 @@ # Contributor: Marco Crosio <marco.crosio@gmail.com> pkgname=eclipse -pkgver=4.2.2 +pkgver=4.3 pkgrel=1 -_date=201302041200 +_date=201306052000 pkgdesc="An IDE for Java and other languages" arch=('i686' 'x86_64') url="http://eclipse.org" -depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst') +depends=('java-environment' 'gtk2' 'unzip' 'webkitgtk2' 'libxtst') install=${pkgname}.install makedepends=('zip') license=("EPL/1.1") source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz" 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg') -md5sums=('daa539af97a5cf4fb8ae1d7675b9625b' +md5sums=('8046626198b529c2e292022c39c18262' '7ea99a30fbaf06ec29261541b8eb1e23' 'ba2cf02c48e6e35bfe3685401c26bb5b' '77cff7543ccf7e177cb6667f5a20ce19') [ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz" -[ "$CARCH" = "x86_64" ] && md5sums[0]='902102ec85539f4c9342b2c1c4c67f64' +[ "$CARCH" = "x86_64" ] && md5sums[0]='8dba840856c5ca38b3c08ebac9a47cb8' package() { # install eclipse @@ -35,17 +35,8 @@ package() { $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps install -m755 eclipse.sh "$pkgdir/usr/bin/eclipse" install -m644 eclipse.desktop "$pkgdir/usr/share/applications/" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse.png \ - "$pkgdir/usr/share/icons/hicolor/16x16/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse32.png \ - "$pkgdir/usr/share/icons/hicolor/32x32/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse48.png \ - "$pkgdir/usr/share/icons/hicolor/48x48/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse256.png \ - "$pkgdir/usr/share/icons/hicolor/256x256/apps/eclipse.png" - # install icon install -Dm644 "$srcdir"/eclipse.svg \ "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg - sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.3.v201301120609/bin/runant.py + sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.4.v201303080030/bin/runant.py } diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index 2ffd6dd50..db238481b 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185537 2013-05-14 20:42:07Z ioni $ +# $Id: PKGBUILD 191825 2013-07-31 08:49:27Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Martin Kemp <mdkemp@elys.com> pkgname=ethtool -pkgver=3.9 +pkgver=3.10 pkgrel=1 epoch=1 pkgdesc="Utility for controlling network drivers and hardware" @@ -13,7 +13,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/" license=('GPL') depends=('glibc') source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('5777759e85b3323917c6cc9327f5d99c') +md5sums=('d1930df6e70a5204e8154a9911992be4') build() { cd $pkgname-$pkgver diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index c3086e6c2..0ab4c0cb2 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187057 2013-06-03 11:16:31Z allan $ +# $Id: PKGBUILD 191856 2013-07-31 16:26:31Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse -pkgver=2.9.2 -pkgrel=3 +pkgver=2.9.3 +pkgrel=1 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64') url="http://fuse.sourceforge.net/" @@ -16,11 +16,12 @@ backup=(etc/fuse.conf) source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') options=(!libtool) -sha1sums=('fcfc005b1edcd5e8b325729a1b325ff0e8b2a5ab' +sha1sums=('94bd1974a9f2173ac3c2cf122f9fa3c35996b88e' '3b42e37a741d4651099225987dc40e7f02a716ad') prepare() { cd "$pkgname-$pkgver" + # fix building with glibc-2.14 sed -i '1i#define _GNU_SOURCE' util/fusermount.c diff --git a/extra/fuse/fuse.rc.d b/extra/fuse/fuse.rc.d deleted file mode 100755 index 768da5b02..000000000 --- a/extra/fuse/fuse.rc.d +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# -# fuse Init script for Filesystem in Userspace -# Based on the script by Miklos Szeredi <miklos@szeredi.hu> - -. /etc/rc.conf -. /etc/rc.d/functions -FUSECTL=/sys/fs/fuse/connections - -case "$1" in - start) - stat_busy "Starting fuse" - if ! grep -qw fuse /proc/filesystems; then - modprobe fuse >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - if grep -qw fusectl /proc/filesystems && ! grep -qw $FUSECTL /proc/mounts; then - mount -t fusectl none $FUSECTL >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - add_daemon fuse - stat_done - ;; - stop) - stat_busy "Stopping fuse" - umount $FUSECTL >/dev/null 2>&1 - rmmod fuse >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fuse - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 013edad6b..aae217eaa 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 190845 2013-07-18 20:08:14Z jgc $ +# $Id: PKGBUILD 191808 2013-07-30 23:19:36Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gdm pkgname=(gdm libgdm) -pkgver=3.8.3.1 +pkgver=3.8.4 pkgrel=1 pkgdesc="Gnome Display Manager" arch=(i686 x86_64) license=(GPL) url="http://www.gnome.org" options=('!libtool') -depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server) -makedepends=(itstool intltool gnome-doc-utils gobject-introspection) +depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost) +makedepends=(itstool intltool yelp-tools gobject-introspection) checkdepends=('check') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz - fix_external_program_directories.patch) -sha256sums=('a8c8a32803e32c5d087c75c6be8160cfe4d15843953f07b599d653bac471320e' - 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2') + fix_external_program_directories.patch arch-pam.patch) +sha256sums=('db40fb66bf476721b6d333abe0bfed7feacdca7d492f971c86a3f1e5cccdb447' + 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2' + 'b5c225784c3107564cb9685e41dfecdb20b8ea2415905c4119c96748c4e68003') prepare() { cd $pkgbase-$pkgver - patch -Np1 -i "$srcdir/fix_external_program_directories.patch" + patch -Np1 -i ../fix_external_program_directories.patch + patch -Np1 -i ../arch-pam.patch + AUTOPOINT='intltoolize --automake -c' autoreconf -fi } + build() { cd $pkgbase-$pkgver ./configure \ @@ -39,7 +43,7 @@ build() { --without-tcp-wrappers \ --without-console-kit \ --with-systemd \ - --with-default-pam-config=exherbo + --with-default-pam-config=arch sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -64,8 +68,7 @@ package_gdm() { cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install - chmod 1770 "$pkgdir/var/log/gdm" - chmod 700 "$pkgdir/var/lib/gdm/.config/dconf" + chmod 711 "$pkgdir/var/log/gdm" rm -r "$pkgdir/var/run" "$pkgdir/var/gdm" ### Split libgdm diff --git a/extra/gdm/arch-pam.patch b/extra/gdm/arch-pam.patch new file mode 100644 index 000000000..1faa2b90b --- /dev/null +++ b/extra/gdm/arch-pam.patch @@ -0,0 +1,179 @@ +diff --git c/configure.ac i/configure.ac +index bda20c6..e118101 100644 +--- c/configure.ac ++++ i/configure.ac +@@ -185,12 +185,13 @@ if test x$enable_split_authentication = xyes; then + fi + + AC_ARG_WITH(default-pam-config, +- AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, none @<:@default=auto@:>@])) ++ AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, arch, none @<:@default=auto@:>@])) + dnl If not given, try autodetecting from release files (see NetworkManager source) + if test x$with_default_pam_config = x; then + AC_CHECK_FILE(/etc/redhat-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/fedora-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/exherbo-release,with_default_pam_config="exherbo") ++ AC_CHECK_FILE(/etc/arch-release,with_default_pam_config="arch") + AC_CHECK_FILE(/etc/lfs-release,with_default_pam_config="lfs") + dnl If not autodetected, default to none + if test x$with_default_pam_config = x; then +@@ -198,7 +199,7 @@ if test x$with_default_pam_config = x; then + fi + fi + case x$with_default_pam_config in +- xredhat|xopenembedded|xexherbo|xlfs|xnone) ;; ++ xredhat|xopenembedded|xexherbo|xlfs|xarch|xnone) ;; + *) + AC_MSG_ERROR([Invalid --with-default-pam-config ${with_default_pam_config}]) + exit 1 +@@ -208,6 +209,7 @@ AM_CONDITIONAL(ENABLE_REDHAT_PAM_CONFIG, test x$with_default_pam_config = xredha + AM_CONDITIONAL(ENABLE_OPENEMBEDDED_PAM_CONFIG, test x$with_default_pam_config = xopenembedded) + AM_CONDITIONAL(ENABLE_EXHERBO_PAM_CONFIG, test x$with_default_pam_config = xexherbo) + AM_CONDITIONAL(ENABLE_LFS_PAM_CONFIG, test x$with_default_pam_config = xlfs) ++AM_CONDITIONAL(ENABLE_ARCH_PAM_CONFIG, test x$with_default_pam_config = xarch) + + AC_ARG_ENABLE(console-helper, + AS_HELP_STRING([--enable-console-helper], +diff --git c/data/Makefile.am i/data/Makefile.am +index 81eb8ef..6a67433 100644 +--- c/data/Makefile.am ++++ i/data/Makefile.am +@@ -129,6 +129,15 @@ pam_lfs_files = pam-lfs/gdm.pam \ + $(NULL) + EXTRA_DIST += $(pam_lfs_files) + ++pam_arch_files = pam-arch/gdm-autologin.pam \ ++ pam-arch/gdm-launch-environment.pam \ ++ pam-arch/gdm-fingerprint.pam \ ++ pam-arch/gdm-smartcard.pam \ ++ pam-arch/gdm-password.pam \ ++ pam-arch/gdm-pin.pam \ ++ $(NULL) ++EXTRA_DIST += $(pam_arch_files) ++ + if ENABLE_REDHAT_PAM_CONFIG + pam_files = $(pam_redhat_files) + endif +@@ -141,6 +150,9 @@ endif + if ENABLE_LFS_PAM_CONFIG + pam_files = $(pam_lfs_files) + endif ++if ENABLE_ARCH_PAM_CONFIG ++pam_files = $(pam_arch_files) ++endif + + EXTRA_DIST += \ + $(schemas_in_files) \ +diff --git c/data/pam-arch/gdm-autologin.pam i/data/pam-arch/gdm-autologin.pam +new file mode 100644 +index 0000000..de615ef +--- /dev/null ++++ i/data/pam-arch/gdm-autologin.pam +@@ -0,0 +1,13 @@ ++auth required pam_tally.so onerr=succeed file=/var/log/faillog ++auth required pam_shells.so ++auth requisite pam_nologin.so ++auth required pam_env.so ++auth optional pam_permit.so ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password include system-local-login ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-fingerprint.pam i/data/pam-arch/gdm-fingerprint.pam +new file mode 100644 +index 0000000..f296ae0 +--- /dev/null ++++ i/data/pam-arch/gdm-fingerprint.pam +@@ -0,0 +1,15 @@ ++auth required pam_tally.so onerr=succeed file=/var/log/faillog ++auth required pam_shells.so ++auth requisite pam_nologin.so ++auth required pam_env.so ++auth required pam_fprintd.so ++auth optional pam_permit.so ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password required pam_fprintd.so ++password optional pam_permit.so ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-launch-environment.pam i/data/pam-arch/gdm-launch-environment.pam +new file mode 100644 +index 0000000..6dfbc51 +--- /dev/null ++++ i/data/pam-arch/gdm-launch-environment.pam +@@ -0,0 +1,13 @@ ++auth required pam_succeed_if.so audit quiet_success user = gdm ++auth required pam_env.so ++auth optional pam_permit.so ++ ++account required pam_succeed_if.so audit quiet_success user = gdm ++account include system-local-login ++ ++password required pam_deny.so ++ ++session required pam_succeed_if.so audit quiet_success user = gdm ++session required pam_systemd.so ++session optional pam_keyinit.so force revoke ++session optional pam_permit.so +diff --git c/data/pam-arch/gdm-password.pam i/data/pam-arch/gdm-password.pam +new file mode 100644 +index 0000000..7411285 +--- /dev/null ++++ i/data/pam-arch/gdm-password.pam +@@ -0,0 +1,9 @@ ++auth include system-local-login ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password include system-local-login ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-pin.pam i/data/pam-arch/gdm-pin.pam +new file mode 100644 +index 0000000..e024244 +--- /dev/null ++++ i/data/pam-arch/gdm-pin.pam +@@ -0,0 +1,11 @@ ++auth requisite pam_pin.so ++auth include system-local-login ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password include system-local-login ++password optional pam_pin.so ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-smartcard.pam i/data/pam-arch/gdm-smartcard.pam +new file mode 100644 +index 0000000..7c3d736 +--- /dev/null ++++ i/data/pam-arch/gdm-smartcard.pam +@@ -0,0 +1,15 @@ ++auth required pam_tally.so onerr=succeed file=/var/log/faillog ++auth required pam_shells.so ++auth requisite pam_nologin.so ++auth required pam_env.so ++auth required pam_pkcs11.so wait_for_card card_only ++auth optional pam_permit.so ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password required pam_pkcs11.so ++password optional pam_permit.so ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start + diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install index c48faf4ae..4f15730f0 100644 --- a/extra/gdm/gdm.install +++ b/extra/gdm/gdm.install @@ -5,6 +5,7 @@ post_install() { getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm passwd -l gdm > /dev/null chown -R gdm:gdm /var/lib/gdm > /dev/null + chown root:gdm /var/log/gdm > /dev/null glib-compile-schemas /usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor diff --git a/extra/glpk/PKGBUILD b/extra/glpk/PKGBUILD index 9799c3ee3..2d6705203 100644 --- a/extra/glpk/PKGBUILD +++ b/extra/glpk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178114 2013-02-16 16:08:40Z ronald $ +# $Id: PKGBUILD 191850 2013-07-31 15:25:15Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: bzklrm <bzklrm@gmail.com> # Additional contributors Senjin, Xavier, dundee pkgname=glpk -pkgver=4.48 +pkgver=4.52 pkgrel=1 pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems." arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ license=('GPL') depends=('glibc') options=('!libtool') source=(http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz{,.sig}) -sha1sums=('e00c92faa38fd5d865fa27206abbb06680bab7bb' - '4b57f5ae0a8114c5307daa6071f9be5967a935d6') +sha1sums=('44b30b0de777a0a07e00615ac6791af180ff4d2c' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 6f87c5ba7..e88d3369f 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185463 2013-05-14 10:32:30Z heftig $ +# $Id: PKGBUILD 191810 2013-07-30 23:24:20Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.8.2 +pkgver=3.8.4 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) @@ -16,7 +16,7 @@ url="http://www.gnome.org" groups=(gnome) source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz timeout.patch) -sha256sums=('a6ed1c109005f81ec34a8aa09b2f114c07b4fba8feef47d2f23559797be88640' +sha256sums=('e6ccc71563d9e36d166ebb8a1e9fc962ff31605d5800af411d3b8df494f03ec1' '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') build() { diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 128c3facb..bddb6c987 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189242 2013-07-01 09:11:00Z jgc $ +# $Id: PKGBUILD 191829 2013-07-31 09:01:10Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.8.3 -pkgrel=3 +pkgver=3.8.4 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64) url="http://live.gnome.org/GnomeShell" @@ -19,20 +19,15 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - nm-libexecdir.patch - git-fixes.patch) -sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' - '3e08176d55c000eb88660349a4325e8134f4def66ef83efc7f45f0fb34a06e1c') + nm-libexecdir.patch) +sha256sums=('547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') prepare() { cd $pkgname-$pkgver # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch - - # Git fixes - up to 60225ef86d070a7999bd6cded43837ca87d3f24f - patch -Np1 -i ../git-fixes.patch } build() { diff --git a/extra/gnome-shell/git-fixes.patch b/extra/gnome-shell/git-fixes.patch deleted file mode 100644 index 989c881f0..000000000 --- a/extra/gnome-shell/git-fixes.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css -index 775b687..f4ea781 100644 ---- a/data/theme/gnome-shell.css -+++ b/data/theme/gnome-shell.css -@@ -2312,6 +2312,7 @@ StScrollBar StButton#vhandle:active { - font-weight: bold; - color: #666666; - padding-top: 1em; -+ padding-left: 2px; - } - - .login-dialog-not-listed-button:focus .login-dialog-not-listed-label, -diff --git a/js/gdm/util.js b/js/gdm/util.js -index 6075e66..cae3e1b 100644 ---- a/js/gdm/util.js -+++ b/js/gdm/util.js -@@ -164,6 +164,7 @@ const ShellUserVerifier = new Lang.Class({ - - answerQuery: function(serviceName, answer) { - if (!this._userVerifier.hasPendingMessages) { -+ this._clearMessageQueue(); - this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null); - } else { - let signalId = this._userVerifier.connect('no-more-messages', -diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js -index b07ea95..72bc010 100644 ---- a/js/ui/components/telepathyClient.js -+++ b/js/ui/components/telepathyClient.js -@@ -18,7 +18,7 @@ const Params = imports.misc.params; - const PopupMenu = imports.ui.popupMenu; - - // See Notification.appendMessage --const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute -+const SCROLLBACK_IMMEDIATE_TIME = 3 * 60; // 3 minutes - const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes - const SCROLLBACK_RECENT_LENGTH = 20; - const SCROLLBACK_IDLE_LENGTH = 5; -@@ -967,7 +967,8 @@ const ChatNotification = new Lang.Class({ - let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate), - group: 'meta', - styles: ['chat-meta-message'], -- childProps: { expand: true, x_fill: false }, -+ childProps: { expand: true, x_fill: false, -+ x_align: St.Align.END }, - noTimestamp: true, - timestamp: lastMessageTime }); - -diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js -index d322581..ed61bf7 100644 ---- a/js/ui/endSessionDialog.js -+++ b/js/ui/endSessionDialog.js -@@ -420,6 +420,7 @@ const EndSessionDialog = new Lang.Class({ - _startTimer: function() { - let startTime = GLib.get_monotonic_time(); - this._secondsLeft = this._totalSecondsToStayOpen; -+ this._updateDescription(); - - this._timerId = Mainloop.timeout_add_seconds(1, Lang.bind(this, - function() { -diff --git a/js/ui/layout.js b/js/ui/layout.js -index 0bb887e..e25b3bd 100644 ---- a/js/ui/layout.js -+++ b/js/ui/layout.js -@@ -728,6 +728,8 @@ const LayoutManager = new Lang.Class({ - // and shown otherwise) - addChrome: function(actor, params) { - this.uiGroup.add_actor(actor); -+ if (this.uiGroup.contains(global.top_window_group)) -+ this.uiGroup.set_child_below_sibling(actor, global.top_window_group); - this._trackActor(actor, params); - }, - -diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js -index 7e7b536..7fa052e 100644 ---- a/js/ui/osdWindow.js -+++ b/js/ui/osdWindow.js -@@ -167,14 +167,17 @@ const OsdWindow = new Lang.Class({ - { opacity: 0, - time: FADE_TIME, - transition: 'easeOutQuad', -- onComplete: Lang.bind(this, this._reset) }); -+ onComplete: Lang.bind(this, function() { -+ this._reset(); -+ Meta.enable_unredirect_for_screen(global.screen); -+ }) -+ }); - }, - - _reset: function() { - this.actor.hide(); - this.setLabel(null); - this.setLevel(null); -- Meta.enable_unredirect_for_screen(global.screen); - }, - - _monitorsChanged: function() { -diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js -index fe9cd31..4264f01 100644 ---- a/js/ui/screenShield.js -+++ b/js/ui/screenShield.js -@@ -709,6 +709,8 @@ const ScreenShield = new Lang.Class({ - }, - - _onDragEnd: function(action, actor, eventX, eventY, modifiers) { -+ if (this._lockScreenState != MessageTray.State.HIDING) -+ return; - if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) { - // Complete motion automatically - let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0); -diff --git a/src/st/st-widget.c b/src/st/st-widget.c -index 42992ec..4875acc 100644 ---- a/src/st/st-widget.c -+++ b/src/st/st-widget.c -@@ -608,8 +608,9 @@ st_widget_get_theme_node (StWidget *widget) - - if (stage == NULL) - { -- g_error ("st_widget_get_theme_node called on the widget %s which is not in the stage.", -- st_describe_actor (CLUTTER_ACTOR (widget))); -+ g_critical ("st_widget_get_theme_node called on the widget %s which is not in the stage.", -+ st_describe_actor (CLUTTER_ACTOR (widget))); -+ return g_object_new (ST_TYPE_THEME_NODE, NULL); - } - - if (parent_node == NULL) diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index a911df83e..c84117dc0 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189862 2013-07-10 07:26:53Z bpiotrowski $ +# $Id: PKGBUILD 191848 2013-07-31 15:21:27Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuplot -pkgver=4.6.2 -pkgrel=3 +pkgver=4.6.3 +pkgrel=1 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64') url="http://www.gnuplot.info" @@ -16,7 +16,7 @@ options=('!makeflags') install=gnuplot.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" gnuplot-doc2texi-el.patch) -sha1sums=('88748d4bc9bd41ba8a267a35b6e5b7427cd997cd' +sha1sums=('f01e417dc9504a05fd5cc2595b05ccb58bcea5b2' '46f381fafa2f6c6e3bfefa1e7b999729e260a2e8') build() { diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD index 73b9a851a..887ae9310 100644 --- a/extra/gst-libav/PKGBUILD +++ b/extra/gst-libav/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190013 2013-07-12 20:37:31Z heftig $ +# $Id: PKGBUILD 191871 2013-07-31 17:39:18Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-libav -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="Gstreamer libav Plugin" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('yasm') options=(!libtool !emptydirs) provides=("gst-ffmpeg=$pkgver-$pkgrel") source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('e6e538290e585c993609337761d894dd1b6b53ef625798b2a511d5314579995f') +sha256sums=('759641c0597c24191322f40945b363b75df299a539ff4086650be6193028189a') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD index acfdaaa10..618a7dc5e 100644 --- a/extra/gst-plugins-base/PKGBUILD +++ b/extra/gst-plugins-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190006 2013-07-12 20:19:50Z heftig $ +# $Id: PKGBUILD 191865 2013-07-31 17:14:21Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gst-plugins-base pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Base Plugins" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) -sha256sums=('b55c9deea00acf789f82845c088b7c7c17b3ecef24a94831a819071b3dd8ef0d') +sha256sums=('963e3b83d651661f495ca2e44ccd2d5c61e986e9d7706246e568276689a372ea') build() { cd $pkgbase-$pkgver diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index 69381e6cb..e0c27830c 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190007 2013-07-12 20:23:55Z heftig $ +# $Id: PKGBUILD 191870 2013-07-31 17:33:33Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-good -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' ' makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('97831570ccdd8e15557f18858b965e54433d572d27fdabebb8b710cee276cfad') +sha256sums=('cfa2e617a76f93e9ddd4ae1109297e93fb4a06b152042b996231234a72c5a5ff') build() { cd $pkgname-$pkgver diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD index 80b997354..8f8f1c493 100644 --- a/extra/gstreamer/PKGBUILD +++ b/extra/gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190004 2013-07-12 20:15:01Z heftig $ +# $Id: PKGBUILD 191864 2013-07-31 17:05:38Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('ff70f45509566b88e35986971ace5e89cb6cb232e9ca249f84502abceef1762d') +sha256sums=('17a2c60a82baa461ef685ad3de187edb9c03a2c7e07513daba58a5a32efacaa3') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index d8aedbebb..0617259ef 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185255 2013-05-12 15:16:09Z heftig $ +# $Id: PKGBUILD 191835 2013-07-31 09:23:27Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.6.5 +pkgver=4.6.6 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('d5145919708250b3dd0e650f90d156984217356d953da936394ceb8da59ff546') +sha256sums=('145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD index 1fcd02edb..325a7648f 100644 --- a/extra/libgee/PKGBUILD +++ b/extra/libgee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190014 2013-07-12 20:40:29Z heftig $ +# $Id: PKGBUILD 191831 2013-07-31 09:07:16Z jgc $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libgee -pkgver=0.10.2 +pkgver=0.10.3 pkgrel=1 pkgdesc="GObject collection library" url="http://live.gnome.org/Libgee" @@ -13,7 +13,7 @@ depends=(glib2) makedepends=(gobject-introspection vala) options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b365b3afccbf9a9ecf4282be0b8ce7dcd56afa3c59c19d2ca79bb7f2724a966c') +sha256sums=('fbb73b963abaf1d07f360ac5fdb6905b4862d53553ea5f383a6884678bcd8267') build() { cd $pkgname-$pkgver diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 741c65138..d80581bac 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187901 2013-06-07 22:39:54Z heftig $ +# $Id: PKGBUILD 191806 2013-07-30 22:50:38Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3078162c3adef95fb207cc1945b863575ff180709d6394f5cf14e7d0f49b6c2a') +sha256sums=('efe28bb665fd43d97b20c57bb1d1dc0a7e98919b6ad4b770bfd7ec5576e29454') build() { cd "$pkgname-$pkgver" diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index ae93b817e..aa9c67891 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186980 2013-06-02 10:21:27Z ronald $ +# $Id: PKGBUILD 191854 2013-07-31 16:20:12Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave pkgver=3.6.4 -pkgrel=2 +pkgrel=3 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD deleted file mode 100644 index c80259191..000000000 --- a/extra/openexr/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 191714 2013-07-29 10:21:51Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=openexr -pkgver=2.0.1 -pkgrel=1 -pkgdesc="An high dynamic-range image file format library" -url="http://www.openexr.com/" -arch=('i686' 'x86_64') -license=('BSD') -depends=('zlib' 'ilmbase') -options=('!libtool') -source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -md5sums=('4387e6050d2faa65dd5215618ff2ddce') diff --git a/extra/openexr/gcc43.patch b/extra/openexr/gcc43.patch deleted file mode 100644 index ab99eb9a1..000000000 --- a/extra/openexr/gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- exrenvmap/blurImage.cpp -+++ exrenvmap/blurImage.cpp -@@ -39,6 +39,8 @@ - // - //----------------------------------------------------------------------------- - -+#include <cstring> -+ - #include <blurImage.h> - - #include <resizeImage.h> diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index 28c532ede..4d7940817 100644 --- a/extra/pstoedit/PKGBUILD +++ b/extra/pstoedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189866 2013-07-10 07:26:57Z bpiotrowski $ +# $Id: PKGBUILD 191859 2013-07-31 16:31:30Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tobias Powalowski <t.powa@gmx.de> pkgname=pstoedit -pkgver=3.61 -pkgrel=2 +pkgver=3.62 +pkgrel=1 pkgdesc="Translates PostScript and PDF graphics into other vector formats" arch=('i686' 'x86_64') url="http://www.pstoedit.net/" @@ -14,7 +14,7 @@ depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick') makedepends=('ghostscript') options=('!libtool' '!makeflags') source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz") -sha1sums=('426f3746ecb441caa0db401d5880e1ac04a399d5') +sha1sums=('50d5a4e2fe0e0ff2f73cb094cb945b221083e742') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index e14839c30..4671e5e20 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179516 2013-03-05 19:16:44Z ioni $ +# $Id: PKGBUILD 191842 2013-07-31 09:40:22Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.17.3 +pkgver=0.17.5 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2') options=('!libtool' '!emptydirs') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) install=telepathy-gabble.install -md5sums=('f190ac6244440601f616dd61846689ba') +md5sums=('57d7778e58f82a43dba1311cece0d4e3') build() { cd $pkgname-$pkgver diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index 51121e855..d36d9286a 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183617 2013-04-25 16:40:37Z ioni $ +# $Id: PKGBUILD 191840 2013-07-31 09:36:38Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.20.2 +pkgver=0.20.4 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('bfc8a1b94c7a268f15d4d92b83460987') +md5sums=('78be56307d2da7c580cf6df33a225ba0') build() { cd $pkgname-$pkgver diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD index 65d3e1ff5..a0209e580 100644 --- a/extra/wxmaxima/PKGBUILD +++ b/extra/wxmaxima/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=wxmaxima -pkgver=12.09.0 +pkgver=13.04.1 pkgrel=1 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL2') depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils') source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz) install=wxmaxima.install -sha1sums=('9b56f674392eabb75183b228757df8834b45b2a6') +sha1sums=('c1d8be28f92820d0e447d186271a48a72545c887') build() { cd "${srcdir}/wxMaxima-${pkgver}" diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index b39705eed..f386e5e6c 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -1,21 +1,12 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> _pkgname=blender -epoch=9 -_pkgver=2.68 -pkgrel=1 +epoch=10 +_pkgver=2.68a +pkgrel=2 _jpgver=1.5 _pyver=3.3 -# Only used if package is unstable. -_svn=false -[[ $_svn == true ]] && { - pkgrel=1 - _svnrev=58224 - _svnver=.r$_svnrev - _svndesc=', svn version' -} - _spn=false [[ $_spn == true ]] && { _spnname=-spacenav @@ -23,8 +14,8 @@ _spn=false } pkgname=$_pkgname$_spnname-libre -pkgver=$_pkgver$_svnver -pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_svndesc$_spndesc +pkgver=$_pkgver +pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_spndesc arch=( mips64el x86_64 @@ -60,22 +51,30 @@ makedepends=( boost cmake mesa - subversion ) -provides=($_pkgname=$epoch:$_pkgver) -conflicts=$_pkgname +provides=($_pkgname) +[[ $_spn == true ]] && provides+=($_pkgname-libre) +conflicts=($_pkgname) +[[ $_spn == true ]] && conflicts+=($_pkgname-libre) replaces=$_pkgname install=$_pkgname.install source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz -sha512sums=b7a8ce36714881d8dd809c3597695945cceddfc65ab2d20597a7d9c6327805d86edc4131cdc543d9267e120833781764a8a43a2dba06866fc4e62761f7c93ebf -[[ $_svn == true ]] && { - source=$_pkgname-$pkgver::svn+https://svn.$_pkgname.org/svnroot/bf-$_pkgname/trunk/$_pkgname#revision=$_svnrev - sha512sums=SKIP -} +sha512sums=ce93779c5cbadf361f08ad0f9d5370d52878f94edc0b113d73711b842169d0e000e1500ece8e534439d94c5983e6ff3f15ca4ccd74db5f21447274c475090019 prepare() { cd $srcdir/$_pkgname-$pkgver + msg 'renaming wrong OS name' + _OS=$(uname -o) + [[ $_OS == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c + [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' source/creator/buildinfo.c + sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and GNU/Linux-libre| + s|Linux, FreeBSD|GNU, GNU/Linux-libre| + ' release/text/readme.html + + msg 'removing Open Source term' + sed -i 's|free, open source|free|' release/text/readme.html + mkdir -v build msg 'Remove nonfree povray render support' @@ -85,7 +84,7 @@ prepare() { build() { cd $srcdir/$_pkgname-$pkgver/build - [[ $CARCH == x86_64 ]] && _SSE2=ON || _SSE2=OFF + [[ $CARCH == x86_64 || $CARCH == i686 ]] && _SSE=ON _SSE2=ON || _SSE=OFF _SSE2=OFF [[ $_spn == true ]] && _NDOF=ON || _NDOF=OFF cmake ..\ -DCMAKE_BUILD_TYPE=Release\ @@ -96,6 +95,7 @@ build() { -DPYTHON_LIBPATH=/usr/lib\ -DPYTHON_LIBRARY=python${_pyver}m\ -DPYTHON_VERSION=$_pyver\ + -DSUPPORT_SSE_BUILD=$_SSE\ -DSUPPORT_SSE2_BUILD=$_SSE2\ -DWITH_BULLET=ON\ -DWITH_CODEC_FFMPEG=ON\ @@ -123,7 +123,7 @@ build() { package() { cd $srcdir/$_pkgname-$pkgver/build make DESTDIR=$pkgdir install - python -m compileall $pkgdir/usr/share/$_pkgname || return 0 + python -m compileall $pkgdir/usr/share/$_pkgname } # vim:set ts=2 sw=2 et: diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index eac23b4be..6477c774c 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,70 +1,25 @@ -# $Id: PKGBUILD 190001 2013-07-12 20:00:03Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -pkgbase=gst-plugins-bad -pkgname=gst-plugins-bad-libre -pkgver=1.0.8 +_pkgname=gst-plugins-bad +pkgname=$_pkgname-libre +pkgver=1.0.9 pkgrel=1 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' -arch=( - i686 - x86_64 - mips64el -) -license=( - LGPL -) +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') url="http://gstreamer.freedesktop.org/" -depends=( - celt - chromaprint - curl - faad2 - gst-plugins-base-libs - libdca - libdvdnav - libgme - libmms - libmodplug - libofa - neon - mjpegtools - mpg123 - opus - soundtouch - spandsp - wayland -) -makedepends=( - libdvdread - libexif - libmpeg2 - libvdpau - schroedinger -) -provides=( - $pkgbase=$pkgver -) -conflicts=( - $pkgbase -) -replaces=( - $pkgbase -) -options=( - '!libtool' - '!emptydirs' -) -source=( - "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz" -) -sha256sums=( - 6949b5532034fc37d5a874e4e3330107767238bc4def9f769b8193124e2420cc -) +depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg') +makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2') +provides=($_pkgname=$pkgver) +conflicts=$_pkgname +replaces=$_pkgname +options=(!libtool !emptydirs) +source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz) +sha256sums=('69d236b1d8188270a3f51f6710146d0ca63c2f1a9f6cfbab3399ef01b9498f75') build() { - cd $pkgbase-$pkgver + cd $_pkgname-$pkgver sed -i '/AC_PATH_XTRA/d' configure.ac aclocal -I m4 -I common/m4 autoconf @@ -78,11 +33,11 @@ build() { } check() { - cd $pkgbase-$pkgver + cd $_pkgname-$pkgver make check } package() { - cd $pkgbase-$pkgver - make DESTDIR=$pkgdir install + cd $_pkgname-$pkgver + make DESTDIR="${pkgdir}" install } diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD new file mode 100644 index 000000000..52e5783bf --- /dev/null +++ b/libre/stuntrally-data-libre/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +pkgname=stuntrally-data-libre +_pkgname=stuntrally-data +pkgver=2.0 +pkgrel=1 +pkgdesc="Stunt Rally game with track editor, based on VDrift (data files), without nonfree data files" +arch=('any') +license=('GPL3' 'custom') +url="http://code.google.com/p/vdrift-ogre" +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor') +source=(StuntRally-$pkgver-sources.tar.xz::http://sourceforge.net/projects/stuntrally/files/$pkgver/StuntRally-$pkgver-sources.tar.xz/download + libre.patch ) +md5sums=('22eb331c4401a0ed03e7a9e916fdb60c' + 'e96df3ba70d6fd0949bb92f4dd609497') +prepare() { + # patch some data files and remove nonfree data files + cd $srcdir/StuntRally-$pkgver-sources + + patch -Np1 -i $srcdir/libre.patch + + rm -rv "data/"{grass/grassJungle.png,sounds/{0{1,2,3,4,5,6,7,8,9},1{0,1,2},boost,dirt{1,2},mud{1,_cont},scrap,screech,terrain{1,2,3,4,5},water{1,2,3,_cont}}.wav,terrain,trees2,cars/{3S,CT,M3,NS,TC6,XM},tracks/{detroit,ruudskogen,virginia,weekend}} +} + +build() { + # build the sources + cd $srcdir/StuntRally-$pkgver-sources + + mkdir build && cd build + + cmake .. \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DSHARE_INSTALL="share/stuntrally" + make +} + +package() { + #install the sources + cd $srcdir/StuntRally-$pkgver-sources/build + make DESTDIR="$pkgdir" install + + # clean up + rm -rf "$pkgdir/usr/share/stuntrally/tracks/build" + rm -rf "$pkgdir/usr/share/icons" + rm -rf "$pkgdir/usr/share/applications" + rm -rf "$pkgdir/usr/bin" +} diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch new file mode 100644 index 000000000..642188f05 --- /dev/null +++ b/libre/stuntrally-data-libre/libre.patch @@ -0,0 +1,72 @@ +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index e01fc1b..853ebf7 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8) + + # Install data files + # TODO: make this use all data/* subdirs without tracks, not entered by hand .. +-foreach(datadir cars carsim compositor editor fonts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain terrain2 trees-old trees trees2) ++foreach(datadir cars carsim compositor editor fonts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain2 trees-old trees) + install(DIRECTORY ${datadir} DESTINATION ${SHARE_INSTALL}) + endforeach() + +diff --git a/data/grass/_grass.txt b/data/grass/_grass.txt +index 787737e..84197af 100644 +--- a/data/grass/_grass.txt ++++ b/data/grass/_grass.txt +@@ -10,10 +10,3 @@ http://opengameart.org/content/plants-textures-pack-03 + http://opengameart.org/content/plants-textures-pack-04 + + many colored by CryHam for SR +- +----- Old +-grassJungle.png rest is colored +- +-This grass texture included with PagedGeometry was kindly provided by +-Agnisola Philippe (http://www.blitz3dfr.com/portal_joomla/) for +-commercial or non-commercial use. +diff --git a/data/sounds/_sounds_info.txt b/data/sounds/_sounds_info.txt +index 2cab386..eb4e086 100644 +--- a/data/sounds/_sounds_info.txt ++++ b/data/sounds/_sounds_info.txt +@@ -7,39 +7,3 @@ grass + gravel + tire_squeal + wind +- +--- new sounds from +-http://www.freesound.org/ +- +-various smaller cuts, from: +-[author soundname] +- +- metal hits 01..12: +-halleck metal-medium-hit +-halleck metal-hits-medium-1 +-halleck metal-hits-light-1 +-halleck metal-thump +-sagetyrtle crash-1 +-sagetyrtle crash-2 +-halleck big-metal-side-impact-1 +-halleck big-metal-side-impact-2 +-halleck metal-crash-1 +- metal scrap,screech +-halleck metal-roll-cage-hits-heavy +-halleck metal-screech-and-scraping +- +- water,mud: +-cgeffex large-splashes +- +- mud_cont, water_cont +-justinbw water-spigget-onto-mud-1 +-justinbw water-spigget-onto-mud-2 +- +- terrain,dirt: +-halleck hit-with-dirt-spray-1 +-halleck hit-with-dirt-spray-1-body +-halleck hit-with-dirt-spray-2-body +-halleck hit-with-dirt-spray-3 +- +- boost +-nathanshadow thruster-level-ii diff --git a/pcr/libwww-hg/PKGBUILD b/pcr/libwww-hg/PKGBUILD new file mode 100644 index 000000000..9fc91e231 --- /dev/null +++ b/pcr/libwww-hg/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> +# Maintainer (Archlinux): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Buharev Vasilij <buharev.v.p@gmail.com> + +pkgname=libwww-hg +pkgver=20130730 +_changeset=facbea79943a +pkgrel=11 +pkgdesc="A general-purpose client side WEB API" +arch=('i686' 'x86_64') +url="http://hg.kervala.net/packaging/" +license=('W3C') +depends=() +conflicts=("libwww") +provides=("libwww") +makedepends=('gcc' 'pkgconfig' 'perl' 'zlib') +options=('!libtool') +source=("http://hg.kervala.net/packaging/archive/${_changeset}.tar.gz") +sha256sums=('26adbb77c4ecb3df3a074597a8dfc45b7215879fbc0447cb086199c17ae8ba8d') + + +build() { + cd "$srcdir/packaging-${_changeset}/libwww" + ./autogen.sh + ./configure --prefix=/usr/ \ + --with-ssl=no --with-zlib --with-expat --with-gnu-ld \ + --enable-shared --enable-static + #sed -i 's#Examples##' Library/Makefile + make +} + +package() { + cd "$srcdir/packaging-${_changeset}/libwww" + make DESTDIR="$pkgdir" install +} diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD index 01722ab34..29e791e75 100644 --- a/pcr/ryzom-hg/PKGBUILD +++ b/pcr/ryzom-hg/PKGBUILD @@ -4,50 +4,43 @@ pkgname='ryzom-hg' _hgver=ce26956d3a4a pkgver=20130727 -pkgrel="5" -options=(debug strip) # there is a segmentation fault on ryzom_client executable +pkgrel=6 pkgdesc="An awesome free software 3D MMORPG game" arch=('i686' 'x86_64') url="http://www.ryzom.com/" license=('AGPL3') -depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish-svn' 'lua51' 'lua51-sql-mysql') -makedepends=('mercurial' 'cpptest' 'cmake' 'bison') -source=("libre://$pkgname-$pkgver.tar.gz" - 'ryzom.desktop') +depends=('curl' 'hicolor-icon-theme' 'libvorbis' 'libjpeg' 'libwww-hg' 'luabind' 'ryzom-data') +makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'freealut' 'rrdtool' 'boost') +source=("libre://$pkgname-$pkgver.tar.gz") -mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}" - 'ryzom.desktop') - -_CAMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF') -_CMAKE_BOTH_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=ON' '-DWITH_DRIVER_OPENGL=ON' '-DWITH_DRIVER_OPENAL=ON') +mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}") mksource() { rm -rf "$srcdir/$pkgname-$pkgver" - cp "$srcdir/ryzom.desktop" "$srcdir/.$pkgname-$pkgver/code" cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}" } build() { mkdir -p "$srcdir/build" cd "$srcdir/build" - cmake -b -Wno-dev "$srcdir/${pkgname}-${pkgver}" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_BOTH_ARGS[*]} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DRYZOM_ETC_PREFIX=/etc/ryzom \ - -DRYZOM_SHARE_PREFIX=/usr/share/ryzom \ - -DRYZOM_BIN_PREFIX=/usr/bin \ - -DRYZOM_GAMES_PREFIX=/usr/bin - + cmake -Wno-dev "$srcdir/${pkgname}-${pkgver}" -DFINAL_VERSION=ON -DWITH_STATIC=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin + make all } package() { cd "$srcdir/build" make DESTDIR="$pkgdir" install - install -Dm 644 "$srcdir/${pkgname}-${pkgver}/ryzom.desktop" "$pkgdir/usr/share/applications/" + cd "$pkgdir/etc/ryzom/" + # instead of the open shard, we point to the actual ryzom shard. + # this cannot be on prepare(), I tried that already and didn't work + sed -i 's|"ryzom_open"|"ryzom_live"|g' client_default.cfg + sed -i 's|PatchServer = "";|PatchServer = "http://dl.ryzom.com/patch_live";|g' client_default.cfg + sed -i 's|SignUpURL = "";|SignUpURL = "http://www.ryzom.com/subscribe";|g' client_default.cfg + sed -i 's|"open.ryzom.com:40916";|"shard.ryzom.com:40916";|g' client_default.cfg + sed -i 's|CreateAccountURL = "";|CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";|g' client_default.cfg + sed -i 's|InstallWebPage = "";|InstallWebPage = "http://dl.ryzom.com/installer/";|g' client_default.cfg } -mksha256sums=('SKIP' - '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') - -sha256sums=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402' - '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') +mksha256sums=('SKIP') +sha256sums=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402') diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index a2d174304..64778701a 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.07.25.2 +pkgver=2013.07.31 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -14,7 +14,7 @@ license=('custom') depends=('python') makedepends=('python-distribute') source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('db09e5672c674ccadd3c9afed77189d9' +md5sums=('879407fed53888aae97a0eda26e693e6' 'SKIP') prepare() { |