summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-03-27 00:05:42 -0700
committerroot <root@rshg054.dnsready.net>2013-03-27 00:05:42 -0700
commit87fbcb30b652672a7e110b66a4c15342e27df826 (patch)
tree7604502956a186acbfe9983a159a2abd564c3142
parentc16968d4179be76966c262f854c9e1fb827dc3ec (diff)
Wed Mar 27 00:05:42 PDT 2013
-rw-r--r--community/couchdb/PKGBUILD4
-rw-r--r--community/dee/PKGBUILD4
-rw-r--r--community/dwdiff/PKGBUILD4
-rw-r--r--community/fcitx/PKGBUILD6
-rw-r--r--community/gammu/PKGBUILD15
-rwxr-xr-xcommunity/gens-gs/PKGBUILD62
-rwxr-xr-xcommunity/gens-gs/gens-gtk.patch187
-rwxr-xr-xcommunity/gens/PKGBUILD57
-rwxr-xr-xcommunity/gens/gens.desktop9
-rw-r--r--community/ibus-qt/PKGBUILD14
-rw-r--r--community/kbibtex/PKGBUILD33
-rw-r--r--community/kbibtex/kbibtex.install15
-rw-r--r--community/libdbi-drivers/PKGBUILD4
-rw-r--r--community/libfbclient/PKGBUILD4
-rw-r--r--community/libgexiv2/PKGBUILD12
-rw-r--r--community/mapnik/PKGBUILD4
-rw-r--r--community/openttd/PKGBUILD4
-rw-r--r--community/parole/PKGBUILD11
-rw-r--r--community/parrot/PKGBUILD4
-rw-r--r--community/percona-server/PKGBUILD6
-rw-r--r--community/pion/PKGBUILD6
-rw-r--r--community/python-basemap/PKGBUILD83
-rw-r--r--community/python2-basemap/PKGBUILD44
-rw-r--r--community/tea/PKGBUILD4
-rw-r--r--community/yaz/PKGBUILD4
-rw-r--r--core/openssh/PKGBUILD8
-rw-r--r--core/systemd/0001-Fix-vacuum-logic-error.patch40
-rw-r--r--core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch25
-rw-r--r--core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch57
-rw-r--r--core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch25
-rw-r--r--core/systemd/PKGBUILD26
-rw-r--r--extra/ardour/PKGBUILD63
-rw-r--r--extra/ardour/ardour.changelog55
-rw-r--r--extra/ardour/ardour.desktop6
-rw-r--r--extra/ardour/ardour.install21
-rw-r--r--extra/boost/PKGBUILD159
-rw-r--r--extra/boost/boost-1.52.0-python3.patch96
-rw-r--r--extra/brltty/PKGBUILD6
-rw-r--r--extra/calligra/PKGBUILD5
-rw-r--r--extra/gptfdisk/PKGBUILD4
-rw-r--r--extra/harfbuzz/PKGBUILD8
-rw-r--r--extra/hwloc/PKGBUILD6
-rw-r--r--extra/icu/PKGBUILD6
-rw-r--r--extra/imagemagick/PKGBUILD8
-rw-r--r--extra/libreoffice/PKGBUILD8
-rw-r--r--extra/libwacom/PKGBUILD8
-rw-r--r--extra/live-media/PKGBUILD6
-rw-r--r--extra/mariadb/PKGBUILD4
-rw-r--r--extra/mariadb/mariadb.install2
-rw-r--r--extra/php/PKGBUILD4
-rw-r--r--extra/r/PKGBUILD34
-rw-r--r--extra/r/x11.patch36
-rw-r--r--extra/raptor/PKGBUILD6
-rw-r--r--extra/tracker/PKGBUILD36
-rw-r--r--extra/webkitgtk/PKGBUILD4
-rw-r--r--extra/xf86-input-evdev/PKGBUILD8
-rw-r--r--libre/icecat-noscript/PKGBUILD6
-rw-r--r--libre/iceweasel-noscript/PKGBUILD6
58 files changed, 667 insertions, 725 deletions
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index 8fd1b505d..a0fc51f78 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86802 2013-03-22 11:40:46Z spupykin $
+# $Id: PKGBUILD 87043 2013-03-26 11:49:36Z foutrelis $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
# Contributor: Michael Fellinger <m.fellinger@gmail.com>
pkgname=couchdb
pkgver=1.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
arch=('i686' 'x86_64')
url="http://couchdb.apache.org"
diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD
index b0f6440a6..c045143b3 100644
--- a/community/dee/PKGBUILD
+++ b/community/dee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82682 2013-01-23 00:15:51Z eric $
+# $Id: PKGBUILD 87044 2013-03-26 11:49:37Z foutrelis $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=dee
pkgver=1.0.14
-pkgrel=4
+pkgrel=5
pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus"
arch=('i686' 'x86_64')
url="https://launchpad.net/dee"
diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD
index ef766763b..9ab3bf69e 100644
--- a/community/dwdiff/PKGBUILD
+++ b/community/dwdiff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82683 2013-01-23 00:15:52Z eric $
+# $Id: PKGBUILD 87045 2013-03-26 11:49:38Z foutrelis $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=dwdiff
pkgver=2.0.4
-pkgrel=3
+pkgrel=4
pkgdesc="A front-end for the diff program that operates at the word level instead of the line level"
arch=('i686' 'x86_64')
url="http://os.ghalkes.nl/dwdiff.html"
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index 342bacbff..72745e63c 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86209 2013-03-13 05:41:43Z fyan $
+# $Id: PKGBUILD 87046 2013-03-26 11:49:39Z foutrelis $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: csslayer <wengxt AT gmail com>
@@ -6,7 +6,7 @@
pkgbase=fcitx
pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
pkgver=4.2.7
-pkgrel=4
+pkgrel=5
groups=('fcitx-im')
arch=('i686' 'x86_64')
url="http://code.google.com/p/fcitx/"
@@ -122,4 +122,4 @@ package_fcitx-qt4() {
}
md5sums=('6e291717c24615b9dc9bfaa2949af3a7'
- '009e0cd17f078e24c03b3b46b45e41ab')
+ 'ce299aa5b596cc52dc9e66b47795e627')
diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD
index d7a6154d4..80f0e42ae 100644
--- a/community/gammu/PKGBUILD
+++ b/community/gammu/PKGBUILD
@@ -1,36 +1,35 @@
-# $Id: PKGBUILD 87002 2013-03-25 19:16:41Z bpiotrowski $
+# $Id: PKGBUILD 87059 2013-03-26 14:42:55Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Corrado Primier <bardo@aur.archlinux.org>
# Contributor: Aurelien Foret <orelien@chez.com>
pkgname=gammu
pkgver=1.32.0
-pkgrel=2
+pkgrel=3
pkgdesc="GNU All Mobile Management Utilities"
arch=('i686' 'x86_64')
url="http://wammu.eu/"
license=('GPL')
depends=('bluez' 'curl' 'libmariadbclient'
- 'postgresql-libs' 'python2' 'libusb')
+ 'postgresql-libs' 'libusb')
makedepends=('cmake' 'doxygen' 'mariadb')
optdepends=('dialog: support for the gammu-config script')
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
md5sums=('8ea16c6b3cc48097a8e62311fe0e25b9')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
# bash completion dir change
- sed -e 's,DESTINATION "/etc/bash_completion.d",DESTINATION "/usr/share/bash-completion/completions",' -i contrib/CMakeLists.txt
+ sed -i 's,DESTINATION "/etc/bash_completion.d",DESTINATION "/usr/share/bash-completion/completions",' contrib/CMakeLists.txt
- cmake . -DCMAKE_INSTALL_PREFIX="/usr" \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib
+ cmake . -DCMAKE_INSTALL_PREFIX="/usr" -DLIB_SUFFIX=""
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/community/gens-gs/PKGBUILD b/community/gens-gs/PKGBUILD
deleted file mode 100755
index 27ebfa3e6..000000000
--- a/community/gens-gs/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 86824 2013-03-22 13:05:22Z alucryd $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-# Contributor: trya <tryagainprod@gmail.com>
-# Contributor: Yvan <madridista40@orange.fr>
-
-pkgname=gens-gs
-pkgver=2.16.7
-pkgrel=2
-pkgdesc="An emulator of Sega Genesis, Sega CD and 32X, combining features from various forks of Gens"
-arch=('i686' 'x86_64')
-url="http://segaretro.org/Gens/GS"
-license=('GPL')
-if [[ $CARCH == "x86_64" ]]; then
- makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-sdl' 'nasm')
- optdepends=('lib32-alsa-plugins: Sound support for PulseAudio'
- 'lib32-libpulse: Sound support for PulseAudio')
-else
- depends=('gtk2' 'sdl')
- makedepends=('nasm')
-fi
-conflicts=('gens')
-options=('!libtool')
-source=('http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz'
- 'gens-gtk.patch')
-sha256sums=('6320cd7bee85472891e1e29b21731d2c8180d04db67ee21256491f3f9ad145c1'
- '29b1e9755b34e00ef7d19bdc527dc4f841400a0022c81ee71c331be4a76a6c1c')
-
-build() {
- cd "${srcdir}"/${pkgname}-r7
-
-# Patch
- patch -Np1 -i ../gens-gtk.patch
-
-# Multilib
- if [[ $CARCH == "x86_64" ]]; then
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- fi
-
-# Build
- if [[ $CARCH == "x86_64" ]]; then
- ./configure --host=i686-unknown-linux-gnu --prefix=/usr --libdir=/usr/lib32 --with-pic --disable-static
- else
- LIBS='-ldl -lX11' ./configure --prefix=/usr --with-pic --disable-static
- fi
- make
-}
-
-package() {
- cd "${srcdir}"/${pkgname}-r7
-
-# Multilib
- if [[ $CARCH == "x86_64" ]]; then
- depends=('lib32-gtk2' 'lib32-sdl')
- fi
-
-# Install
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/community/gens-gs/gens-gtk.patch b/community/gens-gs/gens-gtk.patch
deleted file mode 100755
index 0bc6fd0ee..000000000
--- a/community/gens-gs/gens-gtk.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp
---- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000
-@@ -84,7 +84,7 @@
- gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE);
-+ g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)about_window, "delete_event",
-diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp
---- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000
-@@ -84,7 +84,7 @@
- gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE);
-+ g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)bmf_window, "delete_event",
-diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp
---- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000
-@@ -109,7 +109,7 @@
- gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE);
-+ g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)(dir_window), "delete_event",
-diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp
---- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000
-@@ -140,7 +140,7 @@
- gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(genopt_window), false);
- gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false);
-+ g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)genopt_window, "delete_event",
-@@ -458,11 +458,11 @@
- gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0);
-
- // Dropdown for intro effect.
-- cboIntroEffect = gtk_combo_box_new_text();
-- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect");
-- //gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
-+ cboIntroEffect = gtk_combo_box_text_new();
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None");
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect");
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect");
-+ //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
- gtk_widget_show(cboIntroEffect);
- gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0);
- g_signal_connect((gpointer)(cboIntroEffect), "changed",
-diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp
---- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000
-@@ -154,9 +154,9 @@
- GSFT_UNUSED_PARAMETER(y);
- GSFT_UNUSED_PARAMETER(user_data);
-
-- if (context->targets)
-+ if (gdk_drag_context_list_targets(context))
- {
-- GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0));
-+ GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0));
- gtk_drag_get_data(widget, context, target_type, time);
- return true;
- }
-diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp
---- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000
-@@ -75,7 +75,7 @@
- gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE);
-+ g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)(glres_window), "delete_event",
-diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp
---- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000
-@@ -80,8 +80,7 @@
- // Callbacks.
- static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data);
- static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data);
--static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
-- guint page_num, gpointer user_data);
-+static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data);
- static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data);
- static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data);
-
-@@ -119,7 +118,7 @@
- gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE);
-+ g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)pmgr_window, "delete_event",
-@@ -559,11 +558,9 @@
- * @param page_num New notebook page index.
- * @param user_data User data.
- */
--static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
-- guint page_num, gpointer user_data)
-+static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data)
- {
- GSFT_UNUSED_PARAMETER(notebook);
-- GSFT_UNUSED_PARAMETER(page);
- GSFT_UNUSED_PARAMETER(user_data);
-
- // Activate the "cursor-changed" callback for the page.
-diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp
---- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000
-@@ -94,7 +94,7 @@
- gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE);
-+ g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)(selcd_window), "delete_event",
-@@ -128,7 +128,7 @@
- gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0);
-
- // Create the dropdown for the CD-ROM device name.
-- cboDeviceName = gtk_combo_box_entry_new_text();
-+ cboDeviceName = gtk_combo_box_text_new_with_entry();
- gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63);
- gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName);
- gtk_widget_show(cboDeviceName);
-@@ -156,7 +156,7 @@
- gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0);
-
- // Create the dropdown for the CD-ROM drive speed selection.
-- cboDriveSpeed = gtk_combo_box_new_text();
-+ cboDriveSpeed = gtk_combo_box_text_new();
- char tmpSpeed[16];
- for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++)
- {
-@@ -167,7 +167,7 @@
- else
- szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]);
-
-- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed);
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed);
- }
- gtk_widget_show(cboDriveSpeed);
- gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0);
-@@ -252,7 +252,7 @@
- continue;
-
- // Add the device file.
-- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName);
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName);
- }
- }
-
-diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp
---- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000
-@@ -111,7 +111,7 @@
- gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE);
- gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE);
-+ g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL);
-
- // Add the window icon.
- GList *icon_list = NULL;
diff --git a/community/gens/PKGBUILD b/community/gens/PKGBUILD
deleted file mode 100755
index 3b54528f0..000000000
--- a/community/gens/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 86823 2013-03-22 12:51:22Z alucryd $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-# Contributor: trya <tryagainprod@gmail.com>
-# Contributor: robb_force <robb_force@holybuffalo.net>
-
-pkgname=gens
-pkgver=2.15.5
-pkgrel=8
-pkgdesc='A Sega Genesis / Sega CD / Sega 32X emulator'
-arch=('i686' 'x86_64')
-url='http://gens.sourceforge.net'
-license=('GPL')
-if [[ $CARCH == "x86_64" ]]; then
- makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-sdl' 'nasm')
- optdepends=('lib32-alsa-plugins: Sound support for PulseAudio'
- 'lib32-libpulse: Sound support for PulseAudio')
-else
- depends=('gtk2' 'sdl')
- makedepends=('nasm')
-fi
-options=('!buildflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'gens.desktop')
-sha256sums=('51910d3056da9ffbb2c01cfec064998c9a4cad0cb379d703ec1b93c83dba305a'
- '146a0e98780b909877b3937c9132c85f5aba9450ef9f748bd1374ae8c9dfb751')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
-# Multilib
- if [[ $CARCH == "x86_64" ]]; then
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- fi
-
-# Build
- export LDFLAGS=-Wl,-z,noexecstack
- ./configure --host=i686-unknown-linux-gnu --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
-# Multilib
- if [[ $CARCH == "x86_64" ]]; then
- depends=('lib32-gtk2' 'lib32-sdl')
- fi
-
-# Install
- make DESTDIR=${pkgdir} install
- install -dm 755 "${pkgdir}"/usr/share/applications
- install -m 644 ../gens.desktop "${pkgdir}"/usr/share/applications/gens.desktop
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/community/gens/gens.desktop b/community/gens/gens.desktop
deleted file mode 100755
index f668f16af..000000000
--- a/community/gens/gens.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Gens
-Type=Application
-GenericName=A Sega Genesis / Sega CD / Sega 32X emulator
-Comment=A Sega Genesis / Sega CD / Sega 32X emulator
-Exec=gens
-Icon=/usr/share/gens/Gens2.ico
-Categories=Application;Game;Emulator;
diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD
index 4f1f9c180..0f26672df 100644
--- a/community/ibus-qt/PKGBUILD
+++ b/community/ibus-qt/PKGBUILD
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD 85362 2013-03-01 10:33:52Z andrea $
+# $Id: PKGBUILD 87047 2013-03-26 11:49:40Z foutrelis $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: garion < garion @ mailoo.org >
# Contributor: leemars
pkgname=ibus-qt
-pkgver=1.3.1
-pkgrel=8
+pkgver=1.3.2
+pkgrel=1
pkgdesc='IBus qt library and IBus qt input method plugin'
arch=('i686' 'x86_64')
license=('LGPL')
url='http://ibus.googlecode.com'
depends=('qt4' 'ibus' 'icu')
makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz"
- 0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch)
+source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz")
build() {
cd "${srcdir}/${pkgname}-${pkgver}-Source"
- patch -p1 -i ../0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch
-
mkdir build
cd build
@@ -31,5 +28,4 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}-Source/build"
make DESTDIR="${pkgdir}" install
}
-md5sums=('769e8872ca8a59327b2073ce2f142589'
- 'c30f52b1a9018132e5ecd0c14616cb65')
+md5sums=('e53cb59f993d0c93ba968330dbc62c22')
diff --git a/community/kbibtex/PKGBUILD b/community/kbibtex/PKGBUILD
new file mode 100644
index 000000000..87024dda3
--- /dev/null
+++ b/community/kbibtex/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
+# Contributor: cmorlok <christianmorlok@web.de>
+
+pkgname=kbibtex
+pkgver=0.4.1
+_branch=0.4
+pkgrel=1
+pkgdesc="A BibTeX editor for KDE"
+arch=('i686' 'x86_64')
+url='http://home.gna.org/kbibtex/'
+license=('GPL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=$pkgname.install
+source=("http://download.gna.org/$pkgname/$_branch/$pkgname-$pkgver.tar.bz2")
+md5sums=('657eda1da48198a3c336ff268ce46d6f')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ cmake -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/kbibtex/kbibtex.install b/community/kbibtex/kbibtex.install
new file mode 100644
index 000000000..139cb5694
--- /dev/null
+++ b/community/kbibtex/kbibtex.install
@@ -0,0 +1,15 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD
index df191ccd3..9f9413c56 100644
--- a/community/libdbi-drivers/PKGBUILD
+++ b/community/libdbi-drivers/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87006 2013-03-25 19:16:46Z bpiotrowski $
+# $Id: PKGBUILD 87088 2013-03-26 19:05:37Z bpiotrowski $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
# Contributor: Olivier Médoc <o_medoc@yahoo.fr>
# Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil.Arch@gmail.com>
@@ -6,7 +6,7 @@
pkgname=libdbi-drivers
pkgver=0.8.3_1
_pkgver=0.8.3-1
-pkgrel=2
+pkgrel=4
pkgdesc="Database drivers for libdbi (MySQL, PostgreSQL, and SQLite)"
url="http://libdbi-drivers.sourceforge.net/"
license=('GPL')
diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD
index 0d7520599..d5ef393d6 100644
--- a/community/libfbclient/PKGBUILD
+++ b/community/libfbclient/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82686 2013-01-23 00:15:55Z eric $
+# $Id: PKGBUILD 87048 2013-03-26 11:49:42Z foutrelis $
# Maintainer: Carlier Laurent <lordheavym@gmail.com>
# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
pkgname=libfbclient
pkgver=2.5.2.26539
-pkgrel=2
+pkgrel=3
pkgdesc="Client library for Firebird."
arch=('i686' 'x86_64')
url="http://www.firebirdsql.org/"
diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD
index 199123d05..69bb7a979 100644
--- a/community/libgexiv2/PKGBUILD
+++ b/community/libgexiv2/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 84188 2013-02-13 13:24:10Z arodseth $
+# $Id: PKGBUILD 87061 2013-03-26 15:12:47Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
pkgname=libgexiv2
-pkgver=0.5.0
-pkgrel=2
+pkgver=0.6.1
+pkgrel=1
pkgdesc='GObject-based wrapper around the Exiv2 library'
arch=('x86_64' 'i686')
url='http://redmine.yorba.org/projects/gexiv2'
license=('GPL2')
-depends=('exiv2' 'glib2' 'gobject-introspection')
+depends=('exiv2' 'gobject-introspection')
options=('!libtool')
-source=("http://yorba.org/download/gexiv2/0.5/$pkgname-$pkgver.tar.xz")
-sha256sums=('3e0d1efbe895912d00b4394f8939b230fa581321f28d5c3c0fbac06b065e3010')
+source=("http://yorba.org/download/gexiv2/${pkgver%.1}/${pkgname}_$pkgver.tar.xz")
+sha256sums=('72ee2fcc6a98c9e83467adea45b10d1b61c55654c204dcce9c2463615389a9e3')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index db4dddbff..933f819ad 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83819 2013-02-05 10:57:53Z spupykin $
+# $Id: PKGBUILD 87049 2013-03-26 11:49:43Z foutrelis $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: David Dent <thewinch@gmail.com>
# Contributor: orbisvicis <orbisvicis@gmail.com>
pkgname=mapnik
pkgver=2.1.0
-pkgrel=7
+pkgrel=8
pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps"
arch=('i686' 'x86_64')
url="http://mapnik.org/"
diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD
index cf01e15f4..f0d00684f 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83874 2013-02-05 23:22:09Z lcarlier $
+# $Id: PKGBUILD 87050 2013-03-26 11:49:43Z foutrelis $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
pkgname=openttd
pkgver=1.2.3
-pkgrel=4
+pkgrel=5
pkgdesc='An engine for running Transport Tycoon Deluxe.'
arch=('i686' 'x86_64')
url='http://www.openttd.org'
diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD
index fe7d2c8da..82ae36fd8 100644
--- a/community/parole/PKGBUILD
+++ b/community/parole/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 86731 2013-03-21 15:51:02Z spupykin $
+# $Id: PKGBUILD 87041 2013-03-26 11:08:17Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: TDY <tdy@gmx.com>
pkgname=parole
pkgver=0.5.0
-pkgrel=2
+pkgrel=3
pkgdesc="A modern media player based on the GStreamer framework"
arch=('i686' 'x86_64')
url="http://goodies.xfce.org/projects/applications/parole/"
@@ -12,7 +12,12 @@ license=('GPL')
depends=('gstreamer' 'gst-plugins-base-libs' 'hicolor-icon-theme' 'libnotify>=0.4.1'
'libxfce4ui>=4.7.0' 'taglib>=1.4' 'desktop-file-utils')
makedepends=('pkgconfig>=0.9.0' 'xfce4-dev-tools')
-optdepends=('xulrunner>=1.9.1: browser plugin')
+optdepends=('xulrunner: browser plugin'
+ 'gst-libav'
+ 'gst-plugins-bad'
+ 'gst-plugins-base'
+ 'gst-plugins-good'
+ 'gst-plugins-ugly')
conflicts=('parole-media-player-git')
options=('!libtool')
install=parole.install
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index 60a4089df..4c8555fc6 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86289 2013-03-14 19:44:14Z dwallace $
+# $Id: PKGBUILD 87052 2013-03-26 11:49:46Z foutrelis $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
@@ -6,7 +6,7 @@ pkgname=parrot
pkgver=5.1.0
#_rel=stable
_rel=devel
-pkgrel=3
+pkgrel=4
pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
arch=('x86_64' 'i686')
url="http://www.parrotcode.org/"
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 1a938b8c3..f40aad0d0 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 87015 2013-03-25 19:16:57Z bpiotrowski $
+# $Id: PKGBUILD 87057 2013-03-26 13:09:29Z mtorromeo $
# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
pkgname=percona-server
pkgver=5.5.30_rel30.1
-pkgrel=2
+pkgrel=3
pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation"
arch=('i686' 'x86_64')
depends=('mariadb-clients' 'libaio' 'systemd-tools')
conflicts=('mysql')
-provides=('mysql')
+provides=("mysql=${pkgver/_rel*}" "mariadb=${pkgver/_rel*}")
optdepends=('perl-dbi' 'perl-dbd-mysql')
makedepends=('cmake' 'openssl' 'zlib')
diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD
index 139b6f735..1e6af7f25 100644
--- a/community/pion/PKGBUILD
+++ b/community/pion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83268 2013-01-28 16:49:58Z stephane $
+# $Id: PKGBUILD 87053 2013-03-26 11:49:47Z foutrelis $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=pion
pkgver=4.0.13.1
# use the git snapshot until a new version is out
_pkgver=dddce5e02d8a60f958e466e690d38eee924475b0
-pkgrel=2
+pkgrel=3
pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
url="http://www.cloudmeter.com/pion/support/"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ provides=('pion-net')
conflicts=('pion-net')
replaces=('pion-net')
source=(https://github.com/cloudmeter/pion/archive/${_pkgver}.zip)
-md5sums=('87b710deb5e526a2c7f045d25eba2bee')
+md5sums=('4b312452058a6f2580b5d88b03321457')
build() {
cd "$srcdir/$pkgname-$_pkgver"
diff --git a/community/python-basemap/PKGBUILD b/community/python-basemap/PKGBUILD
new file mode 100644
index 000000000..916c44b6e
--- /dev/null
+++ b/community/python-basemap/PKGBUILD
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 87032 2013-03-26 01:43:08Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Matthias Ellmer <ellmer.matthias@gmail.com>
+# Contributor: Julien Morin <jmorin@cp.dias.ie>
+
+pkgbase=python-basemap
+pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common')
+pkgver=1.0.6
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://matplotlib.org/basemap/"
+license=('custom')
+makedepends=('python2-numpy' 'python-numpy' 'geos' 'shapelib')
+source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz")
+sha1sums=('76191964c580b3af33c169cb050bb171328298f9')
+
+_py2basever=2.7
+_py3basever=3.3
+
+build() {
+ pushd "${srcdir}"/basemap-${pkgver}
+ # Remove the bundled libraries and common data
+ rm -r geos-*
+ sed -i "s/lib64/lib/g" setup.py
+ popd
+
+ cp -a "${srcdir}"/basemap-${pkgver}{,-python2}
+
+ # Python3 Version
+ cd "${srcdir}"/basemap-${pkgver}
+ python setup.py config
+ python setup.py build
+
+ # Python2 Version
+ cd "${srcdir}"/basemap-${pkgver}-python2
+ python2 setup.py config
+ python2 setup.py build
+}
+
+package_python-basemap() {
+ pkgdesc="Toolkit for plotting data on map projections"
+ depends=('python-basemap-common' 'python-matplotlib' 'geos' 'shapelib' 'python-numpy' 'python-httplib2')
+ optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.')
+
+ cd "${srcdir}"/basemap-${pkgver}
+
+ python setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
+
+ # Conflict with files from python-matplotlib
+ rm "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/__init__.py
+ rm "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/__pycache__/__init__.cpython-33.{pyc,pyo}
+
+ rm -fr "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data
+ ln -sf /usr/share/basemap/data "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data
+}
+
+package_python2-basemap() {
+ pkgdesc="Toolkit for plotting data on map projections"
+ depends=('python-basemap-common' 'python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2')
+ optdepends=('python2-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.')
+
+ cd "${srcdir}"/basemap-${pkgver}-python2
+
+ python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
+
+ # Conflict with files from python2-matplotlib
+ rm "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo}
+
+ rm -fr "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data
+ ln -sf /usr/share/basemap/data "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data
+}
+
+package_python-basemap-common() {
+ pkgdesc="Data files for python-basemap"
+
+ cd "${srcdir}"/basemap-${pkgver}
+
+ install -dm755 "${pkgdir}"/usr/share/basemap
+ cp -a lib/mpl_toolkits/basemap/data/ "${pkgdir}"/usr/share/basemap/
+
+ install -dm755 "${pkgdir}"/usr/share/licenses/${pkgbase}
+ install -m644 LICENSE_{data,pyshp,proj4} README "${pkgdir}"/usr/share/licenses/${pkgbase}/
+}
diff --git a/community/python2-basemap/PKGBUILD b/community/python2-basemap/PKGBUILD
deleted file mode 100644
index 07220bde9..000000000
--- a/community/python2-basemap/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 74860 2012-08-07 15:09:34Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Julien Morin <jmorin@cp.dias.ie>
-
-pkgname=python2-basemap
-pkgver=1.0.5
-pkgrel=1
-pkgdesc="Toolkit for plotting data on map projections"
-arch=('i686' 'x86_64')
-url="http://matplotlib.sourceforge.net/basemap/doc/html/"
-license=('custom')
-depends=('python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2')
-optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.')
-source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz")
-sha1sums=('14b6f5f645febbc73b23e8aea8fdb9e4b4b9adb4')
-
-build() {
- cd "${srcdir}/basemap-${pkgver}"
-
- # Remove the bundled librarie
- rm -r geos-*
-
- sed -i "s/lib64/lib/g" setup.py
-
- python2 setup.py config
- python2 setup.py build
-}
-
-package() {
- cd "${srcdir}/basemap-${pkgver}"
-
- _pybasever=2.7
-
- python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
-
- # Conflict with files from python2-matplotlib
- rm "${pkgdir}"/usr/lib/python${_pybasever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo}
-
- # License
- install -Dm644 LICENSE_data "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm644 LICENSE_pyshp "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm644 LICENSE_proj4 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index c1a887d76..788c6c222 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86989 2013-03-25 17:05:20Z spupykin $
+# $Id: PKGBUILD 87037 2013-03-26 11:01:18Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -22,7 +22,7 @@ md5sums=('aabbbac2b5251e7c3eeb36d8f188d08a'
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i 's|i + j|(int)(i + j)|' textproc.cpp
- qmake PREFIX=/usr/bin
+ qmake-qt4 PREFIX=/usr/bin
make
}
diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD
index 8861c7966..8373e9385 100644
--- a/community/yaz/PKGBUILD
+++ b/community/yaz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82691 2013-01-23 00:16:01Z eric $
+# $Id: PKGBUILD 87054 2013-03-26 11:49:48Z foutrelis $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Ray Rashif <schiv@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,7 +8,7 @@
pkgname=yaz
pkgver=4.2.49
-pkgrel=1
+pkgrel=2
pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
arch=('i686' 'x86_64')
url="http://www.indexdata.dk/yaz"
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 0d6079466..dac70e5d1 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178148 2013-02-17 00:23:24Z bisson $
+# $Id: PKGBUILD 180812 2013-03-26 12:05:13Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
-pkgver=6.1p1
-pkgrel=6
+pkgver=6.2p1
+pkgrel=1
pkgdesc='Free version of the SSH connectivity tools'
url='http://www.openssh.org/portable.html'
license=('custom:BSD')
@@ -23,7 +23,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
'sshd.confd'
'sshd.pam'
'sshd')
-sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
+sha1sums=('8824708c617cc781b2bb29fa20bd905fd3d2a43d'
'954bf1660aa32620c37034320877f4511b767ccb'
'6df5be396f8c593bb511a249a1453294d18a01a6'
'bd6eae36c7ef9efb7147778baad7858b81f2d660'
diff --git a/core/systemd/0001-Fix-vacuum-logic-error.patch b/core/systemd/0001-Fix-vacuum-logic-error.patch
new file mode 100644
index 000000000..a0a6e85ee
--- /dev/null
+++ b/core/systemd/0001-Fix-vacuum-logic-error.patch
@@ -0,0 +1,40 @@
+From 6c142648aaced56ab681fcc97a71b06d588122a9 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Wed, 20 Mar 2013 21:32:05 +0100
+Subject: [PATCH] Fix vacuum logic error
+
+The vacuum code used to stop vacuuming after one deletion, even
+when max_use was still exceeded.
+
+Also make usage a uint64_t, as the code already pretends it is one.
+
+Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+---
+ src/journal/journal-vacuum.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
+index 731f6c7..4a3a5a9 100644
+--- a/src/journal/journal-vacuum.c
++++ b/src/journal/journal-vacuum.c
+@@ -36,7 +36,7 @@
+ #include "util.h"
+
+ struct vacuum_info {
+- off_t usage;
++ uint64_t usage;
+ char *filename;
+
+ uint64_t realtime;
+@@ -293,7 +293,7 @@ int journal_directory_vacuum(
+ if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) {
+ log_debug("Deleted archived journal %s/%s.", directory, list[i].filename);
+
+- if ((uint64_t) list[i].usage > sum)
++ if (list[i].usage < sum)
+ sum -= list[i].usage;
+ else
+ sum = 0;
+--
+1.8.2
+
diff --git a/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch b/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch
new file mode 100644
index 000000000..cd2d70756
--- /dev/null
+++ b/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch
@@ -0,0 +1,25 @@
+From 83d7d83bcc6c462ecbb4c8003e3a8b41f3b88d46 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay@vrfy.org>
+Date: Sat, 16 Mar 2013 16:10:22 +0100
+Subject: [PATCH] journal: pass the *pid* to sd_pid_get_owner_uid()
+
+---
+ src/journal/journald-server.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index ac565c7..364ab0f 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -593,7 +593,7 @@ static void dispatch_message_real(
+ IOVEC_SET_STRING(iovec[n++], session);
+ }
+
+- if (sd_pid_get_owner_uid(ucred->uid, &owner) >= 0) {
++ if (sd_pid_get_owner_uid(ucred->pid, &owner) >= 0) {
+ owner_valid = true;
+ if (asprintf(&owner_uid, "_SYSTEMD_OWNER_UID=%lu", (unsigned long) owner) >= 0)
+ IOVEC_SET_STRING(iovec[n++], owner_uid);
+--
+1.8.2
+
diff --git a/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch b/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch
new file mode 100644
index 000000000..88dabe9d3
--- /dev/null
+++ b/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch
@@ -0,0 +1,57 @@
+From 34b99a8bf7b769b31ad59ff0d60f8572bd0adab5 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay@vrfy.org>
+Date: Wed, 20 Mar 2013 01:26:17 +0100
+Subject: [PATCH] rules: move builtin calls before the permissions section
+
+<heftig> kay: systemd commit 22582bb broke cups usb printing for me
+<heftig> because the "lp" group isn't applied anymore
+<heftig> SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
+<heftig> moving this line to the end of 50-udev-default.rules restores correct behavior, as it's after usb_id
+
+Conflicts:
+ rules/50-udev-default.rules
+---
+ rules/50-udev-default.rules | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
+index 5d8bde5..ce0a4ef 100644
+--- a/rules/50-udev-default.rules
++++ b/rules/50-udev-default.rules
+@@ -1,5 +1,13 @@
+ # do not edit this file, it will be overwritten on update
+
++SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc"
++SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}"
++
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
++SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
++SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware"
++ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"
++
+ ACTION!="add", GOTO="default_permissions_end"
+
+ SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666"
+@@ -8,6 +16,8 @@ SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620"
+ SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
+ KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
+
++SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644"
++
+ SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
+
+ SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640"
+@@ -59,10 +69,3 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun"
+ KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse"
+
+ LABEL="default_permissions_end"
+-SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644", SYMLINK+="rtc"
+-SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}"
+-
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
+-SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
+-SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware"
+-ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"
+--
+1.8.2
+
diff --git a/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch b/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch
new file mode 100644
index 000000000..6d8d9aad4
--- /dev/null
+++ b/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch
@@ -0,0 +1,25 @@
+From 961e4526925b7b1e1d3582f2fc9fb38035e2b5fb Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 15 Mar 2013 16:41:13 +0100
+Subject: [PATCH] strv: fix STRV_FOREACH_PAIR macro definition
+
+---
+ src/shared/strv.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/strv.h b/src/shared/strv.h
+index da9fae6..49058f8 100644
+--- a/src/shared/strv.h
++++ b/src/shared/strv.h
+@@ -77,7 +77,7 @@ bool strv_overlap(char **a, char **b);
+ for (; (l) && ((s) >= (l)); (s)--)
+
+ #define STRV_FOREACH_PAIR(x, y, l) \
+- for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2)
++ for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1))
+
+
+ char **strv_sort(char **l);
+--
+1.8.2
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 0ba718aa0..0e03a7707 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
pkgver=198
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,11 +16,19 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-hook-udev'
'initcpio-install-udev'
'initcpio-install-timestamp'
+ '0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch'
+ '0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch'
+ '0001-rules-move-builtin-calls-before-the-permissions-sect.patch'
+ '0001-Fix-vacuum-logic-error.patch'
'use-split-usr-path.patch')
md5sums=('26a75e2a310f8c1c1ea9ec26ddb171c5'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'fb37e34ea006c79be1c54cbb0f803414'
'df69615503ad293c9ddf9d8b7755282d'
+ 'c93785560cd33e25013224ac84689aa3'
+ '80db2672a49667a3add02fb07dee9dca'
+ 'a0d3aca35ff7f71d1a5a79022b715ae0'
+ '7ae8e22cef30e57de02ca623b0673f76'
'76bf83fe34c5b40533abc5dc940576a6')
build() {
@@ -29,6 +37,19 @@ build() {
# hang onto this until we do the /{,s}bin merge
patch -Np1 <"$srcdir/use-split-usr-path.patch"
+ # upstream commit 83d7d83bcc6c462ecbb4c8003e3a8b41f3b88d46
+ patch -Np1 <"$srcdir"/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch
+
+ # upstream commit 961e4526925b7b1e1d3582f2fc9fb38035e2b5fb
+ patch -Np1 <"$srcdir"/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch
+
+ # upstream commit bbb7f2ae5035105575365750592caa87213d7072
+ # - modified to avoid pulling in disabling of firmware loading
+ patch -Np1 <"$srcdir"/0001-rules-move-builtin-calls-before-the-permissions-sect.patch
+
+ # upstream commit 6c142648aaced56ab681fcc97a71b06d588122a9
+ patch -Np1 <"$srcdir"/0001-Fix-vacuum-logic-error.patch
+
./configure \
--enable-static \
--libexecdir=/usr/lib \
@@ -112,9 +133,6 @@ package_systemd() {
install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
"$srcdir"/_sysvcompat/usr/share/man/man8
-
- # create /var/log/journal. users can control the actual log destination via journald.conf
- install -dm755 "$pkgdir/var/log/journal"
}
package_systemd-sysvcompat() {
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index c153916c9..e1719ecc2 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,66 +1,45 @@
-# $Id: PKGBUILD 176990 2013-02-03 14:59:10Z schiv $
+# $Id: PKGBUILD 180842 2013-03-26 21:39:25Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-# ardour, liblrdf and raptor are heavily dependent on each other. Updating of
-# one package mostly will require an update of all the other packages. I vote
-# for fixed dependencies speaking in terms of versions -- tobias
-
-# SYSLIBS enabled, support still valid; see ardour 2.8.13 rel notes
-# http://ardour.org/node/5263
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Contributor: see .contrib
pkgname=ardour
-pkgver=2.8.16
+pkgver=3.0
pkgrel=1
-pkgdesc="A multichannel hard disk recorder and digital audio workstation"
+pkgdesc="Professional-grade digital audio workstation"
arch=('i686' 'x86_64')
url="http://ardour.org/"
license=('GPL')
-depends=('liblrdf' 'libusb-compat' 'liblo' 'soundtouch'
- 'aubio' 'lilv' 'suil' 'libgnomecanvasmm')
- # -libgnomecanvas(+libgnomecanvasmm)
- # +soundtouch (these +/- changes are for SYSLIBS=1)
- # cwiid removed for https://bugs.archlinux.org/task/28344
-makedepends=('scons' 'boost')
-changelog=$pkgname.changelog
-source=("ftp://ftp.archlinux.org/other/ardour/$pkgname-$pkgver.tar.bz2"
+depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0'
+ 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12')
+makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz')
+install=$pkgname.install
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2"
"$pkgname.desktop")
-md5sums=('5bafe41df00d25e7a357baaa1038f16d'
- '8aeaf433ebf781733db48e5a16b0c4da')
+md5sums=('2759df2ac29e6075e006cc5b262bfee0'
+ '316bd21ece5e2208a104fd09cac521af')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
- # ardour defaults to -O3; use this in CFLAGS below
- sed -i '/-O3/d' SConstruct
+ # python2 fix
+ sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript
- # work around boost linking error (see ardour3 svn r13081)
- # thanks to Harry Harren for the heads-up
- CFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
- CXXFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
- export CFLAGS CXXFLAGS
+ python2 waf configure --prefix=/usr \
+ --configdir=/etc \
+ --docs
- scons $MAKEFLAGS ARCH="${CFLAGS/-O[0-9]/-O3}" \
- PREFIX="/usr" \
- DIST_LIBDIR="lib" \
- FREEDESKTOP=0 \
- FREESOUND=1 \
- SYSLIBS=1
+ python2 waf build $MAKEFLAGS
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
- scons DESTDIR="$pkgdir" install
+ python2 waf install --destdir="$pkgdir"
# install some freedesktop.org compatibility
install -Dm644 "$srcdir/$pkgname.desktop" \
"$pkgdir/usr/share/applications/$pkgname.desktop"
-
- # upstream will not do this
- # install templates
- cp -r templates "$pkgdir/usr/share/ardour2/"
}
# vim:set ts=2 sw=2 et:
diff --git a/extra/ardour/ardour.changelog b/extra/ardour/ardour.changelog
deleted file mode 100644
index 242d5a78a..000000000
--- a/extra/ardour/ardour.changelog
+++ /dev/null
@@ -1,55 +0,0 @@
-11 Aug 2012 (GMT+8) Ray Rashif <schiv@archlinux.org>
- * 2.8.14:
- Upstream release
- Dep on new (s)lv2 stack (lilv, suil et al replaces slv2)
- SYSLIBS turned on by upstream decree; see 2.8.13 release notes
-
-15 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 2.8.11-5:
- Resolve previous issues with slv2 & redland/rasqal/raptor
- - just needed rebuild of slv2 against latest redland suite [1]
- - also needed ardour buildsystem patch for raptor2 [1][2]
- - bring back support for slv2
-
- [1] https://bugs.archlinux.org/task/25060
- [2] http://tracker.ardour.org/view.php?id=4179
-
-9 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 2.8.11-4:
- Fix build failures and runtime segfaults
- - gcc 4.6 patch
- - enable SYSLIBS due to ardour sigc++ issues
- - remove slv2 dep due to ardour rasqal incompatibility [1][2]
-
- [1] https://bugs.archlinux.org/task/25060
- [2] https://ardour.org/node/4301
-
-22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 2.8.11-2 :
- raptor rebuild
-
-9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 2.8.11-1 :
- Testing build.
- Removed libgnomecanvasmm depend (ardour internal).
- Removed soundtouch makedepend (ardour internal, unneded).
- Added new depends
- - slv2 ("LV2" plug-ins support)
- - rubberband (can "do more" than soundtouch)
- - libgnomecanvas
- Not using SYSLIBS because upstream does not support it.
- Namcap warnings can be ignored; they're ardour internals.
-
- * PKGBUILD :
- Minor cosmetic ammendments.
-
- * ardour.changelog :
- Added this changelog.
- Only important changes will be logged.
-
- * ardour.install :
- Removed install scriptlet; old and deprecated information.
diff --git a/extra/ardour/ardour.desktop b/extra/ardour/ardour.desktop
index b50f6c952..de68483e1 100644
--- a/extra/ardour/ardour.desktop
+++ b/extra/ardour/ardour.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=Ardour
+Name=Ardour 3
Comment=Multitrack hard disk recorder
-Exec=ardour2
-Icon=/usr/share/ardour2/icons/ardour_icon_48px.png
+Exec=ardour3
+Icon=/usr/share/ardour3/icons/ardour_icon_48px.png
Terminal=false
Type=Application
X-MultipleArgs=false
diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install
new file mode 100644
index 000000000..555d7377d
--- /dev/null
+++ b/extra/ardour/ardour.install
@@ -0,0 +1,21 @@
+post_install() {
+ cat << MSG
+ > Ardour 3 has support for native "Linux" VSTs. You may want to export
+ > LXVST_PATH to include any custom directories of *.so VST plug-ins.
+
+ > Please consider supporting Paul Davis, lead developer of Ardour, by
+ > either subscribing or at least donating to the project's cause:
+
+ https://community.ardour.org/s/subscribe
+ https://community.ardour.org/donate
+
+ > With your continued support, Ardour will continue to improve and will
+ > one day no longer be dependent on unstable funding.
+MSG
+}
+
+post_upgrade() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 15d67acac..cd61d1341 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176283 2013-01-28 16:48:15Z stephane $
+# $Id: PKGBUILD 180800 2013-03-26 11:49:27Z foutrelis $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: kevin <kevin@archlinux.org>
@@ -10,106 +10,97 @@ pkgbase=boost
pkgname=('boost-libs' 'boost')
pkgver=1.52.0
_boostver=${pkgver//./_}
-pkgrel=1
-arch=('i686' 'x86_64')
+pkgrel=2
url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
+arch=('i686' 'x86_64')
license=('custom')
-sha1sums=('1120430030315b0a94b6d63fc04662960db2444c')
+makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
+source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
+ boost-1.52.0-python3.patch)
+sha1sums=('1120430030315b0a94b6d63fc04662960db2444c'
+ '34026072a7cb2534164f20e77bb71a5c75093307')
_stagedir="${srcdir}/stagedir"
build() {
- # set python path for bjam
- cd "${srcdir}/${pkgbase}_${_boostver}/tools"
- echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
- echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> build/v2/user-config.jam
- echo "using mpi ;" >> build/v2/user-config.jam
-
- cd "${srcdir}"/${pkgbase}_${_boostver}
-
- # build bjam
- cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
- ./build.sh cc
-
- _bindir="bin.linuxx86"
- [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-
- install -d "${_stagedir}"/usr/bin
- install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
-
- # build tools
- cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
- "${_stagedir}"/usr/bin/bjam --toolset=gcc
-
- # copy the tools
- cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
- for i in *;do
- install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
- done
-
- #boostbook needed by quickbook
- cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
- cp -r share "${_stagedir}"
-
- # build libs
- cd "${srcdir}/${pkgbase}_${_boostver}"
-
- # default "minimal" install: "release link=shared,static
- # runtime-link=shared threading=single,multi"
- # --layout=tagged will add the "-mt" suffix for multithreaded libraries
- # and installs includes in /usr/include/boost.
- # --layout=system no longer adds the -mt suffix for multi-threaded libs.
- # install to ${_stagedir} in preparation for split packaging
-
- "${_stagedir}"/usr/bin/bjam \
- release debug-symbols=off threading=multi \
- runtime-link=shared link=shared,static \
- cflags=-fno-strict-aliasing \
+ local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
+
+ cd "${srcdir}/${pkgbase}_${_boostver}"
+
+ # Fix build errors with python 3
+ sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh
+ patch -Np1 -i ../boost-1.52.0-python3.patch
+
+ # Shut up strict aliasing warnings
+ echo "using gcc : : : <compileflags>-fno-strict-aliasing ;" >> ./tools/build/v2/user-config.jam
+ # Add an extra python version. This does not replace anything and python 2.x need to be the default.
+ echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> ./tools/build/v2/user-config.jam
+ # Support for OpenMPI
+ echo "using mpi ;" >> ./tools/build/v2/user-config.jam
+
+ ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2
+
+ _bindir="bin.linuxx86"
+ [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
+
+ install -d -m 755 "${_stagedir}"/bin
+ install "${srcdir}"/${pkgbase}_${_boostver}/tools/build/v2/engine/${_bindir}/bjam "${_stagedir}"/bin/bjam
+
+ pushd tools
+ for _tool in bcp inspect quickbook compiler_status process_jam_log wave; do
+ "${_stagedir}"/bin/bjam --toolset=gcc $_tool
+ done
+ "${_stagedir}"/bin/bjam --toolset=gcc cflags="-std=gnu++11" library_status
+ popd
+ cp -a dist/bin/* "${_stagedir}"/bin
+
+ #boostbook is needed by quickbook
+ install -d -m 755 "${_stagedir}"/share/boostbook
+ cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/
+
+ # default "minimal" install: "release link=shared,static
+ # runtime-link=shared threading=single,multi"
+ # --layout=tagged will add the "-mt" suffix for multithreaded libraries
+ # and installs includes in /usr/include/boost.
+ # --layout=system no longer adds the -mt suffix for multi-threaded libs.
+ # install to ${_stagedir} in preparation for split packaging
+ "${_stagedir}"/bin/bjam \
+ release \
+ debug-symbols=off \
+ threading=multi \
+ runtime-link=shared \
+ link=shared \
toolset=gcc \
- --prefix="${_stagedir}" \
- -sTOOLS=gcc \
--layout=system \
- ${MAKEFLAGS} \
+ --prefix="${_stagedir}" \
+ ${JOBS} \
install
+
+ find ${_stagedir} -name \*.a -exec rm -f {} \;
}
package_boost() {
- pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
- depends=("boost-libs=${pkgver}")
- optdepends=('python: for python3 bindings'
- 'python2: for python2 bindings'
- 'boost-build: to use boost jam for building your project.')
-
- install -d "${pkgdir}"/usr/{include,lib,share}
- # headers/source files
- cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
-
- # static libs
- cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
-
- # utilities (bjam, bcp, pyste)
- cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
+ pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
+ depends=("boost-libs=${pkgver}")
+ optdepends=('python: for python bindings'
+ 'python2: for python2 bindings'
+ 'boost-build: to use boost jam for building your project.')
- #boostbook
- cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
+ install -d -m 755 "${pkgdir}"/usr
+ cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr
- # license
- install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
- "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
+ install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
+ "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
}
package_boost-libs() {
- pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
- depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
- optdepends=('openmpi: for mpi support')
+ pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
+ depends=('bzip2' 'zlib' 'icu')
+ optdepends=('openmpi: for mpi support')
- install -d "${pkgdir}/usr/lib"
- #shared libs
- cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
+ install -d -m 755 "${pkgdir}"/usr
+ cp -a "${_stagedir}"/lib "${pkgdir}"/usr
- # license
- install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
- "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
+ install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
+ "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
}
diff --git a/extra/boost/boost-1.52.0-python3.patch b/extra/boost/boost-1.52.0-python3.patch
new file mode 100644
index 000000000..8d2f59269
--- /dev/null
+++ b/extra/boost/boost-1.52.0-python3.patch
@@ -0,0 +1,96 @@
+diff -Naur boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp boost_1_53_0/libs/mpi/src/python/datatypes.cpp
+--- boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp 2007-11-25 13:38:02.000000000 -0500
++++ boost_1_53_0/libs/mpi/src/python/datatypes.cpp 2013-03-11 20:59:57.171732691 -0400
+@@ -13,6 +13,10 @@
+ #include <boost/mpi/python/serialize.hpp>
+ #include <boost/mpi.hpp>
+
++#if PY_MAJOR_VERSION >= 3
++#define PyInt_Type PyLong_Type
++#endif
++
+ namespace boost { namespace mpi { namespace python {
+
+ void export_datatypes()
+diff -Naur boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp boost_1_53_0/libs/mpi/src/python/py_environment.cpp
+--- boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp 2007-11-25 13:38:02.000000000 -0500
++++ boost_1_53_0/libs/mpi/src/python/py_environment.cpp 2013-03-11 21:02:12.961737401 -0400
+@@ -11,6 +11,9 @@
+ * This file reflects the Boost.MPI "environment" class into Python
+ * methods at module level.
+ */
++
++#include <locale>
++#include <string>
+ #include <boost/python.hpp>
+ #include <boost/mpi.hpp>
+
+@@ -50,11 +53,65 @@
+
+ // If anything changed, convert C-style argc/argv into Python argv
+ if (mpi_argv != my_argv)
++ {
++#if PY_MAJOR_VERSION >= 3
++ // Code stolen from py3k/Modules/python.c.
++
++ wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
++ /* We need a second copies, as Python might modify the first one. */
++ wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
++
++ if (!argv_copy || !argv_copy2) {
++ fprintf(stderr, "out of memory\n");
++ return false;
++ }
++
++ std::locale mylocale;
++ mbstate_t mystate;
++
++ const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
++ std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
++
++ for (int i = 0; i < mpi_argc; i++)
++ {
++ size_t length = strlen(mpi_argv[i]);
++
++ wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1));
++
++ const char *from_next;
++ wchar_t *to_next;
++
++ std::codecvt<wchar_t,char,mbstate_t>::result myresult =
++ myfacet.out(mystate,
++ mpi_argv[i], mpi_argv[i] + length + 1, from_next,
++ dest, dest+length+1, to_next);
++
++ if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
++ {
++ fprintf(stderr, "failure translating argv\n");
++ return 1;
++ }
++
++ argv_copy2[i] = argv_copy[i] = dest;
++ if (!argv_copy[i])
++ return false;
++ }
++
++ PySys_SetArgv(mpi_argc, argv_copy);
++
++ for (int i = 0; i < mpi_argc; i++) {
++ PyMem_Free(argv_copy2[i]);
++ }
++ PyMem_Free(argv_copy);
++ PyMem_Free(argv_copy2);
++#else
+ PySys_SetArgv(mpi_argc, mpi_argv);
++#endif
++ }
+
+- for (int arg = 0; arg < my_argc; ++arg)
+- free(my_argv[arg]);
+- delete [] my_argv;
++ for (int arg = 0; arg < mpi_argc; ++arg)
++ free(mpi_argv[arg]);
++ delete [] mpi_argv;
+
+ return true;
+ }
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index 45b854d34..1405c33f0 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 175866 2013-01-23 00:12:57Z eric $
+# $Id: PKGBUILD 180801 2013-03-26 11:49:28Z foutrelis $
# Maintainer:
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=brltty
pkgver=4.4
-pkgrel=3
+pkgrel=4
pkgdesc="Braille display driver for Linux/Unix"
arch=('i686' 'x86_64')
url="http://mielke.cc/brltty"
license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=50.1.2' 'tcl' 'atk' 'pyrex')
+depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=51.1' 'tcl' 'atk' 'pyrex')
makedepends=('bluez')
optdepends=('bluez: bluetooth support')
backup=(etc/brltty.conf etc/conf.d/brltty.conf)
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index b01af8eee..1a3759c0b 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180550 2013-03-23 07:23:55Z bpiotrowski $
+# $Id: PKGBUILD 180802 2013-03-26 11:49:30Z foutrelis $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
@@ -18,7 +18,7 @@ pkgname=('calligra-filters'
'calligra-braindump'
'calligra-flow')
pkgver=2.6.2
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://www.calligra-suite.org/'
license=('FDL1.2' 'GPL2' 'LGPL')
@@ -215,6 +215,7 @@ package_calligra-flow() {
conflicts=('calligra-flow-doc')
replaces=('calligra-flow-doc')
install=calligra-flow.install
+ optdepends=('calligra-karbon: to export the charts in various formats')
cd "${srcdir}"/build/flow
make DESTDIR="${pkgdir}" install
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index 00c55118f..f0bf3edf9 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 177797 2013-02-09 01:45:32Z foutrelis $
+# $Id: PKGBUILD 180803 2013-03-26 11:49:32Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Hokum <hokum_at_mail_dot_ru>
pkgname=gptfdisk
pkgver=0.8.6
-pkgrel=1
+pkgrel=2
pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
arch=('i686' 'x86_64')
url="http://www.rodsbooks.com/gdisk/"
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 69ec71c15..5bb0db2e0 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175869 2013-01-23 00:13:03Z eric $
+# $Id: PKGBUILD 180804 2013-03-26 11:49:33Z foutrelis $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=harfbuzz
-pkgver=0.9.9
-pkgrel=3
+pkgver=0.9.14
+pkgrel=1
pkgdesc="OpenType text shaping engine."
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2')
optdepends=('cairo: hb-view program')
options=(!libtool)
source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3d8dd4ebbc38da011485ef181f8ff072b4b0d7e305bbda19b355f217d25169cf')
+sha256sums=('d07c0ffdbbbfdfbb6c65e73fe9c76466e87dbf04b094cbd0abf5fd7d571a4004')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index b2bafa9c5..690d4ec3b 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175783 2013-01-21 17:03:37Z stephane $
+# $Id: PKGBUILD 180744 2013-03-26 01:47:54Z stephane $
# Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
# Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
pkgname=hwloc
-pkgver=1.6.1
+pkgver=1.6.2
pkgrel=1
pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('sh' 'pciutils' 'cairo' 'libxml2')
makedepends=('pkg-config')
options=('!libtool' '!docs')
source=(http://www.open-mpi.org/software/hwloc/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('9d02234d6abd5332675957506e4d8144c515e986')
+sha1sums=('f9d9938d427e65257d1745ffc1d10634251cdc09')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 8122fc58c..d2b74f769 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175870 2013-01-23 00:13:04Z eric $
+# $Id: PKGBUILD 180805 2013-03-26 11:49:34Z foutrelis $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Art Gramlich <art@gramlich-net.com>
pkgname=icu
-pkgver=50.1.2
+pkgver=51.1
pkgrel=1
pkgdesc="International Components for Unicode library"
arch=(i686 x86_64)
@@ -14,7 +14,7 @@ depends=('gcc-libs>=4.7.1-5' 'sh')
source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
icu.8198.revert.icu5431.patch)
-md5sums=('beb98aa972219c9fcd9c8a71314943c9'
+md5sums=('6eef33b229d0239d654983028c9c7053'
'ebd5470fc969c75e52baf4af94a9ee82')
build() {
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index b7654765c..e3b811c32 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180320 2013-03-20 04:16:52Z eric $
+# $Id: PKGBUILD 180839 2013-03-26 18:36:41Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgbase=imagemagick
pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.3.10
+pkgver=6.8.4.0
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.imagemagick.org/"
@@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
perlmagick.rpath.patch)
-sha1sums=('2a80effb525ea87e6eef96d30def680175ff3222'
+sha1sums=('e79b197cc17f1053ed5ff22f2eea73e01f94aeb5'
'e143cf9d530fabf3b58023899b5cc544ba93daec')
build() {
@@ -63,7 +63,7 @@ package_imagemagick() {
options=('!docs' 'libtool' '!emptydirs')
cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
- make DESTDIR="${pkgdir}" install
+ make -j1 DESTDIR="${pkgdir}" install
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index ac49b5778..95cc63dfe 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180591 2013-03-24 07:51:29Z andyrtr $
+# $Id: PKGBUILD 180806 2013-03-26 11:49:36Z foutrelis $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
pkgbase="libreoffice"
@@ -21,7 +21,7 @@ pkgname=('libreoffice-common'
'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
_LOver=4.0.1.2
pkgver=4.0.1
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
@@ -32,7 +32,7 @@ makedepends=( # makedepends
'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez'
# the runtime dependencies
"curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
- 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1-2"
+ 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1"
'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.2'
'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
'ttf-dejavu') # to satisfy regression tests
@@ -282,7 +282,7 @@ package_libreoffice-common() {
pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
install=libreoffice-common.install
depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib'
- 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' "poppler>=0.22.2"
+ 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.2"
'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2')
optdepends=('libreoffice-langpack: additional language support'
'java-runtime: adds java support'
diff --git a/extra/libwacom/PKGBUILD b/extra/libwacom/PKGBUILD
index ee919f122..aaf22f835 100644
--- a/extra/libwacom/PKGBUILD
+++ b/extra/libwacom/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 164253 2012-07-28 20:26:26Z eric $
+# $Id: PKGBUILD 180845 2013-03-26 22:37:55Z eric $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=libwacom
-pkgver=0.6
+pkgver=0.7
pkgrel=1
pkgdesc="Library to identify Wacom tablets and their features"
arch=('x86_64' 'i686')
url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom"
license=('MIT')
-depends=('glib2' 'systemd-tools')
+depends=('glib2' 'systemd')
options=('!libtool')
source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d')
+sha256sums=('210c48b595461ebee63b1a846a6eb1d8f029b49d02ccbde34eadf551a5a68a78')
build() {
cd $pkgname-$pkgver
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 224dc4210..a9e616335 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179613 2013-03-08 14:04:07Z giovanni $
+# $Id: PKGBUILD 180835 2013-03-26 16:00:15Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=live-media
-pkgver=2013.03.07
+pkgver=2013.03.23
pkgrel=1
pkgdesc="A set of C++ libraries for multimedia streaming"
arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
url="http://live555.com/liveMedia"
depends=('gcc-libs')
source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('1cdef2dbc7d790f48051194125faf64b')
+md5sums=('e9a75e0cfbf4f25aedd4ee4a10a7c26f')
build() {
cd ${srcdir}/live
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 399be0add..573ac890a 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180012 2013-03-14 18:21:32Z bpiotrowski $
+# $Id: PKGBUILD 180833 2013-03-26 15:59:12Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
pkgbase=mariadb
pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
pkgver=5.5.30
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL')
url='http://mariadb.org/'
diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install
index c99114c07..7d3c2ce5c 100644
--- a/extra/mariadb/mariadb.install
+++ b/extra/mariadb/mariadb.install
@@ -13,7 +13,7 @@ post_install(){
chown -R mysql:mysql var/lib/mysql &>/dev/null
fi
- usr/bin/systemd-tmpfiles --create mysqld.conf
+ usr/bin/systemd-tmpfiles --create mysql.conf
echo ">> If you are migrating from MySQL, don't forget to run 'mysql_upgrade'"
echo " after mysqld.service restart."
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 850dbaef6..1a18b2162 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180290 2013-03-19 19:00:59Z pierre $
+# $Id: PKGBUILD 180807 2013-03-26 11:49:38Z foutrelis $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -22,7 +22,7 @@ pkgname=('php'
'php-tidy'
'php-xsl')
pkgver=5.4.13
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 693f2904a..ce4ba16aa 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 177618 2013-02-08 07:48:31Z ronald $
+# $Id: PKGBUILD 180808 2013-03-26 11:49:39Z foutrelis $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Contributor: K. Piche <kpiche@rogers.com>
pkgname=r
-pkgver=2.15.2
-pkgrel=3
+pkgver=2.15.3
+pkgrel=1
pkgdesc="Language and environment for statistical computing and graphics"
arch=('i686' 'x86_64')
license=('GPL')
@@ -13,21 +13,19 @@ url=('http://www.r-project.org/')
depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff'
'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils')
-makedepends=('openjdk6' 'gcc-fortran' 'tk>=8.6.0')
+makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk')
optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files')
backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
options=('!makeflags' '!emptydirs')
+install=r.install
source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
'r.desktop'
'r.png'
- 'R.conf'
- 'x11.patch')
-install=r.install
-sha1sums=('c80da687d66ee88d1e34fc1ae5c1bd525f9513dd'
+ 'R.conf')
+sha1sums=('a05b68f31b00d8038d9f0a8562cfc0c8e32d9621'
'13aa29219bcaa102e575de8c1c8e0833d233e836'
'a69a07ec363440efc18ce0a7f2af103375dea978'
- '43668da6cfd1b4455a99f23e79e2059294dddac9'
- 'a11b91d53645bd545fddc382c991096502e8ac67')
+ '43668da6cfd1b4455a99f23e79e2059294dddac9')
build() {
cd "${srcdir}/R-${pkgver}"
@@ -36,8 +34,8 @@ build() {
# set texmf dir correctly in makefile
sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
- # upstream patch fixing empty plots FS#32597
- patch -Np0 -i ${srcdir}/x11.patch
+# fix for texinfo 5.X
+ sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
./configure --prefix=/usr \
--libdir=/usr/lib \
@@ -53,11 +51,19 @@ build() {
F77=gfortran \
LIBnn=lib
make
+
+# make libRmath.so
+ cd src/nmath/standalone
+ make shared
}
package() {
cd "${srcdir}/R-${pkgver}"
- make -j1 DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" install
+
+# install libRmath.so
+ cd src/nmath/standalone
+ make DESTDIR="${pkgdir}" install
# Fixup R wrapper scripts.
sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
@@ -80,5 +86,5 @@ package() {
done
# Install ld.so.conf.d file to ensure other applications access the shared lib
- install -Dm644 ${srcdir}/R.conf ${pkgdir}/etc/ld.so.conf.d/R.conf
+ install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf"
}
diff --git a/extra/r/x11.patch b/extra/r/x11.patch
deleted file mode 100644
index 3a02b28ea..000000000
--- a/extra/r/x11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/modules/X11/devX11.c (révision 61681)
-+++ src/modules/X11/devX11.c (révision 61682)
-@@ -244,6 +244,7 @@
- {
- if(inclose || !xd || !xd->buffered || xd->holdlevel > 0) return;
- cairo_paint(xd->xcc);
-+ cairo_surface_flush(xd->xcs);
- if (xd->type == WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
- XSync(display, 0);
- xd->last = currentTime();
-@@ -753,8 +754,10 @@
- #ifdef HAVE_WORKING_CAIRO
- pX11Desc xd = (pX11Desc) dd->deviceSpecific;
- /* We can use the buffered copy where we have it */
-- if(xd->buffered == 1) cairo_paint(xd->xcc);
-- else if (xd->buffered > 1)
-+ if(xd->buffered == 1) {
-+ cairo_paint(xd->xcc);
-+ cairo_surface_flush(xd->xcs);
-+ } else if (xd->buffered > 1)
- /* rely on timer to repaint eventually */
- xd->last_activity = currentTime();
- else
-@@ -2691,7 +2694,11 @@
- Cairo_update(xd);
- return;
- }
-- if(xd->buffered) cairo_paint(xd->xcc);
-+ if(xd->buffered) {
-+ cairo_paint(xd->xcc);
-+ cairo_surface_flush(xd->xcs);
-+ }
-+
- #endif
- if(xd->type==WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
- XSync(display, 0);
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 47f2f3ed3..86bda04b5 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179134 2013-03-04 08:06:34Z tomegun $
+# $Id: PKGBUILD 180809 2013-03-26 11:49:40Z foutrelis $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: eric <eric@archlinux.org>
@@ -6,11 +6,11 @@
pkgname=raptor
pkgver=2.0.9
-pkgrel=1
+pkgrel=2
pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
arch=('i686' 'x86_64')
url="http://librdf.org/raptor"
-depends=('curl' 'libxslt' 'icu>=50.1.2')
+depends=('curl' 'libxslt' 'icu')
license=('LGPL')
options=('!libtool')
source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz")
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 44d98296c..ffc68955e 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 175872 2013-01-23 00:13:08Z eric $
+# $Id: PKGBUILD 180810 2013-03-26 11:49:41Z foutrelis $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Alexander Fehr <pizzapunk gmail com>
pkgbase=tracker
pkgname=(tracker libtracker-sparql)
-pkgver=0.14.4
+pkgver=0.14.5
_tver=${pkgver%.*}
-pkgrel=3
+pkgrel=1
pkgdesc="All-in-one indexer, search tool and metadata database"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
- 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
- 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
- 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
- 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala'
- 'libgxps')
+arch=(i686 x86_64)
+license=(GPL)
+makedepends=(libgnome-keyring upower libexif exempi rest
+ poppler-glib libgsf icu enca networkmanager gtk3
+ desktop-file-utils hicolor-icon-theme gobject-introspection
+ intltool giflib gstreamer0.10-base totem-plparser
+ taglib nautilus libvorbis flac vala libgxps)
url="http://www.gnome.org"
options=('!libtool' '!emptydirs')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918')
+sha256sums=('cabef75eb18ad35208000dc472bdc20a74269799414527ee6e1c1c1cfb28eec8')
build() {
cd $pkgbase-$pkgver
+ # HACK: uninstall libtracker-sparql to ensure a clean build,
+ # as the build system will wrongly link against it
+ #if pacman -Qq libtracker-sparql; then sudo pacman -Rdd --noconfirm libtracker-sparql; fi
+
./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -40,9 +43,9 @@ build() {
}
package_tracker() {
- depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
- 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
- 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
+ depends=("libtracker-sparql=$pkgver-$pkgrel" libgnome-keyring
+ upower libexif exempi rest poppler-glib libgsf enca
+ networkmanager gtk3 desktop-file-utils hicolor-icon-theme)
optdepends=('giflib: extractor for GIF data'
'gstreamer0.10-base: video extractor'
'totem-plparser: playlist support'
@@ -50,7 +53,6 @@ package_tracker() {
'libvorbis: Vorbis metadata extractor'
'flac: FLAC metadata extractor'
'taglib: writeback for audio files'
- 'gnome-panel: tracker-search-bar'
'libgxps: XPS extractor')
groups=('gnome-extra')
install=tracker.install
@@ -80,7 +82,7 @@ package_tracker() {
package_libtracker-sparql() {
pkgdesc="$pkgdesc (SPARQL library)"
- depends=('sqlite' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
+ depends=(sqlite icu glib2 libffi pcre util-linux)
mv "$srcdir"/sparql/* "$pkgdir"
}
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index 8a2d586a6..9065ed194 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175876 2013-01-23 00:13:13Z eric $
+# $Id: PKGBUILD 180811 2013-03-26 11:49:42Z foutrelis $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=webkitgtk
pkgname=('webkitgtk2' 'webkitgtk3')
pkgver=1.10.2
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://webkitgtk.org/"
license=('custom')
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index e9ee0cb50..8b0a684da 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180182 2013-03-18 16:08:53Z andyrtr $
+# $Id: PKGBUILD 180837 2013-03-26 16:14:16Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <Alexander@archlinux.org
pkgname=xf86-input-evdev
-pkgver=2.7.3
-pkgrel=3
+pkgver=2.8.0
+pkgrel=1
pkgdesc="X.org evdev input driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>
options=('!libtool' '!makeflags')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504')
+sha256sums=('2f5b4403955f8e82603acff7f8f21a67e89a7c0230e1506c6924c4b9dd8f0e57')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 5dc6bfa81..8d58da41c 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -4,8 +4,8 @@
_pkgname=firefox-noscript
pkgname=icecat-noscript
-pkgver=2.6.5.8
-pkgrel=1.1
+pkgver=2.6.5.9
+pkgrel=1
pkgdesc="plugin for icecat which disables script"
arch=('any')
url="http://noscript.net/"
@@ -14,7 +14,7 @@ depends=()
provides=$_pkgname=$pkgver
makedepends=('unzip')
source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('f97258a706d87a28fa7bd8bd4ee05627')
+md5sums=('ea50b76dd18c1f714359a095b2f00d6a')
package() {
# _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 3b9bd0ce1..330402ed2 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -4,8 +4,8 @@
_pkgname=firefox-noscript
pkgname=iceweasel-noscript
-pkgver=2.6.5.8
-pkgrel=1.1
+pkgver=2.6.5.9
+pkgrel=1
pkgdesc="plugin for iceweasel which disables script"
arch=('any')
url="http://noscript.net/"
@@ -14,7 +14,7 @@ depends=()
provides=$_pkgname=$pkgver
makedepends=('unzip')
source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('f97258a706d87a28fa7bd8bd4ee05627')
+md5sums=('ea50b76dd18c1f714359a095b2f00d6a')
package() {
# _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`