summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-03-20 04:04:36 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-03-20 04:04:36 +0000
commit7e108c74958ec076a3734822f61f145d0d69547f (patch)
tree5af7d8df8a09ee699544a24ce149876c1cdee06e
parent8640bbf496b9d8a232da91e1db43466797f86861 (diff)
Thu Mar 20 04:00:11 UTC 2014
-rw-r--r--community/bitcoin/PKGBUILD53
-rw-r--r--community/caja-extensions/PKGBUILD91
-rw-r--r--community/caja-extensions/caja-open-terminal.install (renamed from community/caja-extensions/caja-extensions.install)10
-rw-r--r--community/caja-extensions/caja-sendto.install11
-rw-r--r--community/cinnamon-screensaver/PKGBUILD11
-rw-r--r--community/cinnamon-screensaver/lock_screen_on_suspend.patch51
-rw-r--r--community/cinnamon-settings-daemon/PKGBUILD9
-rw-r--r--community/cinnamon-settings-daemon/systemd-support.patch535
-rw-r--r--community/dbmail/PKGBUILD6
-rw-r--r--community/galculator/PKGBUILD38
-rw-r--r--community/gmic/PKGBUILD18
-rw-r--r--community/gmic/opencv-buildfix.patch9
-rw-r--r--community/gnome-commander/PKGBUILD10
-rw-r--r--community/gnome-commander/gnome-commander.changelog3
-rw-r--r--community/mate-system-tools/PKGBUILD13
-rw-r--r--community/mtd-utils/PKGBUILD22
-rwxr-xr-xcommunity/musescore/PKGBUILD15
-rwxr-xr-xcommunity/musescore/mscore-docs.patch21
-rwxr-xr-xcommunity/musescore/mscore-paths.patch61
-rw-r--r--community/nbd/PKGBUILD6
-rw-r--r--community/pax-utils/PKGBUILD9
-rw-r--r--community/pluma/PKGBUILD10
-rw-r--r--community/python2-systemd/PKGBUILD8
-rw-r--r--community/radvd/PKGBUILD6
-rw-r--r--community/read-edid/PKGBUILD28
-rw-r--r--community/shotwell/PKGBUILD12
-rw-r--r--community/vagrant/PKGBUILD12
-rw-r--r--core/dhcpcd/PKGBUILD23
-rw-r--r--core/dhcpcd/commit_9eaeccdf1d.diff191
-rw-r--r--core/dhcpcd/commit_e348e99776.diff17
-rw-r--r--core/sudo/PKGBUILD18
-rw-r--r--core/sudo/sudo.install19
-rw-r--r--core/sudo/sudo.tmpfiles.conf1
-rw-r--r--extra/i8kutils/PKGBUILD30
-rw-r--r--extra/i8kutils/i8kutils-probe.diff84
-rw-r--r--extra/libburn/PKGBUILD10
-rw-r--r--extra/libisoburn/PKGBUILD12
-rw-r--r--extra/liquidwar/PKGBUILD27
-rw-r--r--extra/liquidwar/liquidwar-5.6.4-underlink.patch11
-rw-r--r--extra/python-pysqlite/PKGBUILD37
-rw-r--r--extra/xine-ui/PKGBUILD20
-rw-r--r--extra/xine-ui/xine-ui-readline.patch11
-rw-r--r--kernels/linux-libre-knock/PKGBUILD8
-rw-r--r--kernels/linux-libre-rt/PKGBUILD12
-rw-r--r--pcr/nginx-passenger/PKGBUILD12
45 files changed, 1015 insertions, 606 deletions
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index a3d3c0cbe..4edfc1784 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,40 +1,49 @@
-# $Id: PKGBUILD 105855 2014-02-16 14:27:32Z bpiotrowski $
+# $Id: PKGBUILD 107792 2014-03-19 17:23:43Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: shahid <helllamer@gmail.com>
pkgbase=bitcoin
pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.8.6
-pkgrel=2
+pkgver=0.9.0
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.bitcoin.org/"
-makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc')
+makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc' 'protobuf')
license=('MIT')
-source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz)
-sha256sums=('73495de53d1a30676884961e39ff46c3851ff770eeaa767331d065ff0ce8dd0c')
+source=(http://bitcoin.org/bin/$pkgver/bitcoin-$pkgver-linux.tar.gz
+ https://raw.github.com/bitcoin/bitcoin/v$pkgver/contrib/debian/bitcoin-qt.desktop
+ https://raw.github.com/bitcoin/bitcoin/v$pkgver/share/pixmaps/bitcoin128.png
+ https://raw.github.com/bitcoin/bitcoin/v$pkgver/contrib/debian/examples/bitcoin.conf
+ https://raw.github.com/bitcoin/bitcoin/v$pkgver/contrib/debian/manpages/bitcoind.1
+ https://raw.github.com/bitcoin/bitcoin/v$pkgver/contrib/debian/manpages/bitcoin.conf.5)
+sha256sums=('0f767c13b2c670939750a26558cbb40a7f89ff5ba7d42ce63da0bcc0b701642d'
+ 'b65b377c0d9ecae9eea722843bca0add6bdb7e50929a7e1f751b79b6621c6073'
+ 'ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722'
+ 'e141088b07641e4e58cc750f93bbdda1ca0e8f07262fce66b73524c1ed97480e'
+ '881dcc53ebe2d2a4f8647eb206fd355c69e4186f225e2dcfce19d276381e613a'
+ 'f4598dcff7056a699b62a079b76e74d54435db22e05723bab995e22ae71c7f79')
-build() {
+prepare() {
cd "$srcdir/$pkgbase-$pkgver-linux/src"
+ tar xf $pkgbase-$pkgver.tar.gz
+}
- # and make qt gui
- qmake-qt4 USE_QRCODE=1
+build() {
+ cd "$srcdir/$pkgbase-$pkgver-linux/src/$pkgbase-$pkgver"
+ ./configure --prefix=/usr --with-incompatible-bdb --with-gui=qt4
make
-
- # make bitcoind
- make -f makefile.unix -C src CXXFLAGS="$CXXFLAGS"
}
-
package_bitcoin-qt() {
pkgdesc="Bitcoin is a peer-to-peer network based digital currency - Qt"
- depends=(boost-libs qt4 miniupnpc qrencode)
+ depends=(boost-libs qt4 miniupnpc qrencode protobuf)
install=bitcoin-qt.install
- cd "$srcdir/$pkgbase-$pkgver-linux/src"
- install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt
- install -Dm644 contrib/debian/bitcoin-qt.desktop \
+ cd "$srcdir/$pkgbase-$pkgver-linux/src/$pkgbase-$pkgver"
+ install -Dm755 src/qt/bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt
+ install -Dm644 "$srcdir"/bitcoin-qt.desktop \
"$pkgdir"/usr/share/applications/bitcoin.desktop
- install -Dm644 share/pixmaps/bitcoin128.png \
+ install -Dm644 "$srcdir"/bitcoin128.png \
"$pkgdir"/usr/share/pixmaps/bitcoin128.png
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
@@ -44,13 +53,13 @@ package_bitcoin-daemon() {
pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon"
depends=(boost-libs miniupnpc openssl)
- cd "$srcdir/$pkgbase-$pkgver-linux/src"
+ cd "$srcdir/$pkgbase-$pkgver-linux/src/$pkgbase-$pkgver"
install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind
- install -Dm644 contrib/debian/examples/bitcoin.conf \
+ install -Dm644 "$srcdir"/bitcoin.conf \
"$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf"
- install -Dm644 contrib/debian/manpages/bitcoind.1 \
+ install -Dm644 "$srcdir"/bitcoind.1 \
"$pkgdir"/usr/share/man/man1/bitcoind.1
- install -Dm644 contrib/debian/manpages/bitcoin.conf.5 \
+ install -Dm644 "$srcdir"/bitcoin.conf.5 \
"$pkgdir"/usr/share/man/man5/bitcoin.conf.5
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}
diff --git a/community/caja-extensions/PKGBUILD b/community/caja-extensions/PKGBUILD
index 338210041..32c369006 100644
--- a/community/caja-extensions/PKGBUILD
+++ b/community/caja-extensions/PKGBUILD
@@ -1,34 +1,91 @@
-# $Id: PKGBUILD 106660 2014-03-06 11:40:34Z flexiondotorg $
+# $Id: PKGBUILD 107790 2014-03-19 16:23:03Z flexiondotorg $
# Maintainer : Martin Wimpress <code@flexion.org>
-pkgname=caja-extensions
+pkgbase=caja-extensions
+pkgname=(caja-extensions-common caja-gksu caja-image-converter caja-open-terminal caja-sendto caja-share)
pkgver=1.8.0
-pkgrel=1
-pkgdesc="Caja extensions."
+pkgrel=3
url="http://mate-desktop.org"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('caja' 'dbus-glib' 'gksu' 'gtk2' 'gupnp' 'imagemagick' 'samba')
+depends=('caja' 'dbus-glib' 'gksu' 'gupnp' 'imagemagick' 'samba')
makedepends=('mate-common' 'perl-xml-parser')
-optdepends=('pidgin: Support for sending to instant messaging networks.'
- 'gajim: Support for sending to Jabber.')
-conflicts=('mate-file-manager-gksu' 'mate-file-manager-image-converter' 'mate-file-manager-open-terminal' 'mate-file-manager-sendto' 'mate-file-manager-share')
-replaces=('mate-file-manager-gksu' 'mate-file-manager-image-converter' 'mate-file-manager-open-terminal' 'mate-file-manager-sendto' 'mate-file-manager-share')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgbase}-${pkgver}.tar.xz")
sha1sums=('b4872265988745bfc39531e2eb6ac6d41a01a645')
-install=${pkgname}.install
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgbase}-${pkgver}"
PYTHON=/usr/bin/python2 ./configure \
--prefix=/usr \
--with-gtk=2.0
make
}
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+package_caja-extensions-common() {
+ pkgdesc="Common files for Caja extensions."
+ depends=()
+ conflicts=('caja-extensions')
+ replaces=('caja-extensions')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make -C po DESTDIR="${pkgdir}" install
+}
+
+package_caja-gksu() {
+ pkgdesc="A Caja extension for executing files with elevated privileges."
+ depends=('caja' 'caja-extensions-common' 'gksu')
+ groups=('mate-extra')
+ conflicts=('mate-file-manager-gksu')
+ replaces=('mate-file-manager-gksu')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make -C gksu DESTDIR="${pkgdir}" install
+}
+
+package_caja-image-converter() {
+ pkgdesc="A Caja extension for simple image conversions."
+ depends=('caja' 'caja-extensions-common' 'imagemagick')
+ groups=('mate-extra')
+ conflicts=('mate-file-manager-image-converter')
+ replaces=('mate-file-manager-image-converter')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make -C image-converter DESTDIR="${pkgdir}" install
+}
+
+package_caja-open-terminal() {
+ pkgdesc="A Caja extension for opening terminals in arbitrary local paths."
+ depends=('caja' 'caja-extensions-common')
+ groups=('mate-extra')
+ conflicts=('mate-file-manager-open-terminal')
+ replaces=('mate-file-manager-open-terminal')
+ install=caja-open-terminal.install
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make -C open-terminal DESTDIR="${pkgdir}" install
+}
+
+package_caja-sendto() {
+ pkgdesc="A Caja extension for sending files."
+ depends=('caja' 'caja-extensions-common' 'dbus-glib' 'gupnp')
+ groups=('mate-extra')
+ optdepends=('pidgin: Support for sending to instant messaging networks.'
+ 'gajim: Support for sending to Jabber.')
+ conflicts=('mate-file-manager-sendto')
+ replaces=('mate-file-manager-sendto')
+ install=caja-sendto.install
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make -C sendto DESTDIR="${pkgdir}" install
+}
+
+package_caja-share() {
+ pkgdesc="A Caja extension to quickly share a folder."
+ depends=('caja' 'caja-extensions-common' 'samba')
+ groups=('mate-extra')
+ conflicts=('mate-file-manager-share')
+ replaces=('mate-file-manager-share')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make -C share DESTDIR="${pkgdir}" install
}
diff --git a/community/caja-extensions/caja-extensions.install b/community/caja-extensions/caja-open-terminal.install
index 8fa189f58..3a06d45b9 100644
--- a/community/caja-extensions/caja-extensions.install
+++ b/community/caja-extensions/caja-open-terminal.install
@@ -2,18 +2,10 @@ post_install() {
glib-compile-schemas /usr/share/glib-2.0/schemas/
}
-pre_upgrade() {
- pre_remove
-}
-
post_upgrade() {
post_install
}
-pre_remove() {
- glib-compile-schemas /usr/share/glib-2.0/schemas/
-}
-
post_remove() {
- :
+ post_install
}
diff --git a/community/caja-extensions/caja-sendto.install b/community/caja-extensions/caja-sendto.install
new file mode 100644
index 000000000..3a06d45b9
--- /dev/null
+++ b/community/caja-extensions/caja-sendto.install
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index a58fa0bfe..a89b7ce9c 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=cinnamon-screensaver
pkgver=2.0.3
-pkgrel=3
+pkgrel=4
pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
arch=('i686' 'x86_64')
license=('GPL')
@@ -16,13 +16,11 @@ makedepends=('intltool' 'gnome-common')
source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
cinnamon-screensaver.pam
away-message-fixes.patch
- fix-systemd-lock.patch
- lock_screen_on_suspend.patch)
+ fix-systemd-lock.patch)
sha256sums=('00c866e98994afc8939d1d347de631cebaa6ec34ad59646a7ccd223bd757cc7d'
'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
'f9f3d555b0c325322469be765b488da599fc850f8ff5a74f72fdf69f68e04c96'
- '14d3301a03883330bf044a40ea4dce74a829b03174833d21efe66ebeb940dc0c'
- '54f281eeb0e97c8c46250e287719051e0a580f6c0de384760aaa3532b42616f1')
+ '14d3301a03883330bf044a40ea4dce74a829b03174833d21efe66ebeb940dc0c')
prepare() {
cd $pkgname-$pkgver
@@ -32,9 +30,6 @@ prepare() {
# Use the session path instead of the session id
patch -Np1 -i ../fix-systemd-lock.patch
-
- # Lock screen on suspend with systemd
- patch -Np1 -i ../lock_screen_on_suspend.patch
}
build() {
diff --git a/community/cinnamon-screensaver/lock_screen_on_suspend.patch b/community/cinnamon-screensaver/lock_screen_on_suspend.patch
deleted file mode 100644
index a6019a503..000000000
--- a/community/cinnamon-screensaver/lock_screen_on_suspend.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f8f9beb6a3bf81240d36bfec43e5db9b102ea91e Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martinpitt@gnome.org>
-Date: Wed, 1 May 2013 10:55:49 -0700
-Subject: [PATCH] Lock screen on suspend
-
-Listen for logind's PrepareForSleep signal, and lock the screen (if configured
-to do so). This mirrors what gnome-shell's screensaver does.
----
- src/gs-listener-dbus.c | 28 ++++++++++++++++++++++++++++
- src/gs-listener-dbus.h | 1 +
- src/gs-monitor.c | 20 ++++++++++++++++++++
- 3 files changed, 49 insertions(+)
-
-diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
-index 7f718fa..49586fd 100644
---- a/src/gs-listener-dbus.c
-+++ b/src/gs-listener-dbus.c
-@@ -871,6 +872,17 @@ listener_dbus_handle_system_message (DBusConnection *connection,
- }
-
- return DBUS_HANDLER_RESULT_HANDLED;
-+ } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_INTERFACE, "PrepareForSleep")) {
-+ gboolean active;
-+ if (dbus_message_get_args (message, NULL,
-+ DBUS_TYPE_BOOLEAN, &active,
-+ DBUS_TYPE_INVALID) && active) {
-+ gs_debug ("systemd notified that system is about to sleep");
-+ g_signal_emit (listener, signals [LOCK], 0, "");
-+ } else {
-+ gs_debug ("cannot parse PrepareForSleep");
-+ }
-+ return DBUS_HANDLER_RESULT_HANDLED;
- } else if (dbus_message_is_signal (message, DBUS_INTERFACE_PROPERTIES, "PropertiesChanged")) {
-
- if (_listener_message_path_is_our_session (listener, message)) {
-@@ -1370,6 +1392,12 @@ gs_listener_acquire (GSListener *listener,
- ",interface='"DBUS_INTERFACE_PROPERTIES"'"
- ",member='PropertiesChanged'",
- NULL);
-+ dbus_bus_add_match (listener->priv->system_connection,
-+ "type='signal'"
-+ ",sender='"SYSTEMD_LOGIND_SERVICE"'"
-+ ",interface='"SYSTEMD_LOGIND_INTERFACE"'"
-+ ",member='PrepareForSleep'",
-+ NULL);
-
- return (res != -1);
- }
---
-1.8.1.2
-
diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD
index 557acc308..4dbfb4e75 100644
--- a/community/cinnamon-settings-daemon/PKGBUILD
+++ b/community/cinnamon-settings-daemon/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 106945 2014-03-10 21:09:06Z faidoc $
+# $Id: PKGBUILD 107735 2014-03-19 00:56:51Z bgyorgy $
# Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira@antergos.com>
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=cinnamon-settings-daemon
pkgver=2.0.8
-pkgrel=3
+pkgrel=4
pkgdesc="The Cinnamon Settings daemon"
arch=('i686' 'x86_64')
license=('GPL')
@@ -15,10 +15,12 @@ install=cinnamon-settings-daemon.install
url="https://github.com/linuxmint/cinnamon-settings-daemon"
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
keyboard.patch
+ systemd-support.patch
automount-plugin.patch
dpms.patch)
sha256sums=('6889f021acab93d146c78fe8aa540a83a12260232e1ea5f697037a7c94c877fd'
'3c05b978cb414c8fc1530f211bab58627a64ac9c156630c9d486f5926a85109c'
+ '28c002628bc97e8b4a2aa7e8a8141bcc8388b250a6c3ebc09a640e110ae815a9'
'4fc2b3a354b53d41d92d7f95d175a6a18382330353a0579d29c2d33b9400a837'
'194cc704320a2d6be636191e96f62514f2b5f97655c200991b5690fbf3006026')
@@ -28,6 +30,9 @@ prepare() {
# Fix crasher
patch -Np1 -i ../keyboard.patch
+ # Add systemd support for power and media-keys plugins
+ patch -Np1 -i ../systemd-support.patch
+
# Turn automount helper into a plugin
patch -Np1 -i ../automount-plugin.patch
diff --git a/community/cinnamon-settings-daemon/systemd-support.patch b/community/cinnamon-settings-daemon/systemd-support.patch
new file mode 100644
index 000000000..3c8b115e8
--- /dev/null
+++ b/community/cinnamon-settings-daemon/systemd-support.patch
@@ -0,0 +1,535 @@
+diff --git a/plugins/media-keys/csd-media-keys-manager.c b/plugins/media-keys/csd-media-keys-manager.c
+index 02930a3..7c1c519 100644
+--- a/plugins/media-keys/csd-media-keys-manager.c
++++ b/plugins/media-keys/csd-media-keys-manager.c
+@@ -39,6 +39,7 @@
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ #include <gio/gdesktopappinfo.h>
++#include <gio/gunixfdlist.h>
+
+ #ifdef HAVE_GUDEV
+ #include <gudev/gudev.h>
+@@ -121,6 +122,10 @@ static const gchar kb_introspection_xml[] =
+ #define VOLUME_STEP 5 /* percents for one volume button press */
+ #define MAX_VOLUME 65536.0
+
++#define SYSTEMD_DBUS_NAME "org.freedesktop.login1"
++#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1"
++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager"
++
+ #define CSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CSD_TYPE_MEDIA_KEYS_MANAGER, CsdMediaKeysManagerPrivate))
+
+ typedef struct {
+@@ -167,6 +172,10 @@ struct CsdMediaKeysManagerPrivate
+ GDBusProxy *power_screen_proxy;
+ GDBusProxy *power_keyboard_proxy;
+
++ /* systemd stuff */
++ GDBusProxy *logind_proxy;
++ gint inhibit_keys_fd;
++
+ /* Multihead stuff */
+ GdkScreen *current_screen;
+ GSList *screens;
+@@ -2213,6 +2222,11 @@ csd_media_keys_manager_stop (CsdMediaKeysManager *manager)
+ }
+ #endif /* HAVE_GUDEV */
+
++ if (priv->logind_proxy) {
++ g_object_unref (priv->logind_proxy);
++ priv->logind_proxy = NULL;
++ }
++
+ if (priv->settings) {
+ g_object_unref (priv->settings);
+ priv->settings = NULL;
+@@ -2356,9 +2370,85 @@ csd_media_keys_manager_class_init (CsdMediaKeysManagerClass *klass)
+ }
+
+ static void
++inhibit_done (GObject *source,
++ GAsyncResult *result,
++ gpointer user_data)
++{
++ GDBusProxy *proxy = G_DBUS_PROXY (source);
++ CsdMediaKeysManager *manager = CSD_MEDIA_KEYS_MANAGER (user_data);
++ GError *error = NULL;
++ GVariant *res;
++ GUnixFDList *fd_list = NULL;
++ gint idx;
++
++ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
++ if (res == NULL) {
++ g_warning ("Unable to inhibit keypresses: %s", error->message);
++ g_error_free (error);
++ } else {
++ g_variant_get (res, "(h)", &idx);
++ manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
++ if (manager->priv->inhibit_keys_fd == -1) {
++ g_warning ("Failed to receive system inhibitor fd: %s", error->message);
++ g_error_free (error);
++ }
++ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
++ g_object_unref (fd_list);
++ g_variant_unref (res);
++ }
++}
++
++static void
+ csd_media_keys_manager_init (CsdMediaKeysManager *manager)
+ {
++ GError *error;
++ GDBusConnection *bus;
++
++ error = NULL;
+ manager->priv = CSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
++
++ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
++ if (bus == NULL) {
++ g_warning ("Failed to connect to system bus: %s",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ manager->priv->logind_proxy =
++ g_dbus_proxy_new_sync (bus,
++ 0,
++ NULL,
++ SYSTEMD_DBUS_NAME,
++ SYSTEMD_DBUS_PATH,
++ SYSTEMD_DBUS_INTERFACE,
++ NULL,
++ &error);
++
++ if (manager->priv->logind_proxy == NULL) {
++ g_warning ("Failed to connect to systemd: %s",
++ error->message);
++ g_error_free (error);
++ }
++
++ g_object_unref (bus);
++
++ g_debug ("Adding system inhibitors for power keys");
++ manager->priv->inhibit_keys_fd = -1;
++ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
++ "Inhibit",
++ g_variant_new ("(ssss)",
++ "handle-power-key:handle-suspend-key:handle-hibernate-key",
++ g_get_user_name (),
++ "Cinnamon handling keypresses",
++ "block"),
++ 0,
++ G_MAXINT,
++ NULL,
++ NULL,
++ inhibit_done,
++ manager);
++
+ }
+
+ static void
+@@ -2375,6 +2465,8 @@ csd_media_keys_manager_finalize (GObject *object)
+
+ if (media_keys_manager->priv->start_idle_id != 0)
+ g_source_remove (media_keys_manager->priv->start_idle_id);
++ if (media_keys_manager->priv->inhibit_keys_fd != -1)
++ close (media_keys_manager->priv->inhibit_keys_fd);
+
+ G_OBJECT_CLASS (csd_media_keys_manager_parent_class)->finalize (object);
+ }
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index b54cb5b..b9c5429 100644
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -32,6 +32,7 @@
+ #include <libupower-glib/upower.h>
+ #include <libnotify/notify.h>
+ #include <canberra-gtk.h>
++#include <gio/gunixfdlist.h>
+
+ #include <X11/extensions/dpms.h>
+
+@@ -79,6 +80,10 @@
+ #define CSD_POWER_MANAGER_CRITICAL_ALERT_TIMEOUT 5 /* seconds */
+ #define CSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT 30 /* seconds */
+
++#define SYSTEMD_DBUS_NAME "org.freedesktop.login1"
++#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1"
++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager"
++
+ /* Keep this in sync with gnome-shell */
+ #define SCREENSAVER_FADE_TIME 10 /* seconds */
+
+@@ -203,6 +208,13 @@ struct CsdPowerManagerPrivate
+ GtkStatusIcon *status_icon;
+ guint xscreensaver_watchdog_timer_id;
+ gboolean is_virtual_machine;
++
++ /* systemd stuff */
++ GDBusProxy *logind_proxy;
++ gint inhibit_lid_switch_fd;
++ gboolean inhibit_lid_switch_taken;
++ gint inhibit_suspend_fd;
++ gboolean inhibit_suspend_taken;
+ };
+
+ enum {
+@@ -3350,30 +3362,6 @@ lock_screensaver (CsdPowerManager *manager)
+ if (!do_lock)
+ return;
+
+- /* connect to the screensaver first */
+- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+- NULL,
+- GS_DBUS_NAME,
+- GS_DBUS_PATH,
+- GS_DBUS_INTERFACE,
+- NULL,
+- sleep_cb_screensaver_proxy_ready_cb,
+- manager);
+-}
+-
+-static void
+-upower_notify_sleep_cb (UpClient *client,
+- UpSleepKind sleep_kind,
+- CsdPowerManager *manager)
+-{
+- gboolean do_lock;
+-
+- do_lock = g_settings_get_boolean (manager->priv->settings,
+- "lock-on-suspend");
+- if (!do_lock)
+- return;
+-
+ /* connect to the screensaver first */
+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+@@ -3384,46 +3372,6 @@ upower_notify_sleep_cb (UpClient *client,
+ NULL,
+ sleep_cb_screensaver_proxy_ready_cb,
+ manager);
+-
+-}
+-
+-static void
+-upower_notify_resume_cb (UpClient *client,
+- UpSleepKind sleep_kind,
+- CsdPowerManager *manager)
+-{
+- gboolean ret;
+- GError *error = NULL;
+-
+- /* this displays the unlock dialogue so the user doesn't have
+- * to move the mouse or press any key before the window comes up */
+- if (manager->priv->screensaver_proxy != NULL) {
+- g_dbus_proxy_call (manager->priv->screensaver_proxy,
+- "SimulateUserActivity",
+- NULL,
+- G_DBUS_CALL_FLAGS_NONE,
+- -1, NULL, NULL, NULL);
+- }
+-
+- if (manager->priv->screensaver_proxy != NULL) {
+- g_object_unref (manager->priv->screensaver_proxy);
+- manager->priv->screensaver_proxy = NULL;
+- }
+-
+- /* close existing notifications on resume, the system power
+- * state is probably different now */
+- notify_close_if_showing (manager->priv->notification_low);
+- notify_close_if_showing (manager->priv->notification_discharging);
+-
+- /* ensure we turn the panel back on after resume */
+- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+- GNOME_RR_DPMS_ON,
+- &error);
+- if (!ret) {
+- g_warning ("failed to turn the panel on after resume: %s",
+- error->message);
+- g_error_free (error);
+- }
+ }
+
+ static void
+@@ -3582,6 +3530,219 @@ disable_builtin_screensaver (gpointer unused)
+ return TRUE;
+ }
+
++static void
++inhibit_lid_switch_done (GObject *source,
++ GAsyncResult *result,
++ gpointer user_data)
++{
++ GDBusProxy *proxy = G_DBUS_PROXY (source);
++ CsdPowerManager *manager = CSD_POWER_MANAGER (user_data);
++ GError *error = NULL;
++ GVariant *res;
++ GUnixFDList *fd_list = NULL;
++ gint idx;
++
++ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
++ if (res == NULL) {
++ g_warning ("Unable to inhibit lid switch: %s", error->message);
++ g_error_free (error);
++ } else {
++ g_variant_get (res, "(h)", &idx);
++ manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
++ if (manager->priv->inhibit_lid_switch_fd == -1) {
++ g_warning ("Failed to receive system inhibitor fd: %s", error->message);
++ g_error_free (error);
++ }
++ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
++ g_object_unref (fd_list);
++ g_variant_unref (res);
++ }
++}
++
++static void
++inhibit_lid_switch (CsdPowerManager *manager)
++{
++ GVariant *params;
++
++ if (manager->priv->inhibit_lid_switch_taken) {
++ g_debug ("already inhibited lid-switch");
++ return;
++ }
++ g_debug ("Adding lid switch system inhibitor");
++ manager->priv->inhibit_lid_switch_taken = TRUE;
++
++ params = g_variant_new ("(ssss)",
++ "handle-lid-switch",
++ g_get_user_name (),
++ "Multiple displays attached",
++ "block");
++ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
++ "Inhibit",
++ params,
++ 0,
++ G_MAXINT,
++ NULL,
++ NULL,
++ inhibit_lid_switch_done,
++ manager);
++}
++
++static void
++inhibit_suspend_done (GObject *source,
++ GAsyncResult *result,
++ gpointer user_data)
++{
++ GDBusProxy *proxy = G_DBUS_PROXY (source);
++ CsdPowerManager *manager = CSD_POWER_MANAGER (user_data);
++ GError *error = NULL;
++ GVariant *res;
++ GUnixFDList *fd_list = NULL;
++ gint idx;
++
++ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
++ if (res == NULL) {
++ g_warning ("Unable to inhibit suspend: %s", error->message);
++ g_error_free (error);
++ } else {
++ g_variant_get (res, "(h)", &idx);
++ manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
++ if (manager->priv->inhibit_suspend_fd == -1) {
++ g_warning ("Failed to receive system inhibitor fd: %s", error->message);
++ g_error_free (error);
++ }
++ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
++ g_object_unref (fd_list);
++ g_variant_unref (res);
++ }
++}
++
++/* We take a delay inhibitor here, which causes logind to send a
++ * PrepareToSleep signal, which gives us a chance to lock the screen
++ * and do some other preparations.
++ */
++static void
++inhibit_suspend (CsdPowerManager *manager)
++{
++ if (manager->priv->inhibit_suspend_taken) {
++ g_debug ("already inhibited lid-switch");
++ return;
++ }
++ g_debug ("Adding suspend delay inhibitor");
++ manager->priv->inhibit_suspend_taken = TRUE;
++ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
++ "Inhibit",
++ g_variant_new ("(ssss)",
++ "sleep",
++ g_get_user_name (),
++ "Cinnamon needs to lock the screen",
++ "delay"),
++ 0,
++ G_MAXINT,
++ NULL,
++ NULL,
++ inhibit_suspend_done,
++ manager);
++}
++
++static void
++uninhibit_suspend (CsdPowerManager *manager)
++{
++ if (manager->priv->inhibit_suspend_fd == -1) {
++ g_debug ("no suspend delay inhibitor");
++ return;
++ }
++ g_debug ("Removing suspend delay inhibitor");
++ close (manager->priv->inhibit_suspend_fd);
++ manager->priv->inhibit_suspend_fd = -1;
++ manager->priv->inhibit_suspend_taken = FALSE;
++}
++
++static void
++handle_suspend_actions (CsdPowerManager *manager)
++{
++ gboolean do_lock;
++
++ do_lock = g_settings_get_boolean (manager->priv->settings,
++ "lock-on-suspend");
++ if (do_lock)
++ lock_screensaver (manager);
++
++ /* lift the delay inhibit, so logind can proceed */
++ uninhibit_suspend (manager);
++}
++
++static void
++handle_resume_actions (CsdPowerManager *manager)
++{
++ gboolean ret;
++ GError *error = NULL;
++
++ /* this displays the unlock dialogue so the user doesn't have
++ * to move the mouse or press any key before the window comes up */
++ g_dbus_connection_call (manager->priv->connection,
++ GS_DBUS_NAME,
++ GS_DBUS_PATH,
++ GS_DBUS_INTERFACE,
++ "SimulateUserActivity",
++ NULL, NULL,
++ G_DBUS_CALL_FLAGS_NONE, -1,
++ NULL, NULL, NULL);
++
++ /* close existing notifications on resume, the system power
++ * state is probably different now */
++ notify_close_if_showing (manager->priv->notification_low);
++ notify_close_if_showing (manager->priv->notification_discharging);
++
++ /* ensure we turn the panel back on after resume */
++ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
++ GNOME_RR_DPMS_ON,
++ &error);
++ if (!ret) {
++ g_warning ("failed to turn the panel on after resume: %s",
++ error->message);
++ g_error_free (error);
++ }
++
++ /* set up the delay again */
++ inhibit_suspend (manager);
++}
++
++static void
++upower_notify_sleep_cb (UpClient *client,
++ UpSleepKind sleep_kind,
++ CsdPowerManager *manager)
++{
++ handle_suspend_actions (manager);
++}
++
++static void
++upower_notify_resume_cb (UpClient *client,
++ UpSleepKind sleep_kind,
++ CsdPowerManager *manager)
++{
++ handle_resume_actions (manager);
++}
++
++static void
++logind_proxy_signal_cb (GDBusProxy *proxy,
++ const gchar *sender_name,
++ const gchar *signal_name,
++ GVariant *parameters,
++ gpointer user_data)
++{
++ CsdPowerManager *manager = CSD_POWER_MANAGER (user_data);
++ gboolean is_about_to_suspend;
++
++ if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
++ return;
++ g_variant_get (parameters, "(b)", &is_about_to_suspend);
++ if (is_about_to_suspend) {
++ handle_suspend_actions (manager);
++ } else {
++ handle_resume_actions (manager);
++ }
++}
++
+ static gboolean
+ is_hardware_a_virtual_machine (void)
+ {
+@@ -3647,6 +3808,26 @@ csd_power_manager_start (CsdPowerManager *manager,
+ if (manager->priv->x11_screen == NULL)
+ return FALSE;
+
++ /* Set up the logind proxy */
++ manager->priv->logind_proxy =
++ g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
++ 0,
++ NULL,
++ SYSTEMD_DBUS_NAME,
++ SYSTEMD_DBUS_PATH,
++ SYSTEMD_DBUS_INTERFACE,
++ NULL,
++ error);
++ g_signal_connect (manager->priv->logind_proxy, "g-signal",
++ G_CALLBACK (logind_proxy_signal_cb),
++ manager);
++
++ /* Set up a delay inhibitor to be informed about suspend attempts */
++ inhibit_suspend (manager);
++
++ /* Disable logind's lid handling while g-s-d is active */
++ inhibit_lid_switch (manager);
++
+ /* track the active session */
+ manager->priv->session = cinnamon_settings_session_new ();
+ g_signal_connect (manager->priv->session, "notify::state",
+@@ -3856,6 +4037,22 @@ csd_power_manager_stop (CsdPowerManager *manager)
+ manager->priv->up_client = NULL;
+ }
+
++ if (manager->priv->inhibit_lid_switch_fd != -1) {
++ close (manager->priv->inhibit_lid_switch_fd);
++ manager->priv->inhibit_lid_switch_fd = -1;
++ manager->priv->inhibit_lid_switch_taken = FALSE;
++ }
++ if (manager->priv->inhibit_suspend_fd != -1) {
++ close (manager->priv->inhibit_suspend_fd);
++ manager->priv->inhibit_suspend_fd = -1;
++ manager->priv->inhibit_suspend_taken = FALSE;
++ }
++
++ if (manager->priv->logind_proxy != NULL) {
++ g_object_unref (manager->priv->logind_proxy);
++ manager->priv->logind_proxy = NULL;
++ }
++
+ if (manager->priv->x11_screen != NULL) {
+ g_object_unref (manager->priv->x11_screen);
+ manager->priv->x11_screen = NULL;
+@@ -3928,6 +4125,8 @@ static void
+ csd_power_manager_init (CsdPowerManager *manager)
+ {
+ manager->priv = CSD_POWER_MANAGER_GET_PRIVATE (manager);
++ manager->priv->inhibit_lid_switch_fd = -1;
++ manager->priv->inhibit_suspend_fd = -1;
+ }
+
+ static void
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index 25989d34b..a5b65c902 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 106511 2014-03-05 09:58:14Z spupykin $
+# $Id: PKGBUILD 107773 2014-03-19 12:02:14Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
pkgname=dbmail
-pkgver=3.1.12
+pkgver=3.1.13
pkgrel=1
pkgdesc="Fast and scalable sql based mail services"
arch=('i686' 'x86_64')
@@ -27,7 +27,7 @@ source=("http://www.dbmail.org/download/3.1/dbmail-${pkgver}.tar.gz"
"dbmail-pop3d.xinetd"
"dbmail-timsieved.xinetd"
"dbmail-7-systemd.diff")
-md5sums=('a17f22e113e26dda8fc1461690054163'
+md5sums=('528f718a9c3909fbd5c0d77f9dfcb68b'
'890de13361afbdf4fed12d6d7eb53e66'
'961593658cd596297d03d25eb9c9e98f'
'4cb764894abd3914802e90602bf90a0c'
diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD
index ede9b5151..20ed8b014 100644
--- a/community/galculator/PKGBUILD
+++ b/community/galculator/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 107224 2014-03-14 16:49:24Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# $Id: PKGBUILD 107795 2014-03-19 18:01:16Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
# Contributor: SpepS <dreamspepser at yahoo dot it>
# Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -7,45 +8,50 @@
pkgbase=galculator
pkgname=(galculator galculator-gtk2)
pkgver=2.1.3
-pkgrel=1
+pkgrel=2
pkgdesc='GTK+ based scientific calculator'
arch=('i686' 'x86_64')
url='http://galculator.sourceforge.net/'
license=('GPL')
-depends=('gtk3' 'gtk2')
+depends=('gtk2' 'gtk3')
makedepends=('intltool')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2)
+install=${pkgname}.install
+source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2")
sha256sums=('91ac62d6d74da910cb79c68f7bf3f4505ac0efe51091150c4ea54fe1c1306235')
build() {
# GTK3 version
- cd $pkgname-$pkgver
- [ -e gtk3 ] || mkdir gtk3
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ [ -d gtk3 ] || mkdir gtk3
cd gtk3
- ../configure --prefix=/usr
+ ../configure \
+ --prefix=/usr
make
# GTK2 version
- cd $srcdir/$pkgname-$pkgver
- [ -e gtk2 ] || mkdir gtk2
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ [ -d gtk2 ] || mkdir gtk2
cd gtk2
- ../configure --prefix=/usr --disable-gtk3
+ ../configure \
+ --prefix=/usr \
+ --disable-gtk3
make
}
package_galculator() {
depends=('gtk3')
-
- cd $pkgbase-$pkgver/gtk3
+
+ cd "${pkgbase}-${pkgver}/gtk3"
make DESTDIR="$pkgdir" install
}
package_galculator-gtk2() {
pkgdesc+=' (GTK2 version)'
depends=('gtk2')
- conflicts=('galculator')
+ groups=('mate-extra')
+ replaces=('mate-calc')
+ conflicts=('galculator' 'mate-calc')
- cd $pkgbase-$pkgver/gtk2
+ cd "${pkgbase}-${pkgver}/gtk2"
make DESTDIR="$pkgdir" install
}
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index ccc81c138..8d2981a69 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105557 2014-02-10 11:18:20Z spupykin $
+# $Id: PKGBUILD 107782 2014-03-19 15:31:11Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: farid <farid at archlinuc-br.org>
@@ -6,27 +6,25 @@
pkgbase=gmic
pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.8.3
+pkgver=1.5.8.4
pkgrel=1
arch=("i686" "x86_64")
url="http://gmic.sourceforge.net"
license=("custom:CeCILL")
makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
-#options=('!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
- "opencv-buildfix.patch")
-md5sums=('ee80a2dc1a2441a6c0adf92e9bea623b'
- '120319b0d6c81c5af186abe2281b79ca')
+source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz")
+md5sums=('103ffe6606981c5d0bedaffd0f466bc2')
prepare() {
cd "${srcdir}/gmic-${pkgver}"
- patch -p1 -i "${srcdir}/opencv-buildfix.patch"
- sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|g' src/Makefile
- sed -i 's|/usr/bin/qmake|/usr/bin/qmake-qt4|g' zart/Makefile
+ sed -i -e 's|qmake zart.pro|qmake-qt4 zart.pro|g' \
+ -e 's|/etc/bash_completion.d|/usr/share/bash-completion/completions|g' \
+ src/Makefile
}
build() {
cd "${srcdir}/gmic-${pkgver}"
+ (cd zart && qmake-qt4 -o Makefile zart.pro)
make -C src all
make -C zart all
}
diff --git a/community/gmic/opencv-buildfix.patch b/community/gmic/opencv-buildfix.patch
index ae6f71487..c45ab09f2 100644
--- a/community/gmic/opencv-buildfix.patch
+++ b/community/gmic/opencv-buildfix.patch
@@ -1,15 +1,6 @@
diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile
--- gmic-1.5.1.7/src/Makefile 2012-07-26 12:59:34.000000000 +0400
+++ gmic-1.5.1.7.q/src/Makefile 2012-08-03 14:03:10.000000000 +0400
-@@ -296,7 +296,7 @@
-
- zart: lib
- ifneq ($(OS),Darwin)
-- cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
-+ cd ../zart && qmake zart.pro && $(MAKE) && strip zart
- else
- cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)"
- endif
@@ -403,6 +403,7 @@
mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD
index 677dc72c7..093022680 100644
--- a/community/gnome-commander/PKGBUILD
+++ b/community/gnome-commander/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104056 2014-01-14 22:32:49Z jlichtblau $
+# $Id: PKGBUILD 107765 2014-03-19 10:09:28Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -6,18 +6,18 @@
# Contributor: Johannes Sjolund <j.sjolund@gmail.com>
pkgname=gnome-commander
-pkgver=1.2.8.17
+pkgver=1.4.0
pkgrel=1
pkgdesc='Graphical two-pane filemanager for Gnome'
arch=('i686' 'x86_64')
url='http://gcmd.github.io/'
license=('GPL')
-depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm')
+depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm' 'libunique')
makedepends=('perl-xml-parser' 'gnome-doc-utils' 'intltool')
install=$pkgname.install
changelog=$pkgname.changelog
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('135033ad2073c9d6fee51a52f1e7a56358b8e3a6fa46d64188dc3feebfe00606')
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.4/$pkgname-$pkgver.tar.xz)
+sha256sums=('ffd1062dd61ca993271e6d013dccf179fd8291f3507907c873facdf893ef6fc1')
build() {
cd "$pkgname-$pkgver"
diff --git a/community/gnome-commander/gnome-commander.changelog b/community/gnome-commander/gnome-commander.changelog
index a562c5ae7..2ca4303b5 100644
--- a/community/gnome-commander/gnome-commander.changelog
+++ b/community/gnome-commander/gnome-commander.changelog
@@ -1,2 +1,5 @@
+2014-03-19 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+ * gnome-commander 1.4.0-1
+
2014-01-14 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
* gnome-commander 1.2.8.17-1
diff --git a/community/mate-system-tools/PKGBUILD b/community/mate-system-tools/PKGBUILD
index d581047b4..0ec43de02 100644
--- a/community/mate-system-tools/PKGBUILD
+++ b/community/mate-system-tools/PKGBUILD
@@ -2,15 +2,14 @@
pkgname=mate-system-tools
pkgver=1.8.0
-pkgrel=1
+pkgrel=2
pkgdesc="Suite of tools for MATE to simplify configuring workstations."
url="http://mate-desktop.org/"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('dconf' 'liboobs' 'mate-polkit' 'system-tools-backends' 'wireless_tools')
+depends=('dconf' 'liboobs' 'mate-polkit' 'system-tools-backends')
makedepends=('caja' 'mate-common' 'perl-xml-parser' 'yelp-tools')
-optdepends=('ntp: Automatic time synchronisation.'
- 'caja: provides Caja Shares extension'
+optdepends=('caja: provides Caja Shares extension'
'yelp: for reading MATE help documents')
source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
sha1sums=('11a8d72cf265834867352ad67a2d32485dbc98e0')
@@ -20,12 +19,14 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure \
--prefix=/usr \
- --sysconfdir=/etc
+ --sysconfdir=/etc \
+ --disable-network \
+ --disable-services \
+ --disable-time
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- rm -f "${pkgdir}/usr/lib/caja/extensions-2.0/libcaja-gst-shares.a"
}
diff --git a/community/mtd-utils/PKGBUILD b/community/mtd-utils/PKGBUILD
new file mode 100644
index 000000000..5e98e0d9c
--- /dev/null
+++ b/community/mtd-utils/PKGBUILD
@@ -0,0 +1,22 @@
+# $Id: PKGBUILD 107779 2014-03-19 14:32:31Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Phil Pirozhkov <pirjsuka@gmail.com>
+
+pkgname=mtd-utils
+pkgver=1.5.0
+pkgrel=3
+pkgdesc='Utilities for dealing with MTD devices'
+arch=('i686' 'x86_64')
+url='http://www.linux-mtd.infradead.org/'
+license=('GPL2')
+depends=('lzo2' 'util-linux')
+source=(ftp://ftp.infradead.org/pub/mtd-utils/$pkgname-$pkgver.tar.bz2)
+md5sums=('7332f1143be4ba8ee2de3096cbd3b03b')
+
+build() {
+ make -C $pkgname-$pkgver
+}
+
+package() {
+ make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
+}
diff --git a/community/musescore/PKGBUILD b/community/musescore/PKGBUILD
index f2e8fe475..7f72a13f5 100755
--- a/community/musescore/PKGBUILD
+++ b/community/musescore/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97939 2013-10-01 16:51:03Z alucryd $
+# $Id: PKGBUILD 107771 2014-03-19 11:44:37Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
# Contributor: Cristian Maureira <saint@archlinux.cl>
@@ -7,24 +7,21 @@
pkgbase=musescore
pkgname=('musescore' 'musescore-docs')
pkgver=1.3
-pkgrel=5
+pkgrel=6
pkgdesc="Create, play and print beautiful sheet music"
arch=('i686' 'x86_64')
url="http://musescore.org/"
license=('GPL')
makedepends=('cmake' 'doxygen' 'portaudio' 'qtscriptgenerator' 'texlive-core')
source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2"
- 'mscore-docs.patch')
+ 'mscore-paths.patch')
sha256sums=('a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683'
- 'ea4c25e8998c1666103d48fb3bcb5a8d7c9601e971195ef23c2f535c1191585d')
+ '00984b9a2bb020b4f907cee7e6f95a8f2f0318613acfe79ad6ad9732e85b5150')
prepare() {
cd mscore-${pkgver}/mscore
- patch -Np1 -i ../../mscore-docs.patch
- sed 's/COMMAND lupdate/COMMAND lupdate-qt4/g
- s/COMMAND lrelease/COMMAND lrelease-qt4/g
- s/set(BUILD_SCRIPTGEN TRUE)/set(BUILD_SCRIPTGEN FALSE)/' -i CMakeLists.txt
+ patch -Np2 -i ../../mscore-paths.patch
}
build() {
@@ -35,7 +32,7 @@ build() {
fi
mkdir build && cd build
- cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
+ cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DBUILD_SCRIPTGEN='FALSE'
make lupdate
make lrelease
make
diff --git a/community/musescore/mscore-docs.patch b/community/musescore/mscore-docs.patch
deleted file mode 100755
index 544dffd86..000000000
--- a/community/musescore/mscore-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/mscore/mscore.cpp
-+++ b/mscore/mscore.cpp
-@@ -919,15 +919,15 @@
- if (debugMode)
- printf("open handbook for language <%s>\n", qPrintable(lang));
-
-- QFileInfo mscoreHelp(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
-+ QFileInfo mscoreHelp(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
- if (!mscoreHelp.isReadable()) {
- if (debugMode) {
- printf("cannot open doc <%s>\n", qPrintable(mscoreHelp.filePath()));
- }
- lang = lang.left(2);
-- mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
-+ mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
- if(!mscoreHelp.isReadable()){
-- mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-en.pdf"));
-+ mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-en.pdf"));
- if (!mscoreHelp.isReadable()) {
- QString info(tr("MuseScore handbook not found at: \n"));
- info += mscoreHelp.filePath();
diff --git a/community/musescore/mscore-paths.patch b/community/musescore/mscore-paths.patch
new file mode 100755
index 000000000..b14081126
--- /dev/null
+++ b/community/musescore/mscore-paths.patch
@@ -0,0 +1,61 @@
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -32,7 +32,7 @@ set(GCC_VISIBILITY TRUE)
+ set(HAS_AUDIOFILE TRUE) # requires libsndfile
+ set(OSC TRUE) # osc remote control
+
+-set(BUILD_SCRIPTGEN TRUE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
++set(BUILD_SCRIPTGEN FALSE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
+ set(STATIC_SCRIPT_BINDINGS FALSE)
+ set(USE_SSE FALSE)
+
+@@ -421,14 +421,14 @@ include (CPack)
+
+ add_custom_target(lupdate
+ COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro
+- COMMAND lupdate -noobsolete ${PROJECT_BINARY_DIR}/mscore.pro
++ COMMAND lupdate-qt4 -noobsolete ${PROJECT_BINARY_DIR}/mscore.pro
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ )
+
+ add_custom_target(lrelease
+ COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro
+- COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/locale/*.ts
+- COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts
++ COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/locale/*.ts
++ COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ )
+
+--- a/mscore/mscore/genft.cpp
++++ b/mscore/mscore/genft.cpp
+@@ -27,7 +27,7 @@
+
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include <freetype/tttables.h>
++#include <freetype2/tttables.h>
+ #include "al/xml.h"
+
+ QMap<int, int> codemap;
+--- a/mscore/mscore/mscore.cpp
++++ b/mscore/mscore/mscore.cpp
+@@ -919,15 +919,15 @@
+ if (debugMode)
+ printf("open handbook for language <%s>\n", qPrintable(lang));
+
+- QFileInfo mscoreHelp(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
++ QFileInfo mscoreHelp(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
+ if (!mscoreHelp.isReadable()) {
+ if (debugMode) {
+ printf("cannot open doc <%s>\n", qPrintable(mscoreHelp.filePath()));
+ }
+ lang = lang.left(2);
+- mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
++ mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
+ if(!mscoreHelp.isReadable()){
+- mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-en.pdf"));
++ mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-en.pdf"));
+ if (!mscoreHelp.isReadable()) {
+ QString info(tr("MuseScore handbook not found at: \n"));
+ info += mscoreHelp.filePath();
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index be216947b..7d35e5316 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 104524 2014-01-22 10:03:16Z svenstaro $
+# $Id: PKGBUILD 107808 2014-03-19 20:59:30Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Christian Hesse <mail@eworm.de>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Gerhard Brauer <gerbra@archlinux.de>
pkgname=nbd
-pkgver=3.7
+pkgver=3.8
pkgrel=1
pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz
backup=('etc/nbd-server/config')
depends=('glib2')
install=nbd.install
-md5sums=('09a17fd19596b6908bff8b7db74141fc'
+md5sums=('e9bcdb3e18af815573880ccbaee02646'
'2d05d426b8c2708d5f8a0d028fcbae05'
'5d1acc143018117174f79eff15afa038')
diff --git a/community/pax-utils/PKGBUILD b/community/pax-utils/PKGBUILD
index 6298b812a..d30618b7a 100644
--- a/community/pax-utils/PKGBUILD
+++ b/community/pax-utils/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 88483 2013-04-18 13:24:39Z tredaelli $
+# $Id: PKGBUILD 107777 2014-03-19 12:12:22Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: sh0 <mee@sh0.org>
# Contributor: Maxwel <msg.maxwel@gmail.com>
pkgname=pax-utils
pkgver=0.7
-pkgrel=1
+pkgrel=2
pkgdesc='ELF related utils for ELF 32/64 binaries that can check files for security relevant properties'
url='http://hardened.gentoo.org/pax-utils.xml'
arch=('i686' 'x86_64')
license=('GPL')
-depends=('bash' 'libcap')
-checkdepends=('python')
+depends=('bash' 'libcap' 'python-pyelftools')
source=("http://distfiles.gentoo.org/distfiles/${pkgname}-${pkgver}.tar.xz")
sha256sums=('1ac4cee9a9ca97a723505eb29a25e50adeccffba3f0f0ef4f035cf082caf3b84')
@@ -27,5 +26,5 @@ check() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+ make USE_PYTHON='yes' DESTDIR="${pkgdir}" install
}
diff --git a/community/pluma/PKGBUILD b/community/pluma/PKGBUILD
index 82e1c9c18..f9594715d 100644
--- a/community/pluma/PKGBUILD
+++ b/community/pluma/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD 106671 2014-03-06 11:42:20Z flexiondotorg $
+# $Id: PKGBUILD 107797 2014-03-19 18:14:08Z flexiondotorg $
# Maintainer : Martin Wimpress <code@flexion.org>
pkgname=pluma
pkgver=1.8.0
-pkgrel=1
+pkgrel=3
pkgdesc="A powerful text editor for MATE"
url="http://mate-desktop.org"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('caja' 'desktop-file-utils' 'enchant' 'gtk2' 'gtksourceview2'
- 'iso-codes' 'libsm' 'mate-desktop' 'python2' 'python2-gobject2'
- 'pygtksourceview2')
+depends=('desktop-file-utils' 'enchant' 'gtk2' 'iso-codes' 'libsm'
+ 'mate-desktop' 'mate-dialogs' 'pygtksourceview2' 'python2-gobject2')
makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
optdepends=('yelp: for reading MATE help documents')
replaces=('mate-text-editor')
provides=('mate-text-editor')
conflicts=('mate-text-editor')
-options=('!emptydirs')
groups=('mate-extra')
source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
sha1sums=('858e3edaee698b3f99189d3285061ab56b21828c')
diff --git a/community/python2-systemd/PKGBUILD b/community/python2-systemd/PKGBUILD
index 8b420df5e..72fa0f450 100644
--- a/community/python2-systemd/PKGBUILD
+++ b/community/python2-systemd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 106496 2014-03-05 02:09:28Z dwallace $
+# $Id: PKGBUILD 107756 2014-03-19 05:20:19Z dwallace $
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com
pkgname=python2-systemd
_pkgname=systemd
-pkgver=210
-pkgrel=2
+pkgver=211
+pkgrel=1
pkgdesc="Python2 bindings for systemd"
arch=('x86_64' 'i686')
url="http://www.freedesktop.org/wiki/Software/systemd/"
@@ -11,7 +11,7 @@ license=('GPL')
depends=('python2' "systemd>=$pkgver" 'python2-lxml')
makedepends=('intltool' 'gperf')
source=("http://www.freedesktop.org/software/$_pkgname/$_pkgname-$pkgver.tar.xz")
-md5sums=('03efddf8c9eca36d4d590f9967e7e818')
+md5sums=('0a70c382b6089526f98073b4ee85ef75')
build() {
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index ec5ac658b..8db014feb 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 106348 2014-02-28 21:36:16Z seblu $
+# $Id: PKGBUILD 107802 2014-03-19 19:39:48Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
pkgname=radvd
-pkgver=1.9.9
+pkgver=1.10.0
pkgrel=1
pkgdesc='IPv6 Router Advertisement Daemon'
url='http://www.litech.org/radvd/'
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64')
backup=('etc/radvd.conf')
source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.xz"{,.asc}
"$pkgname.service")
-sha1sums=('373f7b1b6b2c6efbf8dc253f90b466703526d9b4'
+sha1sums=('b691a2c36863405191010e6275740e5c1a48705d'
'SKIP'
'2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc')
build() {
diff --git a/community/read-edid/PKGBUILD b/community/read-edid/PKGBUILD
new file mode 100644
index 000000000..6ea804480
--- /dev/null
+++ b/community/read-edid/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 107759 2014-03-19 07:00:43Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: LaraCraft304 <lara@craft.net.br>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
+
+pkgname=read-edid
+pkgver=3.0.1
+pkgrel=1
+pkgdesc="Program that can get information from a PNP monitor"
+arch=('i686' 'x86_64')
+url="http://www.polypux.org/projects/read-edid/"
+license=('GPL')
+depends=('libx86>=0.99')
+makedepends=('cmake')
+source=("http://www.polypux.org/projects/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('81f6a57162127ab9e969da53bc290e63')
+
+build() {
+ mkdir $pkgname-build
+ cd $pkgname-build
+ cmake "$srcdir/$pkgname-$pkgver" -DCMAKE_INSTALL_PREFIX="/usr"
+ make
+}
+
+package() {
+ cd $pkgname-build
+ make DESTDIR="$pkgdir/" install
+}
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 4ebf7067a..602025130 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 104606 2014-01-23 13:18:27Z andrea $
+# $Id: PKGBUILD 107775 2014-03-19 12:02:32Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
pkgname=shotwell
-pkgver=0.15.1
-pkgrel=2
+pkgver=0.18.0
+pkgrel=1
pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
arch=('i686' 'x86_64')
url="http://yorba.org/shotwell/"
@@ -13,10 +13,10 @@ license=('LGPL2.1')
depends=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest'
'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib'
'gst-plugins-base' 'libgphoto2')
-makedepends=('intltool' 'vala>=0.17.2' 'libunique3')
+makedepends=('intltool' 'vala>=0.17.2' 'libunique3' 'gnome-doc-utils')
install=shotwell.install
-source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz")
-md5sums=('5af4cfb819249a879a4649a9c7d089e5')
+source=("https://download.gnome.org/sources/shotwell/0.18/shotwell-$pkgver.tar.xz")
+md5sums=('856b69fe67bc8bd42a6985e042041daf')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/vagrant/PKGBUILD b/community/vagrant/PKGBUILD
index a9731c993..b9af83136 100644
--- a/community/vagrant/PKGBUILD
+++ b/community/vagrant/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 107722 2014-03-18 20:52:15Z jsteel $
+# $Id: PKGBUILD 107806 2014-03-19 20:47:07Z jsteel $
# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
# Contributor: Ido Rosen <ido@kernel.org>
# Contributor: Brett Hoerner <brett@bretthoerner.com>
@@ -11,7 +11,7 @@
pkgname=vagrant
pkgver=1.5.1
-pkgrel=3
+pkgrel=4
pkgdesc="Build and distribute virtualized development environments"
arch=('i686' 'x86_64')
url="http://vagrantup.com"
@@ -35,9 +35,15 @@ build() {
}
package() {
- install -d "$pkgdir"/{opt/,usr/bin/}
+ install -d "$pkgdir"/{opt/,usr/bin/,usr/share/bash-completion/completions/}
cp -r "$srcdir"/substrate/ "$pkgdir"/opt/$pkgname/
ln -s /opt/$pkgname/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
+
+ ln -s /opt/$pkgname/embedded/gems/gems/$pkgname-$pkgver/contrib/bash/completion.sh \
+ "$pkgdir"/usr/share/bash-completion/completions/$pkgname
+
+ install -Dm644 "$srcdir"/$pkgname/LICENSE \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 62506015b..2967f3bb4 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 207747 2014-03-14 14:31:40Z anatolik $
+# $Id: PKGBUILD 208219 2014-03-19 12:29:50Z anatolik $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tom Killian <tom.archlinux.org>
# Contributor: Judd Vinet <jvinet.zeroflux.org>
pkgname=dhcpcd
-pkgver=6.3.1
-pkgrel=2
+pkgver=6.3.2
+pkgrel=1
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/projects/dhcpcd/"
arch=('i686' 'x86_64')
@@ -17,21 +17,10 @@ backup=('etc/dhcpcd.conf')
options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
'dhcpcd_.service'
- 'dhcpcd.service'
- 'commit_9eaeccdf1d.diff'
- 'commit_e348e99776.diff')
-sha1sums=('4db014c7eeca57fea7f954640e68feaa1d249c79'
+ 'dhcpcd.service')
+sha1sums=('ff8ef22b7305795eff52b8b41b81e2999a5923ff'
'6f1633edde14d29b5cdc09c4f029a450ef2ebc96'
- '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9'
- '6a381ec2638eba6812a76b0f362e59f283c30168'
- 'c81283b4918370992f2f717a3139a23748c6a46d')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p0 -i "${srcdir}/commit_9eaeccdf1d.diff"
- patch -p0 -i "${srcdir}/commit_e348e99776.diff"
-}
+ '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/dhcpcd/commit_9eaeccdf1d.diff b/core/dhcpcd/commit_9eaeccdf1d.diff
deleted file mode 100644
index 5653dce60..000000000
--- a/core/dhcpcd/commit_9eaeccdf1d.diff
+++ /dev/null
@@ -1,191 +0,0 @@
-Index: auth.c
-==================================================================
---- auth.c
-+++ auth.c
-@@ -229,10 +229,15 @@
- errno = EINVAL;
- return NULL;
- }
- if (state->reconf == NULL)
- errno = ENOENT;
-+ /* Free the old token so we log acceptance */
-+ if (state->token) {
-+ free(state->token);
-+ state->token = NULL;
-+ }
- /* Nothing to validate, just accepting the key */
- return state->reconf;
- case 2:
- if (!((mp == 4 && mt == DHCP_FORCERENEW) ||
- (mp == 6 && mt == DHCP6_RECONFIGURE)))
-
-Index: dhcp.c
-==================================================================
---- dhcp.c
-+++ dhcp.c
-@@ -1059,12 +1059,16 @@
- syslog(LOG_DEBUG, "%s: dhcp_auth_validate: %m",
- ifp->name);
- free(dhcp);
- return NULL;
- }
-- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32,
-- ifp->name, state->auth.token->secretid);
-+ if (state->auth.token)
-+ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32,
-+ ifp->name, state->auth.token->secretid);
-+ else
-+ syslog(LOG_DEBUG, "%s: accepted reconfigure key",
-+ ifp->name);
- }
-
- return dhcp;
- }
-
-@@ -2195,12 +2199,16 @@
- iface->name);
- log_dhcp1(LOG_ERR, "authentication failed",
- iface, dhcp, from, 0);
- return;
- }
-- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32,
-- iface->name, state->auth.token->secretid);
-+ if (state->auth.token)
-+ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32,
-+ iface->name, state->auth.token->secretid);
-+ else
-+ syslog(LOG_DEBUG, "%s: accepted reconfigure key",
-+ iface->name);
- } else if (ifo->auth.options & DHCPCD_AUTH_REQUIRE) {
- log_dhcp1(LOG_ERR, "no authentication", iface, dhcp, from, 0);
- return;
- } else if (ifo->auth.options & DHCPCD_AUTH_SEND)
- log_dhcp1(LOG_WARNING, "no authentication",
-
-Index: dhcp6.c
-==================================================================
---- dhcp6.c
-+++ dhcp6.c
-@@ -1458,18 +1458,18 @@
- {
- struct dhcp6_state *state;
- const struct if_options *ifo;
- const struct dhcp6_option *o;
- const uint8_t *p;
-- int i;
-+ int i, e;
- uint32_t u32, renew, rebind;
- uint8_t iaid[4];
- size_t ol;
- struct ipv6_addr *ap, *nap;
-
- ifo = ifp->options;
-- i = 0;
-+ i = e = 0;
- state = D6_STATE(ifp);
- TAILQ_FOREACH(ap, &state->addrs, next) {
- ap->flags |= IPV6_AF_STALE;
- }
- while ((o = dhcp6_findoption(ifo->ia_type, d, l))) {
-@@ -1498,12 +1498,14 @@
- rebind = ntohl(u32);
- p += sizeof(u32);
- ol -= sizeof(u32);
- } else
- renew = rebind = 0; /* appease gcc */
-- if (dhcp6_checkstatusok(ifp, NULL, p, ol) == -1)
-+ if (dhcp6_checkstatusok(ifp, NULL, p, ol) == -1) {
-+ e = 1;
- continue;
-+ }
- if (ifo->ia_type == D6_OPTION_IA_PD) {
- if (dhcp6_findpd(ifp, iaid, p, ol) == 0) {
- syslog(LOG_WARNING,
- "%s: %s: DHCPv6 REPLY missing Prefix",
- ifp->name, sfrom);
-@@ -1542,10 +1544,12 @@
- eloop_q_timeout_delete(ap->iface->ctx->eloop,
- 0, NULL, ap);
- free(ap);
- }
- }
-+ if (i == 0 && e)
-+ return -1;
- return i;
- }
-
- static int
- dhcp6_validatelease(struct interface *ifp,
-@@ -1657,12 +1661,16 @@
- ifp->name);
- syslog(LOG_ERR, "%s: authentication failed",
- ifp->name);
- goto ex;
- }
-- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32,
-- ifp->name, state->auth.token->secretid);
-+ if (state->auth.token)
-+ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32,
-+ ifp->name, state->auth.token->secretid);
-+ else
-+ syslog(LOG_DEBUG, "%s: accepted reconfigure key",
-+ ifp->name);
- } else if (ifp->options->auth.options & DHCPCD_AUTH_REQUIRE) {
- syslog(LOG_ERR, "%s: authentication now required", ifp->name);
- goto ex;
- }
-
-@@ -2053,14 +2061,17 @@
- if (state == NULL || state->send == NULL) {
- syslog(LOG_DEBUG, "%s: DHCPv6 reply received but not running",
- ifp->name);
- return;
- }
-+
-+ r = (struct dhcp6_message *)ctx->rcvhdr.msg_iov[0].iov_base;
-+
- /* We're already bound and this message is for another machine */
- /* XXX DELEGATED? */
-- if (state->state == DH6S_BOUND ||
-- state->state == DH6S_INFORMED)
-+ if (r->type != DHCP6_RECONFIGURE &&
-+ (state->state == DH6S_BOUND || state->state == DH6S_INFORMED))
- return;
-
- r = (struct dhcp6_message *)ctx->rcvhdr.msg_iov[0].iov_base;
- if (r->type != DHCP6_RECONFIGURE &&
- (r->xid[0] != state->send->xid[0] ||
-@@ -2119,12 +2130,16 @@
- syslog(LOG_DEBUG, "dhcp_auth_validate: %m");
- syslog(LOG_ERR, "%s: authentication failed from %s",
- ifp->name, ctx->sfrom);
- return;
- }
-- syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32,
-- ifp->name, state->auth.token->secretid);
-+ if (state->auth.token)
-+ syslog(LOG_DEBUG, "%s: validated using 0x%08" PRIu32,
-+ ifp->name, state->auth.token->secretid);
-+ else
-+ syslog(LOG_DEBUG, "%s: accepted reconfigure key",
-+ ifp->name);
- } else if (ifo->auth.options & DHCPCD_AUTH_REQUIRE) {
- syslog(LOG_ERR, "%s: no authentication from %s",
- ifp->name, ctx->sfrom);
- return;
- } else if (ifo->auth.options & DHCPCD_AUTH_SEND)
-@@ -2155,11 +2170,12 @@
- * didn't get the IA's returned, so preserve them
- * from our saved response */
- if (error == 1)
- goto recv;
- if (error == -1 ||
-- dhcp6_validatelease(ifp, r, len, ctx->sfrom) == -1){
-+ dhcp6_validatelease(ifp, r, len, ctx->sfrom) == -1)
-+ {
- dhcp6_startdiscover(ifp);
- return;
- }
- break;
- case DH6S_DISCOVER:
-
diff --git a/core/dhcpcd/commit_e348e99776.diff b/core/dhcpcd/commit_e348e99776.diff
deleted file mode 100644
index 3f64f3a55..000000000
--- a/core/dhcpcd/commit_e348e99776.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: dhcp.c
-==================================================================
---- dhcp.c
-+++ dhcp.c
-@@ -2701,11 +2701,10 @@
- if (state == NULL)
- goto eexit;
- ifp->options = calloc(1, sizeof(*ifp->options));
- if (ifp->options == NULL)
- goto eexit;
-- strlcpy(ifp->name, ifname, sizeof(ifp->name));
- snprintf(state->leasefile, sizeof(state->leasefile),
- LEASEFILE, ifp->name);
- strlcpy(ifp->options->script, SCRIPT, sizeof(ifp->options->script));
- state->new = read_lease(ifp);
- if (state->new == NULL && errno == ENOENT) {
-
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 451604289..24fd68940 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 205612 2014-02-09 15:37:47Z foutrelis $
+# $Id: PKGBUILD 208214 2014-03-19 11:02:09Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=sudo
-_sudover=1.8.9p5
+_sudover=1.8.10p2
pkgver=${_sudover/p/.p}
pkgrel=1
pkgdesc="Give certain users the ability to run some commands as root"
@@ -14,10 +14,13 @@ license=('custom')
groups=('base-devel')
depends=('glibc' 'pam' 'libldap')
backup=('etc/sudoers' 'etc/pam.d/sudo')
+install=$pkgname.install
source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
+ sudo.tmpfiles.conf
sudo.pam)
-sha256sums=('bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21'
+sha256sums=('ba6cb8db6dccdb92a96e8ae63ca65c410f8b61270b603ab9af4b1154fef379f1'
'SKIP'
+ '080dd97111b3149f8d140ffac68c88acd63da9eacc81fbcc7c43591be13b42fe'
'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
build() {
@@ -27,6 +30,8 @@ build() {
--prefix=/usr \
--sbindir=/usr/bin \
--libexecdir=/usr/lib \
+ --with-rundir=/run/sudo \
+ --with-vardir=/var/db/sudo \
--with-logfac=auth \
--with-pam \
--with-ldap \
@@ -46,6 +51,13 @@ package() {
cd "$srcdir/$pkgname-$_sudover"
make DESTDIR="$pkgdir" install
+ # Remove /run/sudo directory from the package; we create it using tmpfiles.d
+ rmdir "$pkgdir/run/sudo"
+ rmdir "$pkgdir/run"
+
+ install -Dm644 "$srcdir/sudo.tmpfiles.conf" \
+ "$pkgdir/usr/lib/tmpfiles.d/sudo.conf"
+
install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
diff --git a/core/sudo/sudo.install b/core/sudo/sudo.install
new file mode 100644
index 000000000..1369cc122
--- /dev/null
+++ b/core/sudo/sudo.install
@@ -0,0 +1,19 @@
+post_install() {
+ if type -P systemd-tmpfiles >/dev/null; then
+ systemd-tmpfiles --create sudo.conf
+ fi
+}
+
+pre_upgrade() {
+ # Permissions of /var/db/sudo were changed from 0700 to 0711 in sudo 1.8.10
+ # http://www.sudo.ws/repos/sudo/rev/5c38d77a2d0c
+ if (($(vercmp $2 1.8.10-1) < 0)); then
+ chmod 0711 var/db/sudo
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/sudo/sudo.tmpfiles.conf b/core/sudo/sudo.tmpfiles.conf
new file mode 100644
index 000000000..0bab61444
--- /dev/null
+++ b/core/sudo/sudo.tmpfiles.conf
@@ -0,0 +1 @@
+d /run/sudo 0711 root root -
diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD
index e50f59444..220034c7e 100644
--- a/extra/i8kutils/PKGBUILD
+++ b/extra/i8kutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 205566 2014-02-07 20:38:36Z eric $
+# $Id: PKGBUILD 208208 2014-03-19 01:47:32Z eric $
# Maintainer:
pkgname=i8kutils
-pkgver=1.40
-pkgrel=4
+pkgver=1.41
+pkgrel=1
pkgdesc="Dell Inspiron/Latitude kernel driver and utilities"
arch=('i686' 'x86_64')
url="https://launchpad.net/i8kutils"
@@ -11,30 +11,32 @@ license=('GPL')
depends=('bash' 'acpi')
optdepends=('tk: for i8kmon deamon')
backup=('etc/i8kutils/i8kmon.conf')
-source=(http://ftp.de.debian.org/debian/pool/main/i/${pkgname}/${pkgname}_${pkgver}.tar.gz
- i8kmon.service i8kutils-probe.diff)
-sha1sums=('584edfbd90aa167885520b84848381585d9212fb'
- '5c20f5241de7e60b46117269f4e867b08734cdc8'
- 'ab9058f92adb3e8b9306568005d5751908fb1765')
+DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 --insecure -o %o %u')
+source=(https://launchpad.net/i8kutils/trunk/${pkgver}/+download/i8kutils_${pkgver}.tar.gz{,.asc}
+ i8kmon.service)
+sha1sums=('7baf9ed1b27f4bcab7a9a5c7c037d36c769945cc'
+ 'SKIP'
+ '5c20f5241de7e60b46117269f4e867b08734cdc8')
prepare() {
- cd $pkgname-$pkgver
- patch -p0 -i "$srcdir"/i8kutils-probe.diff
-
+ cd $pkgname
# conform to Arch Linux guidelines
sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1
sed -i 's|/etc/i8kmon.conf|/etc/i8kutils/i8kmon.conf|g' i8kmon
+ make clean
}
build() {
- cd $pkgname-$pkgver
+ cd $pkgname
make
}
package() {
- cd $pkgname-$pkgver
+ cd $pkgname
install -d "$pkgdir"/usr/{bin,share/man/man1}
- make DESTDIR="$pkgdir" install install-man
+ install -D -m644 i8kctl.1 i8kmon.1 "$pkgdir/usr/share/man/man1"
+ install -D -m755 i8kctl i8kfan i8kmon "$pkgdir/usr/bin"
+
install -D -m644 i8kmon.conf "$pkgdir/etc/i8kutils/i8kmon.conf"
install -D -m644 ../i8kmon.service "$pkgdir/usr/lib/systemd/system/i8kmon.service"
}
diff --git a/extra/i8kutils/i8kutils-probe.diff b/extra/i8kutils/i8kutils-probe.diff
deleted file mode 100644
index 60485d737..000000000
--- a/extra/i8kutils/i8kutils-probe.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-=== modified file 'i8kmon'
---- i8kmon 2013-11-23 19:41:17 +0000
-+++ i8kmon 2013-11-23 20:30:47 +0000
-@@ -27,6 +27,7 @@
- sysconfig /etc/i8kmon.conf
- userconfig ~/.i8kmon
- i8kfan /usr/bin/i8kfan
-+ acpi "acpi"
- geometry {}
- use_conf 1
- auto 1
-@@ -202,22 +202,15 @@
-
- set status(acpi_timer) [expr 60 / $config(timeout)]
-
-- set cmd "acpi -a"; set acpi_ac [eval exec $cmd]
-- set cmd2 "acpitool -a"; set acpi_ac2 [eval exec $cmd2]
-- set ret [string first "on-line" $acpi_ac]
-- set ret2 [string first "online" $acpi_ac2]
-- if {$ret >= 0 | $ret2 >= 0} {
-+ set acpi_ac [exec {*}$config(acpi)]
-+ if {[string match *on-line* $acpi_ac] || [string match *online* $acpi_ac]} {
- set status(ac) 1
- } else {
- set status(ac) 0
- }
-
- if {$config(verbose) > 0} {
-- if {$ret >= 0} {
-- puts "[clock seconds] acpi: $acpi_ac"
-- } elseif {$ret2 >= 0} {
-- puts "[clock seconds] acpi: $acpi_ac2"
-- }
-+ puts "[clock seconds] acpi: $acpi_ac"
- }
-
- return 0
-@@ -495,8 +487,8 @@
- -a|--auto control automatically the fans
- -na|--noauto don\x27t control automatically the fans
- -d|--daemon run in daemon mode without user interface
-- -nd|--nodaemon don\x27 run as daemon, open the user interface
-- -nc|--nouserconfig don't use \$HOME/.i8kmon
-+ -nd|--nodaemon don\x27t run as daemon, open the user interface
-+ -nc|--nouserconfig don\x27t use \$HOME/.i8kmon
- -v|--verbose report status on stdout
- -g|--geometry <geom> set applet geometry
- -t|--timeout <secs> set poll timeout
-@@ -556,7 +548,7 @@
- }
-
- if {$config(verbose) > 0} {
-- set copyright "Copyright (C) 2013 i8kutils <https://launchpad.net/i8kutils>"
-+ set copyright "Copyright (C) 2013 Vitor Augusto <vitorafsr@gmail.com>"
- puts "i8kmon $PROG_VERSION - $copyright"
- parray config
- parray status
-@@ -596,8 +588,25 @@
- set status(rightspeed) "0 $rspeed1 $rspeed2 $rspeed3"
- }
-
-+# probe external tools
-+proc probe_tools {} {
-+
-+ # The possibility of choosing 'acpi' or 'acpitool' is for compatibility
-+ # between different architectures: amd64, i386, kFreeBSD
-+ # This code below is strictly related on package dependency stated at
-+ # keyword 'Depends:' on file 'debian/control'
-+ if {![catch {exec acpi}]} {
-+ set config(acpi) "acpi"
-+ } elseif {[catch {exec acpitool}]} {
-+ set config(acpi) "acpitool"
-+ } else {
-+ puts stderr "Package dependency problem: neither 'acpi' nor 'acpitool' package is installed"
-+ }
-+}
-+
- proc main {} {
- probe_fan_speed
-+ probe_tools
- read_config
- parse_options
- make_ui
-
diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD
index 37a3709c7..c8db32d83 100644
--- a/extra/libburn/PKGBUILD
+++ b/extra/libburn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 206898 2014-03-05 17:54:13Z andyrtr $
+# $Id: PKGBUILD 208226 2014-03-19 20:32:56Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=libburn
-pkgver=1.3.6
+pkgver=1.3.6.pl01
pkgrel=1
pkgdesc="Library for reading, mastering and writing optical discs"
arch=('i686' 'x86_64')
@@ -12,17 +12,17 @@ license=('GPL')
depends=('glibc')
source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
options=('!emptydirs')
-md5sums=('ed7b9bbf873fc754b1a75df1b2cc1023'
+md5sums=('ebfecd07b09f0e6a06c97bcdaa3f8fa3'
'SKIP')
build() {
- cd ${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver/.pl01/}
./configure --prefix=/usr --disable-static
make
}
package() {
- cd ${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver/.pl01/}
make DESTDIR=${pkgdir} install
}
diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD
index 4ed6c4cea..293ff4816 100644
--- a/extra/libisoburn/PKGBUILD
+++ b/extra/libisoburn/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 206903 2014-03-05 18:01:14Z andyrtr $
+# $Id: PKGBUILD 208228 2014-03-19 20:36:58Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Gour <Gour <gour@mail.inet.hr>
pkgname=libisoburn
-pkgver=1.3.6
+pkgver=1.3.6.pl01
pkgrel=1
pkgdesc="frontend for libraries libburn and libisofs"
url="http://libburnia-project.org"
arch=('i686' 'x86_64')
license=('GPL2')
-depends=('libburn>=1.3.6' 'libisofs>=1.3.6' 'readline')
+depends=('libburn>=1.3.6.pl01' 'libisofs>=1.3.6' 'readline')
optdepends=('tk: for xorriso-tcltk frontend'
'bwidget: for xorriso-tcltk frontend')
provides=('xorriso' 'xorriso-tcltk')
install=${pkgname}.install
source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('1f7bea50c44ba69acb5710f14f561f5d'
+md5sums=('51f010e022b54e38a5f0c194b78c5b3a'
'SKIP')
build() {
- cd ${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver/.pl01/}
./configure --prefix=/usr
make
}
package() {
- cd ${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver/.pl01/}
make DESTDIR=${pkgdir} install
}
diff --git a/extra/liquidwar/PKGBUILD b/extra/liquidwar/PKGBUILD
index e25f0ea94..e4997d025 100644
--- a/extra/liquidwar/PKGBUILD
+++ b/extra/liquidwar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141061 2011-10-22 20:45:31Z eric $
-# Maintainer: Jeff Mickey <jeff@archlinux.org>
+# $Id: PKGBUILD 208212 2014-03-19 03:53:19Z eric $
+# Maintainer:
pkgname=liquidwar
pkgver=5.6.4
-pkgrel=6
+pkgrel=7
pkgdesc="A unique multiplayer wargame"
arch=('i686' 'x86_64')
url="http://www.ufoot.org/liquidwar/"
@@ -12,21 +12,28 @@ depends=('allegro4')
makedepends=('python2')
install=liquidwar.install
source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz
- http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig liquidwar-5.6.4-ovflfix.patch)
+ http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig
+ liquidwar-5.6.4-ovflfix.patch liquidwar-5.6.4-underlink.patch)
sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6'
- 'a262967d60e0f04ac5b99693144ef6b0038bb6c4'
- 'e2102792c54a01b7cd14adb6d72404044175ec7e')
+ 'SKIP'
+ 'e2102792c54a01b7cd14adb6d72404044175ec7e'
+ '442097d99402890ed27ea1de6b7ae984baa2676a')
-build() {
- cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+ cd $pkgname-$pkgver
patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch"
+ patch -p0 -i "$srcdir/liquidwar-5.6.4-underlink.patch"
sed -i 's/python/python2/' doc/Makefile.in
+}
+
+build() {
+ cd $pkgname-$pkgver
[ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
- LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
+ PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink
}
diff --git a/extra/liquidwar/liquidwar-5.6.4-underlink.patch b/extra/liquidwar/liquidwar-5.6.4-underlink.patch
new file mode 100644
index 000000000..2bc53e0ca
--- /dev/null
+++ b/extra/liquidwar/liquidwar-5.6.4-underlink.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200
++++ src/Makefile.in 2011-06-22 07:46:00.681613957 +0200
+@@ -223,7 +223,7 @@
+ EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
+ else
+ LINK_OPTIONS =
+- EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
++ EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -lm
+ endif
+
+ CONFIG_OPTIONS = \
diff --git a/extra/python-pysqlite/PKGBUILD b/extra/python-pysqlite/PKGBUILD
index 0e308434b..f1591afff 100644
--- a/extra/python-pysqlite/PKGBUILD
+++ b/extra/python-pysqlite/PKGBUILD
@@ -1,38 +1,39 @@
-# $Id: PKGBUILD 169030 2012-10-17 10:21:00Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 208210 2014-03-19 02:32:28Z eric $
+# Maintainer:
pkgbase=python-pysqlite
pkgname=python2-pysqlite
pkgver=2.6.3
-pkgrel=3
+pkgrel=4
pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
license=('custom')
arch=('i686' 'x86_64')
-url="http://code.google.com/p/pysqlite/"
+url="https://pypi.python.org/pypi/pysqlite"
depends=('python2' 'sqlite')
conflicts=('python-pysqlite<=2.6.3-2')
replaces=('python-pysqlite<=2.6.3-2')
-source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \
+source=(https://pypi.python.org/packages/source/p/pysqlite/pysqlite-${pkgver}.tar.gz
setup.cfg)
-md5sums=('711afa1062a1d2c4a67acdf02a33d86e'
+md5sums=('7ff1cedee74646b50117acff87aa1cfa'
'86dd356c65afd14a22f2f8f64a26441e')
-check() {
- cd "${srcdir}"/pysqlite-${pkgver}/build/lib.*/
- python2 -c "from pysqlite2 import test; test.test()"
+prepare() {
+ cp "${srcdir}/setup.cfg" pysqlite-${pkgver}
}
build() {
- cd "${srcdir}/pysqlite-${pkgver}"
- cp "${srcdir}/setup.cfg" .
- python2 setup.py build
+ cd pysqlite-${pkgver}
+ python2 setup.py build
+}
+
+check() {
+ cd pysqlite-${pkgver}/build/lib.*/
+ python2 -c "from pysqlite2 import test; test.test()"
}
package_python2-pysqlite() {
- cd "${srcdir}/pysqlite-${pkgver}"
- python2 setup.py install --root="${pkgdir}"
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- rm -r "${pkgdir}/usr/pysqlite2-doc"
+ cd pysqlite-${pkgver}
+ python2 setup.py install --root="${pkgdir}"
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -r "${pkgdir}/usr/pysqlite2-doc"
}
diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD
index e63309034..7678cf079 100644
--- a/extra/xine-ui/PKGBUILD
+++ b/extra/xine-ui/PKGBUILD
@@ -1,19 +1,25 @@
-# $Id: PKGBUILD 184454 2013-05-06 19:40:24Z foutrelis $
+# $Id: PKGBUILD 208230 2014-03-19 21:26:01Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=xine-ui
-pkgver=0.99.7
-pkgrel=2
+pkgver=0.99.8
+pkgrel=1
pkgdesc="A free video player for Unix"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.xine-project.org"
-depends=('xine-lib' 'curl' 'libpng' 'libxft' 'xdg-utils' 'shared-mime-info'
- 'hicolor-icon-theme' 'desktop-file-utils' 'lirc-utils')
+depends=('xine-lib' 'curl' 'libxft' 'libxxf86vm' 'lirc-utils' 'xdg-utils'
+ 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
options=('!strip')
install=xine-ui.install
-source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('ca82e09cf8245d038813bc4dbd8384ba79cbf197')
+source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz xine-ui-readline.patch)
+sha1sums=('ffe8e6507a95f92f1e29aa4e3751f4b505e8da1a'
+ 'e325c322a365a57ddbd62256a540202d092d4d1e')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}/xine-ui-readline.patch"
+}
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/xine-ui/xine-ui-readline.patch b/extra/xine-ui/xine-ui-readline.patch
new file mode 100644
index 000000000..bb680193e
--- /dev/null
+++ b/extra/xine-ui/xine-ui-readline.patch
@@ -0,0 +1,11 @@
+--- xine-ui-0.99.8.orig/src/xitk/network.c
++++ xine-ui-0.99.8/src/xitk/network.c
+@@ -1255,7 +1255,7 @@ int main(int argc, char **argv) {
+ rl_readline_name = PROGNAME;
+ rl_set_prompt(session.prompt);
+ rl_initialize();
+- rl_attempted_completion_function = (CPPFunction *)completion_function;
++ rl_attempted_completion_function = completion_function;
+
+ signal(SIGPIPE, SIG_IGN);
+
diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD
index 0184dc0f1..efe66b2df 100644
--- a/kernels/linux-libre-knock/PKGBUILD
+++ b/kernels/linux-libre-knock/PKGBUILD
@@ -10,11 +10,11 @@
pkgbase=linux-libre-knock # Build stock -LIBRE-KNOCK kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.12
-_sublevel=13
+_sublevel=14
_knockpatchver=${_basekernel}.4
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.12 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.14 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -40,7 +40,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
md5sums=('254f59707b6676b59ce5ca5c3c698319'
- 'e2ec796847356b785cb06d0563f3f7d5'
+ '93624626751140852d82d83aecfd377d'
'387673a6510de1e1bce8188fc7a72bd1'
'6eac169d20fd27b55815b0b2db4a473b'
'f341bc4685a40dc409b144b0f44bb137'
@@ -56,7 +56,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319'
'cec0bb8981936eab2943b2009b7a6fff'
'88d9cddf9e0050a76ec4674f264fb2a1'
'cb9016630212ef07b168892fbcfd4e5d'
- 'a9a0ee57377ed6e55957f9671eead03a')
+ '1e2d95b87a7ab398527b3aac78ea29c5')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index edb795663..b5cf9c753 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -9,12 +9,12 @@
pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.12
-_releasever=12
-_rtpatchver=rt19
+_releasever=13
+_rtpatchver=rt21
_pkgver=${_basekernel}.${_releasever}
pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
pkgrel=1
-_lxopkgver=${_basekernel}.12 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.13 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -40,8 +40,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('254f59707b6676b59ce5ca5c3c698319'
- 'a763ffc196d8ffa49c676a43448d75a4'
- '97e5652f6039a48544897129c8adaf98'
+ 'e2ec796847356b785cb06d0563f3f7d5'
+ '60f4b7018bf88ad0ba887b3a492f6b1a'
'e40789b1e59136235827a3b3bf40c121'
'bf542c4038d3e7d0da4c92bac0466198'
'82496e68851d1960543a07ba51cdb44a'
@@ -56,7 +56,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319'
'cec0bb8981936eab2943b2009b7a6fff'
'88d9cddf9e0050a76ec4674f264fb2a1'
'cb9016630212ef07b168892fbcfd4e5d'
- 'a9a0ee57377ed6e55957f9671eead03a')
+ '3ce39522f0d8d1422dc095d2a17a77d6')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/pcr/nginx-passenger/PKGBUILD b/pcr/nginx-passenger/PKGBUILD
index b6badd8aa..f3c8dabbc 100644
--- a/pcr/nginx-passenger/PKGBUILD
+++ b/pcr/nginx-passenger/PKGBUILD
@@ -6,9 +6,9 @@
# Contributor (Arch): Miroslaw Szot <mss@czlug.icis.pcz.pl>
pkgname=nginx-passenger
-_nginxver=1.4.5
-_passengerver=4.0.37
-pkgver=$_nginxver
+_nginxver=1.4.7
+_passengerver=4.0.38
+pkgver=$_nginxver.passenger.$_passengerver
pkgrel=1
pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
pkgdesc+=" (with Passenger module)"
@@ -35,8 +35,8 @@ source=($url/download/nginx-$_nginxver.tar.gz
passenger-$_passengerver.tar.gz::https://github.com/phusion/passenger/archive/release-$_passengerver.tar.gz
service
logrotate)
-md5sums=('1a635e9543570f0c881b8ec9db0c6898'
- '7040af5314fe19a420f38732c6bd4f5b'
+md5sums=('aee151d298dcbfeb88b3f7dd3e7a4d17'
+ 'ec6cb96a8f3d444540a54a3007143e2e'
'ce9a06bcaf66ec4a3c4eb59b636e0dfd'
'3441ce77cdd1aab6f0ab7e212698a8a7')
@@ -107,7 +107,7 @@ package() {
install -Dm644 ../service "$pkgdir"/usr/lib/systemd/system/nginx.service
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
- rmdir "$pkgdir/run"
+ rmdir "$pkgdir"/run
}
# vim:set ts=2 sw=2 et: