diff options
Diffstat (limited to 'community')
610 files changed, 7693 insertions, 7906 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index 6325cb3f7..b4c2ff3af 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 96786 2013-09-05 07:34:19Z svenstaro $ +# $Id: PKGBUILD 103111 2013-12-26 13:52:36Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com> pkgname=0ad -pkgver=a14 -_pkgver=0.0.14-alpha +pkgver=a15 +_pkgver=0.0.15-alpha pkgrel=1 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') url="http://play0ad.com/" license=('GPL2' 'CCPL') -depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') +depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu' 'gloox' 'miniupnpc' 'libsm') makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz") -md5sums=('5bbaffa02b6e9082cbd5142d43f9b700') +md5sums=('a651d81eb9b31da01e376ddaa597e954') build() { cd "$srcdir/$pkgname-$_pkgver/build/workspaces" @@ -22,6 +22,7 @@ build() { ./update-workspaces.sh \ --with-system-enet \ + --with-system-miniupnpc \ --bindir=/usr/bin \ --libdir=/usr/lib/0ad \ --datadir=/usr/share/${pkgname}/data diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD index 25345ec7e..9c2cdff22 100644 --- a/community/alex/PKGBUILD +++ b/community/alex/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 89285 2013-04-28 16:52:06Z td123 $ +# $Id: PKGBUILD 102107 2013-12-05 10:44:35Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Philip Nilsson <pnilsson@nullref.se> pkgname=alex -pkgver=3.0.5 -pkgrel=2 +pkgver=3.1.3 +pkgrel=1 pkgdesc='Lexical analyser generator for Haskell' arch=('x86_64' 'i686') url='http://hackage.haskell.org/package/alex' license=('custom:BSD3') depends=('gmp') -makedepends=('ghc=7.6.3-1' 'haskell-quickcheck>=2') +makedepends=('ghc=7.6.3-1' 'haskell-quickcheck>=2' 'happy') source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('c3326417a0538e355e5ad1871ab931b9c8145391e8b2ff79668eb643d9b99659') +sha256sums=('8d41a6e72a016155f00c846f7146ab4b27fe9640668a4b592d6a9b856f970a92') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" runghc Setup.lhs configure --prefix=/usr --datasubdir="$pkgname" runghc Setup.lhs build } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" runghc Setup.lhs copy --destdir="$pkgdir" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/alex/BSD3" - # doc only contains the license + # Doc only contains the license rm -rf $pkgdir/usr/share/doc } diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD index de121bebf..b9b33446a 100644 --- a/community/almanah/PKGBUILD +++ b/community/almanah/PKGBUILD @@ -1,33 +1,21 @@ -# $Id: PKGBUILD 98185 2013-10-07 12:08:18Z jgc $ +# $Id: PKGBUILD 101727 2013-11-30 15:46:56Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=almanah -pkgver=0.10.1 -pkgrel=4 +pkgver=0.11.0 +pkgrel=1 pkgdesc="Small GTK+ application to allow you to keep a diary of your life" arch=('i686' 'x86_64') -url="http://live.gnome.org/Almanah_Diary" +url="https://wiki.gnome.org/Apps/Almanah_Diary" license=('GPL') depends=('evolution-data-server' 'gtkspell3' 'libcryptui' 'xdg-utils') makedepends=('intltool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - eds-3.8.patch - update-gtkspell3-support.patch) -sha256sums=('122789c1baea1713102b200c0401d25395ec177a66ae22635d3ae2fecc1f08bd' - '2407cb2cc11e61b7863bf20fc13d4614a3384e8cb7c5b534f1e3ce7a3afb2d2d' - '60fedd6be05ef2619c3b50539b9fdc717480e4f03a2920d8b68b09e63dc7e7db') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('82085a3884d6820e843fe388040a124cf7c23b4cc6dade54fa484ae75a8b712d') build() { cd "$srcdir/$pkgname-$pkgver" - - # Port to evolution-data-server 3.8 - patch -Np1 -i "$srcdir/eds-3.8.patch" - - # Port to the new gtkspell3 - patch -Np1 -i "$srcdir/update-gtkspell3-support.patch" - - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile make @@ -35,6 +23,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install } diff --git a/community/almanah/eds-3.8.patch b/community/almanah/eds-3.8.patch deleted file mode 100644 index dea51eb74..000000000 --- a/community/almanah/eds-3.8.patch +++ /dev/null @@ -1,2609 +0,0 @@ -From e481f5abdb46d41ac00ee3393332e92f605b55e7 Mon Sep 17 00:00:00 2001 -From: Matthew Barnes <mbarnes@redhat.com> -Date: Thu, 13 Dec 2012 14:16:58 +0000 -Subject: Bug 687229 - Embed ESourceSelector widget from libedataserverui - -Evolution developers are merging libedataserverui back into Evolution. -Drop the libedataserverui dependency and embed the ECellRendererColor -and ESourceSelector widgets from libedataserverui in event-factories. - -See also: -https://mail.gnome.org/archives/distributor-list/2012-December/msg00000.html ---- -diff --git a/configure.ac b/configure.ac -index a529568..b89ba74 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -83,7 +83,7 @@ AC_SUBST(STANDARD_CFLAGS) - AC_SUBST(STANDARD_LIBS) - - dnl Evolution --PKG_CHECK_MODULES(EVO, libecal-1.2 libedataserver-1.2 libedataserverui-3.0, have_evo=yes, have_evo=no) -+PKG_CHECK_MODULES(EVO, libecal-1.2 >= 3.5.91 libedataserver-1.2, have_evo=yes, have_evo=no) - if test "x$have_evo" = "xyes"; then - AC_DEFINE(HAVE_EVO, 1, [Defined if libecal-1.2 is installed]) - fi -diff --git a/src/Makefile.am b/src/Makefile.am -index 0de37e3..740c9f2 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -52,6 +52,10 @@ almanah_SOURCES += \ - event-factories/calendar-debug.h \ - event-factories/calendar-sources.c \ - event-factories/calendar-sources.h \ -+ event-factories/e-cell-renderer-color.c \ -+ event-factories/e-cell-renderer-color.h \ -+ event-factories/e-source-selector.c \ -+ event-factories/e-source-selector.h \ - events/calendar-appointment.c \ - events/calendar-appointment.h \ - events/calendar-task.c \ -diff --git a/src/event-factories/calendar-sources.c b/src/event-factories/calendar-sources.c -index 217327d..9451a0d 100644 ---- a/src/event-factories/calendar-sources.c -+++ b/src/event-factories/calendar-sources.c -@@ -32,7 +32,8 @@ - #define HANDLE_LIBICAL_MEMORY - #include <libecal/libecal.h> - #include <libedataserver/libedataserver.h> --#include <libedataserverui/libedataserverui.h> -+ -+#include "e-source-selector.h" - - #undef CALENDAR_ENABLE_DEBUG - #include "calendar-debug.h" -diff --git a/src/event-factories/e-cell-renderer-color.c b/src/event-factories/e-cell-renderer-color.c -new file mode 100644 -index 0000000..748bea5 ---- /dev/null -+++ b/src/event-factories/e-cell-renderer-color.c -@@ -0,0 +1,237 @@ -+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -+/* e-cell-renderer-color.c -+ * -+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of version 2 of the GNU Lesser General Public -+ * License as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this program; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ -+#include "e-cell-renderer-color.h" -+ -+#include <string.h> -+#include <glib/gi18n-lib.h> -+ -+#define E_CELL_RENDERER_COLOR_GET_PRIVATE(obj) \ -+ (G_TYPE_INSTANCE_GET_PRIVATE \ -+ ((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorPrivate)) -+ -+enum { -+ PROP_0, -+ PROP_COLOR -+}; -+ -+struct _ECellRendererColorPrivate { -+ GdkColor *color; -+}; -+ -+G_DEFINE_TYPE ( -+ ECellRendererColor, -+ e_cell_renderer_color, -+ GTK_TYPE_CELL_RENDERER) -+ -+static void -+cell_renderer_color_get_size (GtkCellRenderer *cell, -+ GtkWidget *widget, -+ const GdkRectangle *cell_area, -+ gint *x_offset, -+ gint *y_offset, -+ gint *width, -+ gint *height) -+{ -+ gint color_width = 16; -+ gint color_height = 16; -+ gint calc_width; -+ gint calc_height; -+ gfloat xalign; -+ gfloat yalign; -+ guint xpad; -+ guint ypad; -+ -+ g_object_get ( -+ cell, "xalign", &xalign, "yalign", &yalign, -+ "xpad", &xpad, "ypad", &ypad, NULL); -+ -+ calc_width = (gint) xpad * 2 + color_width; -+ calc_height = (gint) ypad * 2 + color_height; -+ -+ if (cell_area && color_width > 0 && color_height > 0) { -+ if (x_offset) { -+ *x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? -+ (1.0 - xalign) : xalign) * -+ (cell_area->width - calc_width)); -+ *x_offset = MAX (*x_offset, 0); -+ } -+ -+ if (y_offset) { -+ *y_offset =(yalign * -+ (cell_area->height - calc_height)); -+ *y_offset = MAX (*y_offset, 0); -+ } -+ } else { -+ if (x_offset) *x_offset = 0; -+ if (y_offset) *y_offset = 0; -+ } -+ -+ if (width) -+ *width = calc_width; -+ -+ if (height) -+ *height = calc_height; -+} -+ -+static void -+cell_renderer_color_render (GtkCellRenderer *cell, -+ cairo_t *cr, -+ GtkWidget *widget, -+ const GdkRectangle *background_area, -+ const GdkRectangle *cell_area, -+ GtkCellRendererState flags) -+{ -+ ECellRendererColorPrivate *priv; -+ GdkRectangle pix_rect; -+ GdkRectangle draw_rect; -+ guint xpad; -+ guint ypad; -+ -+ priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cell); -+ -+ if (priv->color == NULL) -+ return; -+ -+ cell_renderer_color_get_size ( -+ cell, widget, cell_area, -+ &pix_rect.x, &pix_rect.y, -+ &pix_rect.width, &pix_rect.height); -+ -+ g_object_get (cell, "xpad", &xpad, "ypad", &ypad, NULL); -+ -+ pix_rect.x += cell_area->x + xpad; -+ pix_rect.y += cell_area->y + ypad; -+ pix_rect.width -= xpad * 2; -+ pix_rect.height -= ypad * 2; -+ -+ if (!gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect)) -+ return; -+ -+ gdk_cairo_set_source_color (cr, priv->color); -+ cairo_rectangle (cr, pix_rect.x, pix_rect.y, draw_rect.width, draw_rect.height); -+ -+ cairo_fill (cr); -+} -+ -+static void -+cell_renderer_color_set_property (GObject *object, -+ guint property_id, -+ const GValue *value, -+ GParamSpec *pspec) -+{ -+ ECellRendererColorPrivate *priv; -+ -+ priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object); -+ -+ switch (property_id) { -+ case PROP_COLOR: -+ if (priv->color != NULL) -+ gdk_color_free (priv->color); -+ priv->color = g_value_dup_boxed (value); -+ return; -+ } -+ -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -+} -+ -+static void -+cell_renderer_color_get_property (GObject *object, -+ guint property_id, -+ GValue *value, -+ GParamSpec *pspec) -+{ -+ ECellRendererColorPrivate *priv; -+ -+ priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object); -+ -+ switch (property_id) { -+ case PROP_COLOR: -+ g_value_set_boxed (value, priv->color); -+ return; -+ } -+ -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -+} -+ -+static void -+cell_renderer_color_finalize (GObject *object) -+{ -+ ECellRendererColorPrivate *priv; -+ -+ priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object); -+ -+ if (priv->color != NULL) -+ gdk_color_free (priv->color); -+ -+ /* Chain up to parent's finalize() method. */ -+ G_OBJECT_CLASS (e_cell_renderer_color_parent_class)->finalize (object); -+} -+ -+static void -+e_cell_renderer_color_class_init (ECellRendererColorClass *class) -+{ -+ GObjectClass *object_class; -+ GtkCellRendererClass *cell_class; -+ -+ g_type_class_add_private (class, sizeof (ECellRendererColorPrivate)); -+ -+ object_class = G_OBJECT_CLASS (class); -+ object_class->set_property = cell_renderer_color_set_property; -+ object_class->get_property = cell_renderer_color_get_property; -+ object_class->finalize = cell_renderer_color_finalize; -+ -+ cell_class = GTK_CELL_RENDERER_CLASS (class); -+ cell_class->get_size = cell_renderer_color_get_size; -+ cell_class->render = cell_renderer_color_render; -+ -+ g_object_class_install_property ( -+ object_class, -+ PROP_COLOR, -+ g_param_spec_boxed ( -+ "color", -+ "Color Info", -+ "The color to render", -+ GDK_TYPE_COLOR, -+ G_PARAM_READWRITE)); -+} -+ -+static void -+e_cell_renderer_color_init (ECellRendererColor *cellcolor) -+{ -+ cellcolor->priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cellcolor); -+ -+ g_object_set (cellcolor, "xpad", 4, NULL); -+} -+ -+/** -+ * e_cell_renderer_color_new: -+ * -+ * Since: 2.22 -+ **/ -+GtkCellRenderer * -+e_cell_renderer_color_new (void) -+{ -+ return g_object_new (E_TYPE_CELL_RENDERER_COLOR, NULL); -+} -diff --git a/src/event-factories/e-cell-renderer-color.h b/src/event-factories/e-cell-renderer-color.h -new file mode 100644 -index 0000000..0e0da70 ---- /dev/null -+++ b/src/event-factories/e-cell-renderer-color.h -@@ -0,0 +1,75 @@ -+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -+/* e-cell-renderer-color.h -+ * -+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of version 2 of the GNU Lesser General Public -+ * License as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this program; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef _E_CELL_RENDERER_COLOR_H_ -+#define _E_CELL_RENDERER_COLOR_H_ -+ -+#include <gtk/gtk.h> -+ -+/* Standard GObject macros */ -+#define E_TYPE_CELL_RENDERER_COLOR \ -+ (e_cell_renderer_color_get_type ()) -+#define E_CELL_RENDERER_COLOR(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST \ -+ ((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColor)) -+#define E_CELL_RENDERER_COLOR_CLASS(cls) \ -+ (G_TYPE_CHECK_CLASS_CAST \ -+ ((cls), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorClass)) -+#define E_IS_CELL_RENDERER_COLOR(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE \ -+ ((obj), E_TYPE_CELL_RENDERER_COLOR)) -+#define E_IS_CELL_RENDERER_COLOR_CLASS(cls) \ -+ (G_TYPE_CHECK_CLASS_TYPE ((cls), E_TYPE_CELL_RENDERER_COLOR)) -+#define E_CELL_RENDERER_COLOR_GET_CLASS(obj) \ -+ (G_TYPE_INSTANCE_GET_CLASS \ -+ ((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorClass)) -+ -+G_BEGIN_DECLS -+ -+typedef struct _ECellRendererColor ECellRendererColor; -+typedef struct _ECellRendererColorClass ECellRendererColorClass; -+typedef struct _ECellRendererColorPrivate ECellRendererColorPrivate; -+ -+/** -+ * ECellRendererColor: -+ * -+ * Since: 2.22 -+ **/ -+struct _ECellRendererColor { -+ GtkCellRenderer parent; -+ ECellRendererColorPrivate *priv; -+}; -+ -+struct _ECellRendererColorClass { -+ GtkCellRendererClass parent_class; -+ -+ /* Padding for future expansion */ -+ void (*_gtk_reserved1) (void); -+ void (*_gtk_reserved2) (void); -+ void (*_gtk_reserved3) (void); -+ void (*_gtk_reserved4) (void); -+}; -+ -+GType e_cell_renderer_color_get_type (void); -+GtkCellRenderer *e_cell_renderer_color_new (void); -+ -+G_END_DECLS -+ -+#endif /* _E_CELL_RENDERER_COLOR_H_ */ -diff --git a/src/event-factories/e-source-selector.c b/src/event-factories/e-source-selector.c -new file mode 100644 -index 0000000..925d9cd ---- /dev/null -+++ b/src/event-factories/e-source-selector.c -@@ -0,0 +1,2080 @@ -+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -+/* e-source-selector.c -+ * -+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this program; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ * Author: Ettore Perazzoli <ettore@ximian.com> -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ -+#include <string.h> -+ -+#include "e-cell-renderer-color.h" -+#include "e-source-selector.h" -+ -+#define E_SOURCE_SELECTOR_GET_PRIVATE(obj) \ -+ (G_TYPE_INSTANCE_GET_PRIVATE \ -+ ((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelectorPrivate)) -+ -+typedef struct _AsyncContext AsyncContext; -+ -+struct _ESourceSelectorPrivate { -+ ESourceRegistry *registry; -+ GHashTable *source_index; -+ gchar *extension_name; -+ -+ GtkTreeRowReference *saved_primary_selection; -+ -+ /* ESource -> GSource */ -+ GHashTable *pending_writes; -+ GMainContext *main_context; -+ -+ gboolean toggled_last; -+ gboolean select_new; -+ gboolean show_colors; -+ gboolean show_toggles; -+}; -+ -+struct _AsyncContext { -+ ESourceSelector *selector; -+ ESource *source; -+}; -+ -+enum { -+ PROP_0, -+ PROP_EXTENSION_NAME, -+ PROP_PRIMARY_SELECTION, -+ PROP_REGISTRY, -+ PROP_SHOW_COLORS, -+ PROP_SHOW_TOGGLES -+}; -+ -+enum { -+ SELECTION_CHANGED, -+ PRIMARY_SELECTION_CHANGED, -+ POPUP_EVENT, -+ DATA_DROPPED, -+ NUM_SIGNALS -+}; -+ -+enum { -+ COLUMN_NAME, -+ COLUMN_COLOR, -+ COLUMN_ACTIVE, -+ COLUMN_SHOW_COLOR, -+ COLUMN_SHOW_TOGGLE, -+ COLUMN_WEIGHT, -+ COLUMN_SOURCE, -+ NUM_COLUMNS -+}; -+ -+static guint signals[NUM_SIGNALS]; -+ -+G_DEFINE_TYPE (ESourceSelector, e_source_selector, GTK_TYPE_TREE_VIEW) -+ -+/* ESafeToggleRenderer does not emit 'toggled' signal -+ * on 'activate' when mouse is not over the toggle. */ -+ -+typedef GtkCellRendererToggle ECellRendererSafeToggle; -+typedef GtkCellRendererToggleClass ECellRendererSafeToggleClass; -+ -+/* Forward Declarations */ -+GType e_cell_renderer_safe_toggle_get_type (void); -+ -+G_DEFINE_TYPE ( -+ ECellRendererSafeToggle, -+ e_cell_renderer_safe_toggle, -+ GTK_TYPE_CELL_RENDERER_TOGGLE) -+ -+static gboolean -+safe_toggle_activate (GtkCellRenderer *cell, -+ GdkEvent *event, -+ GtkWidget *widget, -+ const gchar *path, -+ const GdkRectangle *background_area, -+ const GdkRectangle *cell_area, -+ GtkCellRendererState flags) -+{ -+ gboolean point_in_cell_area = TRUE; -+ -+ if (event->type == GDK_BUTTON_PRESS && cell_area != NULL) { -+ cairo_region_t *region; -+ -+ region = cairo_region_create_rectangle (cell_area); -+ point_in_cell_area = cairo_region_contains_point ( -+ region, event->button.x, event->button.y); -+ cairo_region_destroy (region); -+ } -+ -+ if (!point_in_cell_area) -+ return FALSE; -+ -+ return GTK_CELL_RENDERER_CLASS ( -+ e_cell_renderer_safe_toggle_parent_class)->activate ( -+ cell, event, widget, path, background_area, cell_area, flags); -+} -+ -+static void -+e_cell_renderer_safe_toggle_class_init (ECellRendererSafeToggleClass *class) -+{ -+ GtkCellRendererClass *cell_renderer_class; -+ -+ cell_renderer_class = GTK_CELL_RENDERER_CLASS (class); -+ cell_renderer_class->activate = safe_toggle_activate; -+} -+ -+static void -+e_cell_renderer_safe_toggle_init (ECellRendererSafeToggle *obj) -+{ -+} -+ -+static GtkCellRenderer * -+e_cell_renderer_safe_toggle_new (void) -+{ -+ return g_object_new (e_cell_renderer_safe_toggle_get_type (), NULL); -+} -+ -+static void -+clear_saved_primary_selection (ESourceSelector *selector) -+{ -+ gtk_tree_row_reference_free (selector->priv->saved_primary_selection); -+ selector->priv->saved_primary_selection = NULL; -+} -+ -+static void -+async_context_free (AsyncContext *async_context) -+{ -+ if (async_context->selector != NULL) -+ g_object_unref (async_context->selector); -+ -+ if (async_context->source != NULL) -+ g_object_unref (async_context->source); -+ -+ g_slice_free (AsyncContext, async_context); -+} -+ -+static void -+pending_writes_destroy_source (GSource *source) -+{ -+ g_source_destroy (source); -+ g_source_unref (source); -+} -+ -+static void -+source_selector_write_done_cb (GObject *source_object, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ ESource *source; -+ ESourceSelector *selector; -+ GError *error = NULL; -+ -+ source = E_SOURCE (source_object); -+ selector = E_SOURCE_SELECTOR (user_data); -+ -+ e_source_write_finish (source, result, &error); -+ -+ /* FIXME Display the error in the selector somehow? */ -+ if (error != NULL) { -+ g_warning ("%s: %s", G_STRFUNC, error->message); -+ g_error_free (error); -+ } -+ -+ g_object_unref (selector); -+} -+ -+static gboolean -+source_selector_write_idle_cb (gpointer user_data) -+{ -+ AsyncContext *async_context = user_data; -+ GHashTable *pending_writes; -+ -+ /* XXX This operation is not cancellable. */ -+ e_source_write ( -+ async_context->source, NULL, -+ source_selector_write_done_cb, -+ g_object_ref (async_context->selector)); -+ -+ pending_writes = async_context->selector->priv->pending_writes; -+ g_hash_table_remove (pending_writes, async_context->source); -+ -+ return FALSE; -+} -+ -+static void -+source_selector_cancel_write (ESourceSelector *selector, -+ ESource *source) -+{ -+ GHashTable *pending_writes; -+ -+ /* Cancel any pending writes for this ESource so as not -+ * to overwrite whatever change we're being notified of. */ -+ pending_writes = selector->priv->pending_writes; -+ g_hash_table_remove (pending_writes, source); -+} -+ -+static void -+source_selector_update_row (ESourceSelector *selector, -+ ESource *source) -+{ -+ GHashTable *source_index; -+ ESourceExtension *extension = NULL; -+ GtkTreeRowReference *reference; -+ GtkTreeModel *model; -+ GtkTreePath *path; -+ GtkTreeIter iter; -+ const gchar *extension_name; -+ const gchar *display_name; -+ gboolean selected; -+ -+ source_index = selector->priv->source_index; -+ reference = g_hash_table_lookup (source_index, source); -+ -+ /* This function runs when ANY ESource in the registry changes. -+ * If the ESource is not in our tree model then return silently. */ -+ if (reference == NULL) -+ return; -+ -+ /* If we do have a row reference, it should be valid. */ -+ g_return_if_fail (gtk_tree_row_reference_valid (reference)); -+ -+ model = gtk_tree_row_reference_get_model (reference); -+ path = gtk_tree_row_reference_get_path (reference); -+ gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_path_free (path); -+ -+ display_name = e_source_get_display_name (source); -+ -+ extension_name = e_source_selector_get_extension_name (selector); -+ selected = e_source_selector_source_is_selected (selector, source); -+ -+ if (e_source_has_extension (source, extension_name)) -+ extension = e_source_get_extension (source, extension_name); -+ -+ if (extension != NULL) { -+ GdkColor color; -+ const gchar *color_spec = NULL; -+ gboolean show_color = FALSE; -+ gboolean show_toggle; -+ -+ show_color = -+ E_IS_SOURCE_SELECTABLE (extension) && -+ e_source_selector_get_show_colors (selector); -+ -+ if (show_color) -+ color_spec = e_source_selectable_get_color ( -+ E_SOURCE_SELECTABLE (extension)); -+ -+ if (color_spec != NULL && *color_spec != '\0') -+ show_color = gdk_color_parse (color_spec, &color); -+ -+ show_toggle = e_source_selector_get_show_toggles (selector); -+ -+ gtk_tree_store_set ( -+ GTK_TREE_STORE (model), &iter, -+ COLUMN_NAME, display_name, -+ COLUMN_COLOR, show_color ? &color : NULL, -+ COLUMN_ACTIVE, selected, -+ COLUMN_SHOW_COLOR, show_color, -+ COLUMN_SHOW_TOGGLE, show_toggle, -+ COLUMN_WEIGHT, PANGO_WEIGHT_NORMAL, -+ COLUMN_SOURCE, source, -+ -1); -+ } else { -+ gtk_tree_store_set ( -+ GTK_TREE_STORE (model), &iter, -+ COLUMN_NAME, display_name, -+ COLUMN_COLOR, NULL, -+ COLUMN_ACTIVE, FALSE, -+ COLUMN_SHOW_COLOR, FALSE, -+ COLUMN_SHOW_TOGGLE, FALSE, -+ COLUMN_WEIGHT, PANGO_WEIGHT_BOLD, -+ COLUMN_SOURCE, source, -+ -1); -+ } -+} -+ -+static gboolean -+source_selector_traverse (GNode *node, -+ ESourceSelector *selector) -+{ -+ ESource *source; -+ GHashTable *source_index; -+ GtkTreeRowReference *reference = NULL; -+ GtkTreeModel *model; -+ GtkTreePath *path; -+ GtkTreeIter iter; -+ -+ /* Skip the root node. */ -+ if (G_NODE_IS_ROOT (node)) -+ return FALSE; -+ -+ source_index = selector->priv->source_index; -+ -+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector)); -+ -+ if (node->parent != NULL && node->parent->data != NULL) -+ reference = g_hash_table_lookup ( -+ source_index, node->parent->data); -+ -+ if (gtk_tree_row_reference_valid (reference)) { -+ GtkTreeIter parent; -+ -+ path = gtk_tree_row_reference_get_path (reference); -+ gtk_tree_model_get_iter (model, &parent, path); -+ gtk_tree_path_free (path); -+ -+ gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent); -+ } else -+ gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL); -+ -+ source = E_SOURCE (node->data); -+ -+ path = gtk_tree_model_get_path (model, &iter); -+ reference = gtk_tree_row_reference_new (model, path); -+ g_hash_table_insert (source_index, g_object_ref (source), reference); -+ gtk_tree_path_free (path); -+ -+ source_selector_update_row (selector, source); -+ -+ return FALSE; -+} -+ -+static void -+source_selector_save_expanded (GtkTreeView *tree_view, -+ GtkTreePath *path, -+ GQueue *queue) -+{ -+ GtkTreeModel *model; -+ GtkTreeIter iter; -+ ESource *source; -+ -+ model = gtk_tree_view_get_model (tree_view); -+ gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); -+ g_queue_push_tail (queue, source); -+} -+ -+static void -+source_selector_build_model (ESourceSelector *selector) -+{ -+ ESourceRegistry *registry; -+ GQueue queue = G_QUEUE_INIT; -+ GHashTable *source_index; -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ ESource *selected; -+ const gchar *extension_name; -+ GNode *root; -+ -+ tree_view = GTK_TREE_VIEW (selector); -+ -+ registry = e_source_selector_get_registry (selector); -+ extension_name = e_source_selector_get_extension_name (selector); -+ -+ /* Make sure we have what we need to build the model, since -+ * this can get called early in the initialization phase. */ -+ if (registry == NULL || extension_name == NULL) -+ return; -+ -+ source_index = selector->priv->source_index; -+ selected = e_source_selector_ref_primary_selection (selector); -+ -+ /* Save expanded sources to restore later. */ -+ gtk_tree_view_map_expanded_rows ( -+ tree_view, (GtkTreeViewMappingFunc) -+ source_selector_save_expanded, &queue); -+ -+ model = gtk_tree_view_get_model (tree_view); -+ gtk_tree_store_clear (GTK_TREE_STORE (model)); -+ -+ g_hash_table_remove_all (source_index); -+ -+ root = e_source_registry_build_display_tree (registry, extension_name); -+ -+ g_node_traverse ( -+ root, G_PRE_ORDER, G_TRAVERSE_ALL, -1, -+ (GNodeTraverseFunc) source_selector_traverse, -+ selector); -+ -+ e_source_registry_free_display_tree (root); -+ -+ /* Restore previously expanded sources. */ -+ while (!g_queue_is_empty (&queue)) { -+ GtkTreeRowReference *reference; -+ ESource *source; -+ -+ source = g_queue_pop_head (&queue); -+ reference = g_hash_table_lookup (source_index, source); -+ -+ if (gtk_tree_row_reference_valid (reference)) { -+ GtkTreePath *path; -+ -+ path = gtk_tree_row_reference_get_path (reference); -+ gtk_tree_view_expand_to_path (tree_view, path); -+ gtk_tree_path_free (path); -+ } -+ -+ g_object_unref (source); -+ } -+ -+ /* Restore the primary selection. */ -+ if (selected != NULL) { -+ e_source_selector_set_primary_selection (selector, selected); -+ g_object_unref (selected); -+ } -+ -+ /* Make sure we have a primary selection. If not, pick one. */ -+ selected = e_source_selector_ref_primary_selection (selector); -+ if (selected == NULL) { -+ selected = e_source_registry_ref_default_for_extension_name ( -+ registry, extension_name); -+ e_source_selector_set_primary_selection (selector, selected); -+ } -+ g_object_unref (selected); -+} -+ -+static void -+source_selector_expand_to_source (ESourceSelector *selector, -+ ESource *source) -+{ -+ GHashTable *source_index; -+ GtkTreeRowReference *reference; -+ GtkTreePath *path; -+ -+ source_index = selector->priv->source_index; -+ reference = g_hash_table_lookup (source_index, source); -+ -+ /* If the ESource is not in our tree model then return silently. */ -+ if (reference == NULL) -+ return; -+ -+ /* If we do have a row reference, it should be valid. */ -+ g_return_if_fail (gtk_tree_row_reference_valid (reference)); -+ -+ /* Expand the tree view to the path containing the ESource */ -+ path = gtk_tree_row_reference_get_path (reference); -+ gtk_tree_view_expand_to_path (GTK_TREE_VIEW (selector), path); -+ gtk_tree_path_free (path); -+} -+ -+static void -+source_selector_source_added_cb (ESourceRegistry *registry, -+ ESource *source, -+ ESourceSelector *selector) -+{ -+ source_selector_build_model (selector); -+ -+ source_selector_expand_to_source (selector, source); -+} -+ -+static void -+source_selector_source_changed_cb (ESourceRegistry *registry, -+ ESource *source, -+ ESourceSelector *selector) -+{ -+ source_selector_cancel_write (selector, source); -+ -+ source_selector_update_row (selector, source); -+} -+ -+static void -+source_selector_source_removed_cb (ESourceRegistry *registry, -+ ESource *source, -+ ESourceSelector *selector) -+{ -+ source_selector_build_model (selector); -+} -+ -+static void -+source_selector_source_enabled_cb (ESourceRegistry *registry, -+ ESource *source, -+ ESourceSelector *selector) -+{ -+ source_selector_build_model (selector); -+ -+ source_selector_expand_to_source (selector, source); -+} -+ -+static void -+source_selector_source_disabled_cb (ESourceRegistry *registry, -+ ESource *source, -+ ESourceSelector *selector) -+{ -+ source_selector_build_model (selector); -+} -+ -+static gboolean -+same_source_name_exists (ESourceSelector *selector, -+ const gchar *display_name) -+{ -+ GHashTable *source_index; -+ GHashTableIter iter; -+ gpointer key; -+ -+ source_index = selector->priv->source_index; -+ g_hash_table_iter_init (&iter, source_index); -+ -+ while (g_hash_table_iter_next (&iter, &key, NULL)) { -+ ESource *source = E_SOURCE (key); -+ const gchar *source_name; -+ -+ source_name = e_source_get_display_name (source); -+ if (g_strcmp0 (display_name, source_name) == 0) -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+static gboolean -+selection_func (GtkTreeSelection *selection, -+ GtkTreeModel *model, -+ GtkTreePath *path, -+ gboolean path_currently_selected, -+ ESourceSelector *selector) -+{ -+ ESource *source; -+ GtkTreeIter iter; -+ const gchar *extension_name; -+ -+ if (selector->priv->toggled_last) { -+ selector->priv->toggled_last = FALSE; -+ return FALSE; -+ } -+ -+ if (path_currently_selected) -+ return TRUE; -+ -+ if (!gtk_tree_model_get_iter (model, &iter, path)) -+ return FALSE; -+ -+ extension_name = e_source_selector_get_extension_name (selector); -+ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); -+ -+ if (!e_source_has_extension (source, extension_name)) { -+ g_object_unref (source); -+ return FALSE; -+ } -+ -+ clear_saved_primary_selection (selector); -+ -+ g_object_unref (source); -+ -+ return TRUE; -+} -+ -+static void -+text_cell_edited_cb (ESourceSelector *selector, -+ const gchar *path_string, -+ const gchar *new_name) -+{ -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreePath *path; -+ GtkTreeIter iter; -+ ESource *source; -+ -+ tree_view = GTK_TREE_VIEW (selector); -+ model = gtk_tree_view_get_model (tree_view); -+ path = gtk_tree_path_new_from_string (path_string); -+ -+ gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); -+ gtk_tree_path_free (path); -+ -+ if (new_name == NULL || *new_name == '\0') -+ return; -+ -+ if (same_source_name_exists (selector, new_name)) -+ return; -+ -+ e_source_set_display_name (source, new_name); -+ -+ e_source_selector_queue_write (selector, source); -+} -+ -+static void -+cell_toggled_callback (GtkCellRendererToggle *renderer, -+ const gchar *path_string, -+ ESourceSelector *selector) -+{ -+ ESource *source; -+ GtkTreeModel *model; -+ GtkTreePath *path; -+ GtkTreeIter iter; -+ -+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector)); -+ path = gtk_tree_path_new_from_string (path_string); -+ -+ if (!gtk_tree_model_get_iter (model, &iter, path)) { -+ gtk_tree_path_free (path); -+ return; -+ } -+ -+ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); -+ -+ if (e_source_selector_source_is_selected (selector, source)) -+ e_source_selector_unselect_source (selector, source); -+ else -+ e_source_selector_select_source (selector, source); -+ -+ selector->priv->toggled_last = TRUE; -+ -+ gtk_tree_path_free (path); -+ -+ g_object_unref (source); -+} -+ -+static void -+selection_changed_callback (GtkTreeSelection *selection, -+ ESourceSelector *selector) -+{ -+ g_signal_emit (selector, signals[PRIMARY_SELECTION_CHANGED], 0); -+ g_object_notify (G_OBJECT (selector), "primary-selection"); -+} -+ -+static void -+source_selector_set_extension_name (ESourceSelector *selector, -+ const gchar *extension_name) -+{ -+ g_return_if_fail (extension_name != NULL); -+ g_return_if_fail (selector->priv->extension_name == NULL); -+ -+ selector->priv->extension_name = g_strdup (extension_name); -+} -+ -+static void -+source_selector_set_registry (ESourceSelector *selector, -+ ESourceRegistry *registry) -+{ -+ g_return_if_fail (E_IS_SOURCE_REGISTRY (registry)); -+ g_return_if_fail (selector->priv->registry == NULL); -+ -+ selector->priv->registry = g_object_ref (registry); -+} -+ -+static void -+source_selector_set_property (GObject *object, -+ guint property_id, -+ const GValue *value, -+ GParamSpec *pspec) -+{ -+ switch (property_id) { -+ case PROP_EXTENSION_NAME: -+ source_selector_set_extension_name ( -+ E_SOURCE_SELECTOR (object), -+ g_value_get_string (value)); -+ return; -+ -+ case PROP_PRIMARY_SELECTION: -+ e_source_selector_set_primary_selection ( -+ E_SOURCE_SELECTOR (object), -+ g_value_get_object (value)); -+ return; -+ -+ case PROP_REGISTRY: -+ source_selector_set_registry ( -+ E_SOURCE_SELECTOR (object), -+ g_value_get_object (value)); -+ return; -+ -+ case PROP_SHOW_COLORS: -+ e_source_selector_set_show_colors ( -+ E_SOURCE_SELECTOR (object), -+ g_value_get_boolean (value)); -+ return; -+ -+ case PROP_SHOW_TOGGLES: -+ e_source_selector_set_show_toggles ( -+ E_SOURCE_SELECTOR (object), -+ g_value_get_boolean (value)); -+ return; -+ } -+ -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -+} -+ -+static void -+source_selector_get_property (GObject *object, -+ guint property_id, -+ GValue *value, -+ GParamSpec *pspec) -+{ -+ switch (property_id) { -+ case PROP_EXTENSION_NAME: -+ g_value_set_string ( -+ value, -+ e_source_selector_get_extension_name ( -+ E_SOURCE_SELECTOR (object))); -+ return; -+ -+ case PROP_PRIMARY_SELECTION: -+ g_value_take_object ( -+ value, -+ e_source_selector_ref_primary_selection ( -+ E_SOURCE_SELECTOR (object))); -+ return; -+ -+ case PROP_REGISTRY: -+ g_value_set_object ( -+ value, -+ e_source_selector_get_registry ( -+ E_SOURCE_SELECTOR (object))); -+ return; -+ -+ case PROP_SHOW_COLORS: -+ g_value_set_boolean ( -+ value, -+ e_source_selector_get_show_colors ( -+ E_SOURCE_SELECTOR (object))); -+ return; -+ -+ case PROP_SHOW_TOGGLES: -+ g_value_set_boolean ( -+ value, -+ e_source_selector_get_show_toggles ( -+ E_SOURCE_SELECTOR (object))); -+ return; -+ } -+ -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -+} -+ -+static void -+source_selector_dispose (GObject *object) -+{ -+ ESourceSelectorPrivate *priv; -+ -+ priv = E_SOURCE_SELECTOR_GET_PRIVATE (object); -+ -+ if (priv->registry != NULL) { -+ g_signal_handlers_disconnect_matched ( -+ priv->registry, -+ G_SIGNAL_MATCH_DATA, -+ 0, 0, NULL, NULL, object); -+ g_object_unref (priv->registry); -+ priv->registry = NULL; -+ } -+ -+ g_hash_table_remove_all (priv->source_index); -+ g_hash_table_remove_all (priv->pending_writes); -+ -+ clear_saved_primary_selection (E_SOURCE_SELECTOR (object)); -+ -+ /* Chain up to parent's dispose() method. */ -+ G_OBJECT_CLASS (e_source_selector_parent_class)->dispose (object); -+} -+ -+static void -+source_selector_finalize (GObject *object) -+{ -+ ESourceSelectorPrivate *priv; -+ -+ priv = E_SOURCE_SELECTOR_GET_PRIVATE (object); -+ -+ g_hash_table_destroy (priv->source_index); -+ g_hash_table_destroy (priv->pending_writes); -+ -+ g_free (priv->extension_name); -+ -+ if (priv->main_context != NULL) -+ g_main_context_unref (priv->main_context); -+ -+ /* Chain up to parent's finalize() method. */ -+ G_OBJECT_CLASS (e_source_selector_parent_class)->finalize (object); -+} -+ -+static void -+source_selector_constructed (GObject *object) -+{ -+ ESourceRegistry *registry; -+ ESourceSelector *selector; -+ -+ selector = E_SOURCE_SELECTOR (object); -+ registry = e_source_selector_get_registry (selector); -+ -+ g_signal_connect ( -+ registry, "source-added", -+ G_CALLBACK (source_selector_source_added_cb), selector); -+ -+ g_signal_connect ( -+ registry, "source-changed", -+ G_CALLBACK (source_selector_source_changed_cb), selector); -+ -+ g_signal_connect ( -+ registry, "source-removed", -+ G_CALLBACK (source_selector_source_removed_cb), selector); -+ -+ g_signal_connect ( -+ registry, "source-enabled", -+ G_CALLBACK (source_selector_source_enabled_cb), selector); -+ -+ g_signal_connect ( -+ registry, "source-disabled", -+ G_CALLBACK (source_selector_source_disabled_cb), selector); -+ -+ source_selector_build_model (selector); -+ -+ gtk_tree_view_expand_all (GTK_TREE_VIEW (selector)); -+} -+ -+static gboolean -+source_selector_button_press_event (GtkWidget *widget, -+ GdkEventButton *event) -+{ -+ ESourceSelector *selector; -+ GtkWidgetClass *widget_class; -+ GtkTreePath *path; -+ ESource *source = NULL; -+ ESource *primary; -+ gboolean right_click = FALSE; -+ gboolean triple_click = FALSE; -+ gboolean row_exists; -+ gboolean res = FALSE; -+ -+ selector = E_SOURCE_SELECTOR (widget); -+ -+ selector->priv->toggled_last = FALSE; -+ -+ /* Triple-clicking a source selects it exclusively. */ -+ -+ if (event->button == 3 && event->type == GDK_BUTTON_PRESS) -+ right_click = TRUE; -+ else if (event->button == 1 && event->type == GDK_3BUTTON_PRESS) -+ triple_click = TRUE; -+ else -+ goto chainup; -+ -+ row_exists = gtk_tree_view_get_path_at_pos ( -+ GTK_TREE_VIEW (widget), event->x, event->y, -+ &path, NULL, NULL, NULL); -+ -+ /* Get the source/group */ -+ if (row_exists) { -+ GtkTreeModel *model; -+ GtkTreeIter iter; -+ -+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); -+ -+ gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); -+ } -+ -+ if (source == NULL) -+ goto chainup; -+ -+ primary = e_source_selector_ref_primary_selection (selector); -+ if (source != primary) -+ e_source_selector_set_primary_selection (selector, source); -+ if (primary != NULL) -+ g_object_unref (primary); -+ -+ if (right_click) -+ g_signal_emit ( -+ widget, signals[POPUP_EVENT], 0, source, event, &res); -+ -+ if (triple_click) { -+ e_source_selector_select_exclusive (selector, source); -+ res = TRUE; -+ } -+ -+ g_object_unref (source); -+ -+ return res; -+ -+chainup: -+ -+ /* Chain up to parent's button_press_event() method. */ -+ widget_class = GTK_WIDGET_CLASS (e_source_selector_parent_class); -+ return widget_class->button_press_event (widget, event); -+} -+ -+static void -+source_selector_drag_leave (GtkWidget *widget, -+ GdkDragContext *context, -+ guint time_) -+{ -+ GtkTreeView *tree_view; -+ GtkTreeViewDropPosition pos; -+ -+ tree_view = GTK_TREE_VIEW (widget); -+ pos = GTK_TREE_VIEW_DROP_BEFORE; -+ -+ gtk_tree_view_set_drag_dest_row (tree_view, NULL, pos); -+} -+ -+static gboolean -+source_selector_drag_motion (GtkWidget *widget, -+ GdkDragContext *context, -+ gint x, -+ gint y, -+ guint time_) -+{ -+ ESource *source = NULL; -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreePath *path = NULL; -+ GtkTreeIter iter; -+ GtkTreeViewDropPosition pos; -+ GdkDragAction action = 0; -+ -+ tree_view = GTK_TREE_VIEW (widget); -+ model = gtk_tree_view_get_model (tree_view); -+ -+ if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL)) -+ goto exit; -+ -+ if (!gtk_tree_model_get_iter (model, &iter, path)) -+ goto exit; -+ -+ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); -+ -+ if (!e_source_get_writable (source)) -+ goto exit; -+ -+ pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE; -+ gtk_tree_view_set_drag_dest_row (tree_view, path, pos); -+ -+ if (gdk_drag_context_get_actions (context) & GDK_ACTION_MOVE) -+ action = GDK_ACTION_MOVE; -+ else -+ action = gdk_drag_context_get_suggested_action (context); -+ -+exit: -+ if (path != NULL) -+ gtk_tree_path_free (path); -+ -+ if (source != NULL) -+ g_object_unref (source); -+ -+ gdk_drag_status (context, action, time_); -+ -+ return TRUE; -+} -+ -+static gboolean -+source_selector_drag_drop (GtkWidget *widget, -+ GdkDragContext *context, -+ gint x, -+ gint y, -+ guint time_) -+{ -+ ESource *source; -+ ESourceSelector *selector; -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreePath *path; -+ GtkTreeIter iter; -+ const gchar *extension_name; -+ gboolean drop_zone; -+ gboolean valid; -+ -+ tree_view = GTK_TREE_VIEW (widget); -+ model = gtk_tree_view_get_model (tree_view); -+ -+ if (!gtk_tree_view_get_path_at_pos ( -+ tree_view, x, y, &path, NULL, NULL, NULL)) -+ return FALSE; -+ -+ valid = gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_path_free (path); -+ g_return_val_if_fail (valid, FALSE); -+ -+ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); -+ -+ selector = E_SOURCE_SELECTOR (widget); -+ extension_name = e_source_selector_get_extension_name (selector); -+ drop_zone = e_source_has_extension (source, extension_name); -+ -+ g_object_unref (source); -+ -+ return drop_zone; -+} -+ -+static void -+source_selector_drag_data_received (GtkWidget *widget, -+ GdkDragContext *context, -+ gint x, -+ gint y, -+ GtkSelectionData *selection_data, -+ guint info, -+ guint time_) -+{ -+ ESource *source = NULL; -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreePath *path = NULL; -+ GtkTreeIter iter; -+ GdkDragAction action; -+ gboolean delete; -+ gboolean success = FALSE; -+ -+ tree_view = GTK_TREE_VIEW (widget); -+ model = gtk_tree_view_get_model (tree_view); -+ -+ action = gdk_drag_context_get_selected_action (context); -+ delete = (action == GDK_ACTION_MOVE); -+ -+ if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL)) -+ goto exit; -+ -+ if (!gtk_tree_model_get_iter (model, &iter, path)) -+ goto exit; -+ -+ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); -+ -+ if (!e_source_get_writable (source)) -+ goto exit; -+ -+ g_signal_emit ( -+ widget, signals[DATA_DROPPED], 0, selection_data, -+ source, gdk_drag_context_get_selected_action (context), -+ info, &success); -+ -+exit: -+ if (path != NULL) -+ gtk_tree_path_free (path); -+ -+ if (source != NULL) -+ g_object_unref (source); -+ -+ gtk_drag_finish (context, success, delete, time_); -+} -+ -+static gboolean -+source_selector_popup_menu (GtkWidget *widget) -+{ -+ ESourceSelector *selector; -+ ESource *source; -+ gboolean res = FALSE; -+ -+ selector = E_SOURCE_SELECTOR (widget); -+ source = e_source_selector_ref_primary_selection (selector); -+ g_signal_emit (selector, signals[POPUP_EVENT], 0, source, NULL, &res); -+ -+ if (source != NULL) -+ g_object_unref (source); -+ -+ return res; -+} -+ -+static gboolean -+source_selector_test_collapse_row (GtkTreeView *tree_view, -+ GtkTreeIter *iter, -+ GtkTreePath *path) -+{ -+ ESourceSelectorPrivate *priv; -+ GtkTreeSelection *selection; -+ GtkTreeModel *model; -+ GtkTreeIter child_iter; -+ -+ priv = E_SOURCE_SELECTOR_GET_PRIVATE (tree_view); -+ -+ /* Clear this because something else has been clicked on now */ -+ priv->toggled_last = FALSE; -+ -+ if (priv->saved_primary_selection) -+ return FALSE; -+ -+ selection = gtk_tree_view_get_selection (tree_view); -+ -+ if (!gtk_tree_selection_get_selected (selection, &model, &child_iter)) -+ return FALSE; -+ -+ if (gtk_tree_store_is_ancestor (GTK_TREE_STORE (model), iter, &child_iter)) { -+ GtkTreeRowReference *reference; -+ GtkTreePath *child_path; -+ -+ child_path = gtk_tree_model_get_path (model, &child_iter); -+ reference = gtk_tree_row_reference_new (model, child_path); -+ priv->saved_primary_selection = reference; -+ gtk_tree_path_free (child_path); -+ } -+ -+ return FALSE; -+} -+ -+static void -+source_selector_row_expanded (GtkTreeView *tree_view, -+ GtkTreeIter *iter, -+ GtkTreePath *path) -+{ -+ ESourceSelectorPrivate *priv; -+ GtkTreeModel *model; -+ GtkTreePath *child_path; -+ GtkTreeIter child_iter; -+ -+ priv = E_SOURCE_SELECTOR_GET_PRIVATE (tree_view); -+ -+ if (!priv->saved_primary_selection) -+ return; -+ -+ model = gtk_tree_view_get_model (tree_view); -+ -+ child_path = gtk_tree_row_reference_get_path ( -+ priv->saved_primary_selection); -+ gtk_tree_model_get_iter (model, &child_iter, child_path); -+ -+ if (gtk_tree_store_is_ancestor (GTK_TREE_STORE (model), iter, &child_iter)) { -+ GtkTreeSelection *selection; -+ -+ selection = gtk_tree_view_get_selection (tree_view); -+ gtk_tree_selection_select_iter (selection, &child_iter); -+ -+ clear_saved_primary_selection (E_SOURCE_SELECTOR (tree_view)); -+ } -+ -+ gtk_tree_path_free (child_path); -+} -+ -+static gboolean -+source_selector_get_source_selected (ESourceSelector *selector, -+ ESource *source) -+{ -+ ESourceSelectable *extension; -+ const gchar *extension_name; -+ gboolean selected = TRUE; -+ -+ extension_name = e_source_selector_get_extension_name (selector); -+ -+ if (!e_source_has_extension (source, extension_name)) -+ return FALSE; -+ -+ extension = e_source_get_extension (source, extension_name); -+ -+ if (E_IS_SOURCE_SELECTABLE (extension)) -+ selected = e_source_selectable_get_selected (extension); -+ -+ return selected; -+} -+ -+static void -+source_selector_set_source_selected (ESourceSelector *selector, -+ ESource *source, -+ gboolean selected) -+{ -+ ESourceSelectable *extension; -+ const gchar *extension_name; -+ -+ extension_name = e_source_selector_get_extension_name (selector); -+ -+ if (!e_source_has_extension (source, extension_name)) -+ return; -+ -+ extension = e_source_get_extension (source, extension_name); -+ -+ if (!E_IS_SOURCE_SELECTABLE (extension)) -+ return; -+ -+ if (selected != e_source_selectable_get_selected (extension)) { -+ e_source_selectable_set_selected (extension, selected); -+ e_source_selector_queue_write (selector, source); -+ } -+} -+ -+static gboolean -+ess_bool_accumulator (GSignalInvocationHint *ihint, -+ GValue *out, -+ const GValue *in, -+ gpointer data) -+{ -+ gboolean v_boolean; -+ -+ v_boolean = g_value_get_boolean (in); -+ g_value_set_boolean (out, v_boolean); -+ -+ return !v_boolean; -+} -+ -+static void -+e_source_selector_class_init (ESourceSelectorClass *class) -+{ -+ GObjectClass *object_class; -+ GtkWidgetClass *widget_class; -+ GtkTreeViewClass *tree_view_class; -+ -+ g_type_class_add_private (class, sizeof (ESourceSelectorPrivate)); -+ -+ object_class = G_OBJECT_CLASS (class); -+ object_class->set_property = source_selector_set_property; -+ object_class->get_property = source_selector_get_property; -+ object_class->dispose = source_selector_dispose; -+ object_class->finalize = source_selector_finalize; -+ object_class->constructed = source_selector_constructed; -+ -+ widget_class = GTK_WIDGET_CLASS (class); -+ widget_class->button_press_event = source_selector_button_press_event; -+ widget_class->drag_leave = source_selector_drag_leave; -+ widget_class->drag_motion = source_selector_drag_motion; -+ widget_class->drag_drop = source_selector_drag_drop; -+ widget_class->drag_data_received = source_selector_drag_data_received; -+ widget_class->popup_menu = source_selector_popup_menu; -+ -+ tree_view_class = GTK_TREE_VIEW_CLASS (class); -+ tree_view_class->test_collapse_row = source_selector_test_collapse_row; -+ tree_view_class->row_expanded = source_selector_row_expanded; -+ -+ class->get_source_selected = source_selector_get_source_selected; -+ class->set_source_selected = source_selector_set_source_selected; -+ -+ g_object_class_install_property ( -+ object_class, -+ PROP_EXTENSION_NAME, -+ g_param_spec_string ( -+ "extension-name", -+ NULL, -+ NULL, -+ NULL, -+ G_PARAM_READWRITE | -+ G_PARAM_CONSTRUCT_ONLY | -+ G_PARAM_STATIC_STRINGS)); -+ -+ g_object_class_install_property ( -+ object_class, -+ PROP_PRIMARY_SELECTION, -+ g_param_spec_object ( -+ "primary-selection", -+ NULL, -+ NULL, -+ E_TYPE_SOURCE, -+ G_PARAM_READWRITE | -+ G_PARAM_STATIC_STRINGS)); -+ -+ g_object_class_install_property ( -+ object_class, -+ PROP_REGISTRY, -+ g_param_spec_object ( -+ "registry", -+ NULL, -+ NULL, -+ E_TYPE_SOURCE_REGISTRY, -+ G_PARAM_READWRITE | -+ G_PARAM_CONSTRUCT_ONLY | -+ G_PARAM_STATIC_STRINGS)); -+ -+ g_object_class_install_property ( -+ object_class, -+ PROP_SHOW_COLORS, -+ g_param_spec_boolean ( -+ "show-colors", -+ NULL, -+ NULL, -+ TRUE, -+ G_PARAM_READWRITE | -+ G_PARAM_STATIC_STRINGS)); -+ -+ g_object_class_install_property ( -+ object_class, -+ PROP_SHOW_TOGGLES, -+ g_param_spec_boolean ( -+ "show-toggles", -+ NULL, -+ NULL, -+ TRUE, -+ G_PARAM_READWRITE | -+ G_PARAM_STATIC_STRINGS)); -+ -+ signals[SELECTION_CHANGED] = g_signal_new ( -+ "selection-changed", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (ESourceSelectorClass, selection_changed), -+ NULL, NULL, NULL, -+ G_TYPE_NONE, 0); -+ -+ /* XXX Consider this signal deprecated. Connect -+ * to "notify::primary-selection" instead. */ -+ signals[PRIMARY_SELECTION_CHANGED] = g_signal_new ( -+ "primary-selection-changed", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (ESourceSelectorClass, primary_selection_changed), -+ NULL, NULL, NULL, -+ G_TYPE_NONE, 0); -+ -+ signals[POPUP_EVENT] = g_signal_new ( -+ "popup-event", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (ESourceSelectorClass, popup_event), -+ ess_bool_accumulator, NULL, NULL, -+ G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT, -+ GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); -+ -+ signals[DATA_DROPPED] = g_signal_new ( -+ "data-dropped", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (ESourceSelectorClass, data_dropped), -+ NULL, NULL, NULL, -+ G_TYPE_BOOLEAN, 4, -+ GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE, -+ E_TYPE_SOURCE, -+ GDK_TYPE_DRAG_ACTION, -+ G_TYPE_UINT); -+} -+ -+static void -+e_source_selector_init (ESourceSelector *selector) -+{ -+ GHashTable *pending_writes; -+ GtkTreeViewColumn *column; -+ GtkTreeSelection *selection; -+ GtkCellRenderer *renderer; -+ GtkTreeStore *tree_store; -+ GtkTreeView *tree_view; -+ -+ pending_writes = g_hash_table_new_full ( -+ (GHashFunc) g_direct_hash, -+ (GEqualFunc) g_direct_equal, -+ (GDestroyNotify) g_object_unref, -+ (GDestroyNotify) pending_writes_destroy_source); -+ -+ selector->priv = E_SOURCE_SELECTOR_GET_PRIVATE (selector); -+ -+ selector->priv->pending_writes = pending_writes; -+ -+ selector->priv->main_context = g_main_context_get_thread_default (); -+ if (selector->priv->main_context != NULL) -+ g_main_context_ref (selector->priv->main_context); -+ -+ tree_view = GTK_TREE_VIEW (selector); -+ -+ gtk_tree_view_set_search_column (tree_view, COLUMN_SOURCE); -+ gtk_tree_view_set_enable_search (tree_view, TRUE); -+ -+ selector->priv->toggled_last = FALSE; -+ selector->priv->select_new = FALSE; -+ selector->priv->show_colors = TRUE; -+ selector->priv->show_toggles = TRUE; -+ -+ selector->priv->source_index = g_hash_table_new_full ( -+ (GHashFunc) e_source_hash, -+ (GEqualFunc) e_source_equal, -+ (GDestroyNotify) g_object_unref, -+ (GDestroyNotify) gtk_tree_row_reference_free); -+ -+ tree_store = gtk_tree_store_new ( -+ NUM_COLUMNS, -+ G_TYPE_STRING, /* COLUMN_NAME */ -+ GDK_TYPE_COLOR, /* COLUMN_COLOR */ -+ G_TYPE_BOOLEAN, /* COLUMN_ACTIVE */ -+ G_TYPE_BOOLEAN, /* COLUMN_SHOW_COLOR */ -+ G_TYPE_BOOLEAN, /* COLUMN_SHOW_TOGGLE */ -+ G_TYPE_INT, /* COLUMN_WEIGHT */ -+ E_TYPE_SOURCE); /* COLUMN_SOURCE */ -+ -+ gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (tree_store)); -+ -+ column = gtk_tree_view_column_new (); -+ gtk_tree_view_append_column (tree_view, column); -+ -+ renderer = e_cell_renderer_color_new (); -+ g_object_set ( -+ G_OBJECT (renderer), "mode", -+ GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL); -+ gtk_tree_view_column_pack_start (column, renderer, FALSE); -+ gtk_tree_view_column_add_attribute ( -+ column, renderer, "color", COLUMN_COLOR); -+ gtk_tree_view_column_add_attribute ( -+ column, renderer, "visible", COLUMN_SHOW_COLOR); -+ -+ renderer = e_cell_renderer_safe_toggle_new (); -+ gtk_tree_view_column_pack_start (column, renderer, FALSE); -+ gtk_tree_view_column_add_attribute ( -+ column, renderer, "active", COLUMN_ACTIVE); -+ gtk_tree_view_column_add_attribute ( -+ column, renderer, "visible", COLUMN_SHOW_TOGGLE); -+ g_signal_connect ( -+ renderer, "toggled", -+ G_CALLBACK (cell_toggled_callback), selector); -+ -+ renderer = gtk_cell_renderer_text_new (); -+ g_object_set ( -+ G_OBJECT (renderer), -+ "ellipsize", PANGO_ELLIPSIZE_END, NULL); -+ g_signal_connect_swapped ( -+ renderer, "edited", -+ G_CALLBACK (text_cell_edited_cb), selector); -+ gtk_tree_view_column_pack_start (column, renderer, TRUE); -+ gtk_tree_view_column_set_attributes ( -+ column, renderer, -+ "text", COLUMN_NAME, -+ "weight", COLUMN_WEIGHT, -+ NULL); -+ -+ selection = gtk_tree_view_get_selection (tree_view); -+ gtk_tree_selection_set_select_function ( -+ selection, (GtkTreeSelectionFunc) -+ selection_func, selector, NULL); -+ g_signal_connect_object ( -+ selection, "changed", -+ G_CALLBACK (selection_changed_callback), -+ G_OBJECT (selector), 0); -+ -+ gtk_tree_view_set_headers_visible (tree_view, FALSE); -+} -+ -+/** -+ * e_source_selector_new: -+ * @registry: an #ESourceRegistry -+ * @extension_name: the name of an #ESource extension -+ * -+ * Displays a list of sources from @registry having an extension named -+ * @extension_name. The sources are grouped by backend or groupware -+ * account, which are described by the parent source. -+ * -+ * Returns: a new #ESourceSelector -+ **/ -+GtkWidget * -+e_source_selector_new (ESourceRegistry *registry, -+ const gchar *extension_name) -+{ -+ g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), NULL); -+ g_return_val_if_fail (extension_name != NULL, NULL); -+ -+ return g_object_new ( -+ E_TYPE_SOURCE_SELECTOR, "registry", registry, -+ "extension-name", extension_name, NULL); -+} -+ -+/** -+ * e_source_selector_get_registry: -+ * @selector: an #ESourceSelector -+ * -+ * Returns the #ESourceRegistry that @selector is getting sources from. -+ * -+ * Returns: an #ESourceRegistry -+ * -+ * Since: 3.6 -+ **/ -+ESourceRegistry * -+e_source_selector_get_registry (ESourceSelector *selector) -+{ -+ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL); -+ -+ return selector->priv->registry; -+} -+ -+/** -+ * e_source_selector_get_extension_name: -+ * @selector: an #ESourceSelector -+ * -+ * Returns the extension name used to filter which sources are displayed. -+ * -+ * Returns: the #ESource extension name -+ * -+ * Since: 3.6 -+ **/ -+const gchar * -+e_source_selector_get_extension_name (ESourceSelector *selector) -+{ -+ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL); -+ -+ return selector->priv->extension_name; -+} -+ -+/** -+ * e_source_selector_get_show_colors: -+ * @selector: an #ESourceSelector -+ * -+ * Returns whether colors are shown next to data sources. -+ * -+ * Returns: %TRUE if colors are being shown -+ * -+ * Since: 3.6 -+ **/ -+gboolean -+e_source_selector_get_show_colors (ESourceSelector *selector) -+{ -+ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE); -+ -+ return selector->priv->show_colors; -+} -+ -+/** -+ * e_source_selector_set_show_colors: -+ * @selector: an #ESourceSelector -+ * @show_colors: whether to show colors -+ * -+ * Sets whether to show colors next to data sources. -+ * -+ * Since: 3.6 -+ **/ -+void -+e_source_selector_set_show_colors (ESourceSelector *selector, -+ gboolean show_colors) -+{ -+ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); -+ -+ if ((show_colors ? 1 : 0) == (selector->priv->show_colors ? 1 : 0)) -+ return; -+ -+ selector->priv->show_colors = show_colors; -+ -+ g_object_notify (G_OBJECT (selector), "show-colors"); -+ -+ source_selector_build_model (selector); -+} -+ -+/** -+ * e_source_selector_get_show_toggles: -+ * @selector: an #ESourceSelector -+ * -+ * Returns whether toggles are shown next to data sources. -+ * -+ * Returns: %TRUE if toggles are being shown -+ * -+ * Since: 3.6 -+ **/ -+gboolean -+e_source_selector_get_show_toggles (ESourceSelector *selector) -+{ -+ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE); -+ -+ return selector->priv->show_toggles; -+} -+ -+/** -+ * e_source_selector_set_show_toggles: -+ * @selector: an #ESourceSelector -+ * @show_toggles: whether to show toggles -+ * -+ * Sets whether to show toggles next to data sources. -+ * -+ * Since: 3.6 -+ **/ -+void -+e_source_selector_set_show_toggles (ESourceSelector *selector, -+ gboolean show_toggles) -+{ -+ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); -+ -+ if ((show_toggles ? 1 : 0) == (selector->priv->show_toggles ? 1 : 0)) -+ return; -+ -+ selector->priv->show_toggles = show_toggles; -+ -+ g_object_notify (G_OBJECT (selector), "show-toggles"); -+ -+ source_selector_build_model (selector); -+} -+ -+/* Helper for e_source_selector_get_selection() */ -+static gboolean -+source_selector_check_selected (GtkTreeModel *model, -+ GtkTreePath *path, -+ GtkTreeIter *iter, -+ gpointer user_data) -+{ -+ ESource *source; -+ -+ struct { -+ ESourceSelector *selector; -+ GSList *list; -+ } *closure = user_data; -+ -+ gtk_tree_model_get (model, iter, COLUMN_SOURCE, &source, -1); -+ -+ if (e_source_selector_source_is_selected (closure->selector, source)) -+ closure->list = g_slist_prepend (closure->list, source); -+ else -+ g_object_unref (source); -+ -+ return FALSE; -+} -+ -+/** -+ * e_source_selector_get_selection: -+ * @selector: an #ESourceSelector -+ * -+ * Get the list of selected sources, i.e. those that were enabled through the -+ * corresponding checkboxes in the tree. -+ * -+ * Returns: A list of the ESources currently selected. The sources will -+ * be in the same order as they appear on the screen, and the list should be -+ * freed using e_source_selector_free_selection(). -+ **/ -+GSList * -+e_source_selector_get_selection (ESourceSelector *selector) -+{ -+ struct { -+ ESourceSelector *selector; -+ GSList *list; -+ } closure; -+ -+ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL); -+ -+ closure.selector = selector; -+ closure.list = NULL; -+ -+ gtk_tree_model_foreach ( -+ gtk_tree_view_get_model (GTK_TREE_VIEW (selector)), -+ (GtkTreeModelForeachFunc) source_selector_check_selected, -+ &closure); -+ -+ return g_slist_reverse (closure.list); -+} -+ -+/** -+ * e_source_list_free_selection: -+ * @list: A selection list returned by e_source_selector_get_selection(). -+ * -+ * Free the selection list. -+ **/ -+void -+e_source_selector_free_selection (GSList *list) -+{ -+ g_slist_foreach (list, (GFunc) g_object_unref, NULL); -+ g_slist_free (list); -+} -+ -+/** -+ * e_source_selector_set_select_new: -+ * @selector: An #ESourceSelector widget -+ * @state: A gboolean -+ * -+ * Set whether or not to select new sources added to @selector. -+ **/ -+void -+e_source_selector_set_select_new (ESourceSelector *selector, -+ gboolean state) -+{ -+ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); -+ -+ selector->priv->select_new = state; -+} -+ -+/** -+ * e_source_selector_select_source: -+ * @selector: An #ESourceSelector widget -+ * @source: An #ESource. -+ * -+ * Select @source in @selector. -+ **/ -+void -+e_source_selector_select_source (ESourceSelector *selector, -+ ESource *source) -+{ -+ ESourceSelectorClass *class; -+ GtkTreeRowReference *reference; -+ GHashTable *source_index; -+ -+ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); -+ g_return_if_fail (E_IS_SOURCE (source)); -+ -+ /* Make sure the ESource is in our tree model. */ -+ source_index = selector->priv->source_index; -+ reference = g_hash_table_lookup (source_index, source); -+ g_return_if_fail (gtk_tree_row_reference_valid (reference)); -+ -+ class = E_SOURCE_SELECTOR_GET_CLASS (selector); -+ g_return_if_fail (class->set_source_selected != NULL); -+ -+ class->set_source_selected (selector, source, TRUE); -+ -+ g_signal_emit (selector, signals[SELECTION_CHANGED], 0); -+} -+ -+/** -+ * e_source_selector_unselect_source: -+ * @selector: An #ESourceSelector widget -+ * @source: An #ESource. -+ * -+ * Unselect @source in @selector. -+ **/ -+void -+e_source_selector_unselect_source (ESourceSelector *selector, -+ ESource *source) -+{ -+ ESourceSelectorClass *class; -+ GtkTreeRowReference *reference; -+ GHashTable *source_index; -+ -+ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); -+ g_return_if_fail (E_IS_SOURCE (source)); -+ -+ /* Make sure the ESource is in our tree model. */ -+ source_index = selector->priv->source_index; -+ reference = g_hash_table_lookup (source_index, source); -+ g_return_if_fail (gtk_tree_row_reference_valid (reference)); -+ -+ class = E_SOURCE_SELECTOR_GET_CLASS (selector); -+ g_return_if_fail (class->set_source_selected != NULL); -+ -+ class->set_source_selected (selector, source, FALSE); -+ -+ g_signal_emit (selector, signals[SELECTION_CHANGED], 0); -+} -+ -+/** -+ * e_source_selector_select_exclusive: -+ * @selector: An #ESourceSelector widget -+ * @source: An #ESource. -+ * -+ * Select @source in @selector and unselect all others. -+ * -+ * Since: 2.30 -+ **/ -+void -+e_source_selector_select_exclusive (ESourceSelector *selector, -+ ESource *source) -+{ -+ ESourceSelectorClass *class; -+ GHashTable *source_index; -+ GHashTableIter iter; -+ gpointer key; -+ -+ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); -+ g_return_if_fail (E_IS_SOURCE (source)); -+ -+ class = E_SOURCE_SELECTOR_GET_CLASS (selector); -+ g_return_if_fail (class->set_source_selected != NULL); -+ -+ source_index = selector->priv->source_index; -+ g_hash_table_iter_init (&iter, source_index); -+ -+ while (g_hash_table_iter_next (&iter, &key, NULL)) { -+ gboolean selected = e_source_equal (key, source); -+ class->set_source_selected (selector, key, selected); -+ } -+ -+ g_signal_emit (selector, signals[SELECTION_CHANGED], 0); -+} -+ -+/** -+ * e_source_selector_source_is_selected: -+ * @selector: An #ESourceSelector widget -+ * @source: An #ESource. -+ * -+ * Check whether @source is selected in @selector. -+ * -+ * Returns: %TRUE if @source is currently selected, %FALSE otherwise. -+ **/ -+gboolean -+e_source_selector_source_is_selected (ESourceSelector *selector, -+ ESource *source) -+{ -+ ESourceSelectorClass *class; -+ GtkTreeRowReference *reference; -+ GHashTable *source_index; -+ -+ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE); -+ g_return_val_if_fail (E_IS_SOURCE (source), FALSE); -+ -+ /* Make sure the ESource is in our tree model. */ -+ source_index = selector->priv->source_index; -+ reference = g_hash_table_lookup (source_index, source); -+ g_return_val_if_fail (gtk_tree_row_reference_valid (reference), FALSE); -+ -+ class = E_SOURCE_SELECTOR_GET_CLASS (selector); -+ g_return_val_if_fail (class->get_source_selected != NULL, FALSE); -+ -+ return class->get_source_selected (selector, source); -+} -+ -+/** -+ * e_source_selector_edit_primary_selection: -+ * @selector: An #ESourceSelector widget -+ * -+ * Allows the user to rename the primary selected source by opening an -+ * entry box directly in @selector. -+ * -+ * Since: 2.26 -+ **/ -+void -+e_source_selector_edit_primary_selection (ESourceSelector *selector) -+{ -+ GtkTreeRowReference *reference; -+ GtkTreeSelection *selection; -+ GtkTreeViewColumn *column; -+ GtkCellRenderer *renderer; -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreePath *path = NULL; -+ GtkTreeIter iter; -+ GList *list; -+ -+ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); -+ -+ tree_view = GTK_TREE_VIEW (selector); -+ column = gtk_tree_view_get_column (tree_view, 0); -+ reference = selector->priv->saved_primary_selection; -+ selection = gtk_tree_view_get_selection (tree_view); -+ -+ if (reference != NULL) -+ path = gtk_tree_row_reference_get_path (reference); -+ else if (gtk_tree_selection_get_selected (selection, &model, &iter)) -+ path = gtk_tree_model_get_path (model, &iter); -+ -+ if (path == NULL) -+ return; -+ -+ /* XXX Because we stuff three renderers in a single column, -+ * we have to manually hunt for the text renderer. */ -+ renderer = NULL; -+ list = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column)); -+ while (list != NULL) { -+ renderer = list->data; -+ if (GTK_IS_CELL_RENDERER_TEXT (renderer)) -+ break; -+ list = g_list_delete_link (list, list); -+ } -+ g_list_free (list); -+ -+ /* Make the text cell renderer editable, but only temporarily. -+ * We don't want editing to be activated by simply clicking on -+ * the source name. Too easy for accidental edits to occur. */ -+ g_object_set (renderer, "editable", TRUE, NULL); -+ gtk_tree_view_expand_to_path (tree_view, path); -+ gtk_tree_view_set_cursor_on_cell ( -+ tree_view, path, column, renderer, TRUE); -+ g_object_set (renderer, "editable", FALSE, NULL); -+ -+ gtk_tree_path_free (path); -+} -+ -+/** -+ * e_source_selector_ref_primary_selection: -+ * @selector: An #ESourceSelector widget -+ * -+ * Get the primary selected source. The primary selection is the one that is -+ * highlighted through the normal #GtkTreeView selection mechanism (as opposed -+ * to the "normal" selection, which is the set of source whose checkboxes are -+ * checked). -+ * -+ * The returned #ESource is referenced for thread-safety and must be -+ * unreferenced with g_object_unref() when finished with it. -+ * -+ * Returns: The selected source. -+ * -+ * Since: 3.6 -+ **/ -+ESource * -+e_source_selector_ref_primary_selection (ESourceSelector *selector) -+{ -+ ESource *source; -+ GtkTreeRowReference *reference; -+ GtkTreeSelection *selection; -+ GtkTreeView *tree_view; -+ GtkTreeModel *model; -+ GtkTreeIter iter; -+ const gchar *extension_name; -+ gboolean have_iter = FALSE; -+ -+ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL); -+ -+ tree_view = GTK_TREE_VIEW (selector); -+ model = gtk_tree_view_get_model (tree_view); -+ selection = gtk_tree_view_get_selection (tree_view); -+ -+ reference = selector->priv->saved_primary_selection; -+ -+ if (gtk_tree_row_reference_valid (reference)) { -+ GtkTreePath *path; -+ -+ path = gtk_tree_row_reference_get_path (reference); -+ have_iter = gtk_tree_model_get_iter (model, &iter, path); -+ gtk_tree_path_free (path); -+ } -+ -+ if (!have_iter) -+ have_iter = gtk_tree_selection_get_selected ( -+ selection, NULL, &iter); -+ -+ if (!have_iter) -+ return NULL; -+ -+ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); -+ -+ extension_name = e_source_selector_get_extension_name (selector); -+ -+ if (!e_source_has_extension (source, extension_name)) { -+ g_object_unref (source); -+ return NULL; -+ } -+ -+ return source; -+} -+ -+/** -+ * e_source_selector_set_primary_selection: -+ * @selector: an #ESourceSelector widget -+ * @source: an #ESource to select -+ * -+ * Highlights @source in @selector. The highlighted #ESource is called -+ * the primary selection. -+ * -+ * Do not confuse this function with e_source_selector_select_source(), -+ * which activates the check box next to an #ESource's display name in -+ * @selector. This function does not alter the check box. -+ **/ -+void -+e_source_selector_set_primary_selection (ESourceSelector *selector, -+ ESource *source) -+{ -+ GHashTable *source_index; -+ GtkTreeRowReference *reference; -+ GtkTreeSelection *selection; -+ GtkTreeView *tree_view; -+ GtkTreePath *child_path; -+ GtkTreePath *parent_path; -+ const gchar *extension_name; -+ -+ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); -+ g_return_if_fail (E_IS_SOURCE (source)); -+ -+ tree_view = GTK_TREE_VIEW (selector); -+ selection = gtk_tree_view_get_selection (tree_view); -+ -+ source_index = selector->priv->source_index; -+ reference = g_hash_table_lookup (source_index, source); -+ -+ /* XXX Maybe we should return a success/fail boolean? */ -+ if (!gtk_tree_row_reference_valid (reference)) -+ return; -+ -+ extension_name = e_source_selector_get_extension_name (selector); -+ -+ /* Return silently if attempting to select a parent node -+ * lacking the expected extension (e.g. On This Computer). */ -+ if (!e_source_has_extension (source, extension_name)) -+ return; -+ -+ /* We block the signal because this all needs to be atomic */ -+ g_signal_handlers_block_matched ( -+ selection, G_SIGNAL_MATCH_FUNC, -+ 0, 0, NULL, selection_changed_callback, NULL); -+ gtk_tree_selection_unselect_all (selection); -+ g_signal_handlers_unblock_matched ( -+ selection, G_SIGNAL_MATCH_FUNC, -+ 0, 0, NULL, selection_changed_callback, NULL); -+ -+ clear_saved_primary_selection (selector); -+ -+ child_path = gtk_tree_row_reference_get_path (reference); -+ -+ parent_path = gtk_tree_path_copy (child_path); -+ gtk_tree_path_up (parent_path); -+ -+ if (gtk_tree_view_row_expanded (tree_view, parent_path)) { -+ gtk_tree_selection_select_path (selection, child_path); -+ } else { -+ selector->priv->saved_primary_selection = -+ gtk_tree_row_reference_copy (reference); -+ g_signal_emit (selector, signals[PRIMARY_SELECTION_CHANGED], 0); -+ g_object_notify (G_OBJECT (selector), "primary-selection"); -+ } -+ -+ gtk_tree_path_free (child_path); -+ gtk_tree_path_free (parent_path); -+} -+ -+/** -+ * e_source_selector_ref_source_by_path: -+ * @selector: an #ESourceSelector -+ * @path: a #GtkTreePath -+ * -+ * Returns the #ESource object at @path, or %NULL if @path is invalid. -+ * -+ * The returned #ESource is referenced for thread-safety and must be -+ * unreferenced with g_object_unref() when finished with it. -+ * -+ * Returns: the #ESource object at @path, or %NULL -+ * -+ * Since: 3.6 -+ **/ -+ESource * -+e_source_selector_ref_source_by_path (ESourceSelector *selector, -+ GtkTreePath *path) -+{ -+ ESource *source = NULL; -+ GtkTreeModel *model; -+ GtkTreeIter iter; -+ -+ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL); -+ g_return_val_if_fail (path != NULL, NULL); -+ -+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector)); -+ -+ if (gtk_tree_model_get_iter (model, &iter, path)) -+ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); -+ -+ return source; -+} -+ -+/** -+ * e_source_selector_queue_write: -+ * @selector: an #ESourceSelecetor -+ * @source: an #ESource with changes to be written -+ * -+ * Queues a main loop idle callback to write changes to @source back to -+ * the D-Bus registry service. -+ * -+ * Since: 3.6 -+ **/ -+void -+e_source_selector_queue_write (ESourceSelector *selector, -+ ESource *source) -+{ -+ GSource *idle_source; -+ GHashTable *pending_writes; -+ GMainContext *main_context; -+ AsyncContext *async_context; -+ -+ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); -+ g_return_if_fail (E_IS_SOURCE (source)); -+ -+ main_context = selector->priv->main_context; -+ pending_writes = selector->priv->pending_writes; -+ -+ idle_source = g_hash_table_lookup (pending_writes, source); -+ if (idle_source != NULL && !g_source_is_destroyed (idle_source)) -+ return; -+ -+ async_context = g_slice_new0 (AsyncContext); -+ async_context->selector = g_object_ref (selector); -+ async_context->source = g_object_ref (source); -+ -+ /* Set a higher priority so this idle source runs before our -+ * source_selector_cancel_write() signal handler, which will -+ * cancel this idle source. Cancellation is the right thing -+ * to do when receiving changes from OTHER registry clients, -+ * but we don't want to cancel our own changes. -+ * -+ * XXX This might be an argument for using etags. -+ */ -+ idle_source = g_idle_source_new (); -+ g_hash_table_insert ( -+ pending_writes, -+ g_object_ref (source), -+ g_source_ref (idle_source)); -+ g_source_set_callback ( -+ idle_source, -+ source_selector_write_idle_cb, -+ async_context, -+ (GDestroyNotify) async_context_free); -+ g_source_set_priority (idle_source, G_PRIORITY_HIGH_IDLE); -+ g_source_attach (idle_source, main_context); -+ g_source_unref (idle_source); -+} -+ -diff --git a/src/event-factories/e-source-selector.h b/src/event-factories/e-source-selector.h -new file mode 100644 -index 0000000..b6d3770 ---- /dev/null -+++ b/src/event-factories/e-source-selector.h -@@ -0,0 +1,137 @@ -+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -+/* e-source-selector.h -+ * -+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this program; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ * Author: Ettore Perazzoli <ettore@ximian.com> -+ */ -+ -+#ifndef E_SOURCE_SELECTOR_H -+#define E_SOURCE_SELECTOR_H -+ -+#include <gtk/gtk.h> -+#include <libedataserver/libedataserver.h> -+ -+/* Standard GObject macros */ -+#define E_TYPE_SOURCE_SELECTOR \ -+ (e_source_selector_get_type ()) -+#define E_SOURCE_SELECTOR(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST \ -+ ((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelector)) -+#define E_SOURCE_SELECTOR_CLASS(cls) \ -+ (G_TYPE_CHECK_CLASS_CAST \ -+ ((cls), E_TYPE_SOURCE_SELECTOR, ESourceSelectorClass)) -+#define E_IS_SOURCE_SELECTOR(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE \ -+ ((obj), E_TYPE_SOURCE_SELECTOR)) -+#define E_IS_SOURCE_SELECTOR_CLASS(cls) \ -+ (G_TYPE_CHECK_CLASS_TYPE \ -+ ((cls), E_TYPE_SOURCE_SELECTOR)) -+#define E_SOURCE_SELECTOR_GET_CLASS(obj) \ -+ (G_TYPE_INSTANCE_GET_CLASS \ -+ ((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelectorClass)) -+ -+G_BEGIN_DECLS -+ -+typedef struct _ESourceSelector ESourceSelector; -+typedef struct _ESourceSelectorClass ESourceSelectorClass; -+typedef struct _ESourceSelectorPrivate ESourceSelectorPrivate; -+ -+struct _ESourceSelector { -+ GtkTreeView parent; -+ ESourceSelectorPrivate *priv; -+}; -+ -+struct _ESourceSelectorClass { -+ GtkTreeViewClass parent_class; -+ -+ /* Methods */ -+ gboolean (*get_source_selected) (ESourceSelector *selector, -+ ESource *source); -+ void (*set_source_selected) (ESourceSelector *selector, -+ ESource *source, -+ gboolean selected); -+ -+ /* Signals */ -+ void (*selection_changed) (ESourceSelector *selector); -+ void (*primary_selection_changed) -+ (ESourceSelector *selector); -+ gboolean (*popup_event) (ESourceSelector *selector, -+ ESource *primary, -+ GdkEventButton *event); -+ gboolean (*data_dropped) (ESourceSelector *selector, -+ GtkSelectionData *data, -+ ESource *destination, -+ GdkDragAction action, -+ guint target_info); -+ -+ gpointer padding1; -+ gpointer padding2; -+ gpointer padding3; -+}; -+ -+GType e_source_selector_get_type (void); -+GtkWidget * e_source_selector_new (ESourceRegistry *registry, -+ const gchar *extension_name); -+ESourceRegistry * -+ e_source_selector_get_registry (ESourceSelector *selector); -+const gchar * e_source_selector_get_extension_name -+ (ESourceSelector *selector); -+gboolean e_source_selector_get_show_colors -+ (ESourceSelector *selector); -+void e_source_selector_set_show_colors -+ (ESourceSelector *selector, -+ gboolean show_colors); -+gboolean e_source_selector_get_show_toggles -+ (ESourceSelector *selector); -+void e_source_selector_set_show_toggles -+ (ESourceSelector *selector, -+ gboolean show_toggles); -+void e_source_selector_select_source (ESourceSelector *selector, -+ ESource *source); -+void e_source_selector_unselect_source -+ (ESourceSelector *selector, -+ ESource *source); -+void e_source_selector_select_exclusive -+ (ESourceSelector *selector, -+ ESource *source); -+gboolean e_source_selector_source_is_selected -+ (ESourceSelector *selector, -+ ESource *source); -+GSList * e_source_selector_get_selection (ESourceSelector *selector); -+void e_source_selector_free_selection -+ (GSList *list); -+void e_source_selector_set_select_new -+ (ESourceSelector *selector, -+ gboolean state); -+void e_source_selector_edit_primary_selection -+ (ESourceSelector *selector); -+ESource * e_source_selector_ref_primary_selection -+ (ESourceSelector *selector); -+void e_source_selector_set_primary_selection -+ (ESourceSelector *selector, -+ ESource *source); -+ESource * e_source_selector_ref_source_by_path -+ (ESourceSelector *selector, -+ GtkTreePath *path); -+void e_source_selector_queue_write (ESourceSelector *selector, -+ ESource *source); -+ -+G_END_DECLS -+ -+#endif /* E_SOURCE_SELECTOR_H */ --- -cgit v0.9.1 diff --git a/community/almanah/update-gtkspell3-support.patch b/community/almanah/update-gtkspell3-support.patch deleted file mode 100644 index aa2a81159..000000000 --- a/community/almanah/update-gtkspell3-support.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 114c4f78ac9882be51c4154751760bd4fea48403 Mon Sep 17 00:00:00 2001 -From: Álvaro Peña <alvaropg@gmail.com> -Date: Wed, 06 Feb 2013 10:12:54 +0000 -Subject: Update GtkSpell 3 support - ---- -diff --git a/configure.ac b/configure.ac -index b89ba74..fbe6889 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -95,7 +95,7 @@ AC_SUBST(EVO_LIBS) - - dnl Spell checking - if test $spell_checking = "true"; then -- PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell-3.0) -+ PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell3-3.0) - AC_SUBST(SPELL_CHECKING_CFLAGS) - AC_SUBST(SPELL_CHECKING_LIBS) - fi -diff --git a/src/main-window.c b/src/main-window.c -index fb931e1..2fe01ef 100644 ---- a/src/main-window.c -+++ b/src/main-window.c -@@ -1109,7 +1109,7 @@ mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar_button, AlmanahMain - AlmanahEventManager *event_manager; - GDate calendar_date; - #ifdef ENABLE_SPELL_CHECKING -- GtkSpell *gtkspell; -+ GtkSpellChecker *gtkspell; - #endif /* ENABLE_SPELL_CHECKING */ - AlmanahMainWindowPrivate *priv = main_window->priv; - AlmanahEntry *entry; -@@ -1166,9 +1166,9 @@ mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar_button, AlmanahMain - - #ifdef ENABLE_SPELL_CHECKING - /* Ensure the spell-checking is updated */ -- gtkspell = gtkspell_get_from_text_view (priv->entry_view); -+ gtkspell = gtk_spell_checker_get_from_text_view (priv->entry_view); - if (gtkspell != NULL) { -- gtkspell_recheck_all (gtkspell); -+ gtk_spell_checker_recheck_all (gtkspell); - gtk_widget_queue_draw (GTK_WIDGET (priv->entry_view)); - } - #endif /* ENABLE_SPELL_CHECKING */ -@@ -1326,13 +1326,13 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error) - { - AlmanahApplication *application; - GSettings *settings; -- GtkSpell *gtkspell; -+ GtkSpellChecker *gtkspell; - gchar *spelling_language; - GtkTextTagTable *table; - GtkTextTag *tag; - - /* Bail out if spell checking's already enabled */ -- if (gtkspell_get_from_text_view (self->priv->entry_view) != NULL) -+ if (gtk_spell_checker_get_from_text_view (self->priv->entry_view) != NULL) - return TRUE; - - /* If spell checking wasn't already enabled, we have a dummy gtkspell-misspelled text tag to destroy */ -@@ -1353,7 +1353,9 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error) - spelling_language = NULL; - } - -- gtkspell = gtkspell_new_attach (self->priv->entry_view, spelling_language, error); -+ gtkspell = gtk_spell_checker_new (); -+ gtk_spell_checker_set_language (gtkspell, spelling_language, error); -+ gtk_spell_checker_attach (gtkspell, self->priv->entry_view); - g_free (spelling_language); - - if (gtkspell == NULL) -@@ -1364,13 +1366,13 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error) - static void - disable_spell_checking (AlmanahMainWindow *self) - { -- GtkSpell *gtkspell; -+ GtkSpellChecker *gtkspell; - GtkTextTagTable *table; - GtkTextTag *tag; - -- gtkspell = gtkspell_get_from_text_view (self->priv->entry_view); -+ gtkspell = gtk_spell_checker_get_from_text_view (self->priv->entry_view); - if (gtkspell != NULL) -- gtkspell_detach (gtkspell); -+ gtk_spell_checker_detach (gtkspell); - - /* Remove the old gtkspell-misspelling text tag */ - table = gtk_text_buffer_get_tag_table (self->priv->entry_buffer); --- -cgit v0.9.1 diff --git a/community/argyllcms/PKGBUILD b/community/argyllcms/PKGBUILD index ef7dd7bb4..21110bd41 100644 --- a/community/argyllcms/PKGBUILD +++ b/community/argyllcms/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99402 2013-10-28 11:10:04Z tredaelli $ +# $Id: PKGBUILD 102451 2013-12-11 14:31:37Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) pkgname=argyllcms _pkgname=Argyll -pkgver=1.6.1 +pkgver=1.6.2 _pkgver="V${pkgver}" pkgrel=1 pkgdesc="An ICC compatible color management system with support for different colorimeter hardware" @@ -15,35 +15,33 @@ source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip) url="http://www.argyllcms.com/" license=("GPL" "AGPL") install=${pkgname}.install -md5sums=('aed439b76054ef8e8b065106d314681c') +sha256sums=('c21591d5615a584df438ecbfe7858fde571f6066e56da436c541d08ca899ac9f') build() { - cd "${srcdir}"/${_pkgname}_${_pkgver} + cd ${_pkgname}_${_pkgver} echo "***running makeall.sh***" sh ./makeall.sh echo "***running makeinstall.sh***" sh ./makeinstall.sh echo "***running makepackagebin.sh***" sh ./makepackagebin.sh - rm "${srcdir}"/${_pkgname}_${_pkgver}/bin/License.txt - rm "${srcdir}"/${_pkgname}_${_pkgver}/ref/License.txt - rm "${srcdir}"/${_pkgname}_${_pkgver}/ref/afiles - rm "${srcdir}"/${_pkgname}_${_pkgver}/doc/afiles + rm {bin,ref}/License.txt + rm {doc,ref}/afiles } package() { mkdir -p "${pkgdir}"/usr/bin - install -m755 "${srcdir}"/${_pkgname}_${_pkgver}/bin/* "${pkgdir}"/usr/bin + install -m755 ${_pkgname}_${_pkgver}/bin/* "${pkgdir}"/usr/bin mkdir -p "${pkgdir}"/usr/share/${pkgname}/ref - install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/ref/*.* "${pkgdir}"/usr/share/${pkgname}/ref - install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/profile/*.sp "${pkgdir}"/usr/share/${pkgname}/ref - install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/scanin/*.c?? "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 ${_pkgname}_${_pkgver}/ref/*.* "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 ${_pkgname}_${_pkgver}/profile/*.sp "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 ${_pkgname}_${_pkgver}/scanin/*.c?? "${pkgdir}"/usr/share/${pkgname}/ref # Because there is just html documentation we have to move it mkdir -p "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs - install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/doc/ccmxs/*.ccmx "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs - install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc + install -m644 ${_pkgname}_${_pkgver}/doc/ccmxs/*.ccmx "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs + install -m644 ${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc mkdir -p "${pkgdir}"/usr/lib/udev/rules.d - install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules + install -m644 ${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules sed -i 's|IMPORT{program}="usb|#IMPORT{program}="usb|' "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules cat <<EOF >>"${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules diff --git a/community/arj/001_arches_align.patch b/community/arj/001_arches_align.patch new file mode 100644 index 000000000..c55d17ec4 --- /dev/null +++ b/community/arj/001_arches_align.patch @@ -0,0 +1,34 @@ +#DPATCHLEVEL=1 +diff -Naur arj-3.10.19.orig/arj_proc.c arj-3.10.19/arj_proc.c +--- arj-3.10.19.orig/arj_proc.c 2004-02-20 14:18:52.000000000 +0100 ++++ arj-3.10.22/arj_proc.c 2004-04-08 14:06:58.000000000 +0200 +@@ -2898,7 +2898,7 @@ + } + #endif + +-#if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER) ++#if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER) + /* Model-independent routine to get 2 bytes from far RAM */ + + unsigned int mget_word(char FAR *p) +diff -Naur arj-3.10.19.orig/arj_proc.h arj-3.10.19/arj_proc.h +--- arj-3.10.19.orig/arj_proc.h 2004-01-25 01:40:00.000000000 +0100 ++++ arj-3.10.22/arj_proc.h 2004-04-08 14:07:18.000000000 +0200 +@@ -12,7 +12,7 @@ + + #define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF) + #define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c) +-#ifndef WORDS_BIGENDIAN ++#if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN) + #define mget_word(p) (*(unsigned short *)(p)&0xFFFF) + #define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w)) + #define mget_dword(p) (*(unsigned long *)(p)) +@@ -60,7 +60,7 @@ + void unpack_mem(struct mempack *mempack); + void strip_lf(char *str); + char *ltrim(char *str); +-#ifdef WORDS_BIGENDIAN ++#if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN) + unsigned int mget_word(char FAR *p); + unsigned long mget_dword(char FAR *p); + void mput_word(unsigned int w, char FAR *p); diff --git a/community/arj/002_no_remove_static_const.patch b/community/arj/002_no_remove_static_const.patch new file mode 100644 index 000000000..3656ba504 --- /dev/null +++ b/community/arj/002_no_remove_static_const.patch @@ -0,0 +1,20 @@ +#DPATCHLEVEL=1 +diff -Naur arj-3.10.22.orig/gnu/makefile.in arj-3.10.22/gnu/makefile.in +--- arj-3.10.22.orig/gnu/makefile.in 2004-04-17 14:28:06.000000000 +0300 ++++ arj-3.10.22/gnu/makefile.in 2005-08-04 21:50:24.000000000 +0300 +@@ -192,6 +192,15 @@ + dispose: + + # ++# XXX: Do not use -O2, it removes the static const variable with gcc 4.x ++# ++ ++INTEGR_DIRS = $(ARJ_DIR) $(REARJ_DIR) $(ARJCRYPT_DIR) $(REGISTER_DIR) ++ ++$(patsubst %,%/integr.o, $(INTEGR_DIRS)): $(SRC_DIR)/integr.c ++ $(CC) -Wall -g -c -o$@ $< ++ ++# + # The tools + # + diff --git a/community/arj/003_64_bit_clean.patch b/community/arj/003_64_bit_clean.patch new file mode 100644 index 000000000..7cd602ea5 --- /dev/null +++ b/community/arj/003_64_bit_clean.patch @@ -0,0 +1,194 @@ +#DPATCHLEVEL=1 +diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_arcv.c arj-3.10.22/arj_arcv.c +--- arj-3.10.22.orig/arj_arcv.c 2005-06-21 22:53:12.000000000 +0300 ++++ arj-3.10.22/arj_arcv.c 2005-11-24 02:50:31.000000000 +0200 +@@ -59,27 +59,27 @@ + #define setup_hput(ptr) (tmp_hptr=(ptr)) + + #define hget_byte() (*(tmp_hptr++)&0xFF) +-#define hput_byte(c) (*(tmp_hptr++)=(char) (c)) ++#define hput_byte(c) (*(tmp_hptr++)=(uint8_t) (c)) + + /* Reads two bytes from the header, incrementing the pointer */ + +-static unsigned int hget_word() ++static uint16_t hget_word() + { +- unsigned int result; ++ uint16_t result; + + result=mget_word(tmp_hptr); +- tmp_hptr+=sizeof(short); ++ tmp_hptr+=sizeof(uint16_t); + return result; + } + + /* Reads four bytes from the header, incrementing the pointer */ + +-static unsigned long hget_longword() ++static uint32_t hget_longword() + { +- unsigned long result; ++ uint32_t result; + + result=mget_dword(tmp_hptr); +- tmp_hptr+=sizeof(unsigned long); ++ tmp_hptr+=sizeof(uint32_t); + return result; + } + +@@ -87,18 +87,18 @@ + + /* Writes two bytes to the header, incrementing the pointer */ + +-static void hput_word(unsigned int w) ++static void hput_word(uint16_t w) + { + mput_word(w,tmp_hptr); +- tmp_hptr+=sizeof(unsigned short); ++ tmp_hptr+=sizeof(uint16_t); + } + + /* Writes four bytes to the header, incrementing the pointer */ + +-static void hput_longword(unsigned long l) ++static void hput_longword(uint32_t l) + { + mput_dword(l,tmp_hptr); +- tmp_hptr+=sizeof(unsigned long); ++ tmp_hptr+=sizeof(uint32_t); + } + + /* Calculates and stores the basic header size */ +diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_proc.c arj-3.10.22/arj_proc.c +--- arj-3.10.22.orig/arj_proc.c 2005-11-24 02:50:19.000000000 +0200 ++++ arj-3.10.22/arj_proc.c 2005-11-24 02:50:31.000000000 +0200 +@@ -585,7 +585,7 @@ + /* Returns the exact amount of data that could be safely written to the + destination volume */ + +-unsigned long get_volfree(unsigned int increment) ++unsigned long get_volfree(unsigned long increment) + { + unsigned long pvol; + unsigned int arjsec_overhead; +@@ -605,7 +605,7 @@ + remain=volume_limit-ftell(aostream)-pvol-(long)arjsec_overhead- + (long)out_bytes-(long)cpos-(long)ext_voldata- + MULTIVOLUME_RESERVE-t_volume_offset; +- return((unsigned long)min(remain, (unsigned long)increment)); ++ return((unsigned long)min(remain, increment)); + } + + /* Performs various checks when multivolume data is packed to predict an +@@ -2466,14 +2466,14 @@ + *tsptr='\0'; + endptr=tsptr; + tsptr=sptr; +- while((unsigned int)tsptr<(unsigned int)endptr&&patterns<SEARCH_STR_MAX) ++ while((intptr_t)tsptr<(intptr_t)endptr&&patterns<SEARCH_STR_MAX) + { + while(*tsptr=='\0') + tsptr++; +- if((unsigned int)tsptr<(unsigned int)endptr) ++ if((intptr_t)tsptr<(intptr_t)endptr) + { + search_str[patterns++]=tsptr; +- while(*tsptr!='\0'&&(unsigned int)tsptr<(unsigned int)endptr) ++ while(*tsptr!='\0'&&(intptr_t)tsptr<(intptr_t)endptr) + tsptr++; + } + } +@@ -2901,9 +2901,9 @@ + #if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER) + /* Model-independent routine to get 2 bytes from far RAM */ + +-unsigned int mget_word(char FAR *p) ++uint16_t mget_word(char FAR *p) + { +- unsigned int b0, b1; ++ uint16_t b0, b1; + + b0=mget_byte(p); + b1=mget_byte(p+1); +@@ -2912,9 +2912,9 @@ + + /* Model-independent routine to get 4 bytes from far RAM */ + +-unsigned long mget_dword(char FAR *p) ++uint32_t mget_dword(char FAR *p) + { +- unsigned long w0, w1; ++ uint32_t w0, w1; + + w0=mget_word(p); + w1=mget_word(p+2); +@@ -2923,7 +2923,7 @@ + + /* Model-independent routine to store 2 bytes in far RAM */ + +-void mput_word(unsigned int w, char FAR *p) ++void mput_word(uint16_t w, char FAR *p) + { + mput_byte(w&0xFF, p); + mput_byte(w>>8 , p+1); +@@ -2931,7 +2931,7 @@ + + /* Model-independent routine to store 4 bytes in far RAM */ + +-void mput_dword(unsigned long d, char FAR *p) ++void mput_dword(uint32_t d, char FAR *p) + { + mput_word(d&0xFFFF, p); + mput_word(d>>16 , p+2); +diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_proc.h arj-3.10.22/arj_proc.h +--- arj-3.10.22.orig/arj_proc.h 2005-11-24 02:50:19.000000000 +0200 ++++ arj-3.10.22/arj_proc.h 2005-11-24 03:17:25.000000000 +0200 +@@ -8,15 +8,17 @@ + #ifndef ARJ_PROC_INCLUDED + #define ARJ_PROC_INCLUDED + ++#include <stdint.h> ++ + /* Helper macros */ + +-#define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF) +-#define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c) ++#define mget_byte(p) (*(uint8_t FAR *)(p)&0xFF) ++#define mput_byte(c, p) *(uint8_t FAR *)(p)=(uint8_t)(c) + #if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN) +-#define mget_word(p) (*(unsigned short *)(p)&0xFFFF) +-#define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w)) +-#define mget_dword(p) (*(unsigned long *)(p)) +-#define mput_dword(w,p) (*(unsigned long *)(p)=(unsigned long)(w)) ++#define mget_word(p) (*(uint16_t *)(p)&0xFFFF) ++#define mput_word(w,p) (*(uint16_t *)(p)=(uint16_t)(w)) ++#define mget_dword(p) (*(uint32_t *)(p)) ++#define mput_dword(w,p) (*(uint32_t *)(p)=(uint32_t)(w)) + #endif + + /* Prototypes */ +@@ -31,7 +33,7 @@ + int translate_path(char *name); + void restart_proc(char *dest); + int search_for_extension(char *name, char *ext_list); +-unsigned long get_volfree(unsigned int increment); ++unsigned long get_volfree(unsigned long increment); + unsigned int check_multivolume(unsigned int increment); + void store(); + void hollow_encode(); +@@ -61,10 +63,10 @@ + void strip_lf(char *str); + char *ltrim(char *str); + #if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN) +-unsigned int mget_word(char FAR *p); +-unsigned long mget_dword(char FAR *p); +-void mput_word(unsigned int w, char FAR *p); +-void mput_dword(unsigned long d, char FAR *p); ++uint16_t mget_word(char FAR *p); ++uint32_t mget_dword(char FAR *p); ++void mput_word(uint16_t w, char FAR *p); ++void mput_dword(uint32_t d, char FAR *p); + #endif + + #endif diff --git a/community/arj/PKGBUILD b/community/arj/PKGBUILD new file mode 100644 index 000000000..b7d14445e --- /dev/null +++ b/community/arj/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 101269 2013-11-21 12:18:33Z bpiotrowski $ +# Maintainer: +# Contributor: Travis Willard <travisw@wmpub.ca> +# Contributor: Gergely Tamas <dice@mfa.kfki.hu> + +pkgname=arj +pkgver=3.10.22 +pkgrel=8 +pkgdesc="Free and portable clone of the ARJ archiver" +url="http://arj.sourceforge.net/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('glibc') +options=('!makeflags') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 001_arches_align.patch + 002_no_remove_static_const.patch + 003_64_bit_clean.patch + arj-3.10.22-custom-printf.patch) +md5sums=('f263bf3cf6d42a8b7e85b4fb514336d3' + '550bc972d825036f17f202a2b11b35c2' + '395dfa8cc500ffae648777f8f241be88' + '56b3cf96ec485b0d824761457417fcc0' + '4630a7254dfc6c8d8c7e696aa4a58f4a') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Add gentoo patches + patch -p1 -i "${srcdir}/001_arches_align.patch" + patch -p1 -i "${srcdir}/002_no_remove_static_const.patch" + patch -p1 -i "${srcdir}/003_64_bit_clean.patch" + patch -p1 -i "${srcdir}/arj-3.10.22-custom-printf.patch" + + cd gnu + aclocal + autoconf + rm -f config.{guess,sub} + cp /usr/share/automake-1.14/config.{guess,sub} . +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}/gnu" + ./configure --prefix=/usr + cd .. + make prepare + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/arj/arj-3.10.22-custom-printf.patch b/community/arj/arj-3.10.22-custom-printf.patch new file mode 100644 index 000000000..b789dd5c7 --- /dev/null +++ b/community/arj/arj-3.10.22-custom-printf.patch @@ -0,0 +1,15 @@ +Patch by Lubomir Rintel <lkundrak@v3.sk> for arj >= 3.10.22, which disables +the custom printf to avoid conflicting strnlen definition with the glibc +headers. By using custom printf (as in the past), we're completely loosing +all the _FORTIFY_SOURCE printf protections. + +--- arj-3.10.22/fardata.c 2004-04-17 13:39:42.000000000 +0200 ++++ arj-3.10.22/fardata.c.printf 2009-04-18 16:23:52.000000000 +0200 +@@ -13,7 +13,6 @@ + /* ASR fix 02/05/2003: need that regardless of COLOR_OUTPUT to support -jp + correctly */ + #if SFX_LEVEL>=ARJ +- #define CUSTOM_PRINTF + #define CHUNK_SIZE 512 /* Size of the output block */ + #define CHUNK_THRESHOLD (CHUNK_SIZE-256) /* Safety bound */ + #endif diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD index 526fbc6f2..9187b0b50 100644 --- a/community/arpwatch/PKGBUILD +++ b/community/arpwatch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94834 2013-07-31 01:12:04Z seblu $ +# $Id: PKGBUILD 102230 2013-12-07 00:44:42Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sébastien Luttringer pkgname=arpwatch pkgver=2.1a15 -pkgrel=12 +pkgrel=13 pkgdesc='Ethernet/FDDI station activity monitor' arch=('i686' 'x86_64') url='ftp://ftp.ee.lbl.gov/' @@ -15,7 +15,7 @@ source=("ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz" 'LICENSE' "$pkgname.service") md5sums=('cebfeb99c4a7c2a6cee2564770415fe7' - '0a47a4e7a0f2ede5c8c7f22ec678fa72' + 'c5abd91d8852f68bf5bf49ed9e80dba0' '9359518c500562281e76cdb0b2fa9062' '43e2358ba0532da38e5296250a7fcfd8') diff --git a/community/arpwatch/ethercodes.dat.xz b/community/arpwatch/ethercodes.dat.xz Binary files differindex 1838c8194..70ad1dcaf 100644 --- a/community/arpwatch/ethercodes.dat.xz +++ b/community/arpwatch/ethercodes.dat.xz diff --git a/community/aspell-it/PKGBUILD b/community/aspell-it/PKGBUILD new file mode 100644 index 000000000..8fe648455 --- /dev/null +++ b/community/aspell-it/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 102316 2013-12-08 09:19:12Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Eric Johnson <eric@coding-zone.com> + +pkgname=aspell-it +pkgver=2.2_20050523 +pkgrel=4 +pkgdesc="Italian dictionary for aspell" +arch=('i686' 'x86_64') +url="http://aspell.net/" +license=('GPL') +depends=('aspell') +source=("ftp://ftp.gnu.org/gnu/aspell/dict/it/aspell6-it-${pkgver}-0.tar.bz2") +md5sums=('b1217299a0b67d1e121494d7ec18a88d') + +build() { + cd "${srcdir}/aspell6-it-${pkgver}-0" + + ./configure + make +} + +package() { + cd "${srcdir}/aspell6-it-${pkgver}-0" + + make DESTDIR="${pkgdir}" install +} diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD index 45cca0bb6..e733366c5 100644 --- a/community/audit/PKGBUILD +++ b/community/audit/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 99687 2013-10-30 23:01:49Z allan $ +# $Id: PKGBUILD 102540 2013-12-13 11:46:14Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> # Contributor: henning mueller <henning@orgizm.net> pkgname=audit pkgver=2.3.2 -pkgrel=2 +pkgrel=3 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' -url="http://people.redhat.com/sgrubb/$pkgname" +url="http://people.redhat.com/sgrubb/audit" arch=(i686 x86_64) depends=(krb5 libcap-ng) makedepends=(libldap swig linux-headers python2) @@ -15,7 +15,7 @@ license=(GPL) options=(emptydirs) backup=( etc/libaudit.conf - etc/audit/rules.d/audit.rules + etc/audit/audit.rules etc/audit/auditd.conf etc/audisp/audispd.conf etc/audisp/audisp-remote.conf @@ -38,7 +38,7 @@ build() { --with-python=yes \ --enable-gssapi-krb5=yes \ --enable-systemd=yes \ - --with-libcap-ng=yes #--with-apparmor=yes + --with-libcap-ng=yes make } @@ -56,6 +56,7 @@ package() { usr/lib/systemd/system/auditd.service chmod 644 usr/lib/systemd/system/auditd.service + mv "$pkgdir"/etc/audit/{rules.d/,}audit.rules } sha256sums=('8872e0b5392888789061db8034164305ef0e1b34543e1e7004d275f039081d29') diff --git a/community/autocutsel/PKGBUILD b/community/autocutsel/PKGBUILD index 6e39cc60d..4c0e71eef 100644 --- a/community/autocutsel/PKGBUILD +++ b/community/autocutsel/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 64911 2012-02-18 20:21:56Z jelle $ +# $Id: PKGBUILD 101226 2013-11-20 07:48:32Z jelle $ # Contributor: Tom Killian <tom@archlinux.org> # Contributor: Nikos Kouremenos (zeppelin) kourem at gmail dot com # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=autocutsel -pkgver=0.9.0 -pkgrel=7 +pkgver=0.9.1 +pkgrel=1 pkgdesc="synchronizes the two copy/paste buffers mainly used by X applications" arch=('i686' 'x86_64') depends=('libxaw') -source=(http://lepton.fr/tools/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('ba4a6f632cb4815ae4e5c3027c24cfc5') -url="http://lepton.fr/tools/autocutsel/" +source=(https://github.com/sigmike/autocutsel/releases/download/$pkgver/autocutsel-$pkgver.tar.gz) +url="http://www.nongnu.org/autocutsel/" install=autocutsel.install license=('GPL') +md5sums=('7bf76b1ea7a15592f05d02b4c086d4cd') + build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD index b514e1d35..72757ecf2 100644 --- a/community/avrdude/PKGBUILD +++ b/community/avrdude/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 97484 2013-09-21 11:43:49Z jelle $ +# $Id: PKGBUILD 102091 2013-12-05 02:01:26Z eric $ # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=avrdude pkgver=6.0.1 -pkgrel=1 +pkgrel=3 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers" arch=('i686' 'x86_64') url="http://www.nongnu.org/avrdude/" license=('GPL') -depends=('libusbx' 'readline' 'libftdi') +depends=('readline' 'libftdi' 'libusb-compat') source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig}) md5sums=('346ec2e46393a54ac152b95abf1d9850' 'SKIP') @@ -26,5 +26,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/barcode/PKGBUILD b/community/barcode/PKGBUILD new file mode 100644 index 000000000..4748943b9 --- /dev/null +++ b/community/barcode/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 102195 2013-12-06 13:05:07Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=barcode +pkgver=0.99 +pkgrel=1 +pkgdesc="A tool to convert text strings to printed bars" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/barcode/" +license=('GPL') +depends=('glibc') +install=barcode.install +source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('cdc504ee1020e27fbfeebcb0718de054') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}/usr" install +} diff --git a/community/barcode/barcode.install b/community/barcode/barcode.install new file mode 100644 index 000000000..83966a37d --- /dev/null +++ b/community/barcode/barcode.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(barcode.info.gz) + +post_install() { + [ -x usr/bin/install-info ] + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + [ -x usr/bin/install-info ] + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD index a08a14f64..24ff731e6 100644 --- a/community/bind/PKGBUILD +++ b/community/bind/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99697 2013-10-30 23:05:52Z allan $ +# $Id: PKGBUILD 100668 2013-11-08 00:08:48Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> pkgname=bind -_pkgver=9.9.4 +_pkgver=9.9.4-P1 pkgver=${_pkgver//-/.} pkgrel=1 pkgdesc='The ISC BIND nameserver' @@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc} 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('d7be390e6c2546f37a7280e1975e1cd134565f62' +sha1sums=('35dd28de21626fd6327230c38d0f164dd2263bed' 'SKIP' '029f89c49550c40ec7a95116b6a33f0e5a041094' 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index 639ac47ca..2d41ca639 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98871 2013-10-20 22:53:38Z seblu $ +# $Id: PKGBUILD 101733 2013-11-30 16:20:26Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=bird pkgname=('bird' 'bird6') -pkgver=1.3.11 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://bird.network.cz/' license=('GPL2') @@ -12,7 +12,7 @@ depends=('readline' 'ncurses') source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" 'bird.service' 'bird6.service') -md5sums=('8ad2eb997fb8251bc5b24cf32619571b' +md5sums=('4e5a47308335b1b0bf4691cac6c4174f' '69221e063a3f07dcad519d5eeacaae75' '5b172bd052b523efd95ee018e891e181') diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index 3a0166376..24a8d44e8 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 97296 2013-09-16 16:48:10Z tredaelli $ +# $Id: PKGBUILD 102409 2013-12-10 14:39:27Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.8.5 +pkgver=0.8.6 pkgrel=1 arch=('i686' 'x86_64') url="http://www.bitcoin.org/" makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc') license=('MIT') source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz) -sha256sums=('84543f10de5e82ce6e88dd5a501db37c6327edf79a2a04f29199c24843e71f63') +sha256sums=('73495de53d1a30676884961e39ff46c3851ff770eeaa767331d065ff0ce8dd0c') build() { cd "$srcdir/$pkgbase-$pkgver-linux/src" diff --git a/community/blobby2/PKGBUILD b/community/blobby2/PKGBUILD index 20d3bc0a7..38aee509f 100644 --- a/community/blobby2/PKGBUILD +++ b/community/blobby2/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 79399 2012-11-04 04:36:25Z svenstaro $ +# $Id: PKGBUILD 102240 2013-12-07 10:36:24Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=blobby2 -pkgver=1.0rc3 +pkgver=1.0rc4 arch=('x86_64' 'i686') pkgrel=1 pkgdesc="A beach ball game with blobs of goo" url="http://sourceforge.net/projects/blobby/" license=('GPL') -depends=('sdl' 'physfs' 'libgl') +depends=('sdl' 'sdl2' 'physfs' 'libgl') makedepends=('cmake' 'boost' 'mesa' 'zip') source=(http://downloads.sourceforge.net/blobby/$pkgname-linux-$pkgver.tar.gz $pkgname.desktop $pkgname.png) -md5sums=('c4b7d3133e99806dc8b60a59da296906' +md5sums=('0124ebbb6cf06d053d6a1bcc12b1a89d' 'ab05bed794ee78db693fd3036393275a' 'c1bc427b41a0a3facd771ac83c7fb412') diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD deleted file mode 100644 index d1db7e726..000000000 --- a/community/blueman/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 100136 2013-11-01 20:21:28Z spupykin $ -# Contributor: Ionut Biru <ibiru@archlinux.org -# Contributor: Abhishek Dasgupta <abhidg@gmail.com> - -pkgname=blueman -pkgver=20131021git -pkgrel=2 -pkgdesc="GTK+ bluetooth manager" -arch=('i686' 'x86_64') -license=('GPL') -url="https://github.com/cschramm/blueman" -depends=('bluez' 'bluez-libs' 'gnome-icon-theme' 'libpulse' 'obex-data-server' - 'python2-dbus' 'python2-notify' 'startup-notification' 'xdg-utils') -makedepends=('pyrex' 'intltool' 'git') -optdepends=('dnsmasq: For creating PAN network' - 'modemmanager: For modem management service' - 'notification-daemon: For desktop notifications' - 'polkit-gnome: For privileged actions' - 'pulseaudio: To use the pulseaudio plugin' - 'python2-gconf: For gconf configuration support') -install=$pkgname.install -source=("blueman::git://github.com/cschramm/blueman.git") -md5sums=('SKIP') - -prepare() { - cd "${srcdir}/${pkgname}" - for file in apps/blueman*; do - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file - done - sed -i 's|"blueman-tray"|"blueman"|' blueman/plugins/applet/StatusIcon.py -} - -build() { - cd "${srcdir}/${pkgname}" - export PYTHON=python2 - ./autogen.sh - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/blueman \ - --with-no-runtime-deps-check - make -} - -package() { - cd "${srcdir}/${pkgname}" - make DESTDIR="${pkgdir}" install - echo "NotShowIn=KDE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop -} diff --git a/community/blueman/blueman.install b/community/blueman/blueman.install deleted file mode 100644 index 8bf021487..000000000 --- a/community/blueman/blueman.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/bomberclone/PKGBUILD b/community/bomberclone/PKGBUILD index 308374881..1a48ea385 100644 --- a/community/bomberclone/PKGBUILD +++ b/community/bomberclone/PKGBUILD @@ -1,37 +1,47 @@ -# $Id: PKGBUILD 66517 2012-02-25 22:47:19Z lfleischer $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# $Id: PKGBUILD 102211 2013-12-06 14:28:46Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: arjan <arjan@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=bomberclone pkgver=0.11.9 -pkgrel=2 -pkgdesc='A clone of the game AtomicBomberMan.' -arch=('i686' 'x86_64') +pkgrel=3 +pkgdesc='Clone of the game AtomicBomberMan' +arch=('x86_64' 'i686') url="http://www.bomberclone.de/" license=('GPL') depends=('sdl_mixer' 'sdl_image') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'bomberclone-0.11.9-build-fix.patch' - 'bomberclone.desktop') -md5sums=('3edcfcf69b88dbd2eab42541f236e072' - '88def2b6faf7a6ac7acd96f617fc460e' - '2c0151859e7e9aebd1fc95a1455f0c3b') +makedepends=('gendesk') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" + 'bomberclone-0.11.9-build-fix.patch') +sha256sums=('71eb2788f95c136fd3eecaee15d05a80dea07221b5b3530dc869e433e02ff68d' + 'ee8bbff24f261951379ca55c510df04deb5a0fd17c2c3149b63bbcaf1cfb0549') + +prepare() { + gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'BomberClone' +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" # add build fix extracted from upstream CVS (fixes FS#26942) patch -p0 -i ../bomberclone-0.11.9-build-fix.patch ./configure --prefix=/usr - make AM_CFLAGS=-lm + make CFLAGS="-lm -O2 `pkg-config sdl --cflags` $CFLAGS" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install - install -Dm0644 "${srcdir}/bomberclone.desktop" \ - "${pkgdir}/usr/share/applications/bomberclone.desktop" + make DESTDIR="$pkgdir" install + + # Desktop shortcut and icon + install -Dm644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$pkgdir/usr/share/games/$pkgname/pixmaps/$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" } + +# vim:set ts=2 sw=2 et: diff --git a/community/bomberclone/bomberclone.desktop b/community/bomberclone/bomberclone.desktop deleted file mode 100644 index affc0d8ad..000000000 --- a/community/bomberclone/bomberclone.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Name=BomberClone -GenericName=BomberClone -Comment=Atomic Bomberman clone -Icon=/usr/share/games/bomberclone/pixmaps/bomberclone.png -TryExec=bomberclone -Exec=bomberclone -Terminal=false -Categories=Qt;KDE;GNOME;Game; diff --git a/community/botan/PKGBUILD b/community/botan/PKGBUILD index 190945b06..33bd091be 100644 --- a/community/botan/PKGBUILD +++ b/community/botan/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87983 2013-04-09 20:48:46Z arodseth $ +# $Id: PKGBUILD 101428 2013-11-25 13:19:55Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: d'Ronin <daronin@2600.com> pkgname=botan -pkgver=1.10.5 +pkgver=1.10.6 pkgrel=1 pkgdesc='Crypto library written in C++' license=('BSD') @@ -14,22 +14,21 @@ url='http://botan.randombit.net/' depends=('gcc-libs' 'sh') makedepends=('python2') source=("http://files.randombit.net/botan/Botan-${pkgver}.tbz") -sha256sums=('2934c00533847dc93c485081d3ce6aae4a110151a69b587b895241159da77cf3') +sha256sums=('72a9be97350523ee1b06c8722032faa566fcb98456b0b7ac06b45a1dc4446fa7') build() { - cd "$srcdir/Botan-$pkgver" + cd "Botan-$pkgver" - sed -i 's:env python:env python2:' configure.py - ./configure.py --prefix=/usr + python2 configure.py --prefix=/usr make } package() { - cd "$srcdir/Botan-$pkgver" + cd "Botan-$pkgver" make DESTDIR="$pkgdir/usr" install - install -Dm644 doc/license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" find "$pkgdir/usr/share/doc" -type f -exec chmod 0644 {} \; + install -Dm644 doc/license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/box2d/PKGBUILD b/community/box2d/PKGBUILD index 6aadfb8d3..15030c6c3 100644 --- a/community/box2d/PKGBUILD +++ b/community/box2d/PKGBUILD @@ -1,44 +1,45 @@ -# $Id: PKGBUILD 64742 2012-02-18 03:45:38Z svenstaro $ +# $Id: PKGBUILD 100620 2013-11-06 13:54:05Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=box2d -pkgver=2.2.1 -pkgrel=2 +pkgver=2.3.0 +pkgrel=1 pkgdesc="2D rigid body simulation library for games" url="http://www.box2d.org/" license=('zlib') arch=('i686' 'x86_64') #depends=('freeglut') -makedepends=('cmake') +makedepends=('cmake' 'doxygen') optdepends=() -source=(http://box2d.googlecode.com/files/Box2D_v${pkgver}.zip) -md5sums=('9e9d32a34fb5554c47f0f9cade0fa611') +source=(svn+http://box2d.googlecode.com/svn/tags/v${pkgver}) +md5sums=('SKIP') build() { - cd ${srcdir}/Box2D_v${pkgver} + cd ${srcdir}/v${pkgver}/Box2D msg "Starting build" [[ -d build ]] && rm -r build mkdir build && cd build cmake .. \ -DBOX2D_INSTALL=ON \ + -DBOX2D_INSTALL_DOC=ON \ -DBOX2D_BUILD_SHARED=ON \ - -DBOX2D_BUILD_STATIC=ON \ + -DBOX2D_BUILD_STATIC=OFF \ -DBOX2D_BUILD_EXAMPLES=OFF \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd ${srcdir}/Box2D_v${pkgver}/build + cd ${srcdir}/v${pkgver}/Box2D - make DESTDIR=${pkgdir} install + cd Documentation + doxygen + + cd ../build - mkdir -p ${pkgdir}/usr/share/doc/box2d/ - cp -r ${srcdir}/Box2D_v${pkgver}/Documentation/* ${pkgdir}/usr/share/doc/box2d/ - find ${pkgdir}/usr/share/doc/box2d/ -type f | xargs chmod 644 - find ${pkgdir}/usr/share/doc/box2d/ -type d | xargs chmod 755 + make DESTDIR=${pkgdir} install - install -Dm644 ${srcdir}/Box2D_v${pkgver}/License.txt ${pkgdir}/usr/share/licenses/box2d/LICENSE + install -Dm644 ${srcdir}/v${pkgver}/Box2D/License.txt ${pkgdir}/usr/share/licenses/box2d/LICENSE } # vim: sw=2 ts=2 et: diff --git a/community/brise/PKGBUILD b/community/brise/PKGBUILD index efbeccd76..b525a3e4c 100644 --- a/community/brise/PKGBUILD +++ b/community/brise/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 90136 2013-05-07 05:26:31Z fyan $ +# $Id: PKGBUILD 100938 2013-11-13 14:17:31Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> pkgname=brise -pkgver=0.22 +pkgver=0.30 pkgrel=1 pkgdesc="Rime schema repository" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" license=('GPL3') depends=() -makedepends=('cmake' 'librime>=0.9.9') +makedepends=('cmake' 'librime>=1.0') provides=('librime-data') -conflicts=('librime<0.9.9' 'ibus-rime<0.9.9') +conflicts=('librime<1.0' 'ibus-rime<1.0') source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") build() { - cd "${srcdir}/$pkgname" + cd $pkgname make } package() { - cd "${srcdir}/$pkgname" + cd $pkgname make DESTDIR="$pkgdir" install } -md5sums=('d9a55bc0b6bdd49e2622b76df43ef12f') + +sha512sums=('1d727e71ad9aabbbfab04e934f6a26bee75f8d277eb2a1c67a05616c36b2e029b0b3958eaf94af4263aa6fe350738c96e7c084fe4a5ecc45474a8900d4927748') diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD deleted file mode 100644 index a5469b833..000000000 --- a/community/bullet/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# $Id: PKGBUILD 99165 2013-10-25 09:52:29Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgbase=bullet -pkgname=('bullet' 'bullet-docs') -_rev=2704 -pkgver=2.82 -pkgrel=1 -pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" -arch=('i686' 'x86_64') -url="http://www.bulletphysics.com/Bullet/" -license=('custom:zlib') -depends=() -makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa') -source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-r${_rev}.tgz - ${pkgbase}.pc) -md5sums=('70b3c8d202dee91a0854b4cbc88173e8' - 'd1da06deba3b08b884d2212f6838905c') - -build() { - cd ${pkgbase}-${pkgver}-r${_rev} - - # get a clean build dir - [[ -d build ]] && rm -rf build - mkdir build && cd build - - # generate CMake Makefile - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=1 \ - -DBUILD_DEMOS=0 \ - -DBUILD_MULTITHREADING=1 \ - -DBUILD_EXTRAS=1 \ - -DINSTALL_LIBS=1 \ - -DINSTALL_EXTRA_LIBS=1 \ - -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version - - # compile - make - - # generate docs - cd .. - sed -i 's/GENERATE_HTMLHELP.*//g' Doxyfile - doxygen -} - -package_bullet() { - optdepends=('bullet-docs: documentation') - - cd ${pkgbase}-${pkgver}-r${_rev}/build - - # install it - make DESTDIR=${pkgdir} install - - # manually handle pkgconfig file - mkdir -p "${pkgdir}"/usr/lib/pkgconfig - sed "s|VERSION|${pkgver}|g" ${srcdir}/bullet.pc > ${pkgdir}/usr/lib/pkgconfig/bullet.pc - - # install license - install -Dm644 ../BulletLicense.txt ${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE -} - -package_bullet-docs() { - pkgdesc="Documentation for bullet" - depends=() - - cd ${pkgbase}-${pkgver}-r${_rev} - - # install docs - install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf - cp -r html ${pkgdir}/usr/share/doc/bullet/html -} -# vim: sw=2 ts=2 et: diff --git a/community/bullet/bullet.pc b/community/bullet/bullet.pc deleted file mode 100644 index d236b477f..000000000 --- a/community/bullet/bullet.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: bullet -Description: Bullet Continuous Collision Detection and Physics Library -Requires: -Version: VERSION -Libs: -L${libdir} -lBulletDynamics -lBulletCollision -lLinearMath -lBulletSoftBody -Cflags: -I${includedir}/bullet diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 5c38d74b9..b2f38d9c6 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99706 2013-10-30 23:09:03Z allan $ +# $Id: PKGBUILD 102095 2013-12-05 08:00:44Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils -pkgver=2.0.20 +pkgver=2.0.21 pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!docs' '!emptydirs') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('8af461ec1f2696e92a1fe1c62a08730b') +md5sums=('98f5f211907c89dd978255e48d31a9ca') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cairo-dock/PKGBUILD b/community/cairo-dock/PKGBUILD index 5837f62e4..b5f27561c 100755 --- a/community/cairo-dock/PKGBUILD +++ b/community/cairo-dock/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 99668 2013-10-30 22:32:44Z alucryd $ +# $Id: PKGBUILD 103144 2013-12-27 15:18:35Z alucryd $ # Maintainer: Maxime Gauduin <alucryd at gmail dot com> # Contributor: Tofe <chris dot chapuis at gmail dot com> # Contributor: erm67 <erm67 at yahoo dot it> pkgname=cairo-dock pkgver=3.3.2 -pkgrel=1 +pkgrel=2 pkgdesc='Light eye-candy fully themable animated dock' arch=('i686' 'x86_64') url="https://launchpad.net/${pkgname}-core" license=('GPL') -depends=('curl' 'dbus-glib' 'gtk3' 'librsvg') +depends=('curl' 'dbus-glib' 'glu' 'gtk3' 'librsvg') makedepends=('cmake') optdepends=('cairo-dock-plugins: Plugins for Cairo-Dock') source=("${url}/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD index bd90d9a06..a787619fd 100644 --- a/community/cantata/PKGBUILD +++ b/community/cantata/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 97316 2013-09-17 09:33:55Z bpiotrowski $ +# $Id: PKGBUILD 101406 2013-11-24 23:10:10Z cinelli $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Mcder3 <mcder3[at]gmail[dot]com> # Contributor: MisterFred <mister.fred[at]free[dot]fr> pkgname=cantata -pkgver=1.1.2 +pkgver=1.1.3 pkgdesc="A KDE client for the music player daemon (MPD)" -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://kde-apps.org/content/show.php/Cantata?content=147733" license=('GPL') -depends=('kdebase-runtime' 'taglib-extras' 'mpg123' 'libmtp' 'libcddb' 'libmusicbrainz5') +depends=('kdebase-runtime' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123' 'taglib-extras') +optdepends=('perl-uri: dynamic playlist' + 'mpd: playback') makedepends=('cmake' 'automoc4') install="$pkgname.install" source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2") -md5sums=('628991865a505284a7ce56e117cd36cc') - +md5sums=('22691c1ba9e0f94200f6cdb849be726a') build() { cd "$srcdir/$pkgname-$pkgver" mkdir build diff --git a/community/ccache/PKGBUILD b/community/ccache/PKGBUILD new file mode 100644 index 000000000..9266b18eb --- /dev/null +++ b/community/ccache/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 102197 2013-12-06 13:08:34Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=ccache +pkgver=3.1.9 +pkgrel=1 +pkgdesc="A compiler cache" +arch=('i686' 'x86_64') +url="http://ccache.samba.org/" +license=('GPL3') +depends=('zlib') +source=("http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('65f48376a91d3651d6527ca568858be8') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + install -Dm 755 ccache ${pkgdir}/usr/bin/ccache + install -Dm 644 ccache.1 ${pkgdir}/usr/share/man/man1/ccache.1 + + install -d ${pkgdir}/usr/lib/ccache/bin + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/cc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/gcc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/g++ + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/cpp + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/c++ + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-cc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-gcc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-g++ + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-cpp + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-c++ +} diff --git a/community/ccgo/PKGBUILD b/community/ccgo/PKGBUILD new file mode 100644 index 000000000..affc75102 --- /dev/null +++ b/community/ccgo/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 101516 2013-11-26 20:38:54Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Guillem Rieu <guillemr@gmx.net> + +pkgname=ccgo +pkgver=0.3.6.4 +pkgrel=3 +pkgdesc='Play the game of Go with gnugo or against other players on IGS' +arch=('x86_64' 'i686') +url='http://ccdw.org/~cjj/prog/ccgo/' +license=('GPL') +depends=('gtkmm' 'gconfmm') +source=("http://ccdw.org/~cjj/prog/$pkgname/src/$pkgname-$pkgver.tar.gz") +sha256sums=('1975a4e9b6661f6613dd3a00b3ee7e176b80244f555a184b258b50ef4352a890') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + make -C "$srcdir/$pkgname-$pkgver" DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index 9e8fbd0c3..ed6a8e23f 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98755 2013-10-17 15:45:53Z giovanni $ +# $Id: PKGBUILD 102093 2013-12-05 07:50:08Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid -pkgver=1.4.13 +pkgver=1.4.14 pkgrel=1 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ license=('LGPL' 'GPL') depends=('pcsclite' 'libusbx') makedepends=('pkg-config') backup=(etc/reader.conf.d/libccidtwin) -source=("https://alioth.debian.org/frs/download.php/file/3959/${pkgname}-${pkgver}.tar.bz2") -md5sums=('89c167a873df1f8bc0dc907ce209e5ff') +source=("https://alioth.debian.org/frs/download.php/file/3971/${pkgname}-${pkgver}.tar.bz2") +md5sums=('4596f82e85e2996f7877e892b5c18382') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index b252b3314..3b586a9cb 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 98184 2013-10-07 12:07:00Z jgc $ +# $Id: PKGBUILD 102241 2013-12-07 10:36:26Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive -pkgver=0.9.2 -pkgrel=1 +pkgver=0.9.3 +pkgrel=3 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64') url='http://cclive.sourceforge.net/' @@ -13,7 +13,7 @@ license=('AGPL3') depends=('boost-libs' 'pcre' 'curl' 'libquvi' 'glibmm') makedepends=('boost') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz") -md5sums=('b21f2ed68242901dc0439132a4ea6629') +md5sums=('c336f97e29327d92ead62765a0ef0b65') build() { cd $pkgname-$pkgver diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD index 13a14a71f..a353a5fcd 100644 --- a/community/cdemu-daemon/PKGBUILD +++ b/community/cdemu-daemon/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92546 2013-06-08 00:40:57Z heftig $ +# $Id: PKGBUILD 102785 2013-12-20 01:23:58Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=cdemu-daemon -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=1 pkgdesc="CD/DVD-ROM device emulator daemon" arch=(i686 x86_64) @@ -20,7 +20,7 @@ backup=(etc/conf.d/cdemu-daemon install=cdemu-daemon.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" system-arch.patch) -sha256sums=('8224a5d8d16cbd9a2294e9c7ab544d61059d9870023e48705699af7366846580' +sha256sums=('d26782071184d555b06ad5def7d1c22916cbeb73377328879499b91e1196f36f' '29507da7367983bdc5f541e9f9252f189412041076842b8d08a5c4dac29f23cd') prepare() { diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 0d3941bbd..636e22b38 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,30 +1,32 @@ -# $Id: PKGBUILD 94870 2013-08-01 06:54:43Z bpiotrowski $ +# $Id: PKGBUILD 103093 2013-12-26 11:56:21Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> pkgname=cegui -pkgver=0.8.2 -pkgrel=5 +pkgver=0.8.3 +pkgrel=2 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" license=("MIT") depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua51' 'silly' 'glfw') -makedepends=('cmake' 'python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz' 'irrlicht' 'glm' 'mesa') +makedepends=('cmake' 'python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz' 'irrlicht' 'glm' 'mesa' 'mercurial' 'tolua++') optdepends=("python2: python bindings" "ogre: ogre module" "gtk2: gtk2 module" "irrlicht: irrlicht module") -source=(http://downloads.sourceforge.net/crayzedsgui/cegui-$pkgver.tar.gz) -md5sums=('f72951f0cc0374bb2294035cb639bb83') +source=("hg+ssh://hg@bitbucket.org/cegui/cegui#tag=v0-8-3" + "freetype.patch") +md5sums=('SKIP' + '4c5f81f109f36718045bb4ba5ba25602') build() { - cd "$srcdir/cegui-${pkgver}" + cd "$srcdir/cegui" + patch -Np1 < "$srcdir/freetype.patch" sed -i "s/lib64/lib/g" CMakeLists.txt - sed -i "s/lib32/lib/g" CMakeLists.txt [[ -d build ]] && rm -r build mkdir build && cd build @@ -32,20 +34,17 @@ build() { cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCEGUI_LIB_INSTALL_DIR=lib \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 + -DCEGUI_BUILD_PYTHON_MODULES=OFF # currently broken :( + # -PYTHON_EXECUTABLE=/usr/bin/python2 make make html } package() { - cd "$srcdir/cegui-${pkgver}" + cd "$srcdir/cegui"/build - cd build - make DESTDIR="${pkgdir}" install - cd .. - - install -Dm644 doc/COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 ../doc/COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/cegui/freetype.patch b/community/cegui/freetype.patch new file mode 100644 index 000000000..6fdb9e30b --- /dev/null +++ b/community/cegui/freetype.patch @@ -0,0 +1,14 @@ +diff -r 319182022f9f cmake/FindFreetype.cmake +--- a/cmake/FindFreetype.cmake Sat Dec 07 09:00:48 2013 +0000 ++++ b/cmake/FindFreetype.cmake Tue Dec 17 05:02:30 2013 +0100 +@@ -3,8 +3,8 @@ + ################################################################################ + include(FindPackageHandleStandardArgs) + +-find_path(FREETYPE_H_PATH_ft2build NAMES ft2build.h) +-find_path(FREETYPE_H_PATH_ftconfig NAMES freetype/config/ftconfig.h PATH_SUFFIXES freetype2) ++find_path(FREETYPE_H_PATH_ft2build NAMES ft2build.h PATH_SUFFIXES freetype2) ++find_path(FREETYPE_H_PATH_ftconfig NAMES config/ftconfig.h PATH_SUFFIXES freetype2) + find_library(FREETYPE_LIB NAMES freetype2 freetype libfreetype PATH_SUFFIXES dynamic) + find_library(FREETYPE_LIB_DBG NAMES freetype_d libfreetype_d PATH_SUFFIXES dynamic) + mark_as_advanced(FREETYPE_H_PATH_ft2build FREETYPE_H_PATH_ftconfig FREETYPE_LIB FREETYPE_LIB_DBG) diff --git a/community/chuck/PKGBUILD b/community/chuck/PKGBUILD index efde167ce..3bd620b5e 100644 --- a/community/chuck/PKGBUILD +++ b/community/chuck/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98759 2013-10-17 17:27:23Z arodseth $ +# $Id: PKGBUILD 101520 2013-11-26 22:50:13Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Laurent Carlier <lordheavym@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -8,24 +8,25 @@ pkgname=chuck pkgver=1.3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc='Concurrent, on-the-fly audio programming language' arch=('x86_64' 'i686') url='http://chuck.cs.princeton.edu/' license=('GPL') -depends=('gcc-libs' 'libsndfile') + depends=('gcc-libs' 'libsndfile' 'jack') source=("http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz") sha256sums=('ee0c7d94cd4053f9683f84007350992b7e7552fcc190eeba21a66de8deaf3948') build() { - make -C "$pkgname-$pkgver/src" linux-alsa # linux-jack linux-oss osx win32 + # Other build alternatives are: linux-alsa linux-oss osx win32 + make -C "$pkgname-$pkgver/src" linux-jack } package() { cd "$pkgname-$pkgver/src" install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" - mkdir -p "$pkgdir/usr/share/doc/$pkgname" + install -d "$pkgdir/usr/share/doc/$pkgname" cp -r ../examples "$pkgdir/usr/share/doc/$pkgname" } diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 9124d1ccc..6820abb1d 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99709 2013-10-30 23:10:13Z allan $ +# $Id: PKGBUILD 101563 2013-11-28 01:18:16Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com # Based on gnome-control-center: # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Jan de Groot <jgc@archlinux.org> pkgname=cinnamon-control-center -pkgver=2.0.6 +pkgver=2.0.9 pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ license=('GPL') options=('!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" region.patch) -sha256sums=('4871c7893bd6d215df76abbc69f9f75340a5997cdca00669544c7e63eb3c6a2f' +sha256sums=('63bb179a50d5f873ed1c19de97966592eedbc055ce2829e4298223a75fc33b4e' '077cb8d6814c32a4df85f71c2b8fa84da25e5260263a6e0536c6e1626051f022') prepare() { diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD index b66618bbb..eb3ca73d2 100644 --- a/community/cinnamon-desktop/PKGBUILD +++ b/community/cinnamon-desktop/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jan de Groot <jan@archlinux.org> pkgname=cinnamon-desktop -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc="Library with common API for various Cinnamon modules" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=(intltool gobject-introspection gnome-common) url="https://github.com/linuxmint/cinnamon-desktop" install=cinnamon-desktop.install source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz") -sha256sums=('3a417c6f1a1f77182c794e8df6bbea7f36bf3501a332f974322fa4dd0759319d') +sha256sums=('bd9c50df70432d2e37a7c11728dcdf264af235b261b3f378eade61dc4ef101c3') build() { cd $pkgname-$pkgver diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD index 785176c4c..60944dee0 100644 --- a/community/cinnamon-session/PKGBUILD +++ b/community/cinnamon-session/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=cinnamon-session -pkgver=2.0.4 +pkgver=2.0.6 pkgrel=1 pkgdesc="The Cinnamon Session Handler" arch=(i686 x86_64) @@ -16,7 +16,7 @@ url="https://github.com/linuxmint/cinnamon-session" source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz remove_sessionmigration.patch timeout.patch) -sha256sums=('6de02197c89bde698e4f28cba51653967e1322c17c55ebc5f81ca30b14f58278' +sha256sums=('831a63f31bd5c0f5dcaee833d3e43e50e8c9d540cbe931e71b8e0f79ede14567' 'f3c0bc1a3debfaa686230f19ba371b08dd4645064d90ead0c34f465c7d416736' 'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a') diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD index 92ca14b36..162f2684c 100644 --- a/community/cinnamon-settings-daemon/PKGBUILD +++ b/community/cinnamon-settings-daemon/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=cinnamon-settings-daemon -pkgver=2.0.5 +pkgver=2.0.8 pkgrel=1 pkgdesc="The Cinnamon Settings daemon" arch=('i686' 'x86_64') @@ -16,9 +16,9 @@ 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 automount-plugin.patch) -sha256sums=('12dc50677fb90be00ed7e947f40eee4aa9d5126d7ad026d2a8d87588ef312018' +sha256sums=('6889f021acab93d146c78fe8aa540a83a12260232e1ea5f697037a7c94c877fd' '3c05b978cb414c8fc1530f211bab58627a64ac9c156630c9d486f5926a85109c' - 'ff30a46acc968b2cfab7f6040aa2ee400049f784b466901c347c513da2a538a9') + '4fc2b3a354b53d41d92d7f95d175a6a18382330353a0579d29c2d33b9400a837') prepare() { cd $pkgname-$pkgver diff --git a/community/cinnamon-settings-daemon/automount-plugin.patch b/community/cinnamon-settings-daemon/automount-plugin.patch index 17eebca7f..745ed9e2b 100644 --- a/community/cinnamon-settings-daemon/automount-plugin.patch +++ b/community/cinnamon-settings-daemon/automount-plugin.patch @@ -1,15 +1,15 @@ diff -Naur cinnamon-settings-daemon-2.0.1.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in cinnamon-settings-daemon-2.0.1/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in ---- cinnamon-settings-daemon-2.0.1.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in 2013-10-02 16:13:56.000000000 +0200 -+++ cinnamon-settings-daemon-2.0.1/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in 2013-10-08 22:49:15.438929150 +0200 +--- cinnamon-settings-daemon-2.0.6.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in 2013-11-03 10:50:04.000000000 -0500 ++++ cinnamon-settings-daemon-2.0.6/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in 2013-11-05 15:33:21.112912392 -0500 @@ -2,6 +2,7 @@ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins" path="/org/cinnamon/settings-daemon/plugins/"> <child name="a11y-keyboard" schema="org.cinnamon.settings-daemon.plugins.a11y-keyboard"/> <child name="a11y-settings" schema="org.cinnamon.settings-daemon.plugins.a11y-settings"/> + <child name="automount" schema="org.cinnamon.settings-daemon.plugins.automount"/> - <child name="background" schema="org.cinnamon.settings-daemon.plugins.background"/> <child name="clipboard" schema="org.cinnamon.settings-daemon.plugins.clipboard"/> <child name="color" schema="org.cinnamon.settings-daemon.plugins.color"/> -@@ -43,6 +44,18 @@ + <child name="cursor" schema="org.cinnamon.settings-daemon.plugins.cursor"/> +@@ -42,6 +43,18 @@ <_summary>Priority to use for this plugin</_summary> <_description>Priority to use for this plugin in cinnamon-settings-daemon startup queue</_description> </key> diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 5b3209819..9659394f4 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 100100 2013-11-01 17:11:05Z bgyorgy $ +# $Id: PKGBUILD 101561 2013-11-28 01:14:22Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=2.0.8 -pkgrel=2 +pkgver=2.0.14 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -26,7 +26,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/ "keyboard_applet.patch" "input_keybindings.patch" "org.archlinux.pkexec.cinnamon-settings-users.policy") -sha256sums=('f7868e3321a00dd2704a270b474ad0844b7e34e6c536b1b4a9c70b4be7c1f5f4' +sha256sums=('447f65ceb22a40717656d3d708d16ad450802298d783b23004b6e8d3c8d7da85' '2e10ba71fd9ba40afd7e9492b2fc0d5bcc27874bcde543cfd8a47ad20c52354a' '6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3' 'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6' diff --git a/community/clearsilver/PKGBUILD b/community/clearsilver/PKGBUILD index f14fc444e..6113d7352 100644 --- a/community/clearsilver/PKGBUILD +++ b/community/clearsilver/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100140 2013-11-01 20:22:07Z spupykin $ +# $Id: PKGBUILD 102895 2013-12-23 15:16:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Aaron Griffin <aaron@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clearsilver pkgver=0.10.5 -pkgrel=10 +pkgrel=12 pkgdesc="clearsilver is a fast, powerful, and language-neutral HTML template system" arch=('i686' 'x86_64') url='http://www.clearsilver.net' @@ -17,12 +17,8 @@ source=("http://www.clearsilver.net/downloads/$pkgname-$pkgver.tar.gz" md5sums=('b8c0c7fbe0ef5e06e0c935f134304d44' 'd9db4e5985254e1b0d63e9ff042773f4') -build() -{ +prepare() { cd $srcdir/$pkgname-$pkgver - - ./configure --disable-csharp --prefix=/usr --with-python=/usr/bin/python2 - sed -i "s@/usr/local/bin/python@/usr/bin/env python2@g" scripts/document.py sed -i "s@install.rb install@install.rb install --prefix=$pkgdir@g" ruby/Makefile patch -p1 <$srcdir/clearsilver-ruby-1.9.patch @@ -36,7 +32,12 @@ build() > versite = subprefix.call(c['vendorlibdir']) > sodir = subprefix.call(c['vendorarchdir']) EOF + sed -i 's|LIBRARIES = inserted + LIBRARIES|LIBRARIES = LIBRARIES + inserted|' python/setup.py +} +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --disable-csharp --prefix=/usr --with-python=/usr/bin/python2 make } diff --git a/community/clinica/PKGBUILD b/community/clinica/PKGBUILD deleted file mode 100644 index 49be87069..000000000 --- a/community/clinica/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 94204 2013-07-16 17:21:04Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Gianmarco Brocchi <gianmarcobrocchi@gmail.com> - -pkgname=clinica -pkgver=0.3.0 -pkgrel=1 -pkgdesc="Simple medical records manager" -arch=('i686' 'x86_64') -url="https://launchpad.net/clinica-project" -license=('GPL3') -depends=('libgee06' 'libpeas' 'jansson' 'libsoup' 'librsvg' 'yelp') -makedepends=('cmake' 'vala' 'intltool') -optdepends=('python2-gobject: for Agenzia del Farmaco plugin') -install=clinica.install -options=('!makeflags') -source=("https://launchpad.net/clinica-project/stable/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('dae10a4e10c7d148f05ae56d1b0ae47d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e "s:-Werror=format-security:-Wformat -Werror=format-security:g" CMakeLists.txt - sed -i 's@^#!.*python$@#!/usr/bin/python2@' plugins/AgenziaDelFarmaco.py - sed -i -e "s:Application;GTK;:Office;GTK;:g" data/clinica.desktop - - mkdir build - cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DGSETTINGS_COMPILE=OFF \ - -DGSETTINGS_COMPILE_IN_PLACE=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON .. - - LC_ALL=C LANG=C make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - - make DESTDIR="${pkgdir}" install -} diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD index d3b9d85c9..848134302 100644 --- a/community/confuse/PKGBUILD +++ b/community/confuse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99717 2013-10-30 23:13:11Z allan $ +# $Id: PKGBUILD 101339 2013-11-22 22:46:04Z ttoepper $ # Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org> @@ -6,7 +6,7 @@ pkgname=confuse pkgver=2.7 -pkgrel=2 +pkgrel=3 pkgdesc="C-library for parsing configuration files" arch=('i686' 'x86_64') url="http://www.nongnu.org/confuse" diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index 421422532..51bbdaeb5 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 100369 2013-11-02 21:44:13Z dwallace $ +#$Id: PKGBUILD 102949 2013-12-24 22:58:06Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.19 +pkgver=1.20 pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" @@ -17,7 +17,7 @@ optdepends=('bluez: Support for Bluetooth devices' makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn' 'ppp') source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') -md5sums=('562181545fe04ec8442ab4774963154d' +md5sums=('5e4c7b61321994a772ddccbb5835684d' 'a8d22ee089fb0ed725130d16ad393047') prepare(){ diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index 93e0b227d..e48c4b683 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99619 2013-10-30 16:13:52Z giovanni $ +# $Id: PKGBUILD 102097 2013-12-05 08:05:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen -pkgver=0.6.5 +pkgver=0.6.6 pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7db27020d6071f73eea23655d5272055') +md5sums=('500c5aedec23a13e119ad0ece1ebca1d') build() { cd "${srcdir}" diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index fd7a31ecc..e8e8298d0 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99720 2013-10-30 23:14:13Z allan $ +# $Id: PKGBUILD 100600 2013-11-06 13:21:19Z spupykin $ # 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.4.0 -pkgrel=2 +pkgver=1.5.0 +pkgrel=1 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" @@ -20,7 +20,7 @@ backup=('etc/couchdb/local.ini' source=("http://www.eu.apache.org/dist/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} "couchdb.service" "couchdb.tmpfiles") -md5sums=('9d2ecad195f2991098a542a0904ec0a5' +md5sums=('55a2f86469e0697817da8defee730f04' 'SKIP' '8914a7ffc6745f94106d96206709acb4' '1e254ebe32eeb061be64193bafa35dbf') diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD index 1eb7c0b39..71da6c847 100644 --- a/community/csfml/PKGBUILD +++ b/community/csfml/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 95028 2013-08-03 22:28:51Z svenstaro $ +# $Id: PKGBUILD 103137 2013-12-27 11:10:36Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=csfml pkgver=2.1 -pkgrel=1 +pkgrel=2 pkgdesc='C bindings for sfml' arch=('i686' 'x86_64') url='http://www.sfml-dev.org/' license=('zlib') -depends=("sfml=${pkgver}") +depends=("sfml") makedepends=('cmake' 'doxygen') source=("${pkgname}-${pkgver}::https://github.com/LaurentGomila/CSFML/archive/${pkgver}.tar.gz") md5sums=('960085220e6978c720a62b02cc4a2ec4') diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index 805d39804..3a6bc1db9 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100144 2013-11-01 20:22:44Z spupykin $ +# $Id: PKGBUILD 101630 2013-11-29 15:58:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=dante -pkgver=1.3.2 -pkgrel=6 +pkgver=1.4.0 +pkgrel=1 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64) @@ -14,7 +14,7 @@ backup=('etc/socks.conf' 'etc/sockd.conf') source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz sockd.service) -md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd' +md5sums=('c117a3ce25afb936f13b76f1d2524879' '9bb18a0165764092bd01da0ff6303fbf') build() { diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index b4c90050b..88e871734 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99723 2013-10-30 23:19:15Z allan $ +# $Id: PKGBUILD 103146 2013-12-27 15:54:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.2.3 -_pkgver=1.2 +pkgver=1.4 +_pkgver=1.4 pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ makedepends=('intltool>=0.40' 'cmake' 'librsvg') optdepends=('librsvg') install=darktable.install source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('7eaa89aa5257b5f61cc7462db08ce164') +md5sums=('896416931ded4579f528cd11edad470c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/dart/PKGBUILD b/community/dart/PKGBUILD index 7eb295604..d4ad316cc 100644 --- a/community/dart/PKGBUILD +++ b/community/dart/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100438 2013-11-04 12:04:12Z arodseth $ +# $Id: PKGBUILD 100999 2013-11-14 15:05:53Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: T. Jameson Little <t.jameson.little at gmail dot com> # Contributor: Usagi Ito <usagi@WonderRabbitProject.net> @@ -6,51 +6,42 @@ # Contributor: Julien Nicoulaud <julien.nicoulaud@gmail.com> pkgname=dart -pkgver=0.8.7.0 -pkgrel=2 -pkgdesc='The dart programming language (includes SDK and editor)' +pkgver=1.0 +pkgrel=1 +pkgdesc='The dart programming language SDK' arch=('x86_64' 'i686') url='http://www.dartlang.org/' -license=('BSD' 'EPL') -depends=('java-runtime' 'gtk2' 'desktop-file-utils' 'gconf') -makedepends=('gendesk' 'setconf') -backup=("opt/$pkgname/DartEditor.ini") +license=('BSD') +optdepends=('java-runtime: for dartanalyzer') +makedepends=('setconf') options=('!strip') if [[ $CARCH == x86_64 ]]; then - source=("https://storage.googleapis.com/dart-editor-archive-integration/latest/darteditor-linux-64.zip" - 'darteditor.png::https://www.dartlang.org/tools/images/dart-logo-48.png') - sha256sums=('230d53fc95f873e4d2e7cd2377706693196dbfc154c80493d57cf409d2908d72' - 'd90f14b0cfa2dd36502ed5e5854466d54c8d0cf0ac9a5d9ec823274c1a33a00e') + source=("http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip" + "license.html::https://code.google.com/intl/no/google_bsd_license.html") + sha256sums=('9bc14660399c3570fddd262eb9aa11b3e6e19b7a3c547d3b10d60ad905c52c9b' + 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650') else - source=("https://storage.googleapis.com/dart-editor-archive-integration/latest/darteditor-linux-32.zip" - 'darteditor.png::https://www.dartlang.org/tools/images/dart-logo-48.png') - sha256sums=('4752ad56ca58611cf67474d3ebb979a2e5f26e477a3c508cf5847c7207e837a1' - 'd90f14b0cfa2dd36502ed5e5854466d54c8d0cf0ac9a5d9ec823274c1a33a00e') + source=("http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip" + "license.html::https://code.google.com/intl/no/google_bsd_license.html") + sha256sums=('131afed9a220b2035375aee71e6b791248e6de51ee2612a21be3f6797e5bbfe6' + 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650') fi prepare() { # Fix permissions - find "$pkgname" -type d -exec chmod 0755 '{}' + \ + find "$pkgname-sdk" -type d -exec chmod 0755 '{}' + \ -or -type f -exec chmod 0644 '{}' + - chmod +x "$pkgname/DartEditor" - chmod +x "$pkgname/dart-sdk/bin/"* - - # Remove Dartium (takes 309,31 MB, available in the dartium-bin package on AUR) - rm -r "$pkgname/chromium" - - # Prepare a desktop shortcut - gendesk -n -f --pkgname 'darteditor' --name 'Dart Editor' \ - --exec 'darteditor %U' --pkgdesc 'Editor for the dart programming language' + chmod +x "$pkgname-sdk/bin/"* # Fix paths - cd "$pkgname/dart-sdk/bin" - setconf dart2js BIN_DIR "/opt/$pkgname/dart-sdk/bin" - setconf dart2js PROG_NAME "/opt/$pkgname/dart-sdk/bin/dart2js" - setconf dartanalyzer SCRIPT_DIR "/opt/$pkgname/dart-sdk/bin" - setconf dartdoc BIN_DIR "/opt/$pkgname/dart-sdk/bin" - setconf pub BIN_DIR "/opt/$pkgname/dart-sdk/bin" - setconf pub SDK_DIR "/opt/$pkgname/dart-sdk" + cd "$pkgname-sdk/bin" + setconf dart2js BIN_DIR "/opt/$pkgname-sdk/bin" + setconf dart2js PROG_NAME "/opt/$pkgname-sdk/bin/dart2js" + setconf dartanalyzer SCRIPT_DIR "/opt/$pkgname-sdk/bin" + setconf dartdoc BIN_DIR "/opt/$pkgname-sdk/bin" + setconf pub BIN_DIR "/opt/$pkgname-sdk/bin" + setconf pub SDK_DIR "/opt/$pkgname-sdk/" # Fix missing "fi" and missing newline echo -e "fi\n" >> pub @@ -58,28 +49,24 @@ prepare() { package() { # Create directories - install -d "$pkgdir"{"/opt/$pkgname",/usr/{bin,"share/doc/$pkgname"}} + install -d "$pkgdir"{"/opt/$pkgname-sdk",/usr/{bin,"share/doc/$pkgname-sdk"}} # Package the files - cp -a dart/* "$pkgdir/opt/$pkgname/" + cp -a "$pkgname-sdk/"* "$pkgdir/opt/$pkgname-sdk/" # Set up symbolic links for the executables for f in dart dart2js dartanalyzer dartdoc pub; do - ln -s "/opt/$pkgname/dart-sdk/bin/$f" "$pkgdir/usr/bin/$f" + ln -s "/opt/$pkgname-sdk/bin/$f" "$pkgdir/usr/bin/$f" done - ln -s "/opt/$pkgname/DartEditor" "$pkgdir/usr/bin/darteditor" # Package samples and documentation for f in samples about.html about_files; do - echo mv "$pkgdir/opt/$pkgname/$f" "$pkgdir/usr/share/doc/$pkgname/" + echo mv "$pkgdir/opt/$pkgname-sdk/$f" "$pkgdir/usr/share/doc/$pkgname/" done - # Set up a symbolic link for the configuration - echo ln -s "/opt/$pkgname/DartEditor.ini" "$pkgdir/etc/darteditor.ini" - - # Package desktop shortcut and icon - install -Dm644 'darteditor.desktop' "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 'darteditor.png' "$pkgdir/usr/share/pixmaps/darteditor.png" + # BSD License + install -Dm644 license.html \ + "$pkgdir/usr/share/licenses/$pkgname/license.html" } # vim:set ts=2 sw=2 et: diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 251ca9baa..0b85b2534 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99724 2013-10-30 23:19:36Z allan $ +# $Id: PKGBUILD 102778 2013-12-19 17:41:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail -pkgver=3.1.7 -pkgrel=4 +pkgver=3.1.8 +pkgrel=2 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime' 'libzdb' 'mhash' 'libevent') @@ -26,19 +26,16 @@ source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_1" "dbmail-lmtpd.xinetd" "dbmail-pop3d.xinetd" "dbmail-timsieved.xinetd" - "dbmail-6-sieve.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=92b98094a01eda5efe3ba3080e529482d08945a2" "dbmail-7-systemd.diff") md5sums=('SKIP' '890de13361afbdf4fed12d6d7eb53e66' '961593658cd596297d03d25eb9c9e98f' '4cb764894abd3914802e90602bf90a0c' 'e78dc86355f9aaf24590bc7c6611162f' - 'b1063893dd0e74bc0ddee454bb65bf01' 'a781a4ebe2dd75ed635c9b4a239b38d8') prepare() { cd $srcdir/dbmail-${pkgver}/ - patch -p1 <$srcdir/dbmail-6-sieve.patch patch -Rp1 <$srcdir/dbmail-7-systemd.diff aclocal automake --add-missing diff --git a/community/dd_rescue/PKGBUILD b/community/dd_rescue/PKGBUILD new file mode 100644 index 000000000..05f098682 --- /dev/null +++ b/community/dd_rescue/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 100624 2013-11-06 14:17:22Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Zerial <fernando@zerial.org> +# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> +# Contributor: Jose Riha <jose1711 gmail com> + +pkgname=dd_rescue +pkgver=1.40 +pkgrel=2 +pkgdesc="A dd version that is very useful for data-recovery" +url="http://www.garloff.de/kurt/linux/ddrescue/" +license=("GPL") +depends=('glibc') +arch=('x86_64' 'i686') +source=("http://www.garloff.de/kurt/linux/ddrescue/$pkgname-${pkgver}.tar.gz") +md5sums=('690bc25884272461d994aca10f620b98') + +build() { + cd $pkgname + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" INSTALLDIR="$pkgdir/usr/bin" install +} diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD index afb77ae01..fbc3cd89d 100644 --- a/community/denemo/PKGBUILD +++ b/community/denemo/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 99727 2013-10-30 23:20:50Z allan $ +# $Id: PKGBUILD 102121 2013-12-05 14:32:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> # Contributor: Gnud <ach.gnud@gmail.com> pkgname=denemo -pkgver=1.0.4 +pkgver=1.1.0 pkgrel=1 pkgdesc="A music score editor" arch=('i686' 'x86_64') url="http://www.denemo.org" license=('GPL') depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw' - 'librsvg' 'fluidsynth' 'libsmf' 'evince' 'gtksourceview3' 'portmidi') + 'librsvg' 'fluidsynth' 'libsmf' 'evince' 'gtksourceview3' 'portmidi' + 'rubberband') makedepends=('intltool') backup=('etc/denemo/denemo.conf') source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('1d633ad7741ab12dab865219a20559f0') +md5sums=('5e708247b2abd9b3b196e8e2e033bf11') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD index 2df6273f0..cfc22754a 100644 --- a/community/desmume/PKGBUILD +++ b/community/desmume/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89975 2013-05-06 15:32:51Z schuay $ +# $Id: PKGBUILD 101801 2013-12-01 11:51:18Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Jonathan Conder <jonno dot conder at gmail dot com> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -12,21 +12,24 @@ # Contributor: Asher256 <achrafcherti at gmail dot com> pkgname=desmume -pkgver=0.9.9 +pkgver=0.9.10 pkgrel=2 pkgdesc="Nintendo DS emulator" arch=('i686' 'x86_64') url="http://desmume.org/" license=('GPL') -depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap' - 'soundtouch' 'alsa-lib' 'zziplib' 'glu') +depends=('desktop-file-utils' 'libpcap' 'soundtouch' 'alsa-lib' 'glu' 'sdl' 'gtk2' 'zziplib') makedepends=('intltool' 'mesa') install=desmume.install -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.tar" + "glx_3Demu.patch") build() { cd "$srcdir/$pkgname-$pkgver" + # http://sourceforge.net/p/desmume/code/4907/ + patch -Np2 < "$srcdir"/glx_3Demu.patch + # See https://bugs.archlinux.org/task/35086 and # https://sourceforge.net/tracker/?func=detail&aid=3612768&group_id=164579&atid=832291 sed -i 's/@GETTEXT_PACKAGE@/desmume/' po/Makefile.in.in @@ -41,4 +44,5 @@ package() { make DESTDIR="$pkgdir/" install } -md5sums=('458b5f8b3dbb38a47e6d0518f97aa82a') +md5sums=('a6aedfe5d6437d481aa9ac5fb5aebbea' + '352ea0ffa109f68da2fb79f30d2c85e2') diff --git a/community/desmume/glx_3Demu.patch b/community/desmume/glx_3Demu.patch new file mode 100644 index 000000000..a47342595 --- /dev/null +++ b/community/desmume/glx_3Demu.patch @@ -0,0 +1,25 @@ +--- src/desmume-0.9.10/src/gtk/glx_3Demu.cpp 2013-11-28 01:36:53.712615822 +0100 ++++ glx_3Demu.cpp 2013-11-28 22:08:52.762390897 +0100 +@@ -41,11 +41,7 @@ + glXDestroyContext(dpy, ctx); + + XCloseDisplay(dpy); +- +- return true; + } +- +- return false; + } + + int init_glx_3Demu(void) +--- src/desmume-0.9.10/src/gtk/glx_3Demu.cpp 2013-11-28 01:36:53.712615822 +0100 ++++ glx_3Demu.cpp 2013-11-28 22:14:34.529740137 +0100 +@@ -31,7 +31,7 @@ + static GLXContext ctx; + static GLXPbuffer pbuf; + +-void deinit_glx_3Demu(void) ++int deinit_glx_3Demu(void) + { + Display *dpy = glXGetCurrentDisplay(); + diff --git a/community/dietlibc/PKGBUILD b/community/dietlibc/PKGBUILD index e53e18f30..d52295e95 100644 --- a/community/dietlibc/PKGBUILD +++ b/community/dietlibc/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 100146 2013-11-01 20:23:04Z spupykin $ +# $Id: PKGBUILD 100866 2013-11-12 15:53:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tino Reichardt <milky-archlinux@mcmilk.de> pkgname=dietlibc pkgver=0.33 -pkgrel=2 +pkgrel=3 pkgdesc="a libc optimized for small size" arch=('i686' 'x86_64') url="http://www.fefe.de/dietlibc/" license=("GPL") +options=('staticlibs') #source=(http://www.kernel.org/pub/linux/libs/dietlibc/$pkgname-$pkgver.tar.bz2) source=("http://www.fefe.de/dietlibc/dietlibc-$pkgver.tar.bz2") md5sums=('9d541b9a6623b04ec12e5248b82db7c0') diff --git a/community/diffstat/PKGBUILD b/community/diffstat/PKGBUILD new file mode 100644 index 000000000..3daf97939 --- /dev/null +++ b/community/diffstat/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 102318 2013-12-08 09:22:50Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Matthias-Christian Ott <matthias.christian.at.tiscali.de> + +pkgname=diffstat +pkgver=1.58 +pkgrel=1 +pkgdesc="Display a histogram of diff changes" +arch=('i686' 'x86_64') +url="http://invisible-island.net/diffstat" +depends=('glibc') +license=('MIT') +source=("ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz") +md5sums=('6d6e13f7dcfe4db5da65c5175260ea47') + +build () { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR=${pkgdir}/ install + install -Dm644 package/debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index 72037c483..f1d7b0640 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98383 2013-10-09 11:50:00Z dicebot $ +# $Id: PKGBUILD 100583 2013-11-06 11:18:29Z dicebot $ # Maintainer: Mihails Strasunse <public@dicebot.lv> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Chris Brannon <cmbrannon79@gmail.com> @@ -9,21 +9,19 @@ pkgname=('dmd' 'libphobos-devel' 'libphobos' 'dtools') groups=('dlang' 'dlang-dmd') pkgbase=dmd -pkgver=2.063.2 -pkgrel=4 +pkgver=2.064.2 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.dlang.org" makedepends=('git' 'gcc' 'make') source=("git+http://github.com/D-Programming-Language/dmd.git#tag=v$pkgver" "git+http://github.com/D-Programming-Language/druntime.git#tag=v$pkgver" "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver" - "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver" - "soname.diff") + "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver") sha1sums=('SKIP' 'SKIP' 'SKIP' - 'SKIP' - '5a2198e8a024e1e6494034da569f0df18fabcf9d') + 'SKIP') [[ $CARCH == "x86_64" ]] && _archbits="64" [[ $CARCH == "i686" ]] && _archbits="32" @@ -36,8 +34,6 @@ build() { make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1 cd $srcdir/phobos - # will be in upstream in next release but making naming change as early as possible - git apply $srcdir/soname.diff make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1 cd $srcdir/tools @@ -82,6 +78,7 @@ package_dmd() { package_libphobos-devel() { pkgdesc="The Phobos standard library for D programming language. Modules and static library." depends=("dmd") + options=("staticlibs") provides=("d-runtime=$pkgver" "d-stdlib=$pkgver") license=("custom") @@ -123,5 +120,5 @@ package_dtools() { ln -s dtools-dustmite usr/bin/dustmite # same Boost license as Phobos - install -Dm644 $srcdir/phobos/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE-phobos + install -Dm644 $srcdir/phobos/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE } diff --git a/community/dmd/soname.diff b/community/dmd/soname.diff deleted file mode 100644 index 7d155a52a..000000000 --- a/community/dmd/soname.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/posix.mak b/posix.mak -index 8fd953e..3776bb4 100644 ---- a/posix.mak -+++ b/posix.mak -@@ -153,8 +153,8 @@ DDOC=$(DMD) - VERSION=../dmd/VERSION - - # Set SONAME, the name of the shared library. --# The awk script will produce the last 2 digits of the version string, i.e. 2.063 produces 63 --SONAME = libphobos2.so.0.$(shell awk -F. '{ print $$NF + 0 }' $(VERSION)) -+# The awk script will return the second group without leading zeros of the version string, i.e. 2.063.2 produces 63 -+SONAME = libphobos2.so.0.$(shell awk -F. '{ print $$2 + 0 }' $(VERSION)) - - # Set LIB, the ultimate target - ifeq (,$(findstring win,$(OS))) diff --git a/community/dnscrypt-proxy/PKGBUILD b/community/dnscrypt-proxy/PKGBUILD index 8fc4d9fcc..be3e273d3 100644 --- a/community/dnscrypt-proxy/PKGBUILD +++ b/community/dnscrypt-proxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97435 2013-09-20 02:21:56Z fyan $ +# $Id: PKGBUILD 101137 2013-11-18 07:26:01Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Techlive Zheng <techlivezheng at gmail dot com> # Contributor: peace4all <markspost at rocketmail dot com> pkgname=dnscrypt-proxy pkgver=1.3.3 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for securing communications between a client and a DNS resolver" arch=('i686' 'x86_64') url="http://dnscrypt.org/" @@ -17,13 +17,13 @@ source=(http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.bz2 backup=(etc/conf.d/dnscrypt-proxy) build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver CFLAGS="$CFLAGS -fPIC" ./configure --prefix=/usr --sbindir=/usr/bin make -j2 } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/{usr/share/{licenses,doc}/$pkgname,etc/conf.d,usr/lib/systemd/system} @@ -31,9 +31,8 @@ package() { install -m 644 AUTHORS NEWS README README.markdown "$pkgdir"/usr/share/doc/$pkgname install -m 644 "$srcdir"/conf.d.file "$pkgdir"/etc/conf.d/$pkgname install -m 644 "$srcdir"/dnscrypt-proxy.service "$pkgdir"/usr/lib/systemd/system - rm -rf "$pkgdir"/usr/{lib/*.{l,}a,include} } sha512sums=('c8e9484485f060aa90a36ef097506b1042348c85b74d0e5bfdeefa8bf8f80e42ae79d4568f524bb6de0754b125ed4f4b39a177f6fdee9e4616e7d0c3641aec0b' - '2271eab1baf1a7192a8daaa1b271c24a3a3fa498432ac99c2e4fb3c939590f09aab582427ae874fce7969ece365ccb7a2e946566e5a0c650d93c34d23b536b61' - 'bfff47fc9a515a26d835e08dfeeffba07ff66b09fd887df6c961802c2f8d584f9cd05e83bdcd7ccc274215744e4a05a328aec96152dee70e2fdfe12e12b390d3') + '26e5ce3198c25ff25542dc399f2bb5467ac349dbc11c2ebd6d3ba978ffaef09607088d9401e62ba33c6f50b8b29a59f56fe97d964f55e63ee9d8ca23862c3e00' + '9a1072f83e83e55dcdd7b80d1943f60963fa240da8a50d7491cc219797c6b85b8d79d087c0f7bb9766a4d467dec58eaae2bef31b759652545ace65a6a8afb608') diff --git a/community/dnscrypt-proxy/conf.d.file b/community/dnscrypt-proxy/conf.d.file index fae760f21..32be16a16 100644 --- a/community/dnscrypt-proxy/conf.d.file +++ b/community/dnscrypt-proxy/conf.d.file @@ -1,3 +1,7 @@ DNSCRYPT_LOCALIP=127.0.0.1 DNSCRYPT_LOCALPORT=53 DNSCRYPT_USER=nobody +DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.opendns.com +DNSCRYPT_PROVIDER_KEY=B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79 +DNSCRYPT_RESOLVERIP=208.67.220.220 +DNSCRYPT_RESOLVERPORT=443 diff --git a/community/dnscrypt-proxy/dnscrypt-proxy.service b/community/dnscrypt-proxy/dnscrypt-proxy.service index 5d38fd908..200090c5a 100644 --- a/community/dnscrypt-proxy/dnscrypt-proxy.service +++ b/community/dnscrypt-proxy/dnscrypt-proxy.service @@ -8,6 +8,9 @@ After=network.target EnvironmentFile=/etc/conf.d/dnscrypt-proxy ExecStart=/usr/bin/dnscrypt-proxy \ --local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \ + --resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \ + --provider-name=${DNSCRYPT_PROVIDER_NAME} \ + --provider-key=${DNSCRYPT_PROVIDER_KEY} \ --user=${DNSCRYPT_USER} Restart=on-abort diff --git a/community/docbook2x/PKGBUILD b/community/docbook2x/PKGBUILD index 4bc84cdc8..3ca66b2b0 100644 --- a/community/docbook2x/PKGBUILD +++ b/community/docbook2x/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67604 2012-03-13 14:04:01Z spupykin $ +# $Id: PKGBUILD 101319 2013-11-22 17:09:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> @@ -17,18 +17,24 @@ source=(http://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz md5sums=('b9b76a6af198c4f44574cfd17a322f01' '826fae88a435d9278c4f9614991d55a1') -build() { +prepare() { cd $srcdir/docbook2X-$pkgver patch -p1 <$srcdir/datadir.diff + sed -e 's/AM_CONFIG_HEADER(/AC_CONFIG_HEADERS(/' -i configure.ac +} - autoreconf +build() { + cd $srcdir/docbook2X-$pkgver + autoreconf -i -f ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ --program-transform-name 's,2x-,2,' \ - make +} +package() { + cd $srcdir/docbook2X-$pkgver make DESTDIR=$pkgdir install install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/license sed -i 's|http://docbook2x.sf.net/latest|/usr/share/docbook2X|g' \ diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD new file mode 100644 index 000000000..9215782e4 --- /dev/null +++ b/community/docker/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 102652 2013-12-17 09:06:19Z seblu $ +# Maintainer: Sébastien "Seblu" Luttringer + +pkgname=docker +pkgver=0.7.2 +pkgrel=1 +epoch=1 +pkgdesc='Pack, ship and run any application as a lightweight container' +arch=('x86_64') +url='http://www.docker.io/' +license=('Apache') +depends=('bridge-utils' 'iproute2' 'device-mapper' 'lxc' 'sqlite' 'systemd') +makedepends=('git' 'go') +# don't strip binaries! A sha1 is used to check binary consistency. +options=('!strip') +install=$pkgname.install +source=("git+https://github.com/dotcloud/docker.git#tag=v$pkgver") +md5sums=('SKIP') +# magic harcoded path +_magic=src/github.com/dotcloud + +prepare() { + mkdir -p "$_magic" + ln -sfn "../../../docker" "$_magic/docker" +} + +build() { + cd "$_magic/docker" + export GOPATH="$srcdir:$srcdir/$_magic/docker/vendor" + ./hack/make.sh dynbinary +} + +check() { + cd "$_magic/docker" + # Will be added upstream soon + #./hack/make.sh dyntest +} + +package() { + cd "$_magic/docker" + install -Dm755 "bundles/$pkgver/dynbinary/docker-$pkgver" "$pkgdir/usr/bin/docker" + install -Dm755 "bundles/$pkgver/dynbinary/dockerinit-$pkgver" "$pkgdir/usr/lib/docker/dockerinit" + # completion + install -Dm644 "contrib/completion/bash/docker" "$pkgdir/usr/share/bash-completion/completions/docker" + install -Dm644 "contrib/completion/zsh/_docker" "$pkgdir/usr/share/zsh/site-functions/_docker" + # systemd + install -Dm644 "contrib/init/systemd/docker.service" "$pkgdir/usr/lib/systemd/system/docker.service" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/docker/docker.install b/community/docker/docker.install new file mode 100644 index 000000000..f730503de --- /dev/null +++ b/community/docker/docker.install @@ -0,0 +1,18 @@ +# arg 1: the new package version +post_install() { + # create docker group (FS#38029) + getent group docker >/dev/null || groupadd -g 142 docker +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + (( $(vercmp $2 '1:0.7.1-1') < 0 )) && post_install "$1" || true +} + +# arg 1: the old package version +post_remove() { + groupdel docker >/dev/null 2>&1 || true +} + +# vim:set ts=2 sw=2 et: diff --git a/community/docker/docker.service b/community/docker/docker.service new file mode 100644 index 000000000..b96d19ddb --- /dev/null +++ b/community/docker/docker.service @@ -0,0 +1,11 @@ +[Unit] +Description=Docker Application Container Engine +Documentation=http://docs.docker.io +After=network.target + +[Service] +ExecStartPre=/usr/bin/mount --make-rprivate / +ExecStart=/usr/bin/docker -d + +[Install] +WantedBy=multi-user.target diff --git a/community/dolphin-emu/Dolphin_Logo.png b/community/dolphin-emu/Dolphin_Logo.png Binary files differnew file mode 100644 index 000000000..63450da00 --- /dev/null +++ b/community/dolphin-emu/Dolphin_Logo.png diff --git a/community/dolphin-emu/PKGBUILD b/community/dolphin-emu/PKGBUILD new file mode 100644 index 000000000..1dbe03bb0 --- /dev/null +++ b/community/dolphin-emu/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Jeremy Newton (Mystro256) + +pkgname=dolphin-emu +pkgver=4.0.2 +pkgrel=1 +epoch=1 +pkgdesc='A Gamecube / Wii / Triforce emulator' +arch=('i686' 'x86_64') +url='http://dolphin-emu.org' +license=('GPL2') + +makedepends=('cmake' 'git' 'opencl-headers') +depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.9') +optdepends=('pulseaudio: PulseAudio backend') + +source=("${pkgname%-*}::git+https://code.google.com/p/dolphin-emu/#tag=${pkgver}" + 'dolphin-emu.desktop' + 'Dolphin_Logo.png') + +# TODO: Drop the custom icon and .desktop file, apparently dolphin ships these now. + +build() { + cd "${srcdir}/${pkgname%-*}" + + mkdir build && cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.9 + make +} + +package() { + cd "${srcdir}/${pkgname%-*}/build" + + make DESTDIR=${pkgdir} install + + install -Dm644 "${srcdir}/dolphin-emu.desktop" \ + "${pkgdir}/usr/share/applications/dolphin-emu.desktop" + install -Dm644 "${srcdir}/Dolphin_Logo.png" "${pkgdir}/usr/share/pixmaps/dolphin-emu.png" +} + +md5sums=('SKIP' + 'feed4580c2e6bfbc7f6c67dad861daae' + 'd15c51f547b4bd47e510faac40bcc9d6') diff --git a/community/dolphin-emu/dolphin-emu.desktop b/community/dolphin-emu/dolphin-emu.desktop new file mode 100644 index 000000000..96317d168 --- /dev/null +++ b/community/dolphin-emu/dolphin-emu.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Dolphin +Categories=Game;Emulator;GTK; +GenericName=GameCube and Wii Emulator +Comment=An emulator for the GameCube and Wii consoles +Exec=dolphin-emu +Icon=dolphin-emu +StartupNotify=false +Name[en_US]=Dolphin diff --git a/community/dstep/PKGBUILD b/community/dstep/PKGBUILD new file mode 100644 index 000000000..cc1e93ea4 --- /dev/null +++ b/community/dstep/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Dicebot <public@dicebot.lv> +pkgname=dstep +pkgver=0.1.0 +pkgrel=1 +pkgdesc="Automatic C header to D module translator" +arch=('i686' 'x86_64') +groups=('dlang') +url="https://github.com/jacob-carlborg/dstep" +license=('custom') +depends=('clang') +makedepends=('git' 'dmd' 'libphobos-devel' 'dtools') +source=( + "git+https://github.com/jacob-carlborg/dstep.git#tag=v$pkgver" + "tango::git+https://github.com/SiegeLord/Tango-D2.git" + "http://www.boost.org/LICENSE_1_0.txt" +) +sha1sums=( + 'SKIP' + 'SKIP' + '3cba29011be2b9d59f6204d6fa0a386b1b2dbd90' +) + +build () +{ + cd $srcdir/tango + ARCH=$CARCH make -f build/Makefile + + cd $srcdir/dstep + git submodule update --init --recursive + rdmd --build-only -debug -gc -ofbin/dstep -Idstack/mambo -Idstack -I$srcdir/tango -L-L$srcdir/tango -I/usr/include/dlang -L-lclang -L-ltango-dmd dstep/driver/DStep.d +} + +package () +{ + mkdir -p $pkgdir/usr/bin + install -m755 $srcdir/dstep/bin/dstep $pkgdir/usr/bin/dstep + mkdir -p $pkgdir/usr/share/licenses/$pkgname + install -m644 $srcdir/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE.txt +} diff --git a/community/dub/PKGBUILD b/community/dub/PKGBUILD index 94580a0c2..908b3c2d5 100644 --- a/community/dub/PKGBUILD +++ b/community/dub/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Mihails Strasuns <public@dicebot.lv> # Contributor: Moritz Maxeiner <moritz@ucworks.org> pkgname=dub -pkgver=0.9.19 -pkgrel=1 +pkgver=0.9.20 +pkgrel=2 pkgdesc="Developer package manager for D programming language" arch=('i686' 'x86_64') url="https://github.com/rejectedsoftware/dub" @@ -16,9 +16,12 @@ sha256sums=('SKIP') build() { cd "${srcdir}/${pkgname}" + + echo Generating version file... GITVER=$(git describe) || GITVER=unknown echo "module dub.version_; enum dubVersion = \"$GITVER\";" > source/dub/version_.d - dmd -ofbin/dub -g -debug -w -Isource -L-lcurl @build-files.txt + + dmd -ofbin/dub -g -debug -w -version=DubUseCurl -Isource -L-lcurl @build-files.txt } package() diff --git a/community/dvdisaster/PKGBUILD b/community/dvdisaster/PKGBUILD index 494b615bf..e7dc16189 100644 --- a/community/dvdisaster/PKGBUILD +++ b/community/dvdisaster/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 97061 2013-09-12 03:38:41Z eric $ +# $Id: PKGBUILD 101531 2013-11-27 02:32:12Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=dvdisaster -pkgver=0.72.4 -pkgrel=2 +pkgver=0.72.5 +pkgrel=1 pkgdesc="Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches" arch=('i686' 'x86_64') url="http://www.dvdisaster.com/" license=('GPL') -depends=('gtk2' 'hicolor-icon-theme') +depends=('gtk2') options=('!makeflags') install=dvdisaster.install -source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2{,.gpg}) -sha1sums=('2b47fb5a5535d90641f24a599cd8ae8ffd86b972' - 'SKIP') +source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2 + ${pkgname}-${pkgver}.tar.bz2.sig::http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2.gpg) +sha1sums=('cc89c7eaf838ba1a88be4ed1a567276a911f76b0' + '7bffbbd282c009986938811ee6bd22d10b1a95f4') prepare() { cd ${pkgname}-${pkgver} diff --git a/community/dvdrtools/PKGBUILD b/community/dvdrtools/PKGBUILD deleted file mode 100644 index fe06cc790..000000000 --- a/community/dvdrtools/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 76869 2012-10-01 14:50:59Z bisson $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=dvdrtools -pkgver=0.3.1 -pkgrel=3 -pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives" -arch=('i686' 'x86_64') -url="http://savannah.nongnu.org/projects/dvdrtools/" -license=('GPL') -depends=('file' 'bash') -makedepends=('transcode') -optdepends=('transcode: video/DVD ripper and encoder for the terminal/console') -conflicts=('cdrkit') -source=(ftp://ftp.archlinux.org/other/dvdrtools/$pkgname-$pkgver.tar.gz) -md5sums=('5707b7e877b853e258cd738938833006') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community/dvgrab/PKGBUILD b/community/dvgrab/PKGBUILD new file mode 100644 index 000000000..c39f319f7 --- /dev/null +++ b/community/dvgrab/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 102099 2013-12-05 09:01:04Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=dvgrab +pkgver=3.5 +pkgrel=4 +pkgdesc="Saves audio and video data from an IEEE (FireWire) digital source" +arch=('i686' 'x86_64') +url="http://www.kinodv.org/" +license=('GPL') +depends=('libdv' 'libavc1394' 'libjpeg-turbo' 'libiec61883' 'gcc-libs') +makedepends=('pkgconfig') +source=("http://downloads.sourceforge.net/kino/${pkgname}-${pkgver}.tar.gz") +md5sums=('b39a242ce63e80fc347ab59931f75649') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/community/easystroke/PKGBUILD b/community/easystroke/PKGBUILD index 1a566a279..cf296f3f3 100644 --- a/community/easystroke/PKGBUILD +++ b/community/easystroke/PKGBUILD @@ -3,7 +3,7 @@ pkgname=easystroke pkgver=0.6.0 -pkgrel=3 +pkgrel=4 pkgdesc='Use mouse gestures to initiate commands and hotkeys.' arch=('i686' 'x86_64') url='http://easystroke.sourceforge.net/' diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index 189209940..c73e726d7 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,36 +1,88 @@ -# $Id: PKGBUILD 93139 2013-06-25 15:54:26Z spupykin $ +# $Id: PKGBUILD 102533 2013-12-13 10:32:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd -pkgver=2.1.13 +pkgver=13.12 pkgrel=1 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686') url="http://www.ejabberd.im/" license=("GPL") -depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2') -backup=('etc/ejabberd/ejabberd.cfg' +depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml') +makedepends=('git' 'rebar') +backup=('etc/ejabberd/ejabberd.yml' 'etc/ejabberd/ejabberdctl.cfg' 'etc/logrotate.d/ejabberd') install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/v$pkgver.tar.gz" +replaces=('ejabberd-mod_mysql' 'ejabberd-mod_mysql-svn' + 'ejabberd-mod_pgsql' 'ejabberd-mod_pgsql-svn') +source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz" + "p1_cache_tab::git://github.com/processone/cache_tab" + "p1_tls::git://github.com/processone/tls" + "p1_stringprep::git://github.com/processone/stringprep" + "p1_xml::git://github.com/processone/xml" + "p1_yaml::git://github.com/processone/p1_yaml" + "git://github.com/rds13/xmlrpc" + "p1_pam::git://github.com/processone/epam" + "p1_zlib::git://github.com/processone/zlib" + "git://github.com/basho/lager" + "p1_iconv::git://github.com/processone/eiconv" + "git://github.com/DeadZen/goldrush.git" + "p1_mysql::git://github.com/processone/mysql.git" + "p1_pgsql::git://github.com/processone/pgsql.git" + "p1_stun::git://github.com/processone/stun" + "git://github.com/davisp/jiffy" + "git://github.com/cmullaparthi/ibrowse" + "git://github.com/esl/lhttpc" "$pkgname.logrotate" - "ejabberd.service") -md5sums=('2a7c3b711b4f7091f811c51b52beb735' + "ejabberd.service" + "crash-fix.patch") +md5sums=('6eadb6f190d55c8a679de5496ca0c4a9' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' 'f97c8a96160f30e0aecc9526c12e6606' - 'df32aa17e40a7bc5d9946d3ba6fe5e16') + 'a437aff9d7d477fb036d527205617e18' + 'ef3dd667dec1627c1597c7f6f3cfcd4a') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 <$srcdir/crash-fix.patch + + mkdir -p "$srcdir/$pkgname-$pkgver/deps" + for i in goldrush lager p1_cache_tab p1_iconv p1_pam \ + p1_stringprep p1_tls p1_xml p1_yaml p1_zlib xmlrpc \ + p1_mysql p1_pgsql p1_stun jiffy ibrowse lhttpc; do + rm -rf "$srcdir/$pkgname-$pkgver/deps/$i" + mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps" + done +} build() { - cd "$srcdir/$pkgname-$pkgver/src" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --enable-pam --enable-odbc + --enable-all make } package() { - cd "$srcdir/$pkgname-$pkgver/src" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -d "$pkgdir/var/lib/$pkgname" install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" @@ -40,6 +92,8 @@ package() { chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh" rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin" install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service + # workaround + ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam } # vim:set ts=2 sw=2 et: diff --git a/community/ejabberd/crash-fix.patch b/community/ejabberd/crash-fix.patch new file mode 100644 index 000000000..7ab803bfe --- /dev/null +++ b/community/ejabberd/crash-fix.patch @@ -0,0 +1,14 @@ +diff -wbBur ejabberd-13.10/src/ejabberd_c2s.erl ejabberd-13.10.q/src/ejabberd_c2s.erl +--- ejabberd-13.10/src/ejabberd_c2s.erl 2013-09-27 13:19:22.000000000 +0400 ++++ ejabberd-13.10.q/src/ejabberd_c2s.erl 2013-11-16 03:37:15.525501597 +0400 +@@ -536,8 +536,8 @@ + [StateData#state.socket, + jlib:jid_to_string(JID), AuthModule]), + SID = {now(), self()}, +- Conn = (StateData#state.sockmod):get_conn_type( +- StateData#state.socket), ++ Conn = get_conn_type( ++ StateData), + Info = [{ip, StateData#state.ip}, {conn, Conn}, + {auth_module, AuthModule}], + Res = jlib:make_result_iq_reply( diff --git a/community/ejabberd/ejabberd.install b/community/ejabberd/ejabberd.install index 6e586229d..572667084 100644 --- a/community/ejabberd/ejabberd.install +++ b/community/ejabberd/ejabberd.install @@ -3,18 +3,14 @@ post_install() { useradd -r -G jabber -d /var/lib/ejabberd ejabberd chown -R ejabberd.jabber /var/log/ejabberd chown -R ejabberd.jabber /var/lib/ejabberd - chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam - chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd - chmod 4750 /usr/lib/ejabberd/priv/bin/epam + chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd } post_upgrade() { chown -R ejabberd.jabber /var/log/ejabberd chown -R ejabberd.jabber /var/lib/ejabberd - chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd - chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam - chmod 4750 /usr/lib/ejabberd/priv/bin/epam - echo ">> ejabberd looks into /var/lib/ejabberd for mnesia db now" + chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd + echo "!!! it is major update. Config must be converted to yaml format." } post_remove() { diff --git a/community/ejabberd/ejabberd.service b/community/ejabberd/ejabberd.service index 036cc7c53..7de4e8d00 100644 --- a/community/ejabberd/ejabberd.service +++ b/community/ejabberd/ejabberd.service @@ -7,7 +7,8 @@ Type=forking User=ejabberd LimitNOFILE=16000 RestartSec=5 -ExecStart=/usr/bin/erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\" +ExecStart=/usr/bin/ejabberdctl start +ExecStop=/usr/bin/ejabberdctl stop [Install] WantedBy=multi-user.target diff --git a/community/elasticsearch/PKGBUILD b/community/elasticsearch/PKGBUILD new file mode 100644 index 000000000..edcc42159 --- /dev/null +++ b/community/elasticsearch/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 102806 2013-12-20 13:45:23Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost> +# Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer> + +pkgname=elasticsearch +pkgver=0.90.8 +pkgrel=2 +pkgdesc="Distributed RESTful search engine built on top of Lucene" +arch=('i686' 'x86_64') +url="http://www.elasticsearch.org/" +license=('APACHE') +depends=('java-runtime' 'bash') +install='elasticsearch.install' +source=( + "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz" + elasticsearch.service + elasticsearch-tmpfile.conf +) + +backup=('etc/elasticsearch/elasticsearch.yml' + 'etc/elasticsearch/logging.yml') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + for script in plugin elasticsearch; do + sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \ + -i bin/$script + + for java in jre jdk; do + sed "/^CDPATH/i [ -f /etc/profile.d/$java.sh ] && . /etc/profile.d/$java.sh" \ + -i bin/$script + done + done + + sed 's|$ES_HOME/lib|/usr/lib/elasticsearch|g' -i bin/elasticsearch.in.sh + + echo -e '\nJAVA_OPTS="$JAVA_OPTS -Des.path.conf=/etc/elasticsearch"' >> bin/elasticsearch.in.sh + + sed -e 's/# \(path\.conf: \).*$/\1\/etc\/elasticsearch/' \ + -e '0,/# \(path\.data: \).*$/s//\1\/var\/lib\/elasticsearch/' \ + -e 's/# \(path\.work: \).*$/\1\/tmp\/elasticsearch/' \ + -e 's/# \(path\.logs: \).*$/\1\/var\/log\/elasticsearch/' \ + -i config/elasticsearch.yml +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -dm755 "$pkgdir/etc/elasticsearch" + install -dm755 "$pkgdir/var/lib/elasticsearch" + install -dm755 "$pkgdir/var/log/elasticsearch" + + if [ $CARCH = 'x86_64' ]; then + install -Dm644 lib/sigar/libsigar-amd64-linux.so "$pkgdir/usr/lib/elasticsearch/sigar/libsigar-amd64-linux.so" + else + install -Dm644 lib/sigar/libsigar-x86-linux.so "$pkgdir/usr/lib/elasticsearch/sigar/libsigar-x86-linux.so" + fi + cp lib/sigar/sigar*.jar "$pkgdir/usr/lib/elasticsearch/sigar/" + cp lib/*.jar "$pkgdir/usr/lib/elasticsearch/" + + cp config/* "$pkgdir/etc/elasticsearch/" + + install -Dm755 bin/elasticsearch "$pkgdir/usr/bin/elasticsearch" + install -Dm755 bin/plugin "$pkgdir/usr/bin/elasticsearch-plugin" + install -Dm644 bin/elasticsearch.in.sh "$pkgdir/usr/share/elasticsearch/elasticsearch.in.sh" + + install -Dm644 "$srcdir/elasticsearch.service" "$pkgdir/usr/lib/systemd/system/elasticsearch.service" + + install -Dm644 "$srcdir/elasticsearch-tmpfile.conf" "$pkgdir/usr/lib/tmpfiles.d/elasticsearch.conf" +} + +sha256sums=('4006e9aa9382f386e79a1c44a14c1aef34765eb5480fb6b29a2facf62ab3a321' + '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb' + '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f') diff --git a/community/elasticsearch/elasticsearch-tmpfile.conf b/community/elasticsearch/elasticsearch-tmpfile.conf new file mode 100644 index 000000000..b2844a919 --- /dev/null +++ b/community/elasticsearch/elasticsearch-tmpfile.conf @@ -0,0 +1 @@ +d /run/elasticsearch 0755 elasticsearch elasticsearch -
\ No newline at end of file diff --git a/community/elasticsearch/elasticsearch.install b/community/elasticsearch/elasticsearch.install new file mode 100644 index 000000000..82ff64dbb --- /dev/null +++ b/community/elasticsearch/elasticsearch.install @@ -0,0 +1,24 @@ +post_install() { + getent group elasticsearch >/dev/null 2>&1 || groupadd -g 114 elasticsearch &>/dev/null + getent passwd elasticsearch >/dev/null 2>&1 || useradd -u 114 -g elasticsearch -d /usr/share/elasticsearch -s /bin/false elasticsearch &>/dev/null + + chown -R elasticsearch:elasticsearch /usr/share/elasticsearch + chown -R elasticsearch:elasticsearch /var/lib/elasticsearch + chown -R elasticsearch:elasticsearch /var/log/elasticsearch + + usr/bin/systemd-tmpfiles --create elasticsearch.conf +} + +post_upgrade(){ + getent group elasticsearch >/dev/null 2>&1 || groupadd -g 114 elasticsearch &>/dev/null + getent passwd elasticsearch >/dev/null 2>&1 || useradd -u 114 -g elasticsearch -d /usr/share/elasticsearch -s /bin/false elasticsearch &>/dev/null +} + +post_remove() { + if getent passwd elasticsearch >/dev/null 2>&1; then + userdel elasticsearch + fi + if getent group elasticsearch >/dev/null 2>&1; then + groupdel elasticsearch + fi +} diff --git a/community/elasticsearch/elasticsearch.service b/community/elasticsearch/elasticsearch.service new file mode 100644 index 000000000..28364b878 --- /dev/null +++ b/community/elasticsearch/elasticsearch.service @@ -0,0 +1,13 @@ +[Unit] +Description=ElasticSearch +After=network.target + +[Service] +User=elasticsearch +Type=forking +PIDFile=/run/elasticsearch/elasticsearch.pid +ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/elasticsearch.pid +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index b64a79acd..a0d0a37b2 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96070 2013-08-19 20:07:30Z eric $ +# $Id: PKGBUILD 102244 2013-12-07 10:36:28Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep pkgver=2.7b33 -pkgrel=11 +pkgrel=12 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64') url="http://community.electricsheep.org/" diff --git a/community/elfkickers/PKGBUILD b/community/elfkickers/PKGBUILD new file mode 100644 index 000000000..a084b36d6 --- /dev/null +++ b/community/elfkickers/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 101261 2013-11-21 10:29:03Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Mikko Sysikaski <mikko.sysikaski@gmail.com> +pkgname=elfkickers +pkgver=3.0a +pkgrel=1 +pkgdesc='Collection of ELF utilities (includes sstrip)' +arch=('x86_64' 'i686') +license=('GPL') +source=("http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-$pkgver.tar.gz") +url='http://www.muppetlabs.com/~breadbox/software/elfkickers.html' +sha256sums=('c3429957142169c21ff550e0c06bbb0d48bb76437c4ccbc67164bf56b6e9774f') + +build() { + make -C "ELFkickers-$pkgver" +} + +package() { + install -d "$pkgdir/usr/bin" + install -d "$pkgdir/usr/share/man/man1" + make -C "ELFkickers-$pkgver" prefix="$pkgdir/usr" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD index be37b5725..e3172326e 100644 --- a/community/encfs/PKGBUILD +++ b/community/encfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99736 2013-10-30 23:24:04Z allan $ +# $Id: PKGBUILD 102245 2013-12-07 10:36:29Z bpiotrowski $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Sven Kauber, <celeon@gmail.com> @@ -6,7 +6,7 @@ pkgname=encfs pkgver=1.7.4 -pkgrel=11 +pkgrel=12 pkgdesc='Encrypted filesystem in user-space' arch=('i686' 'x86_64') url='http://www.arg0.net/encfs' @@ -28,5 +28,5 @@ build(){ package() { cd ${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/envoy/PKGBUILD b/community/envoy/PKGBUILD new file mode 100644 index 000000000..868b969a9 --- /dev/null +++ b/community/envoy/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 101179 2013-11-18 17:42:55Z eric $ +# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> + +pkgname=envoy +pkgver=5 +pkgrel=1 +pkgdesc="A ssh-agent/gpg-agent keychain and process monitor" +arch=('i686' 'x86_64') +url="http://github.com/vodik/envoy" +license=('GPL') +depends=('openssh' 'systemd') +optdepends=('gnupg: gpg-agent support') +makedepends=('ragel') +source=("$pkgname-$pkgver.tar.gz::https://github.com/vodik/$pkgname/archive/v$pkgver.tar.gz" + "clique.tar.gz::https://github.com/vodik/clique/archive/v0.1.tar.gz") +md5sums=('feee9b1a0eed31360324ea868d081801' + '8c4f3fd488fc8f92196a8aa42ac9567e') + +prepare() { + cd "$pkgname-$pkgver" + rm -fr clique + ln -s ../clique-0.1 clique +} + +build() { + make -C "$pkgname-$pkgver" +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install +} + +# vim: ft=sh syn=sh et diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD index 49ce66717..c90038f3c 100644 --- a/community/erlang-nox/PKGBUILD +++ b/community/erlang-nox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99621 2013-10-30 16:14:28Z arodseth $ +# $Id: PKGBUILD 102627 2013-12-16 21:55:26Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Lukas Fleischer <archlinux@cryptocrack.de> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -7,7 +7,7 @@ # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com> pkgname=erlang-nox -pkgver=R16B02 +pkgver=R16B03 pkgrel=2 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)' arch=('x86_64' 'i686') @@ -21,9 +21,15 @@ optdepends=('erlang-unixodbc: database support' 'lksctp-tools: for SCTP support') options=('staticlibs') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" - "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") -sha256sums=('6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85' - 'b79ceb0383415088b5f040f2f3705632b425cb3f29c3955ef2219556abec5789') + "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz" + 'epmd.service' + 'epmd.socket' + 'epmd.conf') +sha256sums=('6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06' + 'a2038d32e7c940d5d04f7338406e11b723cac0d26e82d7834596105eea492452' + 'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e' + '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34' + '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2') build() { cd "otp_src_${pkgver/_1/}" @@ -53,6 +59,12 @@ package() { # Remove files that are packaged as erlang-unixodbc rm -r "$pkgdir/usr/lib/erlang/"{lib/odbc*,man/man3/odbc.3.gz} + + # epmd service, socket and conf + cd "$srcdir" + install -Dm644 epmd.service "$pkgdir/usr/lib/systemd/system/epmd.service" + install -Dm644 epmd.socket "$pkgdir/usr/lib/systemd/system/epmd.socket" + install -Dm644 epmd.conf "$pkgdir/etc/conf.d/epmd" } # vim:set ts=2 sw=2 et: diff --git a/community/erlang-nox/epmd.conf b/community/erlang-nox/epmd.conf new file mode 100644 index 000000000..e4f831c39 --- /dev/null +++ b/community/erlang-nox/epmd.conf @@ -0,0 +1,3 @@ +#ERL_EPMD_ADDRESS= +#ERL_EPMD_PORT=4369 +#ERL_EPMD_RELAXED_COMMAND_CHECK= diff --git a/community/erlang-nox/epmd.service b/community/erlang-nox/epmd.service new file mode 100644 index 000000000..643eff3b2 --- /dev/null +++ b/community/erlang-nox/epmd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Erlang Port Mapper Daemon + +[Service] +EnvironmentFile=/etc/conf.d/epmd +ExecStart=/usr/bin/epmd -daemon $EPMD_OPTS +ExecStop=/usr/bin/epmd -kill +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/community/erlang-nox/epmd.socket b/community/erlang-nox/epmd.socket new file mode 100644 index 000000000..ae3594242 --- /dev/null +++ b/community/erlang-nox/epmd.socket @@ -0,0 +1,9 @@ +[Unit] +Conflicts=epmd.service + +[Socket] +ListenStream=4369 +Accept=no + +[Install] +WantedBy=sockets.target diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index e643cc9a2..88229282d 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99617 2013-10-30 15:44:14Z arodseth $ +# $Id: PKGBUILD 102626 2013-12-16 21:55:05Z arodseth $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -8,7 +8,7 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') -pkgver=R16B02 +pkgver=R16B03 pkgrel=2 arch=('x86_64' 'i686') url='http://www.erlang.org/' @@ -20,8 +20,8 @@ source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" 'epmd.service' 'epmd.socket' 'epmd.conf') -sha256sums=('6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85' - 'b79ceb0383415088b5f040f2f3705632b425cb3f29c3955ef2219556abec5789' +sha256sums=('6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06' + 'a2038d32e7c940d5d04f7338406e11b723cac0d26e82d7834596105eea492452' 'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e' '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34' '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2') @@ -67,8 +67,8 @@ package_erlang() { # epmd service, socket and conf cd "$srcdir" - install -Dm644 epmd.service "$pkgdir/etc/systemd/system/epmd.service" - install -Dm644 epmd.socket "$pkgdir/etc/systemd/system/epmd.socket" + install -Dm644 epmd.service "$pkgdir/usr/lib/systemd/system/epmd.service" + install -Dm644 epmd.socket "$pkgdir/usr/lib/systemd/system/epmd.socket" install -Dm644 epmd.conf "$pkgdir/etc/conf.d/epmd" } diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD deleted file mode 100644 index 37a9418fa..000000000 --- a/community/etl/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 90600 2013-05-13 10:14:49Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Franco Iacomella <yaco@gnu.org> - -pkgname=etl -pkgver=0.04.16 -pkgrel=1 -pkgdesc="VoriaETL: C++ STL complementory multiplatform template library" -arch=(i686 x86_64) -url="http://synfig.org" -license=('GPL2') -depends=() -conflicts=('synfig-etl') -replaces=('synfig-etl') -#source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.04.tar.gz) -source=(http://downloads.sourceforge.net/project/synfig/ETL/$pkgver/ETL-$pkgver.tar.gz) -md5sums=('e330d2045e980d424beb054423c73797') - -build() { - cd $srcdir/ETL-$pkgver - [ -f Makefile ] || ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/ETL-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/community/expac/PKGBUILD b/community/expac/PKGBUILD deleted file mode 100644 index cf31567ba..000000000 --- a/community/expac/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 87648 2013-04-05 00:19:21Z dreisner $ -# Maintainer: Dave Reisner <d@falconindy.com> - -pkgname=expac -pkgver=2 -pkgrel=1 -pkgdesc="pacman database extraction utility" -arch=('i686' 'x86_64') -url="http://github.com/falconindy/expac" -license=('GPL') -depends=('pacman') -makedepends=('perl') -source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('41a65f51009e44689bd5320f5c3aa7d4' - 'SKIP') - -build() { - make -C "$pkgname-$pkgver" - - sed '/\*\//q' "$pkgname-$pkgver"/expac.c >LICENSE -} - -package() { - make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim: ft=sh syn=sh diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD index b62623768..e0fb1722c 100644 --- a/community/extremetuxracer/PKGBUILD +++ b/community/extremetuxracer/PKGBUILD @@ -1,46 +1,33 @@ -# $Id: PKGBUILD 90020 2013-05-06 19:36:49Z foutrelis $ +# $Id: PKGBUILD 101299 2013-11-22 05:31:02Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Eric Belanger <eric.archlinux.org> # Contributor: Fabio Scotoni <CCuleX.gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> + pkgname=extremetuxracer -pkgver=0.4 -pkgrel=6 +pkgver=0.6.0 +pkgrel=1 pkgdesc="Downhill racing game starring Tux" arch=('x86_64' 'i686') -url="http://www.extremetuxracer.com" +url="http://sourceforge.net/projects/extremetuxracer/" license=('GPL') -depends=('gcc-libs' 'sdl_mixer' 'tcl>=8.5.0' 'libpng>=1.4.0' 'freetype2' 'glu') -makedepends=('mesa' 'libxi' 'libxmu') +depends=('sdl_image' 'sdl_mixer' 'glu' 'freetype2') +#depends=('libpng' ) +#makedepends=('mesa' 'libxi' 'libxmu') conflicts=('ppracer' 'etracer') replaces=('ppracer' 'etracer') -source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz" - "$pkgname.png" - "$pkgname.desktop" - "libpng15.patch") -sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d' - 'ec1426171fc80b07b702e373bf9528244a3b224e887ab24b52f90740691e92fb' - '349448e8be522bbbe9fd896e875a4add7e02c35d0fafa46c5b10582562da3ca8' - '2b693eaf421d56887615fc02d40f742e9b8bf817ae36be1f1f9e33a52719eea8') +source=("http://downloads.sourceforge.net/$pkgname/etr-$pkgver.tar.xz") +sha256sums=('44312719a1e9aa33e5aa0c8ad50bb52df702d64fd2d16bf2abda62ee27bf893a') build() { - cd "$srcdir/extremetuxracer-$pkgver" - - patch -Np1 -i "${srcdir}/libpng15.patch" - sed -i -e 's/libpng12/libpng15/g' configure + cd "$srcdir/etr-$pkgver" ./configure --prefix=/usr make } package() { - cd "$srcdir/extremetuxracer-$pkgver" + cd "$srcdir/etr-$pkgver" make DESTDIR="$pkgdir" install - - # Install icon and desktop file - install -Dm644 "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "$srcdir/$pkgname.png" \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" } # vim:set ts=2 sw=2 et: diff --git a/community/extremetuxracer/extremetuxracer.desktop b/community/extremetuxracer/extremetuxracer.desktop deleted file mode 100644 index 6593607b8..000000000 --- a/community/extremetuxracer/extremetuxracer.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Encoding=UTF-8 -Name=Extreme Tux Racer -Comment=Open source racing game featuring Tux the Linux Penguin. -Icon=/usr/share/pixmaps/extremetuxracer.png -Exec=etracer -Terminal=false -StartupNotify=true -Categories=Application;Game;ArcadeGame - diff --git a/community/extremetuxracer/extremetuxracer.png b/community/extremetuxracer/extremetuxracer.png Binary files differdeleted file mode 100644 index 6c4aec00b..000000000 --- a/community/extremetuxracer/extremetuxracer.png +++ /dev/null diff --git a/community/extremetuxracer/libpng15.patch b/community/extremetuxracer/libpng15.patch deleted file mode 100644 index 5c9999857..000000000 --- a/community/extremetuxracer/libpng15.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp ---- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp 2007-09-01 19:38:12.000000000 +0300 -+++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp 2010-01-25 03:47:21.000000000 +0200 -@@ -53,7 +53,7 @@ - if (!info_ptr) - { - png_destroy_read_struct(&png_ptr, -- (png_infopp)NULL, (png_infopp)NULL); -+ NULL, NULL); - fclose(fp); - return; - } -@@ -62,7 +62,7 @@ - if (!end_info) - { - png_destroy_read_struct(&png_ptr, &info_ptr, -- (png_infopp)NULL); -+ NULL); - fclose(fp); - return; - } -@@ -77,7 +77,7 @@ - - - png_get_IHDR(png_ptr, info_ptr, &width, &height, -- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); -+ &bit_depth, &color_type, &interlace_type, NULL, NULL); - - if(bit_depth == 16) - png_set_strip_16(png_ptr); -@@ -88,7 +88,7 @@ - png_set_expand(png_ptr); - png_read_update_info(png_ptr, info_ptr); - png_get_IHDR(png_ptr, info_ptr, &width, &height, -- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); -+ &bit_depth, &color_type, &interlace_type, NULL, NULL); - } - - if( color_type == PNG_COLOR_TYPE_GRAY || -@@ -96,7 +96,7 @@ - png_set_gray_to_rgb(png_ptr); - png_read_update_info(png_ptr, info_ptr); - png_get_IHDR(png_ptr, info_ptr, &width, &height, -- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); -+ &bit_depth, &color_type, &interlace_type, NULL, NULL); - } - - this->width=width; -@@ -114,7 +114,7 @@ - } - - png_read_end(png_ptr, info_ptr); -- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); -+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - fclose(fp); - } - diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index e2db19270..ac52bc6ae 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97703 2013-09-27 17:44:03Z stativ $ +# $Id: PKGBUILD 102246 2013-12-07 10:36:30Z bpiotrowski $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat pkgver=1.2.0_beta2 -pkgrel=9 +pkgrel=11 pkgdesc="Qt4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64') url="http://fatrat.dolezel.info/" diff --git a/community/fbpanel/PKGBUILD b/community/fbpanel/PKGBUILD index 287189613..aa75c9216 100644 --- a/community/fbpanel/PKGBUILD +++ b/community/fbpanel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99522 2013-10-29 10:57:06Z spupykin $ +# $Id: PKGBUILD 100493 2013-11-05 10:04:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jeff Mickey <jeff@archlinux.org> # Contributor: Torin Daniel <torindan@gmail.com> @@ -6,20 +6,27 @@ pkgname=fbpanel pkgver=6.1 -pkgrel=5 +pkgrel=6 pkgdesc="NetWM compliant desktop panel" arch=('i686' 'x86_64') url="http://fbpanel.sourceforge.net/" depends=('gtk2') license=('GPL') source=("http://downloads.sourceforge.net/fbpanel/fbpanel-${pkgver}.tbz2" + "taskbar_unicode.patch::https://bugs.archlinux.org/task/37639?getfile=11189" "battery_fix.patch") md5sums=('80ca0c64195b30587cfcb8c2cd9887a0' + '0af51e8f0391ea9b734a57a9880b57e5' 'dc1db8eee1be899725f350eb36793ea4') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" patch -p1 <$srcdir/battery_fix.patch + patch -p1 <$srcdir/taskbar_unicode.patch +} + +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --libexecdir=/usr/lib echo "LDFLAGSX += -lX11 -lm" >>config.mk make diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD index 94899af37..a3a333ecc 100644 --- a/community/fbreader/PKGBUILD +++ b/community/fbreader/PKGBUILD @@ -1,18 +1,25 @@ -# $Id: PKGBUILD 98932 2013-10-21 13:19:58Z spupykin $ +# $Id: PKGBUILD 102366 2013-12-09 14:03:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fbreader pkgver=0.99.4 -pkgrel=3 +pkgrel=4 pkgdesc="An e-book reader for Linux" arch=('i686' 'x86_64') url="http://www.fbreader.org/" license=('GPL') depends=('fribidi' 'bzip2' 'curl' 'qt4' 'libunibreak' 'sqlite') makedepends=('ccache') -source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz) -md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d') +source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz + "fbreader-0.99.4.patch::http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/fbreader/files/fbreader-0.99.4.patch?revision=1.1") +md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d' + 'bc8975fc8235f393ef011b564addf300') + +prepare() { + cd $srcdir/fbreader-$pkgver + patch -p1 <$srcdir/fbreader-0.99.4.patch +} build() { export TARGET_ARCH=desktop diff --git a/community/fcitx-cloudpinyin/PKGBUILD b/community/fcitx-cloudpinyin/PKGBUILD index 4fd88ffc8..479126f45 100644 --- a/community/fcitx-cloudpinyin/PKGBUILD +++ b/community/fcitx-cloudpinyin/PKGBUILD @@ -1,30 +1,28 @@ -# $Id: PKGBUILD 93364 2013-07-02 09:47:21Z fyan $ +# $Id: PKGBUILD 100943 2013-11-13 14:18:13Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: poplarch <poplarch@gmail.com> pkgname=fcitx-cloudpinyin -pkgver=0.3.2 +pkgver=0.3.3 pkgrel=1 pkgdesc='Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates' arch=('i686' 'x86_64') url="https://github.com/fcitx/fcitx-cloudpinyin" license=('GPL') -depends=('curl' 'fcitx>=4.2.7') +depends=('curl' 'fcitx') makedepends=('cmake') source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz") build() { - cd "$srcdir/${pkgname}-${pkgver}" - mkdir -p build - cd build - - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + cd ${pkgname}-${pkgver} + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . make } package() { - cd "$srcdir/${pkgname}-${pkgver}/build" + cd ${pkgname}-${pkgver} make DESTDIR="$pkgdir" install } -sha512sums=('ddda528f72ffd200ae78b4b2d9791e20576a220d0b15e4c55e9bd1977188c65696ca2a522acbb27177b2b22b33cdc41774d1ce111eb090adaba8fcc97f12cd8e') +sha512sums=('874c2b1f037c14e8f6cdbd174c86014d9f6b2035d1828ecf3c8debc704a5f3469eff7ead50638f26080986d912c6e93fe82b78f1a9161f09b738461d07614814') diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index 26a0f871b..7b3218e93 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100392 2013-11-03 11:48:16Z fyan $ +# $Id: PKGBUILD 100541 2013-11-05 17:38:22Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> ## Mozc compile option _bldtype=Release -_zipcoderel=201309 +_zipcoderel=201310 _protobuf_ver=2.5.0 _gyp_rev=1774 @@ -15,7 +15,7 @@ pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" pkgver=1.12.1599.102 _patchver=${pkgver}.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://code.google.com/p/mozc/" license=('custom') @@ -114,8 +114,8 @@ package() { sha512sums=('SKIP' 'SKIP' - 'e497d6dfca2cf06d4ab0ed7f84e1daea8da776071d19818dc09b5c2586d52dfceebd3b665ebc0eb1143e84c8dcb11cac6197e8cbff617415cc6f16316e9a2004' - '04c2719618227beea8b41705d25382a78fa4173c7355c2a4ebd4d424538e0591513aa951eb9a8a11a4ad4ff379839fda42264a98e07f1b062ff8e4200af7c741' + 'f4ba607dc8d8ad6b12fbf47e6a9b56e1dee5552db65bb6a21e55b3db8567601df4e916f88ee039bb4f84dd7ad9994ad9e7b494fbb06d14b8ce6c8ca316e3a571' + '551fd2ee44a0cdf317885351528d5248fc56c261e73b793ac46c8f043a6f5461e1e4400df67cd151a01891217185fc12993a6a0d727d9f8217947d9b23d7b69c' '5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee' 'e6a5a21520e36aa6cd27295c5a1b050a8f1a8dccf82918b0b57f17c79393c8b527c3f70dbfa2de0af42d3f85eac3095ef476a067fb24dbc2fa325c1f6a1138cc' '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a') diff --git a/community/fcitx-rime/PKGBUILD b/community/fcitx-rime/PKGBUILD index 6c75e8126..c9bd7b8e7 100644 --- a/community/fcitx-rime/PKGBUILD +++ b/community/fcitx-rime/PKGBUILD @@ -1,32 +1,29 @@ -# $Id: PKGBUILD 94200 2013-07-16 16:25:08Z fyan $ +# $Id: PKGBUILD 100939 2013-11-13 14:17:32Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: lh <jason52lh@gmail.com> pkgname=fcitx-rime -pkgver=0.2.2 -pkgrel=1 +pkgver=0.3.0 +pkgrel=2 pkgdesc='Fcitx Wrapper for librime' arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx" license=('GPL') -depends=('fcitx>=4.2.8.1' "librime" "brise") +depends=('fcitx' "librime" "brise") makedepends=('cmake') install=fcitx-rime.install source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz") build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver - mkdir -p build - cd build - - cmake -DCMAKE_INSTALL_PREFIX=/usr .. + cmake -DCMAKE_INSTALL_PREFIX=/usr . make } package() { - cd "$srcdir/$pkgname-$pkgver/build" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } -sha512sums=('4497cfdf38e6fd85e358b0c8b52efa21b54a8c46cf5f6a640ca1c1f91a30df2a2033f46eec2d123bfadf9c8c58e4b8f6ec96b1564d32b2b8157261ca14a2855b') +sha512sums=('8dbb8fddf4d372d4af9707d2f1bbdb7c15eb29602ad5de8f0cec5dfca81074087fb2873980afd8cdd09f78316620b086708761d91b820b714539a5100bc156a8') diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD index fbc45f7c3..925430b13 100644 --- a/community/flashrom/PKGBUILD +++ b/community/flashrom/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95621 2013-08-15 04:30:28Z giovanni $ +# $Id: PKGBUILD 102000 2013-12-03 16:51:55Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Cilyan Olowen <gaknar@gmail.com> # Contributor: fill <mailbox@fillo.ru> @@ -6,20 +6,25 @@ pkgname=flashrom pkgver=0.9.7 -pkgrel=1 +pkgrel=2 pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips" url="http://www.flashrom.org/" arch=('i686' 'x86_64') license=('GPL') -depends=('libftdi' 'pciutils') +depends=('libftdi-compat' 'pciutils') optdepends=('dmidecode: for SMBIOS/DMI table decoder support') source=("http://download.flashrom.org/releases/${pkgname}-${pkgver}.tar.bz2") md5sums=('d239bafa1b46619d851f70f84a5b122a') +prepare() { +cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i "s:sbin:bin:g" Makefile +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i "s:sbin:bin:g" Makefile make } diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index d38942ee4..c61451431 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97537 2013-09-23 17:38:40Z spupykin $ +# $Id: PKGBUILD 101480 2013-11-26 11:05:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=flightgear -pkgver=2.12.0 +pkgver=2.12.1 pkgrel=1 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) @@ -16,7 +16,7 @@ options=('!makeflags') #source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") #source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2") source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2") -md5sums=('23e2de5f311f4cbe94ec3386736ee8a5') +md5sums=('0e57582b9e83d7d44e82761792a79793') build() { cd $srcdir/flightgear-$pkgver diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD index 719255ec2..55481bec4 100644 --- a/community/fox/PKGBUILD +++ b/community/fox/PKGBUILD @@ -1,22 +1,34 @@ -# $Id: PKGBUILD 100152 2013-11-01 20:24:18Z spupykin $ +# $Id: PKGBUILD 102384 2013-12-09 23:15:34Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ben <ben@benmazer.net> pkgname=fox pkgver=1.6.49 -pkgrel=3 +pkgrel=4 pkgdesc="Free Objects for X: GUI Toolkit for C++" arch=('i686' 'x86_64') url="http://www.fox-toolkit.org/" license=('LGPL' 'custom') depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'libxi' 'libpng' 'libtiff' 'glu') -makedepends=('mesa') +makedepends=('mesa' 'gendesk' 'imagemagick') optdepends=('perl') source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) md5sums=('e120647d26a27ed37cd5fed8b75c8a3d') +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + gendesk -n -f --pkgname=adie --pkgdesc="Fast and convenient programming text editor" --categories="Utility;TextEditor" + gendesk -n -f --pkgname=calculator --name="FOX Calculator" --pkgdesc="Simple desktop calculator" --categories="Utility;Calculator" + gendesk -n -f --pkgname=ControlPanel --name="FOX Desktop Setup" --pkgdesc="Setup desktop appearance for FOX applications" --categories="Settings;DesktopSettings" + gendesk -n -f --pkgname=PathFinder --pkgdesc="File browser" --categories="System;FileTools;FileManager" +} + build() { cd ${srcdir}/${pkgname}-${pkgver} + convert adie/big_gif.gif adie.png + convert calculator/bigcalc.gif calculator.png + convert pathfinder/file_gif.gif PathFinder.png + export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" ./configure --prefix=/usr \ --enable-release \ @@ -36,8 +48,15 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - cd ${srcdir}/${pkgname}-${pkgver}/tests + + pushd tests make ControlPanel - install -m755 ${srcdir}/${pkgname}-${pkgver}/tests/.libs/ControlPanel ${pkgdir}/usr/bin/ - install -Dm644 ../LICENSE_ADDENDUM ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + install -m755 .libs/ControlPanel ${pkgdir}/usr/bin/ + popd + + install -Dm644 LICENSE_ADDENDUM ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + + install -dm755 ${pkgdir}/usr/share/{applications,pixmaps} + install -m644 *.png ${pkgdir}/usr/share/pixmaps/ + install -m644 *.desktop ${pkgdir}/usr/share/applications/ } diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD index 8d55338b8..5eec6ac9a 100644 --- a/community/freedroidrpg/PKGBUILD +++ b/community/freedroidrpg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90026 2013-05-06 19:36:57Z foutrelis $ +# $Id: PKGBUILD 100931 2013-11-13 12:48:36Z heftig $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: nut543 <kfs1@online.no> pkgname='freedroidrpg' pkgver=0.15.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'glu') makedepends=('mesa') diff --git a/community/fxdesktop/PKGBUILD b/community/fxdesktop/PKGBUILD deleted file mode 100644 index 18b40a21d..000000000 --- a/community/fxdesktop/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 90029 2013-05-06 19:37:01Z foutrelis $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sander Jansen <sander@knology.net> - -pkgname=fxdesktop -pkgver=0.1.12 -pkgrel=7 -pkgdesc="Lightweight Desktop Environment" -arch=('i686' 'x86_64') -url="http://code.google.com/p/fxdesktop/" -license=('GPL') -depends=('fox>=1.6.0') -makedepends=('glu') -source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -md5sums=('9489e7369b5e052e0b6836a3b0670832') - -build() { - cd $srcdir/$pkgname-$pkgver - # Override default flags - export CFLAGS="-Wall -O2 -pipe" - export CXXFLAGS="-Wall -O2 -pipe" - [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64) - # Compile - ./gb --prefix=/usr -} - -package() { - cd $srcdir/$pkgname-$pkgver - ./gb --package-root=$pkgdir/usr install -} diff --git a/community/g15daemon/PKGBUILD b/community/g15daemon/PKGBUILD new file mode 100644 index 000000000..4adcbd3c3 --- /dev/null +++ b/community/g15daemon/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 101656 2013-11-29 20:21:32Z arcanis $ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> +# Contributor: Valeriy Lyasotskiy <onestep@ukr.net> + +pkgname=g15daemon +pkgver=1.9.5.3 +pkgrel=7 +pkgdesc="A daemon that makes it possible to use the G-Buttons and draw on the G15 LCD" +arch=('i686' 'x86_64') +url="http://www.g15tools.com/" +license=('GPL') +depends=('libg15render>=1.2') +options=(!libtool) +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + g15daemon.service + ${pkgname}-${pkgver}-uinput.patch + ${pkgname}-${pkgver}-config-write.patch + ${pkgname}-${pkgver}-recv-oob-answer.patch) +md5sums=('2cd8b4f1bd039bf804f1f472216742f0' + 'c259d875f33a2fba53f9c2200a913c11' + '6c3d5b2b7c585dc095118f80e4d72204' + 'd47755aa8387e89fedffdb28ff3b18de' + '275c28e4950e05336086419873ff8e45') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/${pkgname}-${pkgver}-uinput.patch" + patch -Np1 -i "${srcdir}/${pkgname}-${pkgver}-config-write.patch" + patch -Np1 -i "${srcdir}/${pkgname}-${pkgver}-recv-oob-answer.patch" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sbindir=/usr/bin --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 644 "${srcdir}/g15daemon.service" \ + "${pkgdir}/usr/lib/systemd/system/g15daemon.service" +} diff --git a/community/g15daemon/g15daemon-1.9.5.3-config-write.patch b/community/g15daemon/g15daemon-1.9.5.3-config-write.patch new file mode 100644 index 000000000..6f52d231f --- /dev/null +++ b/community/g15daemon/g15daemon-1.9.5.3-config-write.patch @@ -0,0 +1,12 @@ +diff -Nuar g15daemon-1.9.5.3.orig/g15daemon/utility_funcs.c g15daemon-1.9.5.3/g15daemon/utility_funcs.c +--- g15daemon-1.9.5.3.orig/g15daemon/utility_funcs.c 2008-01-26 07:02:07.000000000 +0200 ++++ g15daemon-1.9.5.3/g15daemon/utility_funcs.c 2011-11-09 09:19:43.000000000 +0200 +@@ -356,7 +356,7 @@ + config_items_t * item=NULL; + char line[1024]; + +- config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC); ++ config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC, 0644); + if(config_fd){ + snprintf(line,1024,"# G15Daemon Configuration File\n# any items entered before a [section] header\n# will be in the Global config space\n# comments you wish to keep should start with a semicolon';'\n"); + write(config_fd,line,strlen(line)); diff --git a/community/g15daemon/g15daemon-1.9.5.3-recv-oob-answer.patch b/community/g15daemon/g15daemon-1.9.5.3-recv-oob-answer.patch new file mode 100644 index 000000000..adb4dccc4 --- /dev/null +++ b/community/g15daemon/g15daemon-1.9.5.3-recv-oob-answer.patch @@ -0,0 +1,11 @@ +--- g15daemon-1.9.5.3.orig/libg15daemon_client/g15daemon_net.c ++++ g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c +@@ -217,7 +217,7 @@ + if(poll(pfd,1,100)>0){ + if(pfd[0].revents & POLLPRI && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL)) { + memset(packet,0,sizeof(packet)); +- msgret = recv(sock, packet, 10 , MSG_OOB); ++ msgret = recv(sock, packet, sizeof(packet) , MSG_OOB); + if (msgret < 1) { + return -1; + } diff --git a/community/g15daemon/g15daemon-1.9.5.3-uinput.patch b/community/g15daemon/g15daemon-1.9.5.3-uinput.patch new file mode 100644 index 000000000..f91843281 --- /dev/null +++ b/community/g15daemon/g15daemon-1.9.5.3-uinput.patch @@ -0,0 +1,35 @@ +Index: g15daemon-1.9.5.3/g15daemon/g15_plugin_uinput.c +=================================================================== +--- g15daemon-1.9.5.3/plugins/g15_plugin_uinput.c ++++ g15daemon-1.9.5.3/plugins/g15_plugin_uinput.c +@@ -125,6 +125,14 @@ + event.value = G15KEY_DOWN; + + write (uinp_fd, &event, sizeof(event)); ++ ++ /* Need to write sync event */ ++ memset(&event, 0, sizeof(event)); ++ event.type = EV_SYN; ++ event.code = SYN_REPORT; ++ event.value = 0; ++ write(uinp_fd, &event, sizeof(event)); ++ + } + + static void g15_uinput_keyup(unsigned char code) +@@ -137,6 +145,14 @@ + event.value = G15KEY_UP; + + write (uinp_fd, &event, sizeof(event)); ++ ++ /* Need to write sync event */ ++ memset(&event, 0, sizeof(event)); ++ event.type = EV_SYN; ++ event.code = SYN_REPORT; ++ event.value = 0; ++ write(uinp_fd, &event, sizeof(event)); ++ + } + + void (*keyup)(unsigned char code) = &g15_uinput_keyup; + diff --git a/community/g15daemon/g15daemon.service b/community/g15daemon/g15daemon.service new file mode 100644 index 000000000..46855ea40 --- /dev/null +++ b/community/g15daemon/g15daemon.service @@ -0,0 +1,11 @@ +[Unit] +Description=Logitech G15 Support Daemon +Documentation=man:g15daemon(1) + +[Service] +Type=forking +PIDFile=/run/g15daemon.pid +ExecStart=/usr/bin/g15daemon + +[Install] +WantedBy=multi-user.target diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index c0dca3d82..3a392b94f 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99337 2013-10-27 11:13:45Z lcarlier $ +# $Id: PKGBUILD 101792 2013-12-01 09:52:05Z andyrtr $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -15,8 +15,8 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-openssl' 'gambas3-gb-report' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') -pkgver=3.5.0 -pkgrel=3 +pkgver=3.5.1 +pkgrel=2 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -31,7 +31,7 @@ makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-uti 'gmime') options=('!emptydirs' 'libtool') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('20274da44d043104adb6fca02e6b5fab') +md5sums=('40f9057cd3686020fbe66a043a2ea400') create_dirs() { install -dm755 ${pkgdir}/usr/lib/gambas3 diff --git a/community/gambas3/gambas3-3.4.1-llvm-3.3.patch b/community/gambas3/gambas3-3.4.1-llvm-3.3.patch deleted file mode 100644 index a5f75fe78..000000000 --- a/community/gambas3/gambas3-3.4.1-llvm-3.3.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -up gambas3-3.4.1/gb.jit/configure.ac.jx gambas3-3.4.1/gb.jit/configure.ac ---- gambas3-3.4.1/gb.jit/configure.ac.jx 2013-03-24 13:34:31.000000000 -0400 -+++ gambas3-3.4.1/gb.jit/configure.ac 2013-05-02 13:42:02.911687100 -0400 -@@ -32,7 +32,7 @@ fi - - GB_COMPONENT( - jit, JIT, gb.jit, [src], -- [GB_FIND(llvm/LLVMContext.h, /usr/lib/llvm* /usr/local/lib /usr/local /usr/lib /usr `$LLVM_CONFIG --prefix`, include)], -+ [GB_FIND(llvm/IR/LLVMContext.h, /usr/lib/llvm* /usr/local/lib /usr/local /usr/lib /usr `$LLVM_CONFIG --prefix`, include)], - [GB_FIND(libLLVM-$LLVM_VERSION.$SHLIBEXT, /usr/lib/llvm* /usr/local /usr `$LLVM_CONFIG --prefix`, lib)], - [$C_LIB `$LLVM_CONFIG --ldflags` -lLLVM-$LLVM_VERSION], - [-I../../main/gbx -I../../main/share -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS]) -diff -up gambas3-3.4.1/gb.jit/src/jit_codegen.cpp.jx gambas3-3.4.1/gb.jit/src/jit_codegen.cpp ---- gambas3-3.4.1/gb.jit/src/jit_codegen.cpp.jx 2013-03-24 13:34:31.000000000 -0400 -+++ gambas3-3.4.1/gb.jit/src/jit_codegen.cpp 2013-05-02 13:54:30.344186594 -0400 -@@ -3614,11 +3614,7 @@ void TryExpression::codegen(){ - create_gep(temp_errcontext1, TARGET_BITS, 0, TARGET_BITS, 0)); - - llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p")); --#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2) -- f->addFnAttr(llvm::Attributes::ReturnsTwice); --#else - f->addFnAttr(llvm::Attribute::ReturnsTwice); --#endif - - llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf); - -@@ -3669,11 +3665,7 @@ void LargeTryExpression::codegen(){ - create_gep(temp_errcontext2, TARGET_BITS, 0, TARGET_BITS, 0)); - - llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p")); --#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2) -- f->addFnAttr(llvm::Attributes::ReturnsTwice); --#else - f->addFnAttr(llvm::Attribute::ReturnsTwice); --#endif - - llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf); - -diff -up gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp.jx gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp ---- gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp.jx 2013-03-24 13:34:31.000000000 -0400 -+++ gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp 2013-05-02 13:42:02.912687103 -0400 -@@ -24,9 +24,9 @@ - ***************************************************************************/ - - #include "llvm/Pass.h" --#include "llvm/Function.h" -+#include "llvm/IR/Function.h" - #if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2) --#include "llvm/IRBuilder.h" -+#include "llvm/IR/IRBuilder.h" - #else - #include "llvm/Support/IRBuilder.h" - #endif -diff -up gambas3-3.4.1/gb.jit/src/jit.h.jx gambas3-3.4.1/gb.jit/src/jit.h ---- gambas3-3.4.1/gb.jit/src/jit.h.jx 2013-03-24 13:34:31.000000000 -0400 -+++ gambas3-3.4.1/gb.jit/src/jit.h 2013-05-02 13:42:02.912687103 -0400 -@@ -26,13 +26,13 @@ - #ifndef __JIT_H - #define __JIT_H - --#include "llvm/LLVMContext.h" --#include "llvm/Module.h" -+#include "llvm/IR/LLVMContext.h" -+#include "llvm/IR/Module.h" - #include "llvm/Analysis/Verifier.h" --#include "llvm/Constants.h" --#include "llvm/DerivedTypes.h" --#include "llvm/Intrinsics.h" --#include "llvm/Instructions.h" -+#include "llvm/IR/Constants.h" -+#include "llvm/IR/DerivedTypes.h" -+#include "llvm/IR/Intrinsics.h" -+#include "llvm/IR/Instructions.h" - #include "llvm/ExecutionEngine/JIT.h" - #include "llvm/ExecutionEngine/Interpreter.h" - #include "llvm/ExecutionEngine/GenericValue.h" -@@ -40,7 +40,7 @@ - #include "llvm/Support/ManagedStatic.h" - #include "llvm/Support/raw_ostream.h" - #if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2) --#include "llvm/IRBuilder.h" -+#include "llvm/IR/IRBuilder.h" - #else - #include "llvm/Support/IRBuilder.h" - #endif diff --git a/community/garmindev/PKGBUILD b/community/garmindev/PKGBUILD index 24cc82014..f740aa005 100644 --- a/community/garmindev/PKGBUILD +++ b/community/garmindev/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97782 2013-09-29 17:08:41Z jlichtblau $ +# $Id: PKGBUILD 103010 2013-12-25 16:23:30Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> pkgname=garmindev pkgver=0.3.4 -pkgrel=6 +pkgrel=7 pkgdesc="Garmin Device Drivers for QlandkarteGT" arch=('i686' 'x86_64') url="http://www.qlandkarte.org/" diff --git a/community/garmindev/garmindev.changelog b/community/garmindev/garmindev.changelog index 64bb867ea..474c70a0f 100644 --- a/community/garmindev/garmindev.changelog +++ b/community/garmindev/garmindev.changelog @@ -1,4 +1,7 @@ -2013-09-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * garmindev 0.3.4-7 static libraries removed + +"013-09-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * garmindev 0.3.4-6 install file update FS#36141 2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> diff --git a/community/gcolor2/PKGBUILD b/community/gcolor2/PKGBUILD index b9b30a4df..83556076a 100644 --- a/community/gcolor2/PKGBUILD +++ b/community/gcolor2/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gcolor2 pkgver=0.4 -pkgrel=6 +pkgrel=7 pkgdesc="A simple GTK+2 color selector" arch=('i686' 'x86_64') url="http://gcolor2.sf.net/" @@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t gcolor2-0.4-amd64.patch gcolor2.desktop) md5sums=('02de9d925ad5921522685f402caec3ec' '5791378f6f86dd25a302ad8586292dd6' - '9523da11b40dd167964d1b50b40250d5') + '1bbc11865df2a0529757cdbdf806b079') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/gcolor2/gcolor2.desktop b/community/gcolor2/gcolor2.desktop index 754df94d3..22d17be47 100644 --- a/community/gcolor2/gcolor2.desktop +++ b/community/gcolor2/gcolor2.desktop @@ -2,6 +2,7 @@ Name=Gcolor2 GenericName=A simple GTK+2 color selector Comment=Choose colours from palette or screen +Keywords=select;pick;detect;choose;colors;palette Exec=gcolor2 Icon=/usr/share/pixmaps/gcolor2/icon.png Type=Application diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD index 89cc9e6a1..41949824d 100644 --- a/community/gcompris/PKGBUILD +++ b/community/gcompris/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 99747 2013-10-30 23:28:02Z allan $ +# $Id: PKGBUILD 100632 2013-11-06 16:42:49Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> pkgname=gcompris -pkgver=12.11 -pkgrel=2 +pkgver=13.11 +pkgrel=1 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" arch=('i686' 'x86_64') url="http://gcompris.net/" license=('GPL3') depends=('pygtk' 'librsvg' 'python2-pysqlite' 'gstreamer0.10-base-plugins') optdepends=('gnucap: for computer simulation within the electricity activity' - 'tuxpaint: for the painting activity' - 'gnuchess: for the chess activity') -makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess') + 'tuxpaint: for the painting activity') +makedepends=('texinfo' 'texi2html' 'intltool' 'gettext') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha256sums=('97b688497963cc907e3d91f844483fb006a07b22010528dafb09ae5380523b20') +sha256sums=('418dad2c8f0fc90e16e97ab67b6700e3af5f33ae05d83f28f3b1117183f88c57') + +prepare() { + cd $pkgname-$pkgver + + sed -i 's/"$GNUCHESS"/"gcompris-gnuchess"/' configure +} build() { cd $pkgname-$pkgver @@ -25,7 +30,7 @@ build() { } package() { - depends+=('gcompris-data') + depends+=("gcompris-data=$pkgver-$pkgrel") cd $pkgname-$pkgver make DESTDIR="$pkgdir" install-exec diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD index dc7c1c15a..f1502a297 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99749 2013-10-30 23:28:45Z allan $ +# $Id: PKGBUILD 102765 2013-12-19 13:49:34Z fyan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gdal pkgver=1.10.0 -pkgrel=5 +pkgrel=6 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64') url="http://www.gdal.org/" diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD index aa3224743..3ed37cf9a 100644 --- a/community/gdc/PKGBUILD +++ b/community/gdc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('gdc' 'libgphobos-devel') pkgver=4.8.2 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url="https://github.com/D-Programming-GDC/GDC" license=('GPL') @@ -90,6 +90,12 @@ package_libgphobos-devel() cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/$pkgver/core cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/$pkgver/gcc + # workaround for auto-generated libbacktrace issue + # script needs to be re-written to first call normal gcc instalaltion targets to + # avoid such problems in future + cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/$pkgver/gcc + rm $pkgdir/usr/include/dlang/gdc/$pkgver/gcc/libbacktrace.d.in + # phobos cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/$pkgver/crc32.d cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/$pkgver/std diff --git a/community/gearmand/PKGBUILD b/community/gearmand/PKGBUILD new file mode 100644 index 000000000..f0f325628 --- /dev/null +++ b/community/gearmand/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 102452 2013-12-11 14:33:31Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Lev Lybin <lev.lybin@gmail.com> +# Contributor: Vadym Abramchuk <abramm@gmail.com> +# Contributor: John Gerritse <reaphsharc@gmail.com> + +pkgname=gearmand +pkgver=1.1.11 +pkgrel=1 +pkgdesc="Distributed job queue server." +arch=('i686' 'x86_64') +depends=('libevent' 'boost-libs' 'libmariadbclient' 'postgresql-libs' 'sqlite') +makedepends=('boost' 'gperf' 'python-sphinx') +conflicts=('gearman') +replaces=('gearman') +provides=("gearman=$pkgver") +url="http://gearman.org/" +license=('CUSTOM') +install=$pkgname.install +backup=('etc/gearmand.conf') +source=(https://launchpad.net/$pkgname/1.2/$pkgver/+download/$pkgname-$pkgver.tar.gz + gearmand.service + gearmand.conf) + +build() { + cd "$srcdir/$pkgname-$pkgver" + export LDFLAGS="$LDFLAGS -lboost_system" + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --localstatedir=/run \ + --disable-static \ + --enable-ssl + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + cd "$srcdir" + install -Dm644 gearmand.service "$pkgdir/usr/lib/systemd/system/gearmand.service" + install -Dm644 gearmand.conf "$pkgdir/etc/gearmand.conf" +} + +sha256sums=('a175cbdeabe8102796418a516532adad58abd5e355365c78b6a234e544655825' + 'dee38ad4e614969047253b8c4996b8cdf33c981b0df215b6627356fd4cbafa33' + '6c14fdcd94105338e13bdd59dbed4f9b77430a517b2c125ac2e6d3bc43bdf506') diff --git a/community/gearmand/gearmand.conf b/community/gearmand/gearmand.conf new file mode 100644 index 000000000..2ea39fb2f --- /dev/null +++ b/community/gearmand/gearmand.conf @@ -0,0 +1 @@ +--syslog --log-file stderr diff --git a/community/gearmand/gearmand.install b/community/gearmand/gearmand.install new file mode 100644 index 000000000..56d8ac86b --- /dev/null +++ b/community/gearmand/gearmand.install @@ -0,0 +1,12 @@ +post_install() { + getent group gearmand >/dev/null 2>&1 || groupadd -g 113 gearmand &>/dev/null + getent passwd gearmand >/dev/null 2>&1 || useradd -u 113 -g gearmand -d /dev/null -s /bin/false gearmand &>/dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + userdel gearmand +} diff --git a/community/gearmand/gearmand.service b/community/gearmand/gearmand.service new file mode 100644 index 000000000..a1a8d5a23 --- /dev/null +++ b/community/gearmand/gearmand.service @@ -0,0 +1,12 @@ +[Unit] +Description=Gearmand distributed job system +After=syslog.target network.target + +[Service] +User=gearmand +Type=forking +ExecStart=/usr/bin/gearmand -d +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD index 4496e9a43..707aa6905 100755 --- a/community/geary/PKGBUILD +++ b/community/geary/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 98024 2013-10-04 08:12:31Z alucryd $ +# $Id: PKGBUILD 102595 2013-12-16 08:40:54Z alucryd $ # Maintainer: Maxime Gauduin <alucryd at gmail dot com> # Contributor : sebikul <sebikul@gmail.com> # Contributor : Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=geary -pkgver=0.4.0 +pkgver=0.5.0 pkgrel=1 -pkgdesc="A lightweight email client for the GNOME desktop" +pkgdesc='A lightweight email client for the GNOME desktop' arch=('i686' 'x86_64') -url="http://www.yorba.org/projects/geary/" +url='http://www.yorba.org/projects/geary/' license=('GPL3') -depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee' 'libnotify' 'libunique3' 'webkitgtk3') +depends=('desktop-file-utils' 'gmime' 'libcanberra' 'libgee' 'libnotify' 'webkitgtk') makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala') install="${pkgname}.install" -source=("http://www.yorba.org/download/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz") -sha256sums=('eb6418fe48ee2d25350999e6fc8fd23de15da5670569f4c2478f9435fe2a2ae1') +source=("https://download.gnome.org/sources/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz") +sha256sums=('7f3f442b2b7349e339b380de474d94e9a8ad625d16277277ea500747c3b7a5af') build() { cd ${pkgname}-${pkgver} @@ -24,7 +24,7 @@ build() { fi mkdir build && cd build - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -D{DESKTOP_UPDATE,GSETTINGS_COMPILE{,_IN_PLACE},ICON_UPDATE}='OFF' + cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -D{DESKTOP_UPDATE,GSETTINGS_COMPILE{,_IN_PLACE},ICON_UPDATE}='OFF' make } diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index cdd98b999..06a061e4e 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99756 2013-10-30 23:31:18Z allan $ +# $Id: PKGBUILD 102711 2013-12-17 18:09:28Z bgyorgy $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Plugins for gedit" arch=(x86_64 i686) @@ -20,7 +20,7 @@ optdepends=('gucharmap: for charmap plugin' options=('!emptydirs') install=gedit-plugins.install source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz") -sha256sums=('17cb703a09a0346b6a73d0e34eec87cde9073ffd5e0168741f0830a419ab57cd') +sha256sums=('b30e30d5a0efb9a711c6583748b37c1ed3e45222505e08f920b78c6de0bc4a9d') build() { cd $pkgname-$pkgver diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index c8b0d9211..f3168f4a4 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97501 2013-09-22 21:35:55Z arodseth $ +# $Id: PKGBUILD 102201 2013-12-06 13:22:28Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=gendesk -pkgver=0.5.5 +pkgver=0.6 pkgrel=1 pkgdesc='Utility to generate .desktop files and download icons' arch=('x86_64' 'i686') @@ -12,7 +12,7 @@ makedepends=('go') depends=('glibc') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz" 'http://roboticoverlords.org/images/default.png') -sha256sums=('52a13d3952f0c00a65f05d01a9ca0fc1f5337f3379ff6017aafb686e5caf0942' +sha256sums=('ccfe024a2258beb81a82217598b432cb98006af5d7b6cc8e6012d263d82f1b5d' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { diff --git a/community/gif2png/PKGBUILD b/community/gif2png/PKGBUILD new file mode 100644 index 000000000..2f22833c9 --- /dev/null +++ b/community/gif2png/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 102199 2013-12-06 13:12:30Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: eric <eric@archlinux.org> +# Contributor: Andrew Rose <ody@netrux.com> + +pkgname=gif2png +pkgver=2.5.8 +pkgrel=2 +pkgdesc="A GIF to PNG image format converter" +arch=('i686' 'x86_64') +url="http://www.catb.org/~esr/gif2png/" +license=('ZLIB') +depends=('libpng') +optdepends=('python2: for using web2png') +source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('0f5caeeca561ade7f267ef3f2a9944b4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's#env python#env python2#' web2png + + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/girara/PKGBUILD b/community/girara/PKGBUILD index 1fcc318cc..eef5fedca 100644 --- a/community/girara/PKGBUILD +++ b/community/girara/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 100160 2013-11-01 20:46:36Z spupykin $ +# $Id: PKGBUILD 101151 2013-11-18 15:15:09Z spupykin $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: mlq <mlq@pwmt.org> pkgbase=girara pkgname=(girara-common girara-gtk2 girara-gtk3) -pkgver=0.1.7 -pkgrel=2 +pkgver=0.1.9 +pkgrel=1 pkgdesc="user interface library" arch=('i686' 'x86_64') url="http://pwmt.org/projects/girara" license=('custom') makedepends=('gtk3' 'gtk2') source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz) -md5sums=('ff73bf26b56cdc28a4a2dcce46f4aa20') +md5sums=('0b51fc07b5763b506d46598576e5576e') build() { true diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD index 19d6379f0..5250f1e6a 100644 --- a/community/glabels/PKGBUILD +++ b/community/glabels/PKGBUILD @@ -1,27 +1,23 @@ -# $Id: PKGBUILD 99761 2013-10-30 23:33:09Z allan $ +# $Id: PKGBUILD 101750 2013-11-30 17:42:47Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: yugrotavele <yugrotavele at archlinux dot us> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=glabels -pkgver=3.0.1 -pkgrel=3 +pkgver=3.2.0 +pkgrel=1 pkgdesc="Creating labels and business cards the very easy way" arch=('i686' 'x86_64') url="http://glabels.org/" license=('GPL' 'LGPL') depends=('librsvg' 'evolution-data-server' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils') -makedepends=('barcode' 'intltool' 'gnome-doc-utils') +makedepends=('intltool' 'itstool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - glabels-3.0.0-new-eds.patch) -sha256sums=('99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2' - 'f02ecf12e10b1d406607bad65f81e53ebd5d56fabe46035a47bd6fe1ec8bf70b') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('c4c5b2c911be7b6513ee5cfeda6cd78434623c24dd741bd29cc3573f90b374c9') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/glabels-3.0.0-new-eds.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile make @@ -29,6 +25,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install } diff --git a/community/glabels/glabels-3.0.0-new-eds.patch b/community/glabels/glabels-3.0.0-new-eds.patch deleted file mode 100644 index 9cae4c076..000000000 --- a/community/glabels/glabels-3.0.0-new-eds.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -up glabels-3.0.0/src/merge-evolution.c.new-eds glabels-3.0.0/src/merge-evolution.c ---- glabels-3.0.0/src/merge-evolution.c.new-eds 2011-04-04 01:02:48.000000000 +0200 -+++ glabels-3.0.0/src/merge-evolution.c 2012-08-29 11:54:20.240577838 +0200 -@@ -29,7 +29,7 @@ - - #include "merge-evolution.h" - --#include <libebook/e-book.h> -+#include <libebook/libebook.h> - #include <glib/gi18n.h> - #include <stdio.h> - #include <string.h> -@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gcon - /*--------------------------------------------------------------------------*/ - /* Open merge source. */ - /*--------------------------------------------------------------------------*/ -+static EBook * -+gl_open_system_addressbook (GError **error) -+{ -+ ESourceRegistry *registry; -+ EBook *book = NULL; -+ ESource *source; -+ -+ registry = e_source_registry_new_sync (NULL, error); -+ if (!registry) -+ return NULL; -+ -+ source = e_source_registry_ref_builtin_address_book (registry); -+ if (!source) { -+ g_object_unref (registry); -+ return NULL; -+ } -+ -+ book = e_book_new (source, error); -+ -+ g_object_unref (source); -+ g_object_unref (registry); -+ -+ return book; -+} -+ - static void - gl_merge_evolution_open (glMerge *merge) - { -@@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge) - return; - } - -- merge_evolution->priv->book = e_book_new_system_addressbook(&error); -+ merge_evolution->priv->book = gl_open_system_addressbook(&error); - if (!merge_evolution->priv->book) { - g_warning ("Couldn't open addressbook."); - if (error) - { -- g_warning ("e_book_new_system_addressbook: %s", error->message); -+ g_warning ("gl_open_system_addressbook: %s", error->message); - g_error_free (error); - } - e_book_query_unref(query); -diff -up glabels-3.0.0/src/merge-vcard.c.new-eds glabels-3.0.0/src/merge-vcard.c ---- glabels-3.0.0/src/merge-vcard.c.new-eds 2011-04-04 01:02:48.000000000 +0200 -+++ glabels-3.0.0/src/merge-vcard.c 2012-08-29 11:54:20.241577849 +0200 -@@ -27,7 +27,7 @@ - - #include "merge-vcard.h" - --#include <libebook/e-contact.h> -+#include <libebook/libebook.h> - #include <stdio.h> - #include <string.h> - #include <errno.h> diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD index b46d8e812..13b5ca01a 100644 --- a/community/glob2/PKGBUILD +++ b/community/glob2/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 94023 2013-07-13 12:32:16Z svenstaro $ +# $Id: PKGBUILD 102248 2013-12-07 10:36:32Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> pkgname=glob2 pkgver=0.9.4.4 -pkgrel=19 -pkgdesc='RTS game which minimizes micro-management by automatically assigning tasks to units' +pkgrel=21 +pkgdesc='RTS game which minimizes micro-management' arch=('x86_64' 'i686') url='http://www.globulation2.org/' license=('GPL3') depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu' - 'fribidi' 'xdg-utils' 'libgl') -makedepends=('scons' 'boost' 'mesa-libgl') + 'fribidi' 'xdg-utils' 'libgl' 'hicolor-icon-theme') +makedepends=('scons' 'boost' 'mesa') install="$pkgname.install" source=("http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz" "$pkgname-${pkgver%.*}.1-gcc44.patch") @@ -20,19 +20,19 @@ sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8' '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a') prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" patch -Np0 -i "$srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch" } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" scons LINKFLAGS="-lboost_system" } package () { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" scons install BINDIR="$pkgdir/usr/bin" INSTALLDIR="$pkgdir/usr/share" find "$pkgdir/usr/share" -type f -exec chmod 644 '{}' \; diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 5107ce651..55b3d7da8 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 99763 2013-10-30 23:33:51Z allan $ +# $Id: PKGBUILD 102249 2013-12-07 10:36:33Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom -pkgver=1.24.1 -pkgrel=1 +pkgver=1.24.2 +pkgrel=2 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64') url="http://www.glom.org/" @@ -14,8 +14,9 @@ license=('GPL') depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql') makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') install=$pkgname.install +changelog=$pkgname.changelog source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.24/$pkgname-$pkgver.tar.xz) -sha256sums=('eae586be8d3fc36ee80e5ca0ef5d877e76d346cbfe451c9abff5be27692030d1') +sha256sums=('7bd16c9ac0db15d273667c1a39c1f5056669281d69e9c779548b1f6bdaef798b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/glom/glom.changelog b/community/glom/glom.changelog new file mode 100644 index 000000000..4e02bf969 --- /dev/null +++ b/community/glom/glom.changelog @@ -0,0 +1,2 @@ +2013-11-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * glom-1.24.2-1 diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index 69d0cad74..e841b8cc0 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100446 2013-11-04 12:12:13Z spupykin $ +# $Id: PKGBUILD 102127 2013-12-05 14:49:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be @@ -7,19 +7,15 @@ pkgname=glusterfs pkgver=3.4.1 _basever=`echo $pkgver | cut -f1-2 -d.` -pkgrel=1 +pkgrel=2 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64) url='http://www.gluster.org/' license=(GPL2 LGPL3) depends=(fuse python2 libxml2) makedepends=(flex bison) -source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz - glusterd.service) -sha256sums=('2a2a43fb52a7f6b8b00331acc5ea2c86a067a2f2901cca886a2348e919c0cbd8' - '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b') -sha256sums=('b5f1b4e3c6b86ecdfc5ff1b870ae3d3384bb2e3943565d6907c29ee6e21ab739' - '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b') +source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz) +md5sums=('dce3d066b7351b360454ea9ca4cabe4c') build() { cd $srcdir/$pkgname-$pkgver @@ -32,6 +28,7 @@ build() { --localstatedir=/var \ --mandir=/usr/share/man \ --libexecdir=/usr/lib/$pkgname \ + --with-systemddir=/usr/lib/systemd/system \ PYTHON=python2 make @@ -51,10 +48,6 @@ package() { $srcdir/$pkgname-$pkgver/{README,INSTALL,COPYING*} \ $pkgdir/usr/share/doc/glusterfs/ - install -D -m 644 \ - $srcdir/glusterd.service \ - $pkgdir/usr/lib/systemd/system/glusterd.service - cp -rf \ $srcdir/$pkgname-$pkgver/doc/* \ $pkgdir/usr/share/doc/glusterfs/ diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 3c4dece82..71d16b033 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99532 2013-10-29 11:26:02Z spupykin $ +# $Id: PKGBUILD 102358 2013-12-09 12:50:15Z 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,7 +6,7 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.7.2 +pkgver=1.5.8.0 pkgrel=1 arch=("i686" "x86_64") url="http://gmic.sourceforge.net" @@ -15,7 +15,7 @@ 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=('08aa65f01b5bec9cb0ff71b30102cf4e' +md5sums=('286d99392a80aaaf2dbcda2ec95f021e' '120319b0d6c81c5af186abe2281b79ca') prepare() { diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index 97e2c9775..a29530d85 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99769 2013-10-30 23:36:07Z allan $ +# $Id: PKGBUILD 102250 2013-12-07 10:36:34Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.10 -pkgrel=10 +pkgrel=11 arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/" license=(GPL3) diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index 9258924f1..eb4b48e3c 100644 --- a/community/gnome-commander/PKGBUILD +++ b/community/gnome-commander/PKGBUILD @@ -1,41 +1,44 @@ -# $Id: PKGBUILD 99771 2013-10-30 23:36:54Z allan $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 103047 2013-12-25 19:18:23Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=gnome-commander -pkgver=1.2.8.15 +pkgver=1.2.8.16 pkgrel=1 -pkgdesc="A graphical two-pane filemanager for Gnome" +pkgdesc='Graphical two-pane filemanager for Gnome' arch=('i686' 'x86_64') -url="http://www.nongnu.org/gcmd/" +url='http://www.nongnu.org/gcmd/' license=('GPL') depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm') -makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool') -install=gnome-commander.install +makedepends=('perlxml' 'gnome-doc-utils' 'intltool') +install=$pkgname.install source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz) -sha256sums=('d2feecf215db3e0faeb873c559087c2ad9af0a5aac26e2b1b32b28be939da37f') +sha256sums=('84d653fab2eaec233b6d899f339099c2fa2d2d5cbdb7a33bd7022c34ed901347') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - # python2 fix - for file in doc/*/gnome-commander.xml; do - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + # Python 2 fix + for f in doc/*/gnome-commander.xml; do + sed -i 's:env python:env python2:' "$f" done ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper --enable-python - + --localstatedir=/var --disable-scrollkeeper --enable-python make } package() { - cd "$srcdir/$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + cd "$pkgname-$pkgver" - mkdir -p "$pkgdir"/usr/share/gconf/schemas - gconf-merge-schema "$pkgdir"/usr/share/gconf/schemas/$pkgname.schemas \ - --domain $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas - rm -rf "$pkgdir"/etc/gconf/schemas/ + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + install -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \ + --domain "$pkgname" "$pkgdir/etc/gconf/schemas/"*.schemas + rm -rf "$pkgdir/etc/gconf/schemas/" } + +# vim:set ts=2 sw=2 et: diff --git a/community/gnome-commander/gnome-commander.install b/community/gnome-commander/gnome-commander.install index e1b6d3a0c..1c0d43e16 100644 --- a/community/gnome-commander/gnome-commander.install +++ b/community/gnome-commander/gnome-commander.install @@ -1,7 +1,7 @@ pkgname=gnome-commander post_install() { - usr/sbin/gconfpkg --install ${pkgname} + gconfpkg --install "$pkgname" update-desktop-database -q } @@ -14,9 +14,11 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall "$pkgname" } post_remove() { update-desktop-database -q } + +# vim:set ts=2 sw=2 et: diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index 00e64e742..f4a24191e 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99773 2013-10-30 23:37:38Z allan $ +# $Id: PKGBUILD 102874 2013-12-23 07:07:51Z bgyorgy $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=gnome-packagekit -pkgver=3.8.2 +pkgver=3.10.1 pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64') @@ -11,12 +11,19 @@ license=('GPL') depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'packagekit') makedepends=('gconf' 'gtk-doc' 'intltool' 'itstool' 'libcanberra' 'upower') -optdepends=('polkit-gnome: required for privileged actions' - 'gnome-settings-daemon-updates: update and message notifications') +optdepends=('gnome-settings-daemon-updates: update and message notifications') options=('!emptydirs') install="$pkgname.install" -source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") -sha256sums=('f13481d477a47295fa204b73ae7590f61d5576a8c889e5644cee0bc1f5cf530c') +source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" + "packagekit-0.8.patch") +sha256sums=('40f11968e6a40606486f232fd6f61348eb75dc465f25deb2f157f6546bbe4e26' + '717ba4d281adbafc9409202538ad1c8ce9a2bb41a6a0bc127e8dd5c4c1da1d65') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + patch -RNp1 -i "$srcdir/packagekit-0.8.patch" +} build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gnome-packagekit/packagekit-0.8.patch b/community/gnome-packagekit/packagekit-0.8.patch new file mode 100644 index 000000000..e1b1b2f97 --- /dev/null +++ b/community/gnome-packagekit/packagekit-0.8.patch @@ -0,0 +1,65 @@ +From 4077ba3ea30354ef070d640a5af4b6a913e97f4b Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Tue, 18 Jun 2013 12:56:05 +0000 +Subject: Ignore package progress updates when the transaction is being simulated + +PackageKit backends do not have to issue INFO_FINISHED when simulating, and most +don't bother. As we didn't special-case simulation, we set up the activity +spinner on the Package(INFO_UPDATING) event and do not cancel the signal. + +This leaves every row in the update viewer with a spinning cursor, which due to +the way the code was structured lead to an O(n*n) exposion of updates to the +cell renderers for each update. For a dozen or so updates it was not noticable, +and nobody noticed the slight increase of CPU usage. + +Now that TeX Live has officially jumped the shark and has many hundreds of +sub-packages, it's quite plausible to have *thousands* of small packages to +update. This means that the O(n*n) bug stops being a minor increase in CPU and +starts to use the CPU at 100% for many hours before completing. + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=969852 +--- +diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c +index 53be9cf..a2182a1 100644 +--- a/src/gpk-update-viewer.c ++++ b/src/gpk-update-viewer.c +@@ -841,6 +841,7 @@ gpk_update_viewer_progress_cb (PkProgress *progress, + gchar *text; + gint percentage; + GtkWidget *widget; ++ guint64 transaction_flags; + PkInfoEnum info; + PkRoleEnum role; + PkStatusEnum status; +@@ -853,6 +854,7 @@ gpk_update_viewer_progress_cb (PkProgress *progress, + "percentage", &percentage, + "package", &package, + "allow-cancel", &allow_cancel, ++ "transaction-flags", &transaction_flags, + NULL); + + if (type == PK_PROGRESS_TYPE_PACKAGE) { +@@ -864,6 +866,10 @@ gpk_update_viewer_progress_cb (PkProgress *progress, + GtkTreePath *path; + gboolean scroll; + ++ /* ignore simulation phase */ ++ if (pk_bitfield_contain (transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE)) ++ goto out; ++ + /* add the results, not the progress */ + if (role == PK_ROLE_ENUM_GET_UPDATES) + goto out; +@@ -1040,6 +1046,10 @@ gpk_update_viewer_progress_cb (PkProgress *progress, + guint size_display; + PkItemProgress *item_progress; + ++ /* ignore simulation phase */ ++ if (pk_bitfield_contain (transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE)) ++ goto out; ++ + g_object_get (progress, + "item-progress", &item_progress, + NULL); +-- +cgit v0.9.2 diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD index 864708ec6..ac2578542 100644 --- a/community/gnome-screensaver/PKGBUILD +++ b/community/gnome-screensaver/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 98193 2013-10-07 12:08:28Z jgc $ +# $Id: PKGBUILD 101767 2013-11-30 20:33:20Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-screensaver pkgver=3.6.1 -pkgrel=6 +pkgrel=7 pkgdesc="Legacy GNOME screensaver" arch=('i686' 'x86_64') license=('GPL') -url="http://live.gnome.org/GnomeScreensaver" +url="https://wiki.gnome.org/Projects/GnomeScreensaver" backup=(etc/pam.d/gnome-screensaver) depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop') makedepends=('intltool' 'gnome-common') @@ -18,12 +18,16 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p gnome-screensaver.pam move-desktop-file.patch fix-autoconf.patch - lock_screen_on_suspend.patch) + fix-systemd-support.patch + lock_screen_on_suspend.patch + lightdm_switch_user.patch) sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0' 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda' '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974' 'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb' - '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8') + '8aa387578c1756e573f6558a66be25fc96d7e8567fb7bee580159479841f5f45' + '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8' + '5d40bd6e1843150912dc52932eaa94c0f6d57931fd45a3769ef40e2335fe3c6f') prepare() { cd "$pkgname-$pkgver" @@ -34,13 +38,18 @@ prepare() { # Fix build patch -Np1 -i "$srcdir/fix-autoconf.patch" + # Fix systemd support + patch -Np1 -i "$srcdir/fix-systemd-support.patch" + # Lock screen on suspend with systemd patch -Np1 -i "$srcdir/lock_screen_on_suspend.patch" + + # Add support for user switch with LightDM + patch -Np1 -i "$srcdir/lightdm_switch_user.patch" } build() { cd "$pkgname-$pkgver" - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --with-mit-ext diff --git a/community/gnome-screensaver/fix-systemd-support.patch b/community/gnome-screensaver/fix-systemd-support.patch new file mode 100644 index 000000000..61db06029 --- /dev/null +++ b/community/gnome-screensaver/fix-systemd-support.patch @@ -0,0 +1,91 @@ +From cac2c0ad8f4f40b6b175b9fbcde06935859f1bbc Mon Sep 17 00:00:00 2001 +From: Peter de Ridder <peter@xfce.org> +Date: Wed, 20 Mar 2013 20:44:51 +0100 +Subject: [PATCH] Use the session path instead of the session id. + +--- + src/gs-listener-dbus.c | 47 +++++++++++++++++++++++++++-------------------- + 1 file changed, 27 insertions(+), 20 deletions(-) + +diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c +index 703d9e1..11fb95e 100644 +--- a/src/gs-listener-dbus.c ++++ b/src/gs-listener-dbus.c +@@ -25,6 +25,7 @@ + #include <stdio.h> + #include <time.h> + #include <string.h> ++#include <unistd.h> + + #include <glib/gi18n.h> + +@@ -116,19 +117,8 @@ enum { + if (listener->priv->session_id == NULL) + return FALSE; + +-#ifdef WITH_SYSTEMD +- /* The bus object path is simply the actual session ID +- * prefixed to make it a bus path */ +- if (listener->priv->have_systemd) +- return g_str_has_prefix (ssid, SYSTEMD_LOGIND_SESSION_PATH "/") +- && strcmp (ssid + sizeof (SYSTEMD_LOGIND_SESSION_PATH), +- listener->priv->session_id) == 0; +-#endif +- +-#ifdef WITH_CONSOLE_KIT + if (strcmp (ssid, listener->priv->session_id) == 0) + return TRUE; +-#endif + + return FALSE; + } +@@ -416,20 +406,37 @@ enum { + + #ifdef WITH_SYSTEMD + if (listener->priv->have_systemd) { +- char *t; +- int r; ++ dbus_uint32_t pid = getpid(); + +- r = sd_pid_get_session (0, &t); +- if (r < 0) { +- gs_debug ("Couldn't determine our own session id: %s", strerror (-r)); ++ message = dbus_message_new_method_call (SYSTEMD_LOGIND_SERVICE, SYSTEMD_LOGIND_PATH, SYSTEMD_LOGIND_INTERFACE, "GetSessionByPID"); ++ if (message == NULL) { ++ gs_debug ("Couldn't allocate the dbus message"); + return NULL; + } + +- /* t is allocated with malloc(), we need it with g_malloc() */ +- ssid = g_strdup(t); +- free (t); ++ if (dbus_message_append_args (message, DBUS_TYPE_UINT32, &pid, DBUS_TYPE_INVALID) == FALSE) { ++ gs_debug ("Couldn't add args to the dbus message"); ++ return NULL; ++ } ++ ++ /* FIXME: use async? */ ++ reply = dbus_connection_send_with_reply_and_block (listener->priv->system_connection, ++ message, ++ -1, &error); ++ dbus_message_unref (message); ++ ++ if (dbus_error_is_set (&error)) { ++ gs_debug ("%s raised:\n %s\n\n", error.name, error.message); ++ dbus_error_free (&error); ++ return NULL; ++ } ++ ++ dbus_message_iter_init (reply, &reply_iter); ++ dbus_message_iter_get_basic (&reply_iter, &ssid); ++ ++ dbus_message_unref (reply); + +- return ssid; ++ return g_strdup (ssid); + } + #endif + +-- +1.8.4 + diff --git a/community/gnome-screensaver/lightdm_switch_user.patch b/community/gnome-screensaver/lightdm_switch_user.patch new file mode 100644 index 000000000..27f67efc7 --- /dev/null +++ b/community/gnome-screensaver/lightdm_switch_user.patch @@ -0,0 +1,100 @@ +Description: Under lightdm, use dbus to switch to greeter instead of + calling gdmflexiserver +Author: Marc Deslauriers <marc.deslauriers@canonical.com> +Forwarded: No, upstream uses GDM +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-screensaver/+bug/950583 + +Index: gnome-screensaver-3.4.2/src/gs-lock-plug.c +=================================================================== +--- gnome-screensaver-3.4.2.orig/src/gs-lock-plug.c 2012-06-28 10:50:53.955326278 +1200 ++++ gnome-screensaver-3.4.2/src/gs-lock-plug.c 2012-06-28 10:50:58.055326137 +1200 +@@ -148,28 +148,60 @@ + static void + do_user_switch (GSLockPlug *plug) + { +- GAppInfo *app; +- GAppLaunchContext *context; +- GError *error; +- char *command; +- +- command = g_strdup_printf ("%s %s", +- GDM_FLEXISERVER_COMMAND, +- GDM_FLEXISERVER_ARGS); ++ GError *error = NULL; + +- error = NULL; +- context = (GAppLaunchContext*)gdk_app_launch_context_new (); +- app = g_app_info_create_from_commandline (command, "gdmflexiserver", 0, &error); +- if (app) +- g_app_info_launch (app, NULL, context, &error); +- +- g_free (command); +- g_object_unref (context); +- g_object_unref (app); ++ /* If running under LightDM switch to the greeter using dbus */ ++ if (g_getenv("XDG_SEAT_PATH")) { ++ GDBusConnection *bus; ++ GVariant *result = NULL; ++ ++ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); ++ if (error) ++ g_warning ("Failed to get system bus: %s", error->message); ++ g_clear_error (&error); ++ ++ if (bus) ++ result = g_dbus_connection_call_sync (bus, ++ "org.freedesktop.DisplayManager", ++ g_getenv ("XDG_SEAT_PATH"), ++ "org.freedesktop.DisplayManager.Seat", ++ "SwitchToGreeter", ++ g_variant_new ("()"), ++ G_VARIANT_TYPE ("()"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ if (error) ++ g_warning ("Failed to switch to greeter: %s", error->message); ++ g_clear_error (&error); + +- if (error != NULL) { +- gs_debug ("Unable to start GDM greeter: %s", error->message); +- g_error_free (error); ++ if (result) ++ g_variant_unref (result); ++ } else { ++ ++ GAppInfo *app; ++ GAppLaunchContext *context; ++ char *command; ++ ++ command = g_strdup_printf ("%s %s", ++ GDM_FLEXISERVER_COMMAND, ++ GDM_FLEXISERVER_ARGS); ++ ++ error = NULL; ++ context = (GAppLaunchContext*)gdk_app_launch_context_new (); ++ app = g_app_info_create_from_commandline (command, "gdmflexiserver", 0, &error); ++ if (app) ++ g_app_info_launch (app, NULL, context, &error); ++ ++ g_free (command); ++ g_object_unref (context); ++ g_object_unref (app); ++ ++ if (error != NULL) { ++ gs_debug ("Unable to start GDM greeter: %s", error->message); ++ g_error_free (error); ++ } + } + } + +@@ -1026,7 +1058,7 @@ + if (switch_enabled) { + gboolean found; + found = is_program_in_path (GDM_FLEXISERVER_COMMAND); +- if (found) { ++ if (found || g_getenv("XDG_SEAT_PATH")) { + gtk_widget_show (plug->priv->auth_switch_button); + } else { + gs_debug ("Waring: GDM flexiserver command not found: %s", GDM_FLEXISERVER_COMMAND); diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index 9deab5537..2f42c8398 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99775 2013-10-30 23:38:21Z allan $ +# $Id: PKGBUILD 102872 2013-12-23 06:37:43Z bgyorgy $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.8.2 +pkgver=3.10.2 pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64') @@ -14,15 +14,21 @@ options=('!emptydirs') install=$_pkgname.install url="http://www.gnome.org" source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" + 'packagekit-0.8.patch' 'arch.patch') -sha256sums=('e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be' - '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea') +sha256sums=('808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264' + '2fd5ee457f5d57bfd9edef049719f55ab1cab5fe6d0fb422f91fe363c02e6efd' + '217004c112b18cf136c535ef3d6cc90f0cecc495573cfb8653ff089230d248bb') -build() { +prepare() { cd "$srcdir/$_pkgname-$pkgver" - + patch -RNp1 -i "$srcdir/packagekit-0.8.patch" patch -Np1 -i "$srcdir/arch.patch" +} +build() { + cd "$srcdir/$_pkgname-$pkgver" + autoreconf -fi ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -31,7 +37,8 @@ build() { #https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -s + make -C 'gnome-settings-daemon' + make -C 'plugins/updates' } package() { diff --git a/community/gnome-settings-daemon-updates/arch.patch b/community/gnome-settings-daemon-updates/arch.patch index df70cd9f8..297b98a48 100644 --- a/community/gnome-settings-daemon-updates/arch.patch +++ b/community/gnome-settings-daemon-updates/arch.patch @@ -35,6 +35,17 @@ index 81c7179..6fd3534 100644 libupdates_la_CPPFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ +@@ -58,7 +60,9 @@ gsd_test_updates_SOURCES = \ + gsd-updates-firmware.h \ + gsd-updates-firmware.c \ + gsd-updates-manager.h \ +- gsd-updates-manager.c ++ gsd-updates-manager.c \ ++ gsd-updates-watch.h \ ++ gsd-updates-watch.c + + gsd_test_updates_CPPFLAGS = \ + -I$(top_srcdir)/data/ \ diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c index 95ee1c4..7b26c06 100644 --- a/plugins/updates/gsd-updates-manager.c diff --git a/community/gnome-settings-daemon-updates/packagekit-0.8.patch b/community/gnome-settings-daemon-updates/packagekit-0.8.patch new file mode 100644 index 000000000..eae0105e0 --- /dev/null +++ b/community/gnome-settings-daemon-updates/packagekit-0.8.patch @@ -0,0 +1,60 @@ +From 5f4f1ed45747343f26f280401bc4915d92b71d89 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Mon, 30 Sep 2013 12:06:22 +0000 +Subject: updates: Raise the dep on PackageKit to avoid complexity + +--- +diff --git a/configure.ac b/configure.ac +index 87eb473..199542c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -306,7 +306,7 @@ AC_ARG_ENABLE(packagekit, + [WANT_PACKAGEKIT=yes]) dnl Default value + + if test x$WANT_PACKAGEKIT = xyes ; then +- PK_REQUIRED_VERSION=0.7.4 ++ PK_REQUIRED_VERSION=0.8.1 + PKG_CHECK_MODULES(PACKAGEKIT, glib-2.0 packagekit-glib2 >= $PK_REQUIRED_VERSION upower-glib >= $UPOWER_REQUIRED_VERSION gudev-1.0 libnotify >= $LIBNOTIFY_REQUIRED_VERSION, + [have_packagekit=true + AC_DEFINE(HAVE_PACKAGEKIT, 1, [Define if PackageKit should be used])], +diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c +index 3aff29a..0f73a42 100644 +--- a/plugins/updates/gsd-updates-manager.c ++++ b/plugins/updates/gsd-updates-manager.c +@@ -742,7 +742,6 @@ auto_download_updates (GsdUpdatesManager *manager) + package_ids[i] = g_strdup (pk_package_get_id (pkg)); + } + +-#if PK_CHECK_VERSION(0,8,1) + /* we've set only-download in PkTask */ + pk_task_update_packages_async (manager->priv->task, + package_ids, +@@ -750,16 +749,6 @@ auto_download_updates (GsdUpdatesManager *manager) + NULL, NULL, + (GAsyncReadyCallback) package_download_finished_cb, + manager); +-#else +- /* download them all */ +- pk_client_download_packages_async (PK_CLIENT(manager->priv->task), +- package_ids, +- NULL, /* this means system cache */ +- manager->priv->cancellable, +- NULL, NULL, +- (GAsyncReadyCallback) package_download_finished_cb, +- manager); +-#endif + g_strfreev (package_ids); + } + +@@ -1506,9 +1495,7 @@ gsd_updates_manager_start (GsdUpdatesManager *manager, + g_object_set (manager->priv->task, + "background", TRUE, + "interactive", FALSE, +-#if PK_CHECK_VERSION(0,8,1) + "only-download", TRUE, +-#endif + NULL); + + /* watch UDev for missing firmware */ +-- +cgit v0.9.2 diff --git a/community/gnuchess/PKGBUILD b/community/gnuchess/PKGBUILD index d68d886f0..706455305 100644 --- a/community/gnuchess/PKGBUILD +++ b/community/gnuchess/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 88493 2013-04-18 15:55:51Z jsteel $ -# Maintainer: Jonathan Steel <mail@jsteel.org> +# $Id: PKGBUILD 101444 2013-11-25 18:39:13Z jsteel $ +# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuchess -pkgver=6.0.3 +pkgver=6.1.1 pkgrel=1 -pkgdesc="Lets most modern computers play a full game of chess" -url="http://www.gnu.org/software/chess/chess.html" +pkgdesc="Play chess against the computer on a terminal and an engine for graphical chess frontends" arch=('i686' 'x86_64') -license=('GPL') -depends=('glibc' 'ncurses' 'readline') -optdepends=('xboard: for a GUI') -source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz) -md5sums=('28625afb8f48b86211ee1d217c308064') +url="http://www.gnu.org/software/chess/chess.html" +license=('GPL3') +depends=('bash') +optdepends=('xboard: graphical frontend') +install=$pkgname.install +source=(http://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz) +md5sums=('1299cbd0025a7cf4fbba21e6c2ef6278') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/gnuchess/gnuchess.install b/community/gnuchess/gnuchess.install new file mode 100644 index 000000000..43d005279 --- /dev/null +++ b/community/gnuchess/gnuchess.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(gnuchess.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/community/gnuradio/PKGBUILD b/community/gnuradio/PKGBUILD index 3200dee0a..32dcfb539 100644 --- a/community/gnuradio/PKGBUILD +++ b/community/gnuradio/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 100355 2013-11-02 16:17:09Z kkeen $ +# $Id: PKGBUILD 102721 2013-12-17 19:43:24Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dominik Heidler <dheidler@gmail.com> +# Contributor: Jonatan Sastre <jsastreh [ at ] hotmail.com> pkgname=gnuradio -pkgver=3.7.1 -pkgrel=8 -pkgdesc="General purpose DSP and SDR toolkit. Supports usrp and fcd." +pkgver=3.7.2.1 +pkgrel=1 +pkgdesc="General purpose DSP and SDR toolkit. With drivers for usrp and fcd." arch=('i686' 'x86_64') url="http://gnuradio.org" license=('GPL') @@ -14,27 +15,41 @@ optdepends=('python2-cheetah: gnuradio-companion' 'python2-lxml: gnuradio-companion' 'pygtk: gnuradio-companion' 'wxpython: gr-wxgui' - 'qwtplot3d: gr-qtgui' - 'pyqwt: gr-qtgui' - 'doxygen: autogenerated documentation' - 'pkgconfig: ?') + 'pkgconfig: libuhd') conflicts=('gnuradio-git') install=gnuradio.install +# gr-qtgui todo +# talk to ronald about adding qwt5 to qwt package +# bring pyqwt in from AUR +# update optdepends +# 'qwtplot3d: gr-qtgui' +# 'pyqwt: gr-qtgui' +# update makedepends +# 'qwtplot3d' + # todo # add gr-osmosdr-git to optdepends # split the gui components? # build doxygen docs? # icons +# comedilib: gr-comedi +# zeroc-ice: gr-ctrlport +# doxygen: C++ autogenerated documentation +# python2-sphinx: Python autogenerated documentation + source=("http://gnuradio.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" "21-fcd.rules") -md5sums=('6c5e67da6ed8724dd900d8e343b64be4' +md5sums=('f2ea23a30cb02802870fe8cb9bf272c9' '465e12c454c6a22ebec9849181af7bdc') build() { export PYTHON=python2 cd "$srcdir/$pkgname-$pkgver" + sed -i -e "s|GR_PKG_LIBEXEC_DIR|GR_RUNTIME_DIR|" grc/freedesktop/CMakeLists.txt + sed -i -e "s|/qwt$|/qwt5|" -e "s| qwt | qwt5 |" cmake/Modules/FindQwt.cmake + sed -i -e "s| sphinx-build$| sphinx-build2|" cmake/Modules/FindSphinx.cmake msg "Starting build." mkdir -p build cd build @@ -43,7 +58,7 @@ build() { -DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \ -DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \ -DENABLE_GRC=ON \ - -DCMAKE_INSTALL_PREFIX=/usr ../ + -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ../ make } diff --git a/community/gnuradio/gnuradio.install b/community/gnuradio/gnuradio.install index e111ef946..1166dd05e 100644 --- a/community/gnuradio/gnuradio.install +++ b/community/gnuradio/gnuradio.install @@ -1,11 +1,50 @@ -post_install() { + +# clean up for anyone silly enough to run this as root + +# it would be great if pkgname and not just pkgver was passed in the arg list + +_pkg='gnuradio' +_cpython='cpython-33' + +post_upgrade() { + while read _f; do + if [[ "${_f:(-3)}" != ".py" ]]; then + continue + fi + if [[ ! -f "$_f" ]]; then + continue + fi + if [[ -e "${_f}c" ]]; then + rm -f "${_f}c" + fi + if [[ -e "${_f}o" ]]; then + rm -f "${_f}o" + fi + _thisdir="$(dirname "$_f")/__pycache__" + if [[ ! -d "$_thisdir" ]]; then + continue + fi + _thisfile="$(basename "$_f")" + _thisfile="${_thisfile/%.py/.${_cpython}.py}" + if [[ -e "${_thisdir}/${_thisfile}c" ]]; then + rm -f "${_thisdir}/${_thisfile}c" + fi + if [[ -e "${_thisdir}/${_thisfile}o" ]]; then + rm -f "${_thisdir}/${_thisfile}o" + fi + # no good way to test for empty dir + # would be 25% faster if there were + rmdir --ignore-fail-on-non-empty "$_thisdir" &> /dev/null + done <<< "$(pacman -Qql $_pkg | grep '\.py$')" + update-desktop-database -q } -post_upgrade() { - post_install +post_install() { + post_upgrade $1 } -post_remove() { - post_install +pre_remove() { + post_upgrade $1 } + diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD index 2d84cda13..9b6234a1f 100644 --- a/community/gnustep-gui/PKGBUILD +++ b/community/gnustep-gui/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 98740 2013-10-17 14:01:47Z andyrtr $ +# $Id: PKGBUILD 101191 2013-11-19 11:01:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-gui pkgver=0.23.1 -pkgrel=4 +pkgrel=5 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64') url="http://www.gnustep.org/" license=('LGPL') -depends=('gnustep-back' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao') +depends=('gnustep-back' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao') makedepends=('gcc-objc' 'gnustep-base' 'gnustep-make') conflicts=('gnustep-gui-svn') groups=('gnustep-core') diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 8515479de..52f9e77a8 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99613 2013-10-30 14:46:57Z arodseth $ +# $Id: PKGBUILD 101866 2013-12-02 13:37:29Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -9,8 +9,8 @@ # Contributor: Daniel YC Lin <dlin.tw@gmail.com> pkgname=go -pkgver=1.1.2 -pkgrel=3 +pkgver=1.2 +pkgrel=1 epoch=2 pkgdesc='Compiler and tools for the Go programming language from Google' arch=('x86_64' 'i686') @@ -19,19 +19,20 @@ license=('custom') depends=('perl' 'gawk') makedepends=('inetutils') options=('!strip' 'staticlibs') +optdepends=('liteide: IDE for editing and building projects written in Go') install="$pkgname.install" backup=('usr/lib/go/bin') if [ "$CARCH" == 'x86_64' ]; then source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" "$pkgname.sh") - sha256sums=('ad583ff91bd2955fc48d24001785587e3c3b5ce5c09e4971a37028db4c3f6a98' - '36202a833faeb8ea10760557a1e221025288480bdeebf776c8b610014aadc181') + sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2' + 'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a') else source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz" "$pkgname.sh") - sha256sums=('56f384c973e58c098ec462bcd892a7c1166b9a392461970ddb22d57ed4d495af' - '36202a833faeb8ea10760557a1e221025288480bdeebf776c8b610014aadc181') + sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651' + 'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a') fi build() { @@ -50,6 +51,7 @@ build() { # Enable ARM crosscompilation for linux export GOOS=linux export GOARCH=arm + bash make.bash # Crosscompilation for various platforms (including linux) diff --git a/community/go/go.install b/community/go/go.install index 755f0a442..e0610f3c5 100644 --- a/community/go/go.install +++ b/community/go/go.install @@ -1,13 +1,10 @@ -post_upgrade() { - # Friendly message to the user - echo "Example use of the \"go\" tool as a user:" - echo " mkdir ~/go" - echo " export GOPATH=~/go" - echo " go get website.com/user/module" -} - post_install() { - post_upgrade + # Friendly message for new users + echo "Example use of the \"go\" tool:" + echo ' mkdir ~/mygoproject' + echo ' export GOPATH=~/mygoproject' + echo ' export PATH=\$PATH:\$GOPATH/bin' + echo ' go get github.com/codegangsta/martini' } # vim:set ts=2 sw=2 et: diff --git a/community/go/go.sh b/community/go/go.sh index 51c6e7677..8393dc8d2 100644 --- a/community/go/go.sh +++ b/community/go/go.sh @@ -1,2 +1 @@ -export GOPATH=/usr/lib/go/site export GOROOT=/usr/lib/go diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD index ae05b5186..c6c5c011e 100644 --- a/community/goaccess/PKGBUILD +++ b/community/goaccess/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98175 2013-10-07 01:47:21Z fyan $ +# $Id: PKGBUILD 102738 2013-12-18 10:42:12Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Josh VanderLinden <arch@cloudlery.com> # Contributor: Nicolas Storme <nicolas@atelier-web.com> pkgname=goaccess -pkgver=0.6.1 +pkgver=0.7 pkgrel=1 pkgdesc="An open source real-time web log analyzer and interactive viewer" arch=('i686' 'x86_64') @@ -14,14 +14,14 @@ depends=('ncurses' 'geoip' 'glib2') source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --enable-geoip make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make prefix="$pkgdir/usr" install } -sha512sums=('67712e4af16c6e039ca46f6f8d8302a58be1e0cfd0c76930068c03a9989c35b58b61f7b1e6a9e79cbb978c8f492b80782b8c7b894abc2e067f0a520e2981f98b') +sha512sums=('0817f6b7429d464fdd2070941b4bf6abaa5398a4b720e31af5af8fd8cd41169e5b71f90157101121cc904d06fb5bd6c7a109c4260fe8f829a19a75ff4b489146') diff --git a/community/goocanvas/PKGBUILD b/community/goocanvas/PKGBUILD index d35ab3d7e..224e88f95 100644 --- a/community/goocanvas/PKGBUILD +++ b/community/goocanvas/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99781 2013-10-30 23:40:49Z allan $ +# $Id: PKGBUILD 102669 2013-12-17 12:22:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=goocanvas -pkgver=2.0.1 -pkgrel=2 +pkgver=2.0.2 +pkgrel=1 pkgdesc="A cairo canvas widget for GTK+" arch=(i686 x86_64) url="http://live.gnome.org/GooCanvas" @@ -13,8 +13,7 @@ license=("LGPL") depends=('gtk3') makedepends=('gobject-introspection' 'python-gobject2') source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/2.0/goocanvas-$pkgver.tar.xz) -sha256sums=('0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553') -sha256sums=('0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553') +sha256sums=('f20e5fbef8d1a2633033edbd886dd13146a1b948d1813a9c353a80a29295d1d0') build() { cd $srcdir/goocanvas-$pkgver diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index 38c91a15d..dd6510a37 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94883 2013-08-01 06:54:59Z bpiotrowski $ +# $Id: PKGBUILD 102252 2013-12-07 10:36:37Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource pkgver=0.40 -pkgrel=3 +pkgrel=4 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64) diff --git a/community/gpointing-device-settings/PKGBUILD b/community/gpointing-device-settings/PKGBUILD index 774da3337..ed53e7497 100644 --- a/community/gpointing-device-settings/PKGBUILD +++ b/community/gpointing-device-settings/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 99786 2013-10-30 23:42:41Z allan $ +# $Id: PKGBUILD 102693 2013-12-17 14:10:52Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> pkgname=gpointing-device-settings pkgver=1.5.1 -pkgrel=4 +pkgrel=5 pkgdesc="GUI tool for setting pointing device such as TrackPoint or Touchpad" arch=('i686' 'x86_64') license=('GPL') -url="http://live.gnome.org/GPointingDeviceSettings" +url="https://wiki.gnome.org/Attic/GPointingDeviceSettings" depends=('gtk2' 'gconf') makedepends=('gnome-settings-daemon' 'intltool') -source=("http://keihanna.dl.sourceforge.jp/gsynaptics/45812/${pkgname}-${pkgver}.tar.gz") -md5sums=('1d1491473df8eabca3c15c997a975d7f') +source=("http://sourceforge.jp/frs/redir.php?m=iij&f=/gsynaptics/45812/$pkgname-$pkgver.tar.gz" + "fix-build.patch") +md5sums=('1d1491473df8eabca3c15c997a975d7f' + 'cc42b7bcd69fb43ae5bfbe6e1d540713') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - # Enable deprecations - sed -i -e '/DISABLE_DEPRECATED/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + # Fix build + patch -Np1 -i "${srcdir}/fix-build.patch" # Disable GSD plugin (won't build with GSD 3.8) sed -i 's/ gnome-settings-daemon-plugins//' modules/Makefile.am +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --disable-static --disable-schemas-install \ diff --git a/community/gpointing-device-settings/fix-build.patch b/community/gpointing-device-settings/fix-build.patch new file mode 100644 index 000000000..341d96fc9 --- /dev/null +++ b/community/gpointing-device-settings/fix-build.patch @@ -0,0 +1,26 @@ +diff -Naur gpointing-device-settings-1.5.1.orig/configure.ac gpointing-device-settings-1.5.1/configure.ac +--- gpointing-device-settings-1.5.1.orig/configure.ac 2010-02-05 00:38:20.000000000 +0100 ++++ gpointing-device-settings-1.5.1/configure.ac 2013-12-17 15:00:08.394574115 +0100 +@@ -3,10 +3,9 @@ + + AC_INIT(gpointing-device-settings, 1.5.1, + [http://bugzilla.gnome.org/enter_bug.cgi?product=GPointingDeviceSettings]) +-AM_INIT_AUTOMAKE([1.9 tar-pax]) +-AM_INIT_AUTOMAKE([foreign]) ++AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR([m4]) + + AM_PROG_LIBTOOL +@@ -146,9 +145,6 @@ + + GPDS_CFLAGS="$XINPUT_CFLAGS $GTK_CFLAGS" + GPDS_CFLAGS="$GPDS_CFLAGS $GCONF2_CFLAGS" +-GPDS_CFLAGS="$GPDS_CFLAGS -DGTK_DISABLE_DEPRECATED" +-GPDS_CFLAGS="$GPDS_CFLAGS -DGDK_DISABLE_DEPRECATED" +-GPDS_CFLAGS="$GPDS_CFLAGS -DG_DISABLE_DEPRECATED" + GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_MODULEDIR=\\\"\"\$(gpds_moduledir)\"\\\"" + GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_DATADIR=\\\"\"\$(gpds_datadir)\"\\\"" + GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_UIDIR=\\\"\"\$(gpds_uidir)\"\\\"" diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD index 41c9416a6..5d9ecf85b 100644 --- a/community/gpsdrive/PKGBUILD +++ b/community/gpsdrive/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94027 2013-07-13 12:32:55Z svenstaro $ +# $Id: PKGBUILD 102253 2013-12-07 10:36:38Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=gpsdrive pkgver=2.11 _pkgver=20120928 -pkgrel=19 +pkgrel=20 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64") url="http://www.gpsdrive.de/" @@ -57,6 +57,8 @@ build() { -DWITH_SPEECH=OFF \ -DWITH_DBUS=OFF \ -DLIBGPS_OLD=OFF \ + -DFREETYPE2_INCLUDE_DIRS=/usr/include/freetype2 \ + -DFREETYPE2_LIBRARIES=/usr/lib \ "$srcdir/gpsdrive-${_pkgver}" make } diff --git a/community/granite/PKGBUILD b/community/granite/PKGBUILD index 45930bbfe..3af80216c 100644 --- a/community/granite/PKGBUILD +++ b/community/granite/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 99110 2013-10-24 13:12:55Z alucryd $ +# $Id: PKGBUILD 102691 2013-12-17 13:25:28Z alucryd $ # Maintainer: Maxime Gauduin <alucryd at gmail dot com> # Contributor: Ner0 <darkelfdarkelf666 at yahoo dot co dot uk> pkgname=granite -pkgver=0.2.2 -pkgrel=3 -pkgdesc="An extension of GTK+ libraries" +pkgver=0.2.3 +pkgrel=1 +pkgdesc='An extension of GTK+ libraries' arch=('i686' 'x86_64') -url="https://launchpad.net/granite" +url='https://launchpad.net/granite' license=('LGPL3') depends=('gtk3' 'libgee06') makedepends=('cmake' 'gobject-introspection' 'vala') install="${pkgname}.install" -source=("https://launchpad.net/${pkgname}/${pkgver%\.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") -sha256sums=('341f94cd8c2af60fc072fb8602e1406bccd77189aad76424b172c3ce08c173cc') +source=("${url}/${pkgver%\.?}/${pkgver}/+download/${pkgname}-${pkgver}.tgz") +sha256sums=('e0a448e647ee4b6dcff543b1d8695e9cb7e630e38c31ba741cf6b19eddae71f1') build() { cd ${pkgname}-${pkgver} diff --git a/community/gsimplecal/PKGBUILD b/community/gsimplecal/PKGBUILD index d469f7621..54932d156 100644 --- a/community/gsimplecal/PKGBUILD +++ b/community/gsimplecal/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 76303 2012-09-15 15:56:51Z jsteel $ -# Maintainer: Jonathan Steel <mail at jsteel dot org> +# $Id: PKGBUILD 101058 2013-11-15 19:09:26Z jsteel $ +# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org> # Contributor: DrZaius <lou at fakeoutdoorsman dot com> # Contributor: Victor Feight <vrfeight3 at gmail dot com> pkgname=gsimplecal -pkgver=1.6 +pkgver=2.0 pkgrel=1 pkgdesc="Simple and lightweight GTK calendar" arch=('i686' 'x86_64') url="http://dmedvinsky.github.com/$pkgname" license=('BSD') -depends=('gtk2') -source=(https://github.com/downloads/dmedvinsky/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('05a596de37491e52b646a0c71ec14841') +depends=('gtk3') +source=(https://github.com/dmedvinsky/$pkgname/archive/v$pkgver.tar.gz) +md5sums=('ae839d5470c9f9a80d2b6a12164ae232') build() { cd "$srcdir"/$pkgname-$pkgver + ./autogen.sh ./configure --prefix=/usr make diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index f706e0e8c..c28400eda 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 100170 2013-11-01 20:48:34Z spupykin $ +# $Id: PKGBUILD 101476 2013-11-26 09:44:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> # Contributor: Lee.MaRS <leemars@gmail.com> pkgname=gsoap pkgver=2.8.16 -pkgrel=2 +pkgrel=3 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++" url="http://www.cs.fsu.edu/~engelen/soap.html" arch=('i686' 'x86_64') license=('GPL' 'custom') depends=('openssl' 'zlib' 'gcc-libs') makedepends=('autoconf' 'automake') +options=('staticlibs') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip LICENSE) md5sums=('274d16bea12b111681bcac2283c4c24a' diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD index 82ca841b7..86fc34f32 100644 --- a/community/gtk2hs-buildtools/PKGBUILD +++ b/community/gtk2hs-buildtools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89286 2013-04-28 16:52:07Z td123 $ +# $Id: PKGBUILD 102051 2013-12-04 14:18:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=gtk2hs-buildtools -pkgver=0.12.4 -pkgrel=2 +pkgver=0.12.5.1 +pkgrel=1 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." url="http://hackage.haskell.org/package/gtk2hs-buildtools" license=('GPL2') @@ -13,7 +13,7 @@ depends=('gmp') options=('strip') provides=('haskell-gtk2hs-buildtools') source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz) -md5sums=('ad3d78bf7c25fdb4c713c3528d137a81') +md5sums=('2f8f761559185c7375b0b31354d791c8') build() { cd ${srcdir}/gtk2hs-buildtools-$pkgver diff --git a/community/gtkglextmm/PKGBUILD b/community/gtkglextmm/PKGBUILD new file mode 100644 index 000000000..f90b68c1b --- /dev/null +++ b/community/gtkglextmm/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 102157 2013-12-06 11:32:53Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Bastien Bouclet <bastien.bouclet@gmail.com> +# Contributor: SpepS <dreamspepser at yahoo dot it> + +pkgname=gtkglextmm +pkgver=1.2.0 +pkgrel=9 +pkgdesc="Cpp C++ bindings for gtkglext" +arch=('i686' 'x86_64') +url="http://gtkglext.sourceforge.net/" +depends=('gtkmm' 'gtkglext') +makedepends=('mesa') +license=('GPL') +source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" + 'gdkspanfunc.patch') +md5sums=('27c05f4d45c5fd07b6fb0f044add3056' + 'd7c8ea33c748a6857ee629c16b2d9bff') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # FS#24706 + patch -Np1 -i "${srcdir}/gdkspanfunc.patch" + + # automake 1.8 fix + sed -i "s|\(AC_DEFUN(\)\(AC_.*_MULTIHEAD\)|\1[\2]|" m4macros/gtkglextmm.m4 + + ./configure --prefix=/usr \ + --disable-gtkglext-test \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/community/gtkglextmm/gdkspanfunc.patch b/community/gtkglextmm/gdkspanfunc.patch new file mode 100644 index 000000000..ae5672a8c --- /dev/null +++ b/community/gtkglextmm/gdkspanfunc.patch @@ -0,0 +1,13 @@ +--- a/gtkglext/gtkmm/gl/widget.cc 2004-05-18 03:01:50.000000000 -0300 ++++ b/gtkglext/gtkmm/gl/widget.cc 2011-06-12 17:57:13.075541070 -0300 +@@ -17,9 +17,8 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include <gtk/gtkglwidget.h> +- + #include "widget.h" ++#include <gtk/gtkglwidget.h> + + namespace Gtk + { diff --git a/community/gtkimageview/PKGBUILD b/community/gtkimageview/PKGBUILD new file mode 100644 index 000000000..13d410b6d --- /dev/null +++ b/community/gtkimageview/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 102159 2013-12-06 11:35:48Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Jan Blazek <appolito@gmail.com> +# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> + +pkgname=gtkimageview +pkgver=1.6.4 +pkgrel=3 +pkgdesc="Simple image viewer widget for GTK2" +arch=('i686' 'x86_64') +url="http://trac.bjourne.webfactional.com/" +license=('LGPL2.1') +depends=('gtk2') +makedepends=('pkgconfig') +source=("http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${pkgname}-${pkgver}.tar.gz?format=raw") +md5sums=('501367b3f50e69a12208dc9c6ad00b18') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}/usr/share" +} diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD index de37afcb1..ec91fe41b 100644 --- a/community/gtkwave/PKGBUILD +++ b/community/gtkwave/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92578 2013-06-08 21:06:37Z kkeen $ +# $Id: PKGBUILD 100853 2013-11-12 01:40:23Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Jared Casper <jaredcasper@gmail.com> pkgname=gtkwave -pkgver=3.3.47 +pkgver=3.3.52 pkgrel=1 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2') makedepends=('gperf') install='gtkwave.install' source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz") -md5sums=('fdb257ed42220a9a7526b70d1746054a') +md5sums=('1a7b7fbfede6f1f91fe26845b3b36f48') build() { cd "${srcdir}/gtkwave-${pkgver}" diff --git a/community/guichan/PKGBUILD b/community/guichan/PKGBUILD index b5625a55b..e6eae876c 100644 --- a/community/guichan/PKGBUILD +++ b/community/guichan/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99805 2013-10-30 23:49:55Z allan $ +# $Id: PKGBUILD 103044 2013-12-25 17:53:57Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Bjørn Lindeijer <bjorn@lindeijer.nl> pkgname=guichan pkgver=0.8.2 -pkgrel=3 +pkgrel=4 pkgdesc="A portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL." arch=('i686' 'x86_64') url="http://guichan.sourceforge.net/" @@ -16,17 +16,17 @@ source=(http://guichan.googlecode.com/files/$pkgname-$pkgver.tar.gz) sha256sums=('eedf206eae5201eaae027b133226d0793ab9a287bfd74c5f82c7681e3684eeab') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver CXXFLAGS="-g" ./configure --prefix=/usr make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - make prefix=${pkgdir}/usr install + make prefix="${pkgdir}"/usr install # Install the license, as required for BSD - install -m644 -D COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + install -m644 -D COPYING "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/guitarix2/PKGBUILD b/community/guitarix2/PKGBUILD index a6835ffa7..8af491c5e 100644 --- a/community/guitarix2/PKGBUILD +++ b/community/guitarix2/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 95211 2013-08-06 18:27:47Z speps $ +# $Id: PKGBUILD 102254 2013-12-07 10:36:38Z bpiotrowski $ # Maintainer: speps <speps at aur dot archlinux dot org> pkgname=guitarix2 -pkgver=0.28.2 -pkgrel=1 +pkgver=0.28.3 +pkgrel=2 pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust" arch=('i686' 'x86_64') url="http://guitarix.sourceforge.net/" license=('GPL') -depends=('gtkmm' 'jack' 'librsvg' 'liblrdf' 'boost-libs' +depends=('gtkmm' 'jack' 'librsvg' 'liblrdf' 'bluez-libs' 'boost-libs' 'zita-convolver' 'zita-resampler' 'desktop-file-utils') makedepends=('python2' 'boost' 'intltool' 'lv2') optdepends=('meterbridge: sound meters') @@ -17,7 +17,7 @@ conflicts=('guitarix' 'gx_head') replaces=('guitarix' 'gx_head') install="$pkgname.install" source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.bz2") -md5sums=('d957c28e4d68318427f2478257307235') +md5sums=('9b535512a07d5a48e67a5cec01ee6944') build() { cd "$srcdir/guitarix-$pkgver" diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD index 34e3bb3fd..6ba517283 100644 --- a/community/guvcview/PKGBUILD +++ b/community/guvcview/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94885 2013-08-01 06:55:00Z bpiotrowski $ +# $Id: PKGBUILD 102513 2013-12-12 16:22:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Maxwell Pray a.k.a. Synthead <synthead@gmail.com> pkgname=guvcview -pkgver=1.7.1 -pkgrel=2 +pkgver=1.7.2 +pkgrel=1 pkgdesc="A video viewer and capturer for the linux uvc driver" arch=('i686' 'x86_64') url="http://guvcview.sourceforge.net/" @@ -14,7 +14,7 @@ makedepends=('pkg-config' 'intltool') optdepends=('pulseaudio: for PulseAudio support') options=('!docs') source=("http://downloads.sourceforge.net/project/${pkgname}/source/${pkgname}-src-${pkgver}.tar.gz") -md5sums=('5ca1b9c89d2b9370ee203dcc24efd695') +md5sums=('93fa335e6ce52bb730541d5280ed0dad') build() { cd "${srcdir}/${pkgname}-src-${pkgver}" diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index c04af17c1..5c82eff82 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99417 2013-10-28 12:23:37Z arodseth $ +# $Id: PKGBUILD 102045 2013-12-04 13:09:12Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haddock -pkgver=2.13.2 -pkgrel=2 +pkgver=2.13.2.1 +pkgrel=1 pkgdesc='Tool for generating documentation for Haskell libraries' url='http://hackage.haskell.org/package/haddock/' license=('custom:BSD3') @@ -14,7 +14,7 @@ makedepends=('alex' 'happy') depends=('ghc' 'haskell-xhtml' 'haskell-ghc-paths') install="$pkgname.install" source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('25e7d5819d38cbb1c9b1ff967e2a4093c776c3defaa0a249c8eabba1e70892e3') +sha256sums=('c9cfe2bd2e8e1201870f88bc9a2ccdb0173315d0a8c734b459ec344feb1af34e') options=('staticlibs') build() { diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD index 99fd4ebb6..d5892f4f4 100644 --- a/community/haskell-bytestring-show/PKGBUILD +++ b/community/haskell-bytestring-show/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 89293 2013-04-28 16:52:14Z td123 $ +# $Id: PKGBUILD 102053 2013-12-04 14:18:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-bytestring-show -pkgver=0.3.5.4 -pkgrel=4 +pkgver=0.3.5.5 +pkgrel=1 pkgdesc="Efficient conversion of values into readable byte strings." url="http://hackage.haskell.org/package/bytestring-show" license=("BSD3") arch=('i686' 'x86_64') depends=("ghc") +options=('staticlibs') install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") -md5sums=('2a4ab243c4b6fffed1fc663975a9ec6d') +md5sums=('7ed08495da103ecc17b90dce70d1ca39') build() { cd ${srcdir}/bytestring-show-${pkgver} diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD index 751d2ee54..7fb276bb9 100644 --- a/community/haskell-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 92370 2013-06-04 12:29:46Z spupykin $ +# $Id: PKGBUILD 102055 2013-12-04 14:19:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-cairo -pkgver=0.12.4 -pkgrel=5 +pkgver=0.12.5.0 +pkgrel=1 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') arch=('i686' 'x86_64') # deps adjusted to specific versions in package() -depends=('ghc' 'cairo' 'haskell-mtl') +depends=('ghc' 'cairo' 'haskell-mtl' 'haskell-utf8-string') makedepends=("gtk2hs-buildtools") -options=('strip') +options=('strip' 'staticlibs') conflicts=('gtk2hs-cairo') provides=('gtk2hs-cairo') replaces=('gtk2hs-cairo') install=gtk2hs-cairo.install source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) -md5sums=('b9d7e8de6ba4db680c222958622d6ee6') +md5sums=('234b2a5f1e30844838aeb8adb28f0bf3') build() { cd ${srcdir}/cairo-$pkgver @@ -34,7 +34,7 @@ build() { package() { _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" "cairo" "haskell-mtl=${_hmtlver}") + depends=("ghc=${_ghcver}" "cairo" "haskell-mtl=${_hmtlver}" 'haskell-utf8-string') cd ${srcdir}/cairo-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD index 6d73d2e55..71fb08a97 100644 --- a/community/haskell-glib/PKGBUILD +++ b/community/haskell-glib/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 89302 2013-04-28 16:52:23Z td123 $ +# $Id: PKGBUILD 102057 2013-12-04 14:19:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-glib -pkgver=0.12.4 -pkgrel=4 +pkgver=0.12.5.0 +pkgrel=1 pkgdesc="Binding to the GLIB library for Gtk2Hs." url="http://hackage.haskell.org/package/glib" license=('LGPL2.1') arch=('i686' 'x86_64') # deps adjusted to specific versions in package() -depends=('ghc' 'glib2') +depends=('ghc' 'glib2' 'haskell-utf8-string') makedepends=("gtk2hs-buildtools") -options=('strip') +options=('strip' 'staticlibs') install=gtk2hs-glib.install provides=('gtk2hs-glib') replaces=('gtk2hs-glib') conflicts=('gtk2hs-glib') source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz) -md5sums=('3172907258183466f1e604a435285c51') +md5sums=('fa94e2f40641dd2fa0d01a0da3fd7b50') build() { cd glib-$pkgver @@ -33,7 +33,7 @@ build() { package() { _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" "glib2") + depends=("ghc=${_ghcver}" "glib2" 'haskell-utf8-string') cd ${srcdir}/glib-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD index c7b150561..af497ad9a 100644 --- a/community/haskell-gtk/PKGBUILD +++ b/community/haskell-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89303 2013-04-28 16:52:24Z td123 $ +# $Id: PKGBUILD 102059 2013-12-04 14:19:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-gtk -pkgver=0.12.4 -pkgrel=4 +pkgver=0.12.5.0 +pkgrel=1 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" license=('LGPL2.1') @@ -13,11 +13,11 @@ makedepends=("gtk2hs-buildtools") provides=('gtk2hs-gtk') replaces=('gtk2hs-gtk') conflicts=('gtk2hs-gtk') -options=('strip') +options=('strip' 'staticlibs') install=gtk2hs-gtk.install source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz ghc-7.6.1.patch) -md5sums=('165a04134cdc3aec9a9aa149c421b1de' +md5sums=('d34d2da37f3e4e15dbc0b6a6aef0cd8f' '5fb93f37fe3f494b30ee682a36b8f1b6') build() { diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index 0dfb8703e..6bde5b545 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 89306 2013-04-28 16:52:27Z td123 $ +# $Id: PKGBUILD 102061 2013-12-04 14:20:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-hslogger -pkgver=1.2.1 -pkgrel=4 +pkgver=1.2.3 +pkgrel=1 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/hslogger" license=('LGPL') arch=('i686' 'x86_64') depends=('ghc' 'haskell-mtl' 'haskell-network') +options=('staticlibs') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz) -md5sums=('d94e39cd6a262565cf0758a6ead74919') +md5sums=('4047e50789860c8ac3e8998f7de68ca5') build() { cd ${srcdir}/hslogger-${pkgver} diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD index 2d52b6be3..7c486d507 100644 --- a/community/haskell-pango/PKGBUILD +++ b/community/haskell-pango/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89311 2013-04-28 16:52:32Z td123 $ +# $Id: PKGBUILD 102063 2013-12-04 14:20:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-pango -pkgver=0.12.4 -pkgrel=4 +pkgver=0.12.5.0 +pkgrel=1 pkgdesc="Binding to the pango library for Gtk2Hs." url="http://hackage.haskell.org/package/pango" license=('LGPL2.1') @@ -14,10 +14,10 @@ makedepends=("gtk2hs-buildtools") provides=('gtk2hs-pango') replaces=('gtk2hs-pango') conflicts=('gtk2hs-pango') -options=('strip') +options=('strip' 'staticlibs') install=gtk2hs-pango.install source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) -md5sums=('e498beb2d10b45ebf08bffc2296e1195') +md5sums=('6dca381064ad8488baa69a783b05e28b') build() { cd ${srcdir}/pango-${pkgver} diff --git a/community/haskell-primitive/PKGBUILD b/community/haskell-primitive/PKGBUILD index 088f5e029..3b03198e4 100644 --- a/community/haskell-primitive/PKGBUILD +++ b/community/haskell-primitive/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 89313 2013-04-28 16:52:35Z td123 $ +# $Id: PKGBUILD 101124 2013-11-17 20:46:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-primitive -pkgver=0.5.0.1 -pkgrel=4 +pkgver=0.5.1.0 +pkgrel=1 pkgdesc="Wrappers for primitive operations" url="http://hackage.haskell.org/package/primitive" license=("custom:BSD3") arch=('i686' 'x86_64') makedepends=() depends=("ghc") -options=('strip') +options=('strip' 'staticlibs') install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/primitive/${pkgver}/primitive-${pkgver}.tar.gz") sha256sums=('526c9d4d06b7b379cb1aaffeffbb30bef810e771f29617ef6d0d99df711f4313') +sha256sums=('8817a5f307c4605709b37857c048caa22fcc7550d681d64a2eea756126721529') build() { cd ${srcdir}/primitive-${pkgver} @@ -28,6 +29,9 @@ build() { } package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}") + cd ${srcdir}/primitive-${pkgver} install -Dm744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD index dee27a3c4..2aff699a1 100644 --- a/community/haskell-syb/PKGBUILD +++ b/community/haskell-syb/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=syb pkgname=haskell-syb -pkgver=0.4.0 -pkgrel=2 +pkgver=0.4.1 +pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') @@ -12,7 +12,8 @@ depends=('ghc=7.6.3-1' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('ec2719d444a6561b2424dcef10b4fe34') +options=('staticlibs') +md5sums=('28df3b70cef652fa6c04e6353c580a7a') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-vector/PKGBUILD b/community/haskell-vector/PKGBUILD index bbd867873..4202d98db 100644 --- a/community/haskell-vector/PKGBUILD +++ b/community/haskell-vector/PKGBUILD @@ -1,19 +1,22 @@ -# $Id: PKGBUILD 89326 2013-04-28 16:52:52Z td123 $ +# $Id: PKGBUILD 101632 2013-11-29 15:58:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-vector -pkgver=0.10.0.1 -pkgrel=4 +pkgver=0.10.9.1 +pkgrel=1 pkgdesc="Efficient Arrays" url="http://code.haskell.org/vector" license=("custom:BSD3") arch=('i686' 'x86_64') makedepends=() -depends=("ghc=7.6.3" "haskell-primitive") -options=('strip') +# deps adjusted to specific versions in package() +depends=("ghc" "haskell-primitive") +options=('strip' 'staticlibs') install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/vector/${pkgver}/vector-${pkgver}.tar.gz") sha256sums=('ece945058b01a77c5fff31e89bbea76ac619677041c41286a2da5e8b515508af') +sha256sums=('23a8ab9a5257781db2513a0741a01f0d5f60c6d0730cd88136abfe7ae44c330d') +sha256sums=('205656e9741aad406e427e988dbf1665bf5dbdf3e9d574e309c274be4e06bde5') build() { cd ${srcdir}/vector-${pkgver} @@ -28,6 +31,9 @@ build() { } package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" "haskell-primitive") + cd ${srcdir}/vector-${pkgver} install -Dm744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh install -Dm744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD deleted file mode 100644 index bf80fc745..000000000 --- a/community/haveged/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 99808 2013-10-31 01:50:18Z allan $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> -# Contributor: kfgz <kfgz at interia dot pl> -# Contributor: pootzko <pootzko at gmail dot com> - -pkgname=haveged -pkgver=1.7.c -_pkgver=${pkgver/.c/c} -pkgrel=2 -pkgdesc='Entropy harvesting daemon using CPU timings' -arch=('i686' 'x86_64') -url='http://www.issihosts.com/haveged' -license=('GPL') -depends=('glibc') -source=($url/$pkgname-$_pkgver.tar.gz - service) -sha256sums=('40397eded96fc0d624a6a81c8e888ab023e46f3114f1ee699994e645531bf121' - 'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12') - -build() { - cd $pkgname-$_pkgver - ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin - make -} - -package() { - cd $pkgname-$_pkgver - make DESTDIR="$pkgdir" install - - rm -rf "$pkgdir"/etc/init.d - install -D -m644 "$srcdir"/service \ - "$pkgdir"/usr/lib/systemd/system/haveged.service -} diff --git a/community/haveged/service b/community/haveged/service deleted file mode 100644 index 676fb1893..000000000 --- a/community/haveged/service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Entropy Harvesting Daemon -Documentation=man:haveged(8) - -[Service] -Type=forking -ExecStart=/usr/bin/haveged -w 1024 -v 1 -PIDFile=/var/run/haveged.pid - -[Install] -WantedBy=multi-user.target diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index c918a8a8e..0c1b5318d 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,10 +1,12 @@ -# $Id: PKGBUILD 97071 2013-09-12 10:11:10Z spupykin $ +# $Id: PKGBUILD 103142 2013-12-27 12:15:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars -pkgver=0.9.19 -pkgrel=4 -pkgdesc="Free Worms-like turn based strategy game" +pkgver=0.9.20 +pkgrel=1 +pkgdesc="turn based strategy, artillery, action and comedy game, featuring the + antics of pink hedgehogs with attitude as they battle from the depths of hell + to the depths of space." arch=('i686' 'x86_64') url="http://hedgewars.org" license=('GPL' 'custom') @@ -20,19 +22,9 @@ makedepends=('fpc' 'cmake' 'haskell-vector' 'haskell-random') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 - hedgewars.png - build-fix.patch - ffmpeg2.0.patch) -md5sums=('51d84ad6ea00e9894e6119b118b4a523' - 'eeb14d50df39063549ac5eca9dbc65d1' - 'a9d7b0ba72cbeb7fc74fce459db9dd90' - 'da84d64a252579236d3ff0cc6e008e72') - -prepare() { - cd $pkgname-src-$pkgver - patch -Rp1 <$srcdir/build-fix.patch - patch -Np1 -i ../ffmpeg2.0.patch -} + hedgewars.png) +md5sums=('7ee1b23e51053d34feb84464184f60fa' + 'eeb14d50df39063549ac5eca9dbc65d1') build() { cd $pkgname-src-$pkgver @@ -40,8 +32,7 @@ build() { -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATA_INSTALL_DIR=/usr/share/hedgewars \ - -DWITH_SERVER=1 \ - -DSYSTEM_PHYSFS=OFF . + -DNOSERVER=0 . make } diff --git a/community/hedgewars/build-fix.patch b/community/hedgewars/build-fix.patch deleted file mode 100644 index 90a4365f2..000000000 --- a/community/hedgewars/build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -wbBur /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas ---- /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-06-03 20:01:14.212121255 +0400 -+++ hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-05-31 00:07:33.000000000 +0400 -@@ -9,7 +9,6 @@ - {$IFNDEF WIN32} - {$linklib physfs} - {$linklib physlayer} -- {$linklib gcc_s} - - {statically linking physfs brings IOKit dependency on OSX} - {divdi3 is found in stdc++ on linux x86 and in gcc_s.1 on osx ppc32} diff --git a/community/hedgewars/ffmpeg2.0.patch b/community/hedgewars/ffmpeg2.0.patch deleted file mode 100644 index 67f123ae3..000000000 --- a/community/hedgewars/ffmpeg2.0.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rupN a/QTfrontend/util/LibavInteraction.cpp b/QTfrontend/util/LibavInteraction.cpp ---- a/QTfrontend/util/LibavInteraction.cpp 2013-05-30 20:07:33.000000000 +0000 -+++ b/QTfrontend/util/LibavInteraction.cpp 2013-07-22 16:24:42.564768844 +0000 -@@ -32,7 +32,7 @@ extern "C" - - struct Codec - { -- CodecID id; -+ AVCodecID id; - bool isAudio; - QString shortName; // used for identification - QString longName; // used for displaying to user -@@ -52,7 +52,7 @@ QList<Codec> codecs; - QMap<QString,Format> formats; - - // test if given format supports given codec --bool FormatQueryCodec(AVOutputFormat *ofmt, enum CodecID codec_id) -+bool FormatQueryCodec(AVOutputFormat *ofmt, enum AVCodecID codec_id) - { - #if LIBAVFORMAT_VERSION_MAJOR >= 54 - return avformat_query_codec(ofmt, codec_id, FF_COMPLIANCE_NORMAL) == 1; diff --git a/community/hexedit/PKGBUILD b/community/hexedit/PKGBUILD new file mode 100644 index 000000000..5ae5bc508 --- /dev/null +++ b/community/hexedit/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 102214 2013-12-06 14:31:06Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Paul Mattal <pjmattal@elys.com> + +pkgname=hexedit +pkgver=1.2.13 +pkgrel=1 +pkgdesc="Hex Editor for Linux" +arch=('i686' 'x86_64') +url="http://rigaux.org/hexedit.html" +license=('GPL') +depends=('ncurses') +source=("http://rigaux.org/${pkgname}-${pkgver}.src.tgz") +md5sums=('a5af1378d028512a9cad27a5ba3e15f9') + +build() { + cd "${srcdir}/${pkgname}" + CFLAGS="$CFLAGS -Wall" + + ./configure + make +} + +package() { + cd "${srcdir}/${pkgname}" + + make prefix="${pkgdir}/usr" install +} diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 3e10a8a7c..53e5f6855 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 100124 2013-11-01 18:47:04Z bluewind $ +# $Id: PKGBUILD 100546 2013-11-05 19:47:43Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Jan Fader <jan.fader@web.de> pkgbase=highlight pkgname=(highlight highlight-gui) pkgver=3.16.1 -_pkgver=3.16 pkgrel=1 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64') makedepends=(qt4 lua boost) -source=(http://www.andre-simon.de/zip/$pkgname-$_pkgver.tar.bz2{,.asc}) +source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc}) md5sums=('688bb537db149dc720b9ef1ffc796ced' 'SKIP') build() { - cd "$srcdir/$pkgbase-$_pkgver" + cd "$srcdir/$pkgbase-$pkgver" make QMAKE=qmake-qt4 make QMAKE=qmake-qt4 gui @@ -24,7 +23,7 @@ build() { package_highlight() { pkgdesc="Fast and flexible source code highlighter (CLI version)" depends=('lua') - cd "$srcdir/$pkgbase-$_pkgver" + cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir" QMAKE=qmake-qt4 install } @@ -32,7 +31,7 @@ package_highlight() { package_highlight-gui() { pkgdesc="Fast and flexible source code highlighter (Qt version)" depends=('qt4' 'highlight') - cd "$srcdir/$pkgbase-$_pkgver" + cd "$srcdir/$pkgbase-$pkgver" install -dm755 "$pkgdir/usr/bin" make DESTDIR="$pkgdir" QMAKE=qmake-qt4 install-gui diff --git a/community/hitori/PKGBUILD b/community/hitori/PKGBUILD index 80a0aa68c..51417c1bb 100644 --- a/community/hitori/PKGBUILD +++ b/community/hitori/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 95244 2013-08-07 13:38:52Z bgyorgy $ +# $Id: PKGBUILD 101773 2013-11-30 21:21:43Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=hitori -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="GTK+ application to generate and let you play games of Hitori" arch=('i686' 'x86_64') -url="https://live.gnome.org/Hitori" +url="https://wiki.gnome.org/Apps/Hitori" license=('GPL') depends=('gtk3' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool' 'itstool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7a34ea697086cabd48ef740370f69995c9487def78ad7c9f280279eea2f282af') +sha256sums=('0df62df7f41ca1648d6a53362aa3c00d90406e39f5d063f9b9d51dbc465c77eb') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install } diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index 38057888c..a7e08bae5 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 95252 2013-08-07 20:52:39Z ttoepper $ +# $Id: PKGBUILD 102909 2013-12-23 21:00:35Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.6 +pkgver=4.7 pkgrel=1 pkgdesc='An improved dynamic tiling window manager' arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url='http://i3wm.org/' license=('BSD') replaces=('i3' 'i3bar') groups=('i3') -depends=('libxcursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl' - 'startup-notification' 'pango' 'perl') +depends=('xcb-util-cursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl' + 'startup-notification' 'pango') makedepends=('bison' 'flex') optdepends=('dmenu: As menu.' 'i3lock: For locking your screen.' @@ -20,7 +20,7 @@ optdepends=('dmenu: As menu.' options=('docs' '!strip') source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2" "http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc") -md5sums=('11901176eea90632384434c371840cfd' +md5sums=('34dade2bc69e241ab3e3ffaa81122266' 'SKIP') build() { diff --git a/community/ibam/PKGBUILD b/community/ibam/PKGBUILD index 3639e85a5..f4288d5dc 100644 --- a/community/ibam/PKGBUILD +++ b/community/ibam/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96802 2013-09-05 18:01:44Z bgyorgy $ +# $Id: PKGBUILD 100846 2013-11-11 19:51:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: Penguin <TGates81.at.gmail.dot.com> pkgname=ibam pkgver=0.5.2 -pkgrel=6 +pkgrel=7 pkgdesc="An intelligent battery monitor" arch=('i686' 'x86_64') url="http://ibam.sourceforge.net/" @@ -15,19 +15,24 @@ makedepends=('sed' 'make') optdepends=('gnuplot: graphs support') install="ibam.install" source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - 03acpi-check.dpatch) + 03acpi-check.dpatch + ibam-0.5.2-sysfs.patch) md5sums=('2d5222ff504dd19e7c1ea8acc2f13cf5' - '2f27fc97932bd59cabacbad063a13f0e') + '2f27fc97932bd59cabacbad063a13f0e' + '2a50027f73276d91555105b713687a4d') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i \ -e "s|/local/bin|/bin|g" \ -e "s|^CFLAGS=-O3|CFLAGS=${CFLAGS}|g" \ Makefile patch -p1 <$srcdir/03acpi-check.dpatch + patch -p1 <$srcdir/ibam-0.5.2-sysfs.patch +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" make } diff --git a/community/ibam/ibam-0.5.2-sysfs.patch b/community/ibam/ibam-0.5.2-sysfs.patch index d9d73f924..a20b83db2 100644 --- a/community/ibam/ibam-0.5.2-sysfs.patch +++ b/community/ibam/ibam-0.5.2-sysfs.patch @@ -1,16 +1,16 @@ -diff -wbBur ibam-0.5.2/ibam.inl ibam-0.5.2.my/ibam.inl ---- ibam-0.5.2/ibam.inl 2009-03-09 16:53:20.000000000 +0000 -+++ ibam-0.5.2.my/ibam.inl 2011-03-24 19:41:32.000000000 +0000 +diff -wbBur ibam-0.5.2/ibam.inl ibam-0.5.2.q/ibam.inl +--- ibam-0.5.2/ibam.inl 2009-03-09 19:53:20.000000000 +0300 ++++ ibam-0.5.2.q/ibam.inl 2013-11-11 23:45:39.197066574 +0400 @@ -959,7 +959,13 @@ acpi.close(); apm = new acpi_status(); } else { -+ sysfs.open((sysfs_path+"/BAT0/charge_full").c_str()); + sysfs.open((sysfs_path+"/BAT0/present").c_str()); + if(!sysfs.is_open()) { - sysfs.open((sysfs_path+"/BAT1/charge_full").c_str()); ++ sysfs.open((sysfs_path+"/BAT1/present").c_str()); + } + if(!sysfs.is_open()) { -+ sysfs.open((sysfs_path+"/BAT2/charge_full").c_str()); ++ sysfs.open((sysfs_path+"/BAT2/present").c_str()); + } if(sysfs.is_open()) { #ifdef IBAM_DEBUG diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD index fed502367..7c49d25c4 100644 --- a/community/ibus-chewing/PKGBUILD +++ b/community/ibus-chewing/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80968 2012-12-08 02:26:09Z fyan $ +# $Id: PKGBUILD 102761 2013-12-19 11:22:34Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Rainy <rainylau(at)gmail(dot)com> @@ -6,20 +6,19 @@ # Contributor: Hiroshi Yui <hiroshiyui@gmail.com> pkgname=ibus-chewing -pkgver=1.4.3 -pkgrel=2 +pkgver=1.4.4 +pkgrel=1 pkgdesc='Chinese Chewing Engine for IBus Framework' arch=('i686' 'x86_64') license=('GPL') url='http://ibus.googlecode.com' depends=('ibus' 'libchewing' 'libxtst' 'gconf') makedepends=('swig' 'cmake' 'gob2') -options=('!makeflags') install=ibus-chewing.install source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz") build() { - cd "${srcdir}/${pkgname}-${pkgver}-Source" + cd ${pkgname}-${pkgver}-Source cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONF_INSTALL_DIR=/usr/share \ -DLIBEXEC_DIR=/usr/lib/ibus @@ -27,7 +26,12 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}-Source" + cd ${pkgname}-${pkgver}-Source make DESTDIR="${pkgdir}" install + + mkdir -p "$pkgdir/usr/share/gconf/schemas" + mv "$pkgdir/etc/gconf/schemas/${pkgname}.schemas" "$pkgdir/usr/share/gconf/schemas/" + rm -r "$pkgdir/etc" } -md5sums=('20b1d553ba14cecabcf7418e91da353b') + +sha512sums=('47581bca46d1a8f0f10f13887d5db37cf1ca3531e1a05fea516ea10fec59d4b0c2f629b5a291b1aed77e642efa3d456670c8f7fcaff460b187e3b7fc8220f2d6') diff --git a/community/ibus-kkc/PKGBUILD b/community/ibus-kkc/PKGBUILD index a9d235358..d67df2eab 100644 --- a/community/ibus-kkc/PKGBUILD +++ b/community/ibus-kkc/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> pkgname=ibus-kkc -pkgver=1.5.18 +pkgver=1.5.19 pkgrel=1 pkgdesc="libkkc (Japanese Kana Kanji input method) engine for ibus" arch=('i686' 'x86_64') @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums=('06212fd6d851ab68ad2ca003d52d67c87d65a2cd776d575e5110c5d39d9feb8f3648608024823bfd2caed6e536e250a1416f186b3e702f5398dd9afe60a07756') +sha512sums=('4f74557974404e8bf945d964b681516fb42eff204920f582474a7ec9c229bddd8fb38a000ec6a1976bd1d6e3fcbd87a877e04dc35550af1a90fd294ed208b756') diff --git a/community/ibus-rime/PKGBUILD b/community/ibus-rime/PKGBUILD index d17860c54..5749d51c2 100644 --- a/community/ibus-rime/PKGBUILD +++ b/community/ibus-rime/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 90137 2013-05-07 05:26:33Z fyan $ +# $Id: PKGBUILD 100941 2013-11-13 14:17:34Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=ibus-rime -pkgver=0.9.9 +pkgver=1.0 pkgrel=1 pkgdesc="Rime input method engine for ibus" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" license=('GPL3') -depends=('ibus' 'libnotify' 'librime>=0.9.9' 'brise') +depends=('ibus' 'libnotify' 'librime>=1.0' 'brise') makedepends=('cmake') install='ibus-rime.install' source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") build() { - cd "$srcdir/$pkgname" + cd $pkgname make } package() { - cd "$srcdir/$pkgname" + cd $pkgname make DESTDIR="$pkgdir" install } -sha512sums=('b18e6f3ba6c97e3b55900d9c4cb70d58f24b202bf2ae894ca861af10ddb028c193d9ac97e609f3b4f0f183b212b74180a02e5d823f235b4c799733933a48afb7') +sha512sums=('75ed251c62fc4772ffd05f95b599932ebed3cb7c52406daa785ef755f825b32d22e6ce3dce94fcb28a88480b696e1014578e4d2210c933bae5fb00a1b0b8e275') diff --git a/community/id3/PKGBUILD b/community/id3/PKGBUILD new file mode 100644 index 000000000..1093b942f --- /dev/null +++ b/community/id3/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 102161 2013-12-06 11:40:12Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Jochem Kossen <j.kossen@home.nl> + +pkgname=id3 +pkgver=0.78 +pkgrel=3 +pkgdesc="Utility to edit id3v1 and id3v2 tags" +arch=('i686' 'x86_64') +url="http://freshmeat.net/projects/id3" +license=('BSD') +depends=('gcc-libs') +options=('!makeflags') +source=(http://linux-bsd-unix.strefa.pl/${pkgname}-${pkgver}.tar.gz + id3-0.78-gcc44.patch) +md5sums=('bbc2a5d8022006330e6bb51034fafb43' + '51370be8d2624efee3683efab608a7f1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/id3-0.78-gcc44.patch + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man" install + + #install license + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + diff --git a/community/id3/id3-0.78-gcc44.patch b/community/id3/id3-0.78-gcc44.patch new file mode 100644 index 000000000..63c4d93b1 --- /dev/null +++ b/community/id3/id3-0.78-gcc44.patch @@ -0,0 +1,29 @@ +--- a/charconv.cpp 2006-02-14 16:44:58.000000000 -0500 ++++ b/charconv.cpp 2009-06-12 17:59:54.332486433 -0400 +@@ -5,6 +5,7 @@ + #include <cstdlib> + #include <clocale> + #include <climits> ++#include <cstring> + #if defined(__STDC_ISO_10646__) || defined(__WIN32__) + # include <wchar.h> + # define fallback(call) (0) +--- a/getid3v2.cpp 2006-02-10 22:23:14.000000000 -0500 ++++ b/getid3v2.cpp 2009-06-12 18:06:49.582446332 -0400 +@@ -1,5 +1,6 @@ + #include <vector> + #include <cstdio> ++#include <cstring> + #include "char_ucs.h" + #include "id3v2.h" + #include "getid3v2.h" +--- a/setfname.cpp 2006-03-19 06:13:36.000000000 -0500 ++++ b/setfname.cpp 2009-06-12 18:09:35.759097380 -0400 +@@ -1,6 +1,7 @@ + #include <cstdio> + #include <cctype> + #include <ctime> // borland needs this ++#include <cstring> + #include <sys/stat.h> + #include <utime.h> + #if defined(__WIN32__) diff --git a/community/ifuse/0001-Updated-for-libimobiledevice-1.1.5.patch b/community/ifuse/0001-Updated-for-libimobiledevice-1.1.5.patch new file mode 100644 index 000000000..fdb9bbb39 --- /dev/null +++ b/community/ifuse/0001-Updated-for-libimobiledevice-1.1.5.patch @@ -0,0 +1,83 @@ +From 9ac32aa3cb2ed5242c0fe3c58ef5f571bf2b95d7 Mon Sep 17 00:00:00 2001 +From: Nikias Bassen <nikias@gmx.li> +Date: Sun, 24 Mar 2013 02:45:23 +0100 +Subject: [PATCH 1/1] Updated for libimobiledevice >= 1.1.5 + +--- + configure.ac | 4 ++++ + src/ifuse.c | 20 +++++++++++++++++++- + 2 files changed, 23 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 85d131a..ca518ff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,10 @@ PKG_CHECK_MODULES(libimobiledevice11, libimobiledevice-1.0 >= 1.1.0, libimobiled + if test x"$libimobiledevice_1_1" = xyes; then + AC_DEFINE([HAVE_LIBIMOBILEDEVICE_1_1], 1, [Define if libimobiledevice is using 1.1.0 API]) + fi ++PKG_CHECK_MODULES(libimobiledevice11, libimobiledevice-1.0 >= 1.1.5, libimobiledevice_1_1_5=yes, libimobiledevice_1_1_5=no) ++if test x"$libimobiledevice_1_1_5" = xyes; then ++ AC_DEFINE([HAVE_LIBIMOBILEDEVICE_1_1_5], 1, [Define if libimobiledevice is using 1.1.5 API]) ++fi + libimobiledevice_VERSION=`$PKG_CONFIG --modversion "libimobiledevice-1.0" 2>&1` + PKG_CHECK_MODULES(libfuse, fuse >= 2.7.0) + PKG_CHECK_MODULES(libplist, libplist) +diff --git a/src/ifuse.c b/src/ifuse.c +index b5735ee..9fafb47 100644 +--- a/src/ifuse.c ++++ b/src/ifuse.c +@@ -71,7 +71,11 @@ static struct { + char *appid; + #endif + char *service_name; ++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5 ++ lockdownd_service_descriptor_t service; ++#else + uint16_t port; ++#endif + } opts; + + enum { +@@ -402,7 +406,11 @@ void *ifuse_init(struct fuse_conn_info *conn) + afc_client_new_from_house_arrest_client(house_arrest, &afc); + } else { + #endif ++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5 ++ afc_client_new(phone, opts.service, &afc); ++#else + afc_client_new(phone, opts.port, &afc); ++#endif + #ifdef HAVE_LIBIMOBILEDEVICE_1_1 + } + #endif +@@ -744,7 +752,13 @@ int main(int argc, char *argv[]) + return EXIT_FAILURE; + } + +- if ((lockdownd_start_service(control, opts.service_name, &opts.port) != LOCKDOWN_E_SUCCESS) || !opts.port) { ++ if ( ++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5 ++ (lockdownd_start_service(control, opts.service_name, &opts.service) != LOCKDOWN_E_SUCCESS) || !opts.service ++#else ++ (lockdownd_start_service(control, opts.service_name, &opts.port) != LOCKDOWN_E_SUCCESS) || !opts.port ++#endif ++ ) { + lockdownd_client_free(control); + idevice_free(phone); + fprintf(stderr, "Failed to start AFC service '%s' on the device.\n", opts.service_name); +@@ -757,7 +771,11 @@ int main(int argc, char *argv[]) + + #ifdef HAVE_LIBIMOBILEDEVICE_1_1 + if (!strcmp(opts.service_name, HOUSE_ARREST_SERVICE_NAME)) { ++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5 ++ house_arrest_client_new(phone, opts.service, &house_arrest); ++#else + house_arrest_client_new(phone, opts.port, &house_arrest); ++#endif + if (!house_arrest) { + fprintf(stderr, "Could not start document sharing service!\n"); + return EXIT_FAILURE; +-- +1.8.4.2 + diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD index c1dc11f7d..b6075319b 100644 --- a/community/ifuse/PKGBUILD +++ b/community/ifuse/PKGBUILD @@ -1,18 +1,25 @@ -# $Id: PKGBUILD 90343 2013-05-11 16:17:25Z tomegun $ +# $Id: PKGBUILD 100637 2013-11-06 19:54:56Z cinelli $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=ifuse pkgver=1.1.2 -pkgrel=4 +pkgrel=5 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch' url='http://libimobiledevice.org/' arch=('i686' 'x86_64') license=('LGPL2.1') depends=('libimobiledevice' 'fuse') -source=("http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2") -md5sums=('4152526b2ac3c505cb41797d997be14d') +source=("http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2" + '0001-Updated-for-libimobiledevice-1.1.5.patch') +md5sums=('4152526b2ac3c505cb41797d997be14d' + 'ca4d4af7f830c10645b605f1572c0ba6') + +prepare() { + cd "$pkgname-$pkgver" + patch -p1 -i "$srcdir/0001-Updated-for-libimobiledevice-1.1.5.patch" +} build() { cd "$pkgname-$pkgver" diff --git a/community/inputattach/0001-Add-w8001-flag.patch b/community/inputattach/0001-Add-w8001-flag.patch deleted file mode 100644 index ba6f9394b..000000000 --- a/community/inputattach/0001-Add-w8001-flag.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 729257077e328e0b2fa1bba5a5509c09a743d5d0 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Tue, 13 Jul 2010 11:49:47 +1000 -Subject: [PATCH 2/3] Add w8001 flag for serial Wacom devices. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - inputattach.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/inputattach.c b/inputattach.c -index a7de302..0382954 100644 ---- a/inputattach.c -+++ b/inputattach.c -@@ -495,6 +495,9 @@ static struct input_types input_types[] = { - { "--dump", "-dump", "Just enable device", - B2400, CS8, - 0, 0x00, 0x00, 0, dump_init }, -+{ "--w8001", "-w8001", "Wacom W8001", -+ B38400, CS8, -+ SERIO_W8001, 0x00, 0x00, 0, NULL }, - { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL } - }; - --- -1.7.2.3 - diff --git a/community/inputattach/0002-Allow-for-custom-baud-rates.patch b/community/inputattach/0002-Allow-for-custom-baud-rates.patch deleted file mode 100644 index 78f5d19c8..000000000 --- a/community/inputattach/0002-Allow-for-custom-baud-rates.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 5d9373f24f1b519c030024b2f36277ba9713697c Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Wed, 21 Jul 2010 14:41:04 +1000 -Subject: [PATCH 3/3] Allow for custom baud rates. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - inputattach.c | 25 ++++++++++++++++++++++++- - 1 files changed, 24 insertions(+), 1 deletions(-) - -diff --git a/inputattach.c b/inputattach.c -index 0382954..6806fc8 100644 ---- a/inputattach.c -+++ b/inputattach.c -@@ -506,7 +506,7 @@ static void show_help(void) - struct input_types *type; - - puts(""); -- puts("Usage: inputattach [--daemon] <mode> <device>"); -+ puts("Usage: inputattach [--daemon] [--baud <baud>] <mode> <device>"); - puts(""); - puts("Modes:"); - -@@ -530,6 +530,7 @@ int main(int argc, char **argv) - int i; - char c; - int retval; -+ int baud = -1; - - for (i = 1; i < argc; i++) { - if (!strcasecmp(argv[i], "--help")) { -@@ -540,6 +541,15 @@ int main(int argc, char **argv) - } else if (need_device) { - device = argv[i]; - need_device = 0; -+ } else if (!strcasecmp(argv[i], "--baud")) { -+ if (argc <= i + 1) { -+ show_help(); -+ fprintf(stderr, -+ "inputattach: require baud rate\n"); -+ return EXIT_FAILURE; -+ } -+ -+ baud = atoi(argv[++i]); - } else { - if (type && type->name) { - fprintf(stderr, -@@ -580,6 +590,19 @@ int main(int argc, char **argv) - return 1; - } - -+ switch(baud) { -+ case -1: break; -+ case 2400: type->speed = B2400; break; -+ case 4800: type->speed = B4800; break; -+ case 9600: type->speed = B9600; break; -+ case 19200: type->speed = B19200; break; -+ case 38400: type->speed = B38400; break; -+ default: -+ fprintf(stderr, "inputattach: invalid baud rate '%d'\n", -+ baud); -+ return EXIT_FAILURE; -+ } -+ - setline(fd, type->flags, type->speed); - - if (type->flush) --- -1.7.2.3 - diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD deleted file mode 100644 index bda613cf0..000000000 --- a/community/inputattach/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 91882 2013-05-28 18:09:11Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Mark Smith <markzzzsmith@yahoo.com.au> - -pkgname=inputattach -pkgver=1.24 -pkgrel=10 -pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system" -arch=('i686' 'x86_64') -url="http://linuxconsole.sourceforge.net/" -license=('GPL') -depends=('bash') -makedepends=('gcc') -backup=(etc/conf.d/inputattach) -source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c' - 'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h' - 'inputattach.conf.d' - 'inputattach.service' - 'inputattachctl' - '0001-Add-w8001-flag.patch' - '0002-Allow-for-custom-baud-rates.patch') -md5sums=('eb595a766ca363edb3b14c25404596ce' - '93d34d96cd3ad19ea1aeca7f68a66b4a' - '7ca903e54829764c8241233af5069216' - 'c19b9ed38b243191cf5378b87a42a4cc' - '7dd0690a9d2fe5e1052900650906e273' - 'f1b3ddae308351357f557cbd5c6cda81' - '8f76908449cae24a95adbf0bc0a17721') - -build() { - cd "$srcdir" - - mkdir src - cp inputattach.c serio-ids.h src/ - cd src - - # Add support for serial wacom tablets - patch -Np1 -i "$srcdir/0001-Add-w8001-flag.patch" - patch -Np1 -i "$srcdir/0002-Allow-for-custom-baud-rates.patch" - - cc $CFLAGS inputattach.c -o inputattach -} - -package() { - cd "$srcdir/src" - install -Dm755 inputattach "$pkgdir/usr/bin/inputattach" - install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl - install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach" - install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service -} diff --git a/community/intel-gpu-tools/PKGBUILD b/community/intel-gpu-tools/PKGBUILD index 20eac3d15..bdb70f216 100644 --- a/community/intel-gpu-tools/PKGBUILD +++ b/community/intel-gpu-tools/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 99814 2013-10-31 01:52:21Z allan $ +# $Id: PKGBUILD 100643 2013-11-07 05:56:05Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: Mikael Eriksson <mikael_eriksson@miffe.org> # Originally by: Denis Smirnov <detanator@gmail.com> pkgname=intel-gpu-tools -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="Tools for development and testing of the Intel DRM driver" arch=(i686 x86_64) license=(MIT) -url="http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/" -depends=('libdrm' 'libpciaccess' 'cairo' python) +url='http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/' +depends=(libdrm libpciaccess cairo python dri2proto) makedepends=(swig) source=(http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2) -md5sums=('bfa2ff70c09c95fcad46e7d332e08d28') +md5sums=('6165a9054de2609f5b1bf0ca0d913f31') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 09b2030b5..d35a312d9 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 98333 2013-10-08 15:40:43Z stativ $ +# $Id: PKGBUILD 102772 2013-12-19 14:18:19Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=12.1.6 -_pkgver=129.1359 +pkgver=13.0.1 +_pkgver=133.331 pkgrel=1 pkgdesc="Architecture dependent libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') @@ -11,15 +11,16 @@ license=('Apache') depends=('glibc') options=(!strip) source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('5731ad2d6113ea7e8aedffc011480cb8') +md5sums=('14ca0ad374cfd96ec4b8d3d3bfec9e76') package() { - install -d -m755 "$pkgdir/usr/share/intellijidea-ce/bin" - install -d -m755 "$pkgdir/usr/lib" - [ $CARCH == "x86_64" ] && SUFFIX=64 - install -m755 "idea-IC-$_pkgver"/bin/fsnotifier${SUFFIX} "$pkgdir"/usr/share/intellijidea-ce/bin/ - install -m644 "idea-IC-$_pkgver"/bin/libbreakgen${SUFFIX}.so "$pkgdir"/usr/lib + install -D -m755 "idea-IC-$_pkgver"/bin/fsnotifier${SUFFIX} "$pkgdir"/usr/share/intellijidea-ce/bin/fsnotifier${SUFFIX} + install -D -m644 "idea-IC-$_pkgver"/bin/libbreakgen${SUFFIX}.so "$pkgdir"/usr/lib/libbreakgen${SUFFIX}.so + + # libpty + [ $CARCH == "x86_64" ] && _ARCH=x86_64 || _ARCH=x86 + install -D -m644 "idea-IC-$_pkgver"/lib/libpty/linux/$_ARCH/libpty.so "$pkgdir"/usr/share/intellijidea-ce/lib/libpty/linux/$_ARCH/libpty.so } # vim:set ts=2 sw=2 et: diff --git a/community/io/PKGBUILD b/community/io/PKGBUILD index 52ddc03cb..76c2b1e26 100644 --- a/community/io/PKGBUILD +++ b/community/io/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99046 2013-10-23 12:00:03Z arodseth $ +# $Id: PKGBUILD 102465 2013-12-11 18:14:42Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Gergely Imreh <imrehg(at)gmail(dot)com> pkgname=io -pkgver=2011.09.12 +pkgver=2013.12.04 pkgrel=1 pkgdesc='IO programming language' arch=('x86_64' 'i686') @@ -13,19 +13,21 @@ depends=('pcre' 'libsndfile' 'libxmu' 'freetype2' 'libedit' 'libxml2' 'libtiff' makedepends=('cmake') source=("$pkgname-$pkgver.tar.gz::https://github.com/stevedekorte/io/tarball/$pkgver") options=('!makeflags' '!buildflags') -sha256sums=('7b4cb97a0aa3abb562703e1dbfe46925c22820eeca6969865b979c397799d092') +sha256sums=('a5ca07b4d211995a0cd9442e1d752b2824444bee018c6db31899ddd6c5c87c4f') build() { - mkdir -p stevedekorte-io-23afbcc/build - cd stevedekorte-io-23afbcc/build + cd stevedekorte-io-* + sed -i "s:20110905:${pkgver//./}:" libs/iovm/source/IoVersion.h + mkdir -p build + cd build cmake -DCMAKE_INSTALL_PREFIX=/usr .. make } package() { - cd stevedekorte-io-23afbcc/build - make DESTDIR="$pkgdir" install - install -Dm644 ../license/bsd_license.txt \ + cd stevedekorte-io-* + make -C build DESTDIR="$pkgdir" install + install -Dm644 license/bsd_license.txt \ "$pkgdir/usr/share/licenses/$pkgname/bsd_license.txt" } diff --git a/community/iodine/PKGBUILD b/community/iodine/PKGBUILD index c84453015..c50b3c9d4 100644 --- a/community/iodine/PKGBUILD +++ b/community/iodine/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96596 2013-09-02 07:16:12Z fyan $ +# $Id: PKGBUILD 101503 2013-11-26 16:10:21Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> @@ -6,13 +6,15 @@ pkgname=iodine pkgver=0.6.0rc1 -pkgrel=2 +pkgrel=3 pkgdesc='Tunnel IPv4 data through a DNS server' arch=('i686' 'x86_64') url='http://code.kryo.se/iodine' license=('custom:ISC') depends=('zlib') -source=("http://code.kryo.se/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz") +source=("http://code.kryo.se/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz" + 'iodined.service' + 'iodined.conf.d') build() { cd ${pkgname}-${pkgver/rc/-rc}/ @@ -26,6 +28,11 @@ package() { make prefix=/usr sbindir=/usr/bin DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/licenses/iodine" sed -n '/AUTHORS & LICENSE/,$p' README > "${pkgdir}/usr/share/licenses/iodine/LICENSE" + + install -Dm644 "$srcdir/iodined.service" "$pkgdir/usr/lib/systemd/system/iodined.service" + install -Dm644 "$srcdir/iodined.conf.d" "$pkgdir/etc/conf.d/iodined" } -sha256sums=('dacf950198b68fd1dae09fe980080155b0c75718f581c08e069eee0c1b6c5e60') +sha256sums=('dacf950198b68fd1dae09fe980080155b0c75718f581c08e069eee0c1b6c5e60' + '4d2c45ab783ce07911afe48403884edc0ee5ccbb463bc4026f83b511d5dde418' + '6babc497d86e7b142f61e529f9facacb95e868e920b15dcf66e039891b02929b') diff --git a/community/iodine/iodined.conf.d b/community/iodine/iodined.conf.d new file mode 100644 index 000000000..ae0870d78 --- /dev/null +++ b/community/iodine/iodined.conf.d @@ -0,0 +1,17 @@ +# Address and subnet to use for the tunnel (default mask is /27) +TUN_IP="172.18.42.1/24" + +# Password (32 characters max) +IODINE_PASSWORD="mypassword" + +# The domain you control, see documentation. +TOP_DOMAIN="example.com" + +# UDP port iodined should listen on. +IODINE_PORT="53" + +# Local IP address iodined should bind to. +IODINE_BIND_ADDRESS="0.0.0.0" + +# External IP of your iodined server, used in DNS answers. +IODINE_EXT_IP="" diff --git a/community/iodine/iodined.service b/community/iodine/iodined.service new file mode 100644 index 000000000..00f0c1f39 --- /dev/null +++ b/community/iodine/iodined.service @@ -0,0 +1,10 @@ +[Unit] +After=network.target +Requires=network.target + +[Service] +EnvironmentFile=/etc/conf.d/iodined +ExecStart=/usr/bin/iodined -f -c -l $IODINE_BIND_ADDRESS -n $IODINE_EXT_IP -p $IODINE_PORT -P $IODINE_PASSWORD $TUN_IP $TOP_DOMAIN + +[Install] +WantedBy=multi-user.target diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD index 53ac71ce8..ae8af24b7 100644 --- a/community/irrlicht/PKGBUILD +++ b/community/irrlicht/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 79765 2012-11-12 07:14:50Z svenstaro $ +# $Id: PKGBUILD 102440 2013-12-11 11:35:15Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Hilton Medeiros <medeiros.hilton AT gmail DOT com> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> # Contributor: Paolo Fagni <paolo.fagni AT mail DOT com> # Contributor: Lukas Kropatschek <lukas.krop AT gmail DOT com> -pkgname=irrlicht -pkgver=1.8 -pkgrel=1 +pkgbase=irrlicht +pkgname=('irrlicht' 'irrlicht-docs') +pkgver=1.8.1 +pkgrel=2 pkgdesc="An open source high performance realtime 3D graphics engine." arch=('i686' 'x86_64') url="http://irrlicht.sourceforge.net/" @@ -17,54 +18,43 @@ makedepends=('mesa' 'unzip' 'libxcursor') optdepends=('libxcursor: run examples') source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip") noextract=($pkgname-$pkgver.zip) -md5sums=('d06329d8f466658caaf4838ba349e393') +md5sums=('db97cce5e92da9b053f4546c652e9bd5') build() { - unzip $pkgname-$pkgver.zip + unzip $pkgbase-$pkgver.zip - cd $srcdir/$pkgname-$pkgver - - cd source/Irrlicht - sed -i "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \ - Makefile + cd $srcdir/$pkgbase-$pkgver/source/Irrlicht make NDEBUG=1 sharedlib +} - make NDEBUG=1 +package_irrlicht() { + cd $srcdir/$pkgbase-$pkgver/source/Irrlicht - install -d $pkgdir/usr/lib \ - $pkgdir/usr/share/licenses/$pkgname \ - $pkgdir/usr/share/$pkgname/examples/bin \ - $pkgdir/usr/share/doc/$pkgname + sed -i "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" Makefile make install - cd $srcdir/$pkgname-$pkgver/ - install -m644 readme.txt $pkgdir/usr/share/licenses/$pkgname - - # Install static library and fix headers permissions - install -m644 lib/Linux/libIrrlicht.a $pkgdir/usr/lib - chmod 644 $pkgdir/usr/include/$pkgname/* + cd $srcdir/$pkgbase-$pkgver/ + install -Dm644 readme.txt $pkgdir/usr/share/licenses/$pkgbase/LICENSE - # Install media files for examples - cp -r media $pkgdir/usr/share/$pkgname - - # Install documentation - cp -r doc/* $pkgdir/usr/share/doc/$pkgname - rm -f $pkgdir/usr/share/doc/$pkgname/*.txt + # fix headers permissions + chmod 644 $pkgdir/usr/include/$pkgbase/* cd $pkgdir/usr/lib ln -s libIrrlicht.so.$pkgver libIrrlicht.so.1 +} - # Just a helper for examples compilation - ln -s libIrrlicht.so.$pkgver $srcdir/$pkgname-$pkgver/lib/Linux/libIrrlicht.so +package_irrlicht-docs() { + cd $srcdir/$pkgbase-$pkgver/ - # Edit, build and install the examples - cd $srcdir/$pkgname-$pkgver/examples - sed -i '/define USE_IRRKLANG/s:.*://&:' ./Demo/CDemo.h - sed -i '/^CXXFLAGS/d' $(grep -Rl "^CXXFLAGS =" *) + install -d $pkgdir/usr/share/$pkgbase \ + $pkgdir/usr/share/doc/$pkgbase - make + # install media files for examples + cp -r media $pkgdir/usr/share/$pkgbase - install -m755 ../bin/Linux/* /$pkgdir/usr/share/$pkgname/examples/bin/ + # install documentation + cp -r doc/* $pkgdir/usr/share/doc/$pkgbase + rm -f $pkgdir/usr/share/doc/$pkgbase/*.txt } diff --git a/community/irrlicht/irrlicht-1.7.2-libpng15.patch b/community/irrlicht/irrlicht-1.7.2-libpng15.patch deleted file mode 100644 index a1426bf29..000000000 --- a/community/irrlicht/irrlicht-1.7.2-libpng15.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- source/Irrlicht/CImageLoaderPNG.cpp -+++ source/Irrlicht/CImageLoaderPNG.cpp -@@ -28,7 +28,7 @@ - static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
- {
- os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
-- longjmp(png_ptr->jmpbuf, 1);
-+ longjmp(png_jmpbuf(png_ptr), 1);
- }
-
- // PNG function for file reading
-@@ -37,7 +37,7 @@ - png_size_t check;
-
- // changed by zola {
-- io::IReadFile* file=(io::IReadFile*)png_ptr->io_ptr;
-+ io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);
- check=(png_size_t) file->read((void*)data,(u32)length);
- // }
-
---- source/Irrlicht/CImageWriterPNG.cpp -+++ source/Irrlicht/CImageWriterPNG.cpp -@@ -35,7 +35,7 @@ - static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
- {
- os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
-- longjmp(png_ptr->jmpbuf, 1);
-+ longjmp(png_jmpbuf(png_ptr), 1);
- }
-
- // PNG function for file writing
-@@ -43,7 +43,7 @@ - {
- png_size_t check;
-
-- io::IWriteFile* file=(io::IWriteFile*)png_ptr->io_ptr;
-+ io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);
- check=(png_size_t) file->write((const void*)data,(u32)length);
-
- if (check != length)
diff --git a/community/isapnptools/PKGBUILD b/community/isapnptools/PKGBUILD new file mode 100644 index 000000000..696ca681f --- /dev/null +++ b/community/isapnptools/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 102163 2013-12-06 11:42:51Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=isapnptools +pkgver=1.27 +pkgrel=4 +pkgdesc="Allow ISA Plug-And-Play devices to be configured on a Linux machine" +url="http://www.roestock.demon.co.uk/isapnptools/" +depends=('glibc') +arch=('i686' 'x86_64') +license=('GPL') +options=('staticlibs') +#source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") +source=("http://ibiblio.org/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") +md5sums=('b997ba56583dc850fce9b93d658dfa0c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sbindir=/usr/bin + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index d8ad4d636..20da91cc8 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92144 2013-06-01 12:22:16Z schiv $ +# $Id: PKGBUILD 100543 2013-11-05 18:38:02Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Daniele Paolella <danielepaolella@email.it> # Contributor: Philipp Überbacher <hollunder at gmx dot at> @@ -9,12 +9,12 @@ pkgname=('jack2' 'jack2-dbus') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.9.5 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) license=('GPL') -makedepends=('python2' 'libffado' 'celt' 'opus' 'libsamplerate') +makedepends=('python2-dbus' 'libffado' 'celt' 'opus' 'libsamplerate') source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2" '99-audio.conf' '40-hpet-permissions.rules') @@ -83,7 +83,7 @@ package_jack2() { pkgdesc="The next-generation JACK with SMP support" depends=('libsamplerate' 'celt' 'opus' 'libffado') - optdepends=('python2: jack_control') + optdepends=('python2-dbus: jack_control') conflicts=('jack') provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') @@ -108,7 +108,7 @@ package_jack2-dbus() { pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" depends=('libsamplerate' 'celt' 'opus' 'libffado') - optdepends=('python2: jack_control') + optdepends=('python2-dbus: jack_control') conflicts=('jack' 'jack2') provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') diff --git a/community/javasqlite/PKGBUILD b/community/javasqlite/PKGBUILD index 45a65dbce..996fc58b0 100644 --- a/community/javasqlite/PKGBUILD +++ b/community/javasqlite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99817 2013-10-31 01:53:22Z allan $ +# $Id: PKGBUILD 102709 2013-12-17 18:05:22Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=javasqlite -pkgver=20120209 +pkgver=20131124 pkgrel=1 pkgdesc="Java support for SQLite database engine" arch=('i686' 'x86_64') @@ -12,8 +12,7 @@ license=('custom:BSD-style') depends=('java-runtime' 'sqlite') makedepends=('java-environment') source=(http://www.ch-werner.de/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('a5c4f7760ed002749560068b2bd4bb25') -sha1sums=('76aebb0a11b9e1f861ebaeab9ea3e5818b753ab3') +sha256sums=('681b58556ea3f565b815efb830993d11c798c93dd961f6b6e7477485591585e2') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/jbigkit/PKGBUILD b/community/jbigkit/PKGBUILD index 5a1a91dc2..5754c044b 100644 --- a/community/jbigkit/PKGBUILD +++ b/community/jbigkit/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 100180 2013-11-01 20:59:44Z spupykin $ +# $Id: PKGBUILD 101141 2013-11-18 10:37:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) pkgname=jbigkit pkgver=2.0 -pkgrel=4 +pkgrel=5 pkgdesc="Data compression library/utilities for bi-level high-resolution images" arch=('i686' 'x86_64') url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/" license=('GPL') depends=('glibc') +options=('staticlibs') source=(http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-$pkgver.tar.gz) md5sums=('3dd87f605abb1a97a22dc79d8b3e8f6c') diff --git a/community/js185/PKGBUILD b/community/js185/PKGBUILD new file mode 100644 index 000000000..3da079149 --- /dev/null +++ b/community/js185/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 101265 2013-11-21 12:14:23Z bpiotrowski $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=js185 +pkgver=1.0.0 +pkgrel=2 +pkgdesc="JavaScript interpreter and libraries (legacy)" +arch=(i686 x86_64) +url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5" +license=(MPL) +depends=(nspr gcc-libs) +makedepends=(python2 zip) +options=(!staticlibs) +source=(http://ftp.mozilla.org/pub/mozilla.org/js/$pkgname-$pkgver.tar.gz) +md5sums=('a4574365938222adca0a6bd33329cb32') + +build() { + cd js-1.8.5/js/src + + # _FORTIFY_SOURCE causes configure error + unset CPPFLAGS + + ./configure --prefix=/usr --with-system-nspr \ + --enable-threadsafe + make +} + +package() { + cd js-1.8.5/js/src + make DESTDIR="$pkgdir" install + install -Dm755 shell/js "$pkgdir/usr/bin/js" + find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} + + + # Bad symlinks (absolute, including DESTDIR!) + cd "$pkgdir/usr/lib" + ln -sf libmozjs185.so.1.0.0 libmozjs185.so.1.0 + ln -sf libmozjs185.so.1.0 libmozjs185.so +} + +# vim:set ts=2 sw=2 et: diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index 6ef9efa50..7180fbea8 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 95722 2013-08-16 00:46:12Z kkeen $ +# $Id: PKGBUILD 100535 2013-11-05 17:02:10Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=jshon -pkgver=20130815 +pkgver=20131105 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ url="http://kmkeen.com/jshon/" license=('MIT') depends=('jansson') source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('3ef31b1954ef0838f67bcaf20993dcdd') +md5sums=('84596bcf2d6cde7bbc0fcb4626765b99') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/kdbg/PKGBUILD b/community/kdbg/PKGBUILD index 308d570bc..6efaf1505 100644 --- a/community/kdbg/PKGBUILD +++ b/community/kdbg/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 99820 2013-10-31 01:54:27Z allan $ +# $Id: PKGBUILD 100788 2013-11-10 20:07:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Jason Taylor <jftaylor21@gmail.com> # Contributor: Georg Grabler <ggrabler@chello.at> pkgname=kdbg -pkgver=2.5.3 -pkgrel=2 +pkgver=2.5.4 +pkgrel=1 pkgdesc="A gdb GUI for KDE" arch=('i686' 'x86_64') url="http://www.kdbg.org" @@ -14,7 +14,7 @@ license=('GPL') depends=('kdebase-runtime' 'gdb') makedepends=('automoc4' 'cmake' 'optipng') source=("http://downloads.sourceforge.net/project/kdbg/Source%20Code/$pkgver/kdbg-$pkgver.tar.gz") -md5sums=('345183d07eb11a9c841d3dc34b734613') +md5sums=('715219a810f39e02b493cab9c4a845a1') build() { cd $srcdir diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index 79f88ade6..7b9cb9482 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96808 2013-09-05 18:47:07Z seblu $ +# $Id: PKGBUILD 100797 2013-11-11 03:42:38Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=keepalived -pkgver=1.2.8 +pkgver=1.2.9 pkgrel=1 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ backup=('etc/keepalived/keepalived.conf') depends=('openssl' 'popt' 'libnl1') source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.service') -md5sums=('8a362b6cea145fd4393bf004d09b4057' +md5sums=('adfad98a2cc34230867d794ebc633492' '0a5171f4298528315e8a8004b55befb7') build() { diff --git a/community/keepassx/ChangeLog b/community/keepassx/ChangeLog deleted file mode 100644 index 7e326dab6..000000000 --- a/community/keepassx/ChangeLog +++ /dev/null @@ -1,16 +0,0 @@ -2008-12-08 Alexander Fehr <pizzapunk gmail com> - - * keepassx-0.3.4-1: - New upstream release. - -2008-08-14 Alexander Fehr <pizzapunk gmail com> - - * keepassx-0.3.3-1: - New upstream release. - -2008-07-31 Alexander Fehr <pizzapunk gmail com> - - * keepassx-0.3.2-1: - New upstream release. - Added dependency on libxtst. - Added ChangeLog. diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD index 3aaedec5e..125273a78 100644 --- a/community/keepassx/PKGBUILD +++ b/community/keepassx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89961 2013-05-06 10:41:03Z spupykin $ +# $Id: PKGBUILD 101314 2013-11-22 17:06:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Greg Bouzakis <gregbouzakis@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD index 35e3044fe..8e4efa056 100644 --- a/community/kid3/PKGBUILD +++ b/community/kid3/PKGBUILD @@ -1,40 +1,64 @@ -# $Id: PKGBUILD 100349 2013-11-02 14:50:28Z jlichtblau $ +# $Id: PKGBUILD 101955 2013-12-02 22:15:37Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> -pkgname=kid3 -pkgver=3.0.1 -pkgrel=1 -pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE" +pkgbase=kid3 +pkgname=('kid3' 'kid3-qt') +pkgver=3.0.2 +pkgrel=2 arch=('i686' 'x86_64') url="http://kid3.sourceforge.net/" license=('GPL') -depends=('chromaprint' 'id3lib' 'taglib' 'kdebase-runtime') -makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl') -options=('!makeflags') -install=$pkgname.install -changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('ebbae8b277c14083f87d49bcde5a86295c1874c4004fc5db2d5764ff53f15d59') +makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl' 'phonon-qt4' 'chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'kdebase-runtime') +install=$pkgbase.install +changelog=$pkgbase.changelog +source=(http://downloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz) +sha256sums=('31492e01039e78d2e73ba342a2d2c837395597eb48a101366b160c36fcdcfab4') build() { - cd ${pkgname}-${pkgver} - cd ${srcdir} + [[ ! -d build ]] && mkdir build + mkdir build-qt - mkdir build +#kid3 cd build cmake \ - ../${pkgname}-${pkgver} \ + ../${pkgbase}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release + -DWITH_APPS="CLI;KDE" + + make + +#kid3-qt + cd $srcdir/build-qt + + cmake \ + ../${pkgbase}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DWITH_APPS="CLI;Qt" make } -package() { - cd build +package_kid3() { +pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, KDE version" +depends=('chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'kdebase-runtime') +conflicts=('kid3-qt') + + cd $srcdir/build + + make DESTDIR=${pkgdir} install +} + +package_kid3-qt() { +pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, QT version" +depends=('chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'qt4') +conflicts=('kid3') +provides=('kid3') + + cd $srcdir/build-qt make DESTDIR=${pkgdir} install } diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog index 270612022..d71b20678 100644 --- a/community/kid3/kid3.changelog +++ b/community/kid3/kid3.changelog @@ -1,3 +1,9 @@ +2013-12-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kid3 3.0.2-2 FS#37642 fixed, package split + +2013-12-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kid3 3.0.2-1 + 2013-11-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * kid3 3.0.1-1 diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD index 709507e8e..376febf7e 100644 --- a/community/ktoblzcheck/PKGBUILD +++ b/community/ktoblzcheck/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99823 2013-10-31 01:55:26Z allan $ +# $Id: PKGBUILD 101147 2013-11-18 10:59:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> pkgname=ktoblzcheck -pkgver=1.42 +pkgver=1.43 pkgrel=1 pkgdesc="A library to check account numbers and bank codes of German banks" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=('gcc-libs' 'python') optdepends=('perl') source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz ktoblzcheck-python3.patch) -md5sums=('86f25d5c6a07313638bb74d6b11eb57c' +md5sums=('1052f9a97bd2f9cbf03e316d289acbe3' 'a81a697bb3aaeffb7fac0ad7d9166e3f') build() { diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index b6798a3e6..df2f9eaf1 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96456 2013-08-29 15:09:01Z spupykin $ +# $Id: PKGBUILD 101243 2013-11-20 11:52:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') -pkgver=1.0.12 +pkgver=1.0.14 _pkgsubver=0 pkgrel=1 url='http://www.lazarus.freepascal.org/' @@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz" 'lazcontrols2.diff') -md5sums=('daeb68f09e9ec9939f91c992f52305d5' +md5sums=('11de0f79cf44eb25ee1c460561cc103b' '288bca6ad5ade79deec34c3602daaaa9') build() { @@ -75,7 +75,7 @@ package_lazarus() { rm -r $pkgdir/usr/lib/lazarus/install # license files: /usr/lib/lazarus/COPYING* - install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgbase/COPYING.modifiedLGPL + install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgname/COPYING.modifiedLGPL } package_lazarus-gtk2() { @@ -98,6 +98,9 @@ package_lazarus-gtk2() { -e 's|\.png|\.xpm|' -i install/lazarus.desktop install -Dm644 install/lazarus.desktop $pkgdir/usr/share/applications/lazarus.desktop install -Dm644 images/ide_icon48x48.png $pkgdir/usr/share/pixmaps/lazarus.png + + # license files: /usr/lib/lazarus/COPYING* + install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgname/COPYING.modifiedLGPL } package_lazarus-qt() { @@ -120,5 +123,9 @@ package_lazarus-qt() { -e 's|\.png|\.xpm|' -i install/lazarus.desktop install -Dm644 install/lazarus.desktop $pkgdir/usr/share/applications/lazarus.desktop install -Dm644 images/ide_icon48x48.png $pkgdir/usr/share/pixmaps/lazarus.png + + # license files: /usr/lib/lazarus/COPYING* + install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgname/COPYING.modifiedLGPL } + # vim:set ts=2 sts=2 sw=2 et: diff --git a/community/lbreakout2/PKGBUILD b/community/lbreakout2/PKGBUILD new file mode 100644 index 000000000..8b3a71a21 --- /dev/null +++ b/community/lbreakout2/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 102169 2013-12-06 11:49:11Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=lbreakout2 +pkgver=2.6.4 +pkgrel=2 +pkgdesc="A breakout game with nice effects, graphics, and sounds" +arch=('i686' 'x86_64') +url="http://lgames.sourceforge.net" +license=('GPL') +depends=('sdl_mixer' 'libpng') +backup=('var/games/lbreakout2/lbreakout2.hscr') +source=("http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz" + 'lbreakout2.desktop' + 'lbreakout2.png') +md5sums=('4849af72225a304267eb71a9c100cd48' + '14cd34a72a8f4e3b8f385f9023625241' + '94e2fa393eb2a7d4494641dec580573b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver/_/-} + + ./configure --prefix=/usr \ + --localstatedir=/var/games/lbreakout2 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver/_/-} + + make DESTDIR=${pkgdir}/ doc_dir=/usr/share/doc install + + chmod -R 755 ${pkgdir}/usr + chown root:games ${pkgdir}/var/games + chmod 775 ${pkgdir}/var/games + chown root:games ${pkgdir}/var/games/lbreakout2 + chmod 755 ${pkgdir}/var/games/lbreakout2 + chown root:games ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr + chmod 775 ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr + + install -Dm644 ${srcdir}/lbreakout2.png ${pkgdir}/usr/share/pixmaps/lbreakout2.png + install -Dm644 ${srcdir}/lbreakout2.desktop ${pkgdir}/usr/share/applications/lbreakout2.desktop +} diff --git a/community/lbreakout2/lbreakout2.desktop b/community/lbreakout2/lbreakout2.desktop new file mode 100644 index 000000000..c8ef945da --- /dev/null +++ b/community/lbreakout2/lbreakout2.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=Linux Breakout 2 +Comment=Breakout and Arkanoid style arcade game +Icon=/usr/share/pixmaps/lbreakout2.png +TryExec=lbreakout2 +Exec=lbreakout2 +Terminal=false +Categories=Application;Game; diff --git a/community/lbreakout2/lbreakout2.png b/community/lbreakout2/lbreakout2.png Binary files differnew file mode 100644 index 000000000..f9541e184 --- /dev/null +++ b/community/lbreakout2/lbreakout2.png diff --git a/community/lcab/PKGBUILD b/community/lcab/PKGBUILD new file mode 100644 index 000000000..5ede6fc96 --- /dev/null +++ b/community/lcab/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 102167 2013-12-06 11:48:03Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> + +pkgname=lcab +pkgver=1.0b12 +pkgrel=4 +pkgdesc="A program to make Microsoft cabinet files" +arch=('i686' 'x86_64') +license=('GPL') +url="http://ohnopub.net/~ohnobinki/lcab/" +depends=('glibc') +source=("ftp://ohnopublishing.net/mirror/${pkgname}-${pkgver}.tar.gz") +md5sums=('9403e08f53fcf262e25641a9b900d4de') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -D -m755 lcab "${pkgdir}/usr/bin/lcab" +} diff --git a/community/lcdproc/PKGBUILD b/community/lcdproc/PKGBUILD index ced069659..3106af2ad 100644 --- a/community/lcdproc/PKGBUILD +++ b/community/lcdproc/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 92663 2013-06-11 09:24:01Z idevolder $ +# $Id: PKGBUILD 102962 2013-12-25 04:58:31Z bgyorgy $ # Maintainer: BlackEagle <ike DOT devolder AT gmail DOT com> # Contributor: Bernhard Walle <bernhard.walle@gmx.de> pkgname=lcdproc pkgver=0.5.6 -pkgrel=3 +pkgrel=4 pkgdesc="Utility to drive one or more LCD (and LCD-like) devices" +arch=('i686' 'x86_64') url="http://lcdproc.omnipotent.net/" -license="GPL" -depends=('libusb-compat') -optdepends=( - 'perl: needed for some lcdproc tools' -) -backup=( - 'etc/LCDd.conf' +license=('GPL') +depends=('libftdi-compat') +optdepends=('perl: needed for some lcdproc tools') +backup=('etc/LCDd.conf' 'etc/lcdexec.conf' 'etc/lcdproc.conf' - 'etc/lcdvc.conf' -) -arch=('i686' 'x86_64') -source=( - "http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - 'lcdd.service' -) + 'etc/lcdvc.conf') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'lcdd.service') +sha256sums=('bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a' + '0acdc0fb9668e6d5e023349874301153a16935e1ad757d550c426a9a7ac64638') build() { cd "$pkgname-$pkgver" @@ -43,6 +39,3 @@ package() { sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" -i "$pkgdir/etc/LCDd.conf" install -Dm644 "$srcdir/lcdd.service" "$pkgdir/usr/lib/systemd/system/lcdd.service" } - -sha256sums=('bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a' - '0acdc0fb9668e6d5e023349874301153a16935e1ad757d550c426a9a7ac64638') diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index b93f4c0e5..5fcea7099 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99051 2013-10-23 12:11:03Z dicebot $ +# $Id: PKGBUILD 101888 2013-12-02 15:58:18Z dicebot $ # Maintainer: Mihails Strasuns <public@dicebot.lv> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=('ldc' 'liblphobos-devel') groups=('dlang' 'dlang-ldc') -pkgver=0.12.0 +pkgver=0.12.1 epoch=1 pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" @@ -35,7 +35,7 @@ build() { } package_ldc() { - optdepends=("liblphobos-devel: stadard library, static one + imports, LDC version") + optdepends=("liblphobos-devel: standard library, static one + imports, LDC version") backup=("etc/ldc2.conf" "etc/ldc2.rebuild.conf" ) diff --git a/community/libcuefile/PKGBUILD b/community/libcuefile/PKGBUILD index 92654aec4..9545dcee1 100644 --- a/community/libcuefile/PKGBUILD +++ b/community/libcuefile/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 57124 2011-10-22 02:51:18Z ebelanger $ -# Maintainer: Corrado Primier <bardo@aur.archlinux.org> +# $Id: PKGBUILD 103016 2013-12-25 16:52:28Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=libcuefile pkgver=475 -pkgrel=1 +pkgrel=2 pkgdesc="A library to work with CUE files" arch=('i686' 'x86_64') url="http://www.musepack.net/index.php?pg=src" diff --git a/community/libdaq/PKGBUILD b/community/libdaq/PKGBUILD index fb36ed4f0..49d03e949 100644 --- a/community/libdaq/PKGBUILD +++ b/community/libdaq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99826 2013-10-31 01:56:41Z allan $ +# $Id: PKGBUILD 102862 2013-12-22 20:59:29Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=libdaq -pkgver=1.1.1 +pkgver=2.0.1 pkgrel=1 pkgdesc='Data Acquisition library for packet I/O.' arch=('i686' 'x86_64') @@ -10,15 +10,14 @@ url='http://www.snort.org/' license=('GPL') depends=('libpcap') makedepends=('ca-certificates') -source=("http://www.snort.org/dl/snort-current/daq-${pkgver}.tar.gz"{,.sig}) -md5sums=('bc204ea09165b4ecbb1bb49c7c1a2ad4' - '3ec4c252249b09adaf5c96e2626a1f74') +source=(http://www.snort.org/dl/snort-current/daq-${pkgver}.tar.gz{,.sig}) +md5sums=('044aa3663d44580d005293eeb8ccf175' + 'SKIP') build() { cd "${srcdir}/daq-${pkgver}" - ./configure --prefix=/usr - make + make -j1 } package() { diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD index 1747f96fc..637f8b535 100644 --- a/community/libdbi-drivers/PKGBUILD +++ b/community/libdbi-drivers/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99828 2013-10-31 01:57:20Z allan $ +# $Id: PKGBUILD 101343 2013-11-22 23:07:08Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Olivier Médoc <o_medoc@yahoo.fr> # Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil.Arch@gmail.com> pkgname=libdbi-drivers pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="Database drivers for libdbi (MySQL, PostgreSQL, and SQLite)" url="http://libdbi-drivers.sourceforge.net/" license=('GPL') @@ -16,6 +16,7 @@ optdepends=("postgresql-libs: To work with postgresql using libdbdpgsql " "sqlite3: To work with sqlite3 using libdbdsqlite3" "libmariadbclient: To work with mysql using libdbdmysql" "sqlite2: To work with sqlite2 using libdbdsqlite") +options=(!libtool) install=libdbi-drivers.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz") sha1sums=('8472875d30c216540d48d591b442e40ba4f7df5d') @@ -24,7 +25,6 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --disable-docs \ - --with-libdbi \ --with-mysql \ --with-pgsql \ --with-sqlite \ @@ -34,6 +34,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} localstatedir=/var install } diff --git a/community/libestr/PKGBUILD b/community/libestr/PKGBUILD index 4f994e609..703f269ef 100644 --- a/community/libestr/PKGBUILD +++ b/community/libestr/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 100192 2013-11-01 21:08:24Z spupykin $ +# $Id: PKGBUILD 100616 2013-11-06 13:35:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Brian Knox <taotetek@gmail.com> pkgname=libestr -pkgver=0.1.5 -pkgrel=2 +pkgver=0.1.9 +pkgrel=1 pkgdesc="essentials for string handling (and a bit more)" url="http://libestr.adiscon.com/" arch=('i686' 'x86_64') license=('LGPL2.1') depends=() source=("http://libestr.adiscon.com/files/download/libestr-$pkgver.tar.gz") -md5sums=('f180c0cdc82883d161eba3f2e8a34eb4') +md5sums=('681ca0ed7e5ae6ddff70fdec413096e4') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/libg15/PKGBUILD b/community/libg15/PKGBUILD new file mode 100644 index 000000000..082bbc1f1 --- /dev/null +++ b/community/libg15/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 101647 2013-11-29 19:08:51Z arcanis $ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> +# Contributor: onestep_ua <onestep at ukr dot net> + +pkgname=libg15 +pkgver=1.2.7 +pkgrel=1 +pkgdesc="Provides low-level access to the Logitech G15 and G11 keyboards and Z10 speakers" +arch=('i686' 'x86_64') +url="http://www.g15tools.com/" +license=('GPL') +depends=('libusb-compat') +options=(!libtool) +source=(http://downloads.sourceforge.net/g15tools/${pkgname}-${pkgver}.tar.bz2) +md5sums=('718c8e1d0d0d4657f95427593d90a27a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/libg15render/PKGBUILD b/community/libg15render/PKGBUILD new file mode 100644 index 000000000..90d48a9a2 --- /dev/null +++ b/community/libg15render/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 101648 2013-11-29 19:09:04Z arcanis $ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> +# Contributor: onestep_ua <onestep at ukr dot net> + +pkgname=libg15render +pkgver=1.2 +pkgrel=3 +pkgdesc="A small graphics library optimised for drawing on an LCD" +arch=('i686' 'x86_64') +url="http://www.g15tools.com/" +license=('GPL') +depends=('libg15') +options=('!libtool') +source=(http://downloads.sourceforge.net/g15tools/${pkgname}-${pkgver}.tar.bz2) +md5sums=('a5a2a833d098926c3d289aeae452cc53') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/libgringotts/PKGBUILD b/community/libgringotts/PKGBUILD index 2d377e1fb..e7f5c9b84 100644 --- a/community/libgringotts/PKGBUILD +++ b/community/libgringotts/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99846 2013-10-31 02:03:26Z allan $ +# $Id: PKGBUILD 103022 2013-12-25 17:07:40Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=libgringotts pkgver=1.2.1 -pkgrel=10 +pkgrel=11 pkgdesc="Encryption backend for Gringotts" arch=('i686' 'x86_64') url="http://developer.berlios.de/projects/gringotts" @@ -14,7 +14,7 @@ source=(http://download.berlios.de/gringotts/$pkgname-$pkgver.tar.bz2) md5sums=('b2b1bad56ef33153f251ccd9500860be') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver autoconf ./configure --prefix=/usr @@ -22,9 +22,9 @@ build() { } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install - rm -fr ${pkgdir}/usr/share + rm -fr "${pkgdir}"/usr/share } diff --git a/community/libgringotts/libgringotts.changelog b/community/libgringotts/libgringotts.changelog index a2357a924..d046639ba 100644 --- a/community/libgringotts/libgringotts.changelog +++ b/community/libgringotts/libgringotts.changelog @@ -1,6 +1,9 @@ +2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * libgringotts 1.2.1-11 static libraries remoed + 2012-05-01 Andrea Scarpino <andrea@archlinux.org> - * Remove libtool dependence - * Remove .la file + * Remove libtool dependence + * Remove .la file 2009-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * osmo dependency, moved to [community] diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD index 2ff6438c6..a5cc932ae 100644 --- a/community/libkkc/PKGBUILD +++ b/community/libkkc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99853 2013-10-31 02:05:47Z allan $ +# $Id: PKGBUILD 102736 2013-12-18 10:42:09Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> pkgname=libkkc -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 pkgdesc="Japanese Kana Kanji conversion library" arch=('i686' 'x86_64') @@ -30,4 +30,4 @@ package() { "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/" } -sha512sums=('6b237930ec0fd0f788364a301b2cf97a0607d708c109cf619b73321255ec50f08c396afde767856a9db6f8e8ceb0117a95eda3a17f3c9c8065a32843b1e97fc0') +sha512sums=('ae3aa5278aabece7e883a1c336211249b4123cd66d23bf0f8db146de1df7c17d12f091b02f0eb0471646c513aba1732777cf80b5f6aab2f2e091df13ef441067') diff --git a/community/liblockfile/PKGBUILD b/community/liblockfile/PKGBUILD index e866d24bf..0e84eb38a 100644 --- a/community/liblockfile/PKGBUILD +++ b/community/liblockfile/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100202 2013-11-01 21:13:53Z spupykin $ +# $Id: PKGBUILD 102144 2013-12-05 21:13:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=liblockfile pkgver=1.08_4 _basever=1.08 -pkgrel=3 +pkgrel=4 pkgdesc="a library with NFS-safe locking functions" arch=('i686' 'x86_64') license=('GPL') @@ -22,7 +22,7 @@ build() { for p in `cat ../debian/patches/series` ; do patch -p1 < ../debian/patches/$p done - ./configure --prefix=/usr --mandir=/usr/share/man + LDCONFIG=/usr/bin/true ./configure --enable-shared --prefix=/usr --mandir=/usr/share/man make } diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index cc61169b5..9427d8834 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99856 2013-10-31 02:07:03Z allan $ +# $Id: PKGBUILD 101323 2013-11-22 17:32:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.64 +pkgver=0.7.65 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=( 'curl' 'libmms' 'libzen') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('27a6afbf5993c894bd38fab9b8e0fc27' +md5sums=('51f62420b58a61c27ec9406e82ab3999' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 838d7e676..f105c94a3 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100208 2013-11-01 21:16:12Z spupykin $ +# $Id: PKGBUILD 102393 2013-12-10 10:04:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,8 +6,8 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.27 -pkgrel=2 +pkgver=0.9.32 +pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') url="http://www.gnu.org/software/libmicrohttpd/" @@ -15,7 +15,7 @@ license=('LGPL') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('a10496b7f1b495aaf6897584da52f51b') +md5sums=('29dcc1c201c36044be2c3f816c64a5bb') build() { cd ${pkgname}-${pkgver} diff --git a/community/libmirage/PKGBUILD b/community/libmirage/PKGBUILD index aab6f10ea..0d0faa344 100644 --- a/community/libmirage/PKGBUILD +++ b/community/libmirage/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99858 2013-10-31 02:07:43Z allan $ +# $Id: PKGBUILD 102784 2013-12-20 01:20:37Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=libmirage -pkgver=2.1.0 -pkgrel=2 +pkgver=2.1.1 +pkgrel=1 pkgdesc="CD-ROM image (B6T/C2D/CCD/CDI/CIF/CUE/ISO/MDS/MDX/NRG/TOC) access library" arch=(i686 x86_64) url="http://cdemu.sourceforge.net/" @@ -13,11 +13,15 @@ license=(GPL) depends=(glib2 libsndfile libsamplerate zlib bzip2 xz shared-mime-info) makedepends=(gtk-doc gobject-introspection cmake) install=libmirage.install -source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2) -sha256sums=('fb30eea15b8c1fc55e194e1af55127fa3b3860a79fec0b6c60588cf9ae8d1ca9') +source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2 + missing-xml.patch) +sha256sums=('f606391095200df510b923201881bfbadb6ab032035ce9a67aa24fcae3145108' + 'c20e5d8d0695e3832971646eef2d735f1d12a4da767da1ff4f9c9af92ad7ad02') prepare() { mkdir build + cd $pkgname-$pkgver + patch -Np2 -i ../missing-xml.patch } build() { @@ -25,7 +29,8 @@ build() { cmake ../$pkgname-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib + -DCMAKE_INSTALL_LIBDIR=lib \ + -DPOST_INSTALL_HOOKS:BOOL=OFF make } diff --git a/community/libmirage/missing-xml.patch b/community/libmirage/missing-xml.patch new file mode 100644 index 000000000..58dfebfeb --- /dev/null +++ b/community/libmirage/missing-xml.patch @@ -0,0 +1,24 @@ +diff --git i/libmirage/src/filters/filter-daa/CMakeLists.txt w/libmirage/src/filters/filter-daa/CMakeLists.txt +index ebd2890..e7021c1 100644 +--- i/libmirage/src/filters/filter-daa/CMakeLists.txt ++++ w/libmirage/src/filters/filter-daa/CMakeLists.txt +@@ -35,6 +35,7 @@ if (${ZLIB_FOUND}) + + # Install MIME type + install(FILES "libmirage-${filter_short}.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages) ++ install(FILES "libmirage-gbi.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages) + if (POST_INSTALL_HOOKS) + install(CODE "execute_process (COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${CMAKE_INSTALL_FULL_DATADIR}/mime)") + endif () +diff --git i/libmirage/src/parsers/image-mds/CMakeLists.txt w/libmirage/src/parsers/image-mds/CMakeLists.txt +index c97be8f..bb0ee2b 100644 +--- i/libmirage/src/parsers/image-mds/CMakeLists.txt ++++ w/libmirage/src/parsers/image-mds/CMakeLists.txt +@@ -20,6 +20,7 @@ if (TRUE) + + # Install MIME type + install(FILES "libmirage-${parser_short}.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages) ++ install(FILES "libmirage-xmd.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages) + if (POST_INSTALL_HOOKS) + install(CODE "execute_process (COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${CMAKE_INSTALL_FULL_DATADIR}/mime)") + endif () diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD index c18fec262..3eb21dddc 100644 --- a/community/libnfs/PKGBUILD +++ b/community/libnfs/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 99036 2013-10-22 19:26:33Z idevolder $ +# $Id: PKGBUILD 101449 2013-11-25 20:44:51Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgname=libnfs -pkgver=1.7.0 -pkgrel=2 +pkgver=1.8.0 +pkgrel=1 pkgdesc="client library for accessing NFS shares" arch=('i686' 'x86_64') url="https://github.com/sahlberg/libnfs" license=('GPL') depends=('glibc') source=("https://github.com/sahlberg/$pkgname/archive/$pkgname-$pkgver.tar.gz") -sha256sums=('724e0b15cb2099ab3bbdb8456eaab54bc6d1de76da4b4f3251323471523e2114') +sha256sums=('e4d766efba85e79b04c18038070506d0a9df5b7e0f08aa54ab402892cd1542cc') build() { cd "$pkgname-$pkgname-$pkgver" diff --git a/community/libpar2/PKGBUILD b/community/libpar2/PKGBUILD index 87d6991b1..9411ef847 100644 --- a/community/libpar2/PKGBUILD +++ b/community/libpar2/PKGBUILD @@ -1,16 +1,17 @@ +# $Id: PKGBUILD 103025 2013-12-25 17:18:28Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Paul Bredbury <brebs@sent.com> # Contributor: Matt McDonald <metzen@gmail.com> pkgname=libpar2 pkgver=0.2 -pkgrel=6 +pkgrel=7 pkgdesc="Parity checking library" arch=('i686' 'x86_64') url="http://parchive.sourceforge.net/" license=('GPL') depends=('libsigc++2.0') -makedepends=('autoconf' 'automake' 'pkgconfig') +makedepends=('autoconf' 'automake' 'pkgconfig' 'patch') source=(http://downloads.sourceforge.net/sourceforge/parchive/${pkgname}-${pkgver}.tar.gz libpar2-0.2-bugfixes.patch libpar2-0.2-cancel.patch) sha256sums=('074fbf840f73b1e13e0405fce261078c81c8c0a4859e30a7bba10510f9199908' diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD index 0ffcd5742..50f7044c8 100644 --- a/community/libpinyin/PKGBUILD +++ b/community/libpinyin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100397 2013-11-03 12:30:24Z fyan $ +# $Id: PKGBUILD 101539 2013-11-27 09:04:03Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Yangtse <yangtsesu@gmail.com> # Contributor: WU Jun <quark at lihdd dot net> pkgname=libpinyin -pkgver=0.9.94 +pkgver=1.0.0 _modelver=7 pkgrel=1 pkgdesc="Library to deal with pinyin" @@ -12,12 +12,13 @@ arch=('i686' 'x86_64') url="https://github.com/libpinyin/libpinyin" license=('GPL') depends=('db' 'glib2') -source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz" +makedepends=('git') +source=("git+https://github.com/$pkgname/${pkgname}.git#tag=$pkgver" "http://downloads.sourceforge.net/libpinyin/model${_modelver}.text.tar.gz") noextract=("model${_modelver}.text.tar.gz") build() { - cd ${pkgname}-${pkgver} + cd ${pkgname} cp ../model${_modelver}.text.tar.gz data/ sed -i "/wget.*model${_modelver}\.text\.tar\.gz/ d" data/Makefile.am @@ -27,9 +28,9 @@ build() { } package() { - cd ${pkgname}-$pkgver + cd ${pkgname} make DESTDIR="${pkgdir}" install } -sha512sums=('733083a8ed1dc0d230c8830e67c4d23b28ecf4c2b4adf386aee5f1e3cd9849363951c60720d5ae5fe9c075b4dbdda88969473c19bb1a8c8187cbc21e35445108' +sha512sums=('SKIP' '74a56a23cdca24124037f688ed85a921089155a1b9a0b61e646f805b2bb698c56682c5d6a47ff86657c8b131a831dbee9d5cc5165d4c1f235b77fcd5b2e480ad') diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD deleted file mode 100644 index c6492c0fd..000000000 --- a/community/libraw/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 99878 2013-10-31 02:14:23Z allan $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> -# Contributor: Brad Fanella <bradfanella@archlinux.us> - -pkgname=libraw -pkgver=0.15.4 -pkgrel=2 -pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" -arch=('i686' 'x86_64') -url="http://www.libraw.org/" -license=('CDDL' 'LGPL' 'custom') -depends=('lcms') -options=('!makeflags') -changelog=$pkgname.changelog -source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz) -sha256sums=('b3fcfee33bc34ae5869a9741880e28a62f029f196cb1d1a007ab156f4a110f79') - -build() { - cd ${srcdir}/LibRaw-${pkgver} - - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/LibRaw-${pkgver} - - make DESTDIR=${pkgdir} install - -#license - install -D -m644 ${srcdir}/LibRaw-${pkgver}/LICENSE.LibRaw.pdf \ - ${pkgdir}/usr/share/licenses/libraw/LICENSE.LibRaw.pdf -} diff --git a/community/libraw/libraw.changelog b/community/libraw/libraw.changelog deleted file mode 100644 index 0c3b4b6fa..000000000 --- a/community/libraw/libraw.changelog +++ /dev/null @@ -1,20 +0,0 @@ -2013-09-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * libraw 0.15.4-1 - -2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * libraw 0.15.2-1 - -2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * libraw 0.14.8-1 - -2012-09-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * libraw 0.14.7-1 - -2012-04-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * libraw 0.14.6-1 - -2012-02-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * libraw 0.14.5-1 - -2011-12-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * libraw 0.14.4-1 diff --git a/community/libreplaygain/PKGBUILD b/community/libreplaygain/PKGBUILD index 19505622d..d5e524c33 100644 --- a/community/libreplaygain/PKGBUILD +++ b/community/libreplaygain/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57695 2011-11-01 10:46:06Z andrea $ -# Maintainer: +# $Id: PKGBUILD 103013 2013-12-25 16:46:04Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=libreplaygain pkgver=475 -pkgrel=1 +pkgrel=2 pkgdesc="A library to adjust audio gain" arch=('i686' 'x86_64') url="http://www.musepack.net/index.php?pg=src" @@ -16,6 +16,7 @@ md5sums=('e27b3b1249b7fbae92d656d9e3d26633') build() { cd "${srcdir}" + mkdir build cd build cmake ../${pkgname}_r${pkgver}/ \ @@ -26,9 +27,10 @@ build() { package() { cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/include/replaygain/" + install -d "${pkgdir}"/usr/include/replaygain/ install -Dm644 "${srcdir}"/${pkgname}_r${pkgver}/include/replaygain/* \ - "${pkgdir}/usr/include/replaygain/" + "${pkgdir}"/usr/include/replaygain/ } diff --git a/community/librime/PKGBUILD b/community/librime/PKGBUILD index 9c6f8e205..d35e2a059 100644 --- a/community/librime/PKGBUILD +++ b/community/librime/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 94029 2013-07-13 12:33:16Z svenstaro $ +# $Id: PKGBUILD 102255 2013-12-07 10:36:39Z bpiotrowski $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=librime -pkgver=0.9.9 +pkgver=1.0 pkgrel=3 pkgdesc="Rime input method engine" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/" license=('GPL3') -depends=('boost' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp>=0.5') +depends=('boost-libs' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp>=0.5') optdepends=('brise: Rime schema repository') -makedepends=('cmake') +makedepends=('cmake' 'boost') source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz") build() { - cd "${srcdir}/$pkgname" + cd $pkgname make } package() { - cd "${srcdir}/$pkgname" + cd $pkgname make DESTDIR="$pkgdir" install } -md5sums=('bd705cd3e4c7ab6e47d983b07044769f') +sha512sums=('79f51174043e0ff524f8af090fd1d0a21301b4e5e530c772648ff59894d39135d15c53c0f4d197895c301defca2e084635eb222464dd20859ab3bdbc6ae8fb2c') diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD index 193e5eb5b..da1b341a7 100644 --- a/community/libsodium/PKGBUILD +++ b/community/libsodium/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99151 2013-10-25 05:03:48Z fyan $ +# $Id: PKGBUILD 100860 2013-11-12 10:28:49Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: namelessjon <jonathan.stott@gmail.com> # Contributor: Alessio Sergi <asergi at archlinux dot us> pkgname=libsodium pkgver=0.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="P(ortable|ackageable) NaCl-based crypto library" arch=('i686' 'x86_64') url="https://github.com/jedisct1/libsodium" @@ -34,4 +34,4 @@ package() { } # vim:set ts=2 sw=2 et: -sha512sums=('8c446b62c0400ed972f11c399a03f334cead80fc48513c4b5eba6f569725e28cf98d71cd6d46da5602fc553719a18e74598008c311fe02b2f05b61c7bc72525b') +sha512sums=('6105bb91982e040420312f042bb71547f0208ed9b2928b1740a68134b82dd4566f18c0761b8959a85d13b6770edbd977d989bc74eabc9bfa5e0000f5ab5c7b32') diff --git a/community/libstatgrab/PKGBUILD b/community/libstatgrab/PKGBUILD index e8a26dfaf..7bfa565e1 100644 --- a/community/libstatgrab/PKGBUILD +++ b/community/libstatgrab/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99883 2013-10-31 02:16:04Z allan $ +# $Id: PKGBUILD 103029 2013-12-25 17:24:20Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Hugo Ideler <hugoideler@dse.nl> pkgname=libstatgrab pkgver=0.17 -pkgrel=3 +pkgrel=4 pkgdesc="A library that provides cross platform access to statistics about the system on which it's run" arch=('i686' 'x86_64') url="http://www.i-scream.org/libstatgrab" @@ -17,14 +17,14 @@ source=(http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/$pkgnam sha256sums=('bbaa88c6bde8bd3cf2720b81a26528cc055a7e83e4ea3bdb1d0a3c4287cceb88') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/libstatgrab/libstatgrab.changelog b/community/libstatgrab/libstatgrab.changelog index ee8f7860f..6b1e7f6db 100644 --- a/community/libstatgrab/libstatgrab.changelog +++ b/community/libstatgrab/libstatgrab.changelog @@ -1,3 +1,6 @@ +2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * libstatgrab 0.17-4 static library removal + 2011-01-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * libstatgrab 0.17-1 @@ -9,3 +12,4 @@ * libstatgrab 0.16-1 * Upstream update * Added ChangeLog + diff --git a/community/libstrl/PKGBUILD b/community/libstrl/PKGBUILD new file mode 100644 index 000000000..0a25f255a --- /dev/null +++ b/community/libstrl/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 102397 2013-12-10 10:41:46Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Nathan Phillip Brink <binki@gentoo.org> + +pkgname=libstrl +pkgver=0.5.1 +pkgrel=1 +pkgdesc="Implementations of certain GNU-only or BSD-only string-related libc functions, such as strlcpy() and getdelim(), for compat purposes" +url="http://ohnopub.net/~ohnobinki/libstrl" +license=('LGPL3') +arch=(i686 x86_64) +depends=() +makedepends=(doxygen libtool pkg-config) +options=(!libtool) +source=(ftp://mirror.ohnopub.net/mirror/${pkgname}-${pkgver}.tar.bz2{,.asc}) +md5sums=('d22fcd8107526d802428be6f0e8f0f60' + 'SKIP') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + ./configure --prefix=/usr --with-doxygen + make +} + +check() { + make -C "${srcdir}"/${pkgname}-${pkgver} check +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # doxygen workaround + sed -i 's|man0/strl.h.0|man30/strl.h.30|g' Makefile + install -Dm0644 man/man30/strl.h.30 $pkgdir/usr/share/man/man0/strl.h.0 + + make DESTDIR="${pkgdir}" install +} diff --git a/community/libtaginfo/PKGBUILD b/community/libtaginfo/PKGBUILD index 0c3542ec8..e9fdc1b46 100644 --- a/community/libtaginfo/PKGBUILD +++ b/community/libtaginfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99234 2013-10-26 09:47:13Z fyan $ +# $Id: PKGBUILD 102566 2013-12-15 04:07:29Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=libtaginfo -pkgver=0.1.6 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="Library for reading media metadata" arch=('i686' 'x86_64') url="https://bitbucket.org/shuerhaaken/libtaginfo" @@ -12,14 +12,14 @@ license=('GPL2') source=("https://bitbucket.org/shuerhaaken/libtaginfo/downloads/$pkgname-$pkgver.tar.gz") build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./autogen.sh --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums=('781361a667767e8553735682d63670ca') +md5sums=('db4358e6328609e262c291f365ec8e81') diff --git a/community/libuhd/PKGBUILD b/community/libuhd/PKGBUILD index c3758b43d..e33eaf34f 100644 --- a/community/libuhd/PKGBUILD +++ b/community/libuhd/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 99249 2013-10-26 12:30:40Z kkeen $ +# $Id: PKGBUILD 102256 2013-12-07 10:36:40Z bpiotrowski $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dominik Heidler <dheidler@gmail.com> pkgname=libuhd pkgver=3.5.4 _verstring=003_005_004 -pkgrel=2 +pkgrel=4 pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver" arch=('x86_64' 'i686') url="http://code.ettus.com/redmine/ettus/projects/uhd/wiki" license=('GPL') depends=('boost-libs' 'orc' 'libusbx') makedepends=('cmake' 'boost' 'python2-cheetah') -install='libuhd.install' source=("libuhd-$pkgver.tar.gz::https://codeload.github.com/EttusResearch/uhd/tar.gz/release_$_verstring") md5sums=('e90c95483a52b75cacc85f4fb0ef63ed') diff --git a/community/libuhd/libuhd.install b/community/libuhd/libuhd.install deleted file mode 100644 index 8a8592faf..000000000 --- a/community/libuhd/libuhd.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - ldconfig -} - -post_upgrade() { - ldconfig -} diff --git a/community/libvdpau-va-gl/PKGBUILD b/community/libvdpau-va-gl/PKGBUILD new file mode 100644 index 000000000..b5f7deb53 --- /dev/null +++ b/community/libvdpau-va-gl/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 101594 2013-11-28 16:02:19Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Behem0th <grantipak@gmail.com> + +pkgname=libvdpau-va-gl +pkgver=0.2.1 +pkgrel=1 +pkgdesc='VDPAU driver with OpenGL/VAAPI backend' +arch=('i686' 'x86_64') +url='https://github.com/i-rinat/libvdpau-va-gl' +license=('LGPL3') +depends=('libvdpau' 'libva' 'libgl' 'ffmpeg' 'glu') +makedepends=('cmake') +source=('https://github.com/i-rinat/${pkgname}/archive/v'${pkgver}'.zip') +md5sums=('bb14c2ec9763c025b1abde96df845512') + +build() { + cd $pkgname-$pkgver + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/libvirt-python/PKGBUILD b/community/libvirt-python/PKGBUILD new file mode 100644 index 000000000..3e592fdfd --- /dev/null +++ b/community/libvirt-python/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 101980 2013-12-03 09:48:38Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jonathan Wiersma <archaur at jonw dot org> + +pkgname=libvirt-python +pkgver=1.2.0 +pkgrel=2 +pkgdesc="libvirt python binding" +arch=('i686' 'x86_64') +url="http://libvirt.org/" +license=('LGPL') +depends=('python2' 'libvirt') +options=('emptydirs') +install="libvirt-python.install" +source=("ftp://libvirt.org/libvirt/python/$pkgname-$pkgver.tar.gz" + "python-fix.patch::http://libvirt.org/git/?p=libvirt-python.git;a=patch;h=9d9e2513c09e7ba7474c94455e5f82b3d00e6396") +md5sums=('38158e5740be65f17eef9f99ffa5dadf' + 'ba2e5b0d5906a25a6e8a857156d55b61') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 <$srcdir/python-fix.patch +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + python2 setup.py build +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + python2 setup.py install --root=$pkgdir +} diff --git a/community/libvirt-python/libvirt-python.install b/community/libvirt-python/libvirt-python.install new file mode 100644 index 000000000..216f08a7c --- /dev/null +++ b/community/libvirt-python/libvirt-python.install @@ -0,0 +1,3 @@ +post_remove() { + rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc +} diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 9eba6c8bd..a19d67276 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99888 2013-10-31 02:17:58Z allan $ +# $Id: PKGBUILD 101981 2013-12-03 09:49:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=1.1.3 +pkgver=1.2.0 pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') @@ -33,7 +33,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d libvirt.tmpfiles.d) -md5sums=('b0dfe373ebe0c588b42a28c14d36a3e6' +md5sums=('f74f78059def4e68d69b975ad6e6c3e2' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' '020971887442ebbf1b6949e031c8dd3f') diff --git a/community/libwww/PKGBUILD b/community/libwww/PKGBUILD index 10909908d..e9095de15 100644 --- a/community/libwww/PKGBUILD +++ b/community/libwww/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 99890 2013-10-31 02:18:38Z allan $ +# $Id: PKGBUILD 101040 2013-11-15 12:42:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Buharev Vasilij <buharev.v.p@gmail.com> pkgname=libwww pkgver=5.4.0 -pkgrel=5 +pkgrel=6 pkgdesc="A general-purpose client side WEB API" arch=('i686' 'x86_64') url="http://www.w3.org/Library/" license=('W3C') -depends=() +depends=('openssl') makedepends=('gcc pkgconfig perl zlib openssl') source=(http://www.w3.org/Library/Distribution/w3c-$pkgname-$pkgver.tgz) md5sums=('c3734ca6caa405707e134cc8c6d7e422') +prepare() { + cd "$srcdir/w3c-$pkgname-$pkgver" + sed -i 's|\${CC-cc}|${CC-cc} -O2 |g' ./configure +} + build() { cd "$srcdir/w3c-$pkgname-$pkgver" + unset LDFLAGS [ -f Makefile ] || ./configure --prefix=/usr \ - --with-md5 --with-zlib --with-expat --with-regex --with-ssl - sed -i 's#Examples##' Library/Makefile + --with-md5 --with-zlib --with-expat --with-regex --with-ssl make +} + +package() { + cd "$srcdir/w3c-$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index 83080cbae..617ec1f89 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100476 2013-11-04 22:51:26Z alucryd $ +# $Id: PKGBUILD 101357 2013-11-23 12:07:27Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') -pkgver=1.8.1 -pkgrel=3 +pkgver=1.8.5 +pkgrel=2 epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64') @@ -19,22 +19,19 @@ source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbas 'lightdm-autologin.pam' 'lightdm.rules' 'lightdm-default-config.patch' - 'lightdm-xdg-session-class.patch' 'Xsession') -sha256sums=('e749ea72ac2517f592a8dfcd8bbdf7aba6729cb75c569c03347751d87f99305a' +sha256sums=('c1a55800628c7a683a529e32646eae4be32295a09af049c9b15387acff0232a2' '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a' 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a' 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' '0b2f740616110887d5c8662e40f1a8350fc0dfa6c7e99f6e3a5636c6b0ca714f' - '1d991d60c8212c9c763c62ffea8401d69b0be39a4d006cccb8e06676d56e5a55' - '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4') + '4d5674906742200b3c171f978457e943560f2c10a2b9156fcd44da3796d185a2') prepare() { cd ${pkgbase}-${pkgver} - patch -Np0 -i ../lightdm-xdg-session-class.patch patch -Np1 -i ../lightdm-default-config.patch } diff --git a/community/lightdm/Xsession b/community/lightdm/Xsession index 589205342..6af8f3f61 100644 --- a/community/lightdm/Xsession +++ b/community/lightdm/Xsession @@ -52,22 +52,6 @@ if [ -d "$xinitdir" ]; then done fi -# Load xsession scripts -xsessionddir="/etc/X11/xsession.d" -if [ -d "$xsessionddir" ]; then - for i in `ls $xsessionddir`; do - script="$xsessionddir/$i" - echo "Loading X session script $script" - if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then - . "$script" - fi - done -fi -if [ -x "$HOME/.xsession" -a -f "$HOME/.xsession" ]; then - echo "Loading user X session script" - . "$HOME/.xsession" -fi - echo "X session wrapper complete, running session $@" exec $@ diff --git a/community/lightdm/lightdm-xdg-session-class.patch b/community/lightdm/lightdm-xdg-session-class.patch deleted file mode 100755 index cd9093cf3..000000000 --- a/community/lightdm/lightdm-xdg-session-class.patch +++ /dev/null @@ -1,130 +0,0 @@ -=== modified file 'src/seat.c' ---- src/seat.c 2013-10-03 21:38:07 +0000 -+++ src/seat.c 2013-10-21 22:55:16 +0000 -@@ -1075,6 +1075,7 @@ - g_signal_connect (greeter_session, "stopped", G_CALLBACK (session_stopped_cb), seat); - - set_session_env (SESSION (greeter_session)); -+ session_set_env (SESSION (greeter_session), "XDG_SESSION_CLASS", "greeter"); - - session_set_pam_service (SESSION (greeter_session), GREETER_SERVICE); - if (getuid () == 0) - -=== modified file 'src/session-child.c' ---- src/session-child.c 2013-07-26 02:27:41 +0000 -+++ src/session-child.c 2013-10-21 22:55:16 +0000 -@@ -213,7 +213,6 @@ - gchar *authentication_result_string; - gchar *service; - gchar *username; -- gchar *class; - gchar *tty; - gchar *remote_host_name; - gchar *xdisplay; -@@ -284,7 +283,7 @@ - username = read_string (); - read_data (&do_authenticate, sizeof (do_authenticate)); - read_data (&is_interactive, sizeof (is_interactive)); -- class = read_string (); -+ read_string (); /* Used to be class, now we just use the environment variable */ - tty = read_string (); - remote_host_name = read_string (); - xdisplay = read_string (); -@@ -480,7 +479,7 @@ - g_variant_builder_init (&ck_parameters, G_VARIANT_TYPE ("(a(sv))")); - g_variant_builder_open (&ck_parameters, G_VARIANT_TYPE ("a(sv)")); - g_variant_builder_add (&ck_parameters, "(sv)", "unix-user", g_variant_new_int32 (user_get_uid (user))); -- if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) == 0) -+ if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") == 0) - g_variant_builder_add (&ck_parameters, "(sv)", "session-type", g_variant_new_string ("LoginWindow")); - if (xdisplay) - { -@@ -601,7 +600,7 @@ - if (child_pid > 0) - { - /* Log to utmp */ -- if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0) -+ if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0) - { - struct utmpx ut; - struct timeval tv; -@@ -632,7 +631,7 @@ - child_pid = 0; - - /* Log to utmp */ -- if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0) -+ if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0) - { - struct utmpx ut; - struct timeval tv; - -=== modified file 'src/session.c' ---- src/session.c 2013-09-19 14:53:48 +0000 -+++ src/session.c 2013-10-21 22:43:11 +0000 -@@ -84,9 +84,6 @@ - /* File to log to */ - gchar *log_filename; - -- /* Seat class */ -- gchar *class; -- - /* tty this session is running on */ - gchar *tty; - -@@ -200,14 +197,6 @@ - } - - void --session_set_class (Session *session, const gchar *class) --{ -- g_return_if_fail (session != NULL); -- g_free (session->priv->class); -- session->priv->class = g_strdup (class); --} -- --void - session_set_display_server (Session *session, DisplayServer *display_server) - { - g_return_if_fail (session != NULL); -@@ -615,7 +604,7 @@ - write_string (session, session->priv->username); - write_data (session, &session->priv->do_authenticate, sizeof (session->priv->do_authenticate)); - write_data (session, &session->priv->is_interactive, sizeof (session->priv->is_interactive)); -- write_string (session, session->priv->class); -+ write_string (session, NULL); /* Used to be class, now we just use the environment variable */ - write_string (session, session->priv->tty); - write_string (session, session->priv->remote_host_name); - write_string (session, session->priv->xdisplay); -@@ -874,7 +863,6 @@ - g_free (self->priv->messages); - g_free (self->priv->authentication_result_string); - g_free (self->priv->log_filename); -- g_free (self->priv->class); - g_free (self->priv->tty); - g_free (self->priv->xdisplay); - if (self->priv->x_authority) - -=== modified file 'src/session.h' ---- src/session.h 2013-08-14 20:14:16 +0000 -+++ src/session.h 2013-10-21 22:55:16 +0000 -@@ -57,10 +57,6 @@ - SESSION_TYPE_REMOTE - } SessionType; - --#define XDG_SESSION_CLASS_USER "user" --#define XDG_SESSION_CLASS_GREETER "greeter" --#define XDG_SESSION_CLASS_LOCK_SCREEN "lock-screen" -- - GType session_get_type (void); - - Session *session_new (void); -@@ -83,8 +79,6 @@ - - void session_set_log_file (Session *session, const gchar *filename); - --void session_set_class (Session *session, const gchar *class); -- - void session_set_display_server (Session *session, DisplayServer *display_server); - - DisplayServer *session_get_display_server (Session *session); - diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index 9502f54ef..c179fafe6 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92554 2013-06-08 11:18:50Z bpiotrowski $ +# $Id: PKGBUILD 102973 2013-12-25 08:45:14Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,7 +6,7 @@ pkgname=lilypond pkgver=2.16.2 -pkgrel=3 +pkgrel=4 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64') url="http://lilypond.org" @@ -15,9 +15,13 @@ depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' 'gsfonts' 'texi2html') options=('emptydirs') -install=lilypond.install -source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz) -md5sums=('6db27f17d47e4f66a3b0716c65db3041') +#install=lilypond.install +source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz + lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch + lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch) +md5sums=('6db27f17d47e4f66a3b0716c65db3041' + '121ac86f1004338ae20ad55a5690c0ad' + 'fa5073506f0e4dd96fb1858e3a75e08e') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -32,6 +36,10 @@ prepare() { sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure rm -rf python/out/ + + # Fix build + patch -Np1 -i "$srcdir/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch" + patch -Np1 -i "$srcdir/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch" } build() { @@ -39,6 +47,7 @@ build() { export PYTHON=/usr/bin/python2 export GUILE=/usr/bin/guile1.8 export GUILE_CONFIG=/usr/bin/guile-config1.8 + export LDFLAGS="$LDFLAGS -lpthread" ./configure --prefix=/usr --disable-documentation make } diff --git a/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch b/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch new file mode 100644 index 000000000..57b5b8ef6 --- /dev/null +++ b/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch @@ -0,0 +1,29 @@ +From: Julien Rioux <julien.rioux@gmail.com> +Date: Mon, 28 Oct 2013 20:42:43 +0000 (+0100) +Subject: Build: Fix compilation with GNU make 4.0 +X-Git-Tag: release/2.17.95-1~4^2 +X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=1ca9814191d16fd3c571d93035247db039254fc1;hp=025f0236ebab947e6fe2047f20b7f74f4cec3fc4 + +Build: Fix compilation with GNU make 4.0 + +Fix "recipes commence before first target" error. + +Patch from Thomas Klausner. +--- + +diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make +index 8919dab..8a0dd76 100644 +--- a/stepmake/stepmake/po-targets.make ++++ b/stepmake/stepmake/po-targets.make +@@ -37,10 +37,10 @@ ifneq ($(strip $(ALL_PO_SOURCES)),) + --keyword=_ --keyword=_f --keyword=_i \ + $(XGETTEXT_FLAGS) $(ALL_PO_SOURCES) + endif +-endif + sed -i '1,2d' $(po-outdir)/$(package).po + sed -i -e 's/^\# This file is distributed.*/$(sed-header)/' $(po-outdir)/$(package).po + sed -i -e 's/^\"Content-Type: text\/plain.*/$(sed-content)/' $(po-outdir)/$(package).po ++endif + + + po-update: po diff --git a/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch b/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch new file mode 100644 index 000000000..ad0c3d4fe --- /dev/null +++ b/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch @@ -0,0 +1,63 @@ +From: Werner Lemberg <wl@gnu.org> +Date: Thu, 5 Dec 2013 14:01:48 +0000 (+0100) +Subject: Issue 3694: Use standard inclusion scheme for FreeType headers. +X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=7705e46966bfa05015fb9fb20c68da844ab88028;hp=88435714e762229ebe2715bcf6863eb89c1f8dff + +Issue 3694: Use standard inclusion scheme for FreeType headers. + +The most recent FreeType release (2.5.1) has changed locations for header +files. Using the standard way, this is not visible to applications. +--- + +diff --git a/lily/freetype-error.cc b/lily/freetype-error.cc +index 00e5cae..88af76c 100644 +--- a/lily/freetype-error.cc ++++ b/lily/freetype-error.cc +@@ -31,7 +31,7 @@ const struct Freetype_error_message + const char *err_msg; + } ft_errors[] = + +-#include <freetype/fterrors.h> ++#include FT_ERRORS_H + + ; + +diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc +index df6a744..837a1f2 100644 +--- a/lily/open-type-font.cc ++++ b/lily/open-type-font.cc +@@ -23,7 +23,7 @@ + + using namespace std; + +-#include <freetype/tttables.h> ++#include FT_TRUETYPE_TABLES_H + + #include "dimensions.hh" + #include "freetype.hh" +diff --git a/lily/pango-font.cc b/lily/pango-font.cc +index ee986fc..b148a5b 100644 +--- a/lily/pango-font.cc ++++ b/lily/pango-font.cc +@@ -22,7 +22,7 @@ + #define PANGO_ENABLE_BACKEND + + #include <pango/pangoft2.h> +-#include <freetype/ftxf86.h> ++#include FT_XFREE86_H + + #include <map> + #include <cstdio> +diff --git a/lily/ttf.cc b/lily/ttf.cc +index eaeb67a..6d7f97b 100644 +--- a/lily/ttf.cc ++++ b/lily/ttf.cc +@@ -20,7 +20,7 @@ + #include <cstdio> + #include "freetype.hh" + +-#include <freetype/tttables.h> ++#include FT_TRUETYPE_TABLES_H + + #include "international.hh" + #include "memory-stream.hh" diff --git a/community/lincity-ng/PKGBUILD b/community/lincity-ng/PKGBUILD index ee4e04a08..ba0eac0e0 100644 --- a/community/lincity-ng/PKGBUILD +++ b/community/lincity-ng/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 75818 2012-09-01 20:39:35Z heftig $ +# $Id: PKGBUILD 100932 2013-11-13 12:48:37Z heftig $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lincity-ng pkgver=2.0 -pkgrel=5.1 +pkgrel=6 pkgdesc="A city simulation game" arch=('i686' 'x86_64') -url="https://fedorahosted.org/LinCity-NG" +url="http://sourceforge.net/projects/lincity-ng.berlios/" license=('GPL' 'custom') -depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'gcc-libs' 'libgl') -makedepends=('ftjam' 'mesa') +depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'libgl') +makedepends=('ftjam' 'mesa' 'glu') source=(http://sourceforge.net/projects/${pkgname}.berlios/files/${pkgname}-${pkgver}.tar.bz2) sha1sums=('2961a3f60f7481b33858d7d5ef7cf9c788d01077') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr jam } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} jam -sprefix="${pkgdir}/usr" install install -D -m644 COPYING-data.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-data.txt" install -D -m644 COPYING-fonts.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-fonts.txt" diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index c9169eea7..9a061562f 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98972 2013-10-21 20:21:28Z seblu $ +# $Id: PKGBUILD 102150 2013-12-05 21:53:38Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=linux-tools @@ -8,7 +8,7 @@ pkgname=('linux-tools-meta' 'cpupower' 'x86_energy_perf_policy' 'usbip') -pkgver=3.11 +pkgver=3.12 pkgrel=2 license=('GPL2') arch=('i686' 'x86_64') @@ -25,13 +25,14 @@ makedepends+=('pciutils') makedepends+=('glib2' 'sysfsutils') groups=("$pkgbase") source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz" -# "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.5.xz" + "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz" 'cpupower.default' 'cpupower.systemd' 'cpupower.service' 'usbipd.service') # http://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc -sha256sums=('803ec8f0ad4b2ddedcb0332a590cd2b5e10dfc57c3b1c95bc9c46af81d51d7f9' +sha256sums=('2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02' + '22f2f3249e9014693a487c9734dc4142d89ed8bd9e3b2a74128208f5ea7e47d6' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' diff --git a/community/linuxconsole/PKGBUILD b/community/linuxconsole/PKGBUILD new file mode 100644 index 000000000..b7e9de300 --- /dev/null +++ b/community/linuxconsole/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 100995 2013-11-14 11:37:01Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Andrzej Giniewicz <gginiu@gmail.com> + +pkgname=linuxconsole +pkgver=1.4.6 +pkgrel=1 +pkgdesc="Set of utilities for joysticks and serial devices" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/linuxconsole/" +license=('GPL') +makedepends=('sdl') +provides=('joystick' 'inputattach') +replaces=('joystick' 'inputattach') +optdepends=('sdl: for ffmvforce utility') +source=(http://prdownloads.sourceforge.net/linuxconsole/linuxconsoletools-$pkgver.tar.bz2 + 'inputattach.conf.d' + 'inputattach.service' + 'inputattachctl') +md5sums=('9115e08e3a2193b62da46d0e02852787' + '7ca903e54829764c8241233af5069216' + 'c19b9ed38b243191cf5378b87a42a4cc' + '7dd0690a9d2fe5e1052900650906e273') + +build() { + cd "${srcdir}"/linuxconsoletools-$pkgver + make +} + +package() { + cd "${srcdir}"/linuxconsoletools-$pkgver + make PREFIX=/usr DESTDIR="${pkgdir}" install + + install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl + install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach" + install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service +} diff --git a/community/inputattach/inputattach.conf.d b/community/linuxconsole/inputattach.conf.d index ae8d1842a..ae8d1842a 100644 --- a/community/inputattach/inputattach.conf.d +++ b/community/linuxconsole/inputattach.conf.d diff --git a/community/inputattach/inputattach.service b/community/linuxconsole/inputattach.service index 2ec902c09..2ec902c09 100644 --- a/community/inputattach/inputattach.service +++ b/community/linuxconsole/inputattach.service diff --git a/community/inputattach/inputattachctl b/community/linuxconsole/inputattachctl index 05dfa4af5..05dfa4af5 100755 --- a/community/inputattach/inputattachctl +++ b/community/linuxconsole/inputattachctl diff --git a/community/linuxdoc-tools/PKGBUILD b/community/linuxdoc-tools/PKGBUILD index 22c533374..0803976eb 100644 --- a/community/linuxdoc-tools/PKGBUILD +++ b/community/linuxdoc-tools/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: David Ell <david at bytesizebits dot net> pkgname=linuxdoc-tools -pkgver=0.9.68 +pkgver=0.9.69 pkgrel=1 pkgdesc="Convert LinuxDoc SGML source into other formats" arch=('i686' 'x86_64') @@ -11,13 +11,17 @@ url="http://packages.debian.org/sid/linuxdoc-tools" license=('GPL') depends=('jade') optdepends=('groff' 'texlive-bin') -source=(http://ftp.de.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver}.tar.gz) -md5sums=('68434f800ab3b68f44da790cc61cf766') +source=(http://ftp.de.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz) +md5sums=('1d13d500918a7a145b0edc2f16f61dd1') build() { cd "$srcdir/$pkgname-$pkgver" sed -i '/extern int yyleng;/d' rtf-fix/rtf2rtf.l ./configure --prefix=/usr --mandir=/usr/share/man make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/community/linuxtv-dvb-apps/PKGBUILD b/community/linuxtv-dvb-apps/PKGBUILD index c99735f62..b3c49f876 100644 --- a/community/linuxtv-dvb-apps/PKGBUILD +++ b/community/linuxtv-dvb-apps/PKGBUILD @@ -1,32 +1,40 @@ -# $Id: PKGBUILD 80369 2012-11-21 04:04:30Z jconder $ +# $Id: PKGBUILD 102879 2013-12-23 10:19:57Z bgyorgy $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Camille Moncelier <pix@devlife.org> pkgname=linuxtv-dvb-apps -pkgver=1486 +pkgver=1504 pkgrel=1 -_hgrev=3fc7dfa68484 -pkgdesc='Viewer programs for DVB cards' +_hgrev=d40083fff895 +pkgdesc='Linux DVB API applications and utilities' arch=('i686' 'x86_64') url='http://www.linuxtv.org/' license=('GPL') -source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2") -sha256sums=('60cfd45fe7417a4445a7814ce6e645ddaad0f8e934015c09d53eb93c8739b35a') +depends=('glibc') +makedepends=('mercurial') +source=("hg+http://linuxtv.org/hg/dvb-apps/#revision=$_hgrev") +sha256sums=('SKIP') -build() { - cd "dvb-apps-$_hgrev" - rm -rf include - - make -C lib - make -C util +pkgver() { + cd "dvb-apps" + echo $(hg identify -n) } -package() { - cd "dvb-apps-$_hgrev" +prepare() { + cd "dvb-apps" + # Fix build + sed -i '/$(sharedir)\/dvb\//d' util/scan/Makefile +} - make -C lib DESTDIR="$pkgdir" install - make -C util DESTDIR="$pkgdir" install +build() { + cd "dvb-apps" + make +} - chmod 755 "$pkgdir"/usr/lib/*.so* +package() { + cd "dvb-apps" + make DESTDIR="$pkgdir" install + # Remove conflict with xbase (FS#37862) + mv "$pkgdir"/usr/bin/{zap,dvbzap} } diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD index 8694c7513..99f620f92 100644 --- a/community/lockdev/PKGBUILD +++ b/community/lockdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97056 2013-09-11 21:00:47Z bgyorgy $ +# $Id: PKGBUILD 102542 2013-12-13 15:59:07Z bgyorgy $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <a.wagner@stud.uni-frankfurt.de> @@ -6,29 +6,32 @@ pkgname=lockdev pkgver=1.0.3_1.5 _pkgver=1.0.3 -pkgrel=3 +pkgrel=4 pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.' url='http://packages.qa.debian.org/l/lockdev.html' license=("GPL") arch=('i686' 'x86_64') +depends=('glibc') source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz" "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz" - 'build.patch') + 'build.patch' + 'gcc-4.7.patch') md5sums=('64b9c1b87b125fc348e892e24625524a' 'c4e8a5a2e46b76b48339c232b358f579' - '2db93cadf6670ddcd01de4bfc22a35e1') + '2db93cadf6670ddcd01de4bfc22a35e1' + 'e16faebfa2d162d40830ef6f2700b7ba') prepare() { cd "${pkgname}-${_pkgver}" patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff" sed -i "s|CFLAGS = -g|CFLAGS = -g -fPIC|" Makefile patch -p1 -i ../build.patch # FS#33280 + patch -p1 -i ../gcc-4.7.patch # FS#34457 } build() { cd "${pkgname}-${_pkgver}" - make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC" - make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC" + make CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC" } package() { diff --git a/community/lockdev/gcc-4.7.patch b/community/lockdev/gcc-4.7.patch new file mode 100644 index 000000000..3b11e0b92 --- /dev/null +++ b/community/lockdev/gcc-4.7.patch @@ -0,0 +1,18 @@ +diff -Naur lockdev-1.0.3.orig/src/ttylock.h lockdev-1.0.3/src/ttylock.h +--- lockdev-1.0.3.orig/src/ttylock.h 2013-12-13 15:34:52.195877321 +0000 ++++ lockdev-1.0.3/src/ttylock.h 2013-12-13 15:38:16.131190480 +0000 +@@ -36,10 +36,10 @@ + + /* API of the library */ + +-int ttylock (char * devname); +-int ttywait (char * devname); +-int ttyunlock (char * devname); +-int ttylocked (char * devname); ++static inline int ttylock (char * devname); ++static inline int ttywait (char * devname); ++static inline int ttyunlock (char * devname); ++static inline int ttylocked (char * devname); + + + static inline int diff --git a/community/log4cpp/PKGBUILD b/community/log4cpp/PKGBUILD index a21144a70..7db5c9930 100644 --- a/community/log4cpp/PKGBUILD +++ b/community/log4cpp/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 99897 2013-10-31 02:20:59Z allan $ +# $Id: PKGBUILD 102767 2013-12-19 14:04:47Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor : Geraud Le Falher <daureg@gmail.com> pkgname=log4cpp -pkgver=1.1 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc="A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations." arch=('i686' 'x86_64') url="http://log4cpp.sourceforge.net/" license=('LGPL') depends=('gcc-libs') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('b9ef6244baa5e5e435f35e0b9474b35d') +md5sums=('1e173df8ee97205f412ff84aa93b8fbe') build() { cd "$srcdir/$pkgname" + export CXXFLAGS="$CXXFLAGS -lpthread" ./configure --prefix=/usr --disable-doxygen --disable-dot --without-idsa make } diff --git a/community/lorcon/PKGBUILD b/community/lorcon/PKGBUILD index b1db5a746..30bac1745 100644 --- a/community/lorcon/PKGBUILD +++ b/community/lorcon/PKGBUILD @@ -1,42 +1,45 @@ -# $Id: PKGBUILD 99899 2013-10-31 02:21:39Z allan $ +# $Id: PKGBUILD 101007 2013-11-14 20:43:40Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: fnord0 [fnord0 <AT> riseup <DOT> net] # Contributor: dninja <dninja@gmail.com> +# Contributor: Jon Gjengset <jon@thesquareplanet.com> pkgname=lorcon -pkgver=224 -pkgrel=2 -pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames" +pkgver=2.0.0.20091101 +pkgrel=1 +epoch=1 +pkgdesc='Generic library for injecting 802.11 frames' url='http://802.11ninja.net/' license=('GPL') arch=('x86_64' 'i686') depends=('libpcap') -makedepends=('subversion') -replaces=('lorcon-old-svn') -_svntrunk="http://802.11ninja.net/svn/lorcon/trunk" -_svnrev=$pkgver +makedepends=('git') +source=('git+https://code.google.com/p/lorcon/') +md5sums=('SKIP') + +pkgver() { + cd "$pkgname" + + major=$(cat Makefile.in | grep -E "^MAJOR " | sed 's/^.*= *//') + minor=$(cat Makefile.in | grep -E "^MINOR " | sed 's/^.*= *//') + tiny=$(cat Makefile.in | grep -E "^TINY " | sed 's/^.*= *//') + version=$(cat Makefile.in | grep -E "^VERSION " | sed 's/^.*= *//') + echo "$major.$minor.$tiny.$version" +} + +prepare() { + cd "$pkgname" -build() { - cd "$srcdir" - - if [ -d "$_svnmod/.svn" ]; then - (cd "$_svnmod" && svn up -r "$_svnrev") - else - svn co "$_svntrunk/$_svnmod" --config-dir ./ -r \ - "$_svnrev" "$_svnmod" - fi - msg "SVN checkout done or server timeout" - cd "$_svnmod" - ./configure --prefix=/usr --mandir=/usr/share/man - make } -package() { - cd "$_svnmod" +build() { + make -C "$pkgname" +} - make DESTDIR="$pkgdir" install +package() { + make -C "$pkgname" DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/love/PKGBUILD b/community/love/PKGBUILD index 0fc743ccc..30429d74f 100644 --- a/community/love/PKGBUILD +++ b/community/love/PKGBUILD @@ -2,31 +2,20 @@ # Contributor: Linus Sjögren <thelinx@unreliablepollution.net> # Contributor: Eric Forgeot < http://anamnese.online.fr >, dreeze pkgname=love -pkgver=0.8.0 +pkgver=0.9.0 pkgrel=2 pkgdesc="An open-source 2D game engine which uses the versatile Lua scripting language to create dynamic gaming experiences" arch=(i686 x86_64) url="http://love2d.org/" license=('zlib') -depends=('luajit' 'physfs' 'freetype2' 'devil' 'mpg123' 'openal' 'libvorbis' 'libmodplug' 'sdl' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils') +depends=('luajit' 'physfs' 'freetype2' 'devil' 'mpg123' 'openal' 'libvorbis' 'libmodplug' 'sdl2' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils') install=love.install -source=("https://bitbucket.org/rude/love/downloads/love-${pkgver}-linux-src.tar.gz" - "https://bitbucket.org/rude/love/raw/$pkgver/license.txt" - "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/app.svg" - "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/game.svg" - "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/love.desktop" - "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/love.xml") -md5sums=('9db9c32585fc7c7da3eba7e438783099' - 'a4890908149d91bc042b30d00c121c58' - 'a1e19f91420cc519a683af360f5b1120' - '16f2ecc899c9ffc8b7b7c807f8967861' - '971bec1bffe4f424972eef2a26d27bec' - 'b4f00fb1cb80057a0a371a994100d418') +source=("https://bitbucket.org/rude/love/downloads/love-${pkgver}-linux-src.tar.gz") +md5sums=('6591752af4e33f521d616d9b048aa894') build() { cd "$srcdir"/love-$pkgver - #./platform/unix/automagic - ./configure --prefix=/usr --with-luajit #LDFLAGS="$LDFLAGS -Wl,--no-as-needed" + ./configure --prefix=/usr make } @@ -35,17 +24,7 @@ package() { make DESTDIR="$pkgdir" install - mkdir -p "$pkgdir/usr/share/licenses/$pkgname" - mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/mimetypes" - mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/apps" - mkdir -p "$pkgdir/usr/share/applications" - mkdir -p "$pkgdir/usr/share/mime/packages" - - install -Dm0644 "$srcdir/license.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm0644 "$srcdir/app.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/love.svg" - install -Dm0644 "$srcdir/game.svg" "$pkgdir/usr/share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-love-game.svg" - install -Dm0644 "$srcdir/love.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm0644 "$srcdir/love.xml" "$pkgdir/usr/share/mime/packages/love.xml" + install -Dm0644 "license.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/love/love.install b/community/love/love.install index dbc25459b..5badb6372 100644 --- a/community/love/love.install +++ b/community/love/love.install @@ -1,6 +1,6 @@ post_install() { update-desktop-database -q - update-mime-database usr/share/mime + update-mime-database usr/share/mime &> /dev/null gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/community/love08/PKGBUILD b/community/love08/PKGBUILD new file mode 100644 index 000000000..245a75b9f --- /dev/null +++ b/community/love08/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Linus Sjögren <thelinx@unreliablepollution.net> +# Contributor: Eric Forgeot < http://anamnese.online.fr >, dreeze +pkgname=love08 +pkgver=0.8.0 +pkgrel=1 +pkgdesc="An open-source 2D game engine which uses the versatile Lua scripting language to create dynamic gaming experiences" +arch=(i686 x86_64) +url="http://love2d.org/" +license=('zlib') +depends=('luajit' 'physfs' 'freetype2' 'devil' 'mpg123' 'openal' 'libvorbis' 'libmodplug' 'sdl' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'libgl' 'glu') +makedepends=('mesa') +source=("https://bitbucket.org/rude/love/downloads/love-${pkgver}-linux-src.tar.gz") +md5sums=('9db9c32585fc7c7da3eba7e438783099') + +build() { + cd "$srcdir"/love-$pkgver + sed -i "s|freetype/|freetype2/|g" src/modules/font/freetype/{TrueTypeRasterizer.h,Font.h} + ./configure --program-suffix=08 --prefix=/usr --with-luajit + make +} + +package() { + cd "$srcdir"/love-$pkgver + + make DESTDIR="$pkgdir" install + + install -Dm0644 "license.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/ltris/PKGBUILD b/community/ltris/PKGBUILD index 25569c0ba..a35b71eda 100644 --- a/community/ltris/PKGBUILD +++ b/community/ltris/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100352 2013-11-02 15:47:29Z jlichtblau $ +# $Id: PKGBUILD 102907 2013-12-23 20:48:51Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> pkgname=ltris pkgver=1.0.19 -pkgrel=1 +pkgrel=2 pkgdesc="A tetris clone where you have a bowl with blocks falling down" arch=('i686' 'x86_64') url="http://lgames.sourceforge.net/index.php?project=LTris" @@ -31,4 +31,6 @@ package() { install -d ${pkgdir}/usr/share/pixmaps install -m644 icons/ltris{16,32,48}.xpm ${pkgdir}/usr/share/pixmaps +#FS#37951 fix + chmod 775 ${pkgdir}/var/games } diff --git a/community/ltris/ltris.changelog b/community/ltris/ltris.changelog index 325b8d524..948c4fce3 100644 --- a/community/ltris/ltris.changelog +++ b/community/ltris/ltris.changelog @@ -1,3 +1,8 @@ +2013-12-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * ltris 1.0.19-2 + * FS#37951 fix + 2013-11-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * ltris 1.0.19-1 diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD index 497e28d5a..a073f48fb 100644 --- a/community/luajit/PKGBUILD +++ b/community/luajit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92307 2013-06-03 20:18:47Z bpiotrowski $ +# $Id: PKGBUILD 102287 2013-12-07 10:57:57Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Chris Brannon <chris@the-brannons.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> @@ -6,7 +6,7 @@ pkgname=luajit pkgver=2.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1' arch=('i686' 'x86_64') url='http://luajit.org/' @@ -16,14 +16,13 @@ source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz) sha256sums=('c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38') build() { - cd $srcdir/LuaJIT-$pkgver + cd LuaJIT-$pkgver make amalg PREFIX=/usr } package() { - cd $srcdir/LuaJIT-$pkgver - make install DESTDIR=$pkgdir PREFIX=/usr + cd LuaJIT-$pkgver + make install DESTDIR="$pkgdir" PREFIX=/usr - install -Dm644 $srcdir/LuaJIT-$pkgver/COPYRIGHT \ - $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT + install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT } diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index fd6f427da..e1711b762 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99666 2013-10-30 21:24:19Z stativ $ +# $Id: PKGBUILD 102257 2013-12-07 10:36:41Z bpiotrowski $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=('luxrays' 'luxmark') -pkgver=1.3 -_pkgver=d16b0f132b4a -pkgrel=1 +pkgver=1.3.1 +_pkgver=7459cd8a9583 +pkgrel=2 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64') url="http://www.luxrender.net/" @@ -14,7 +14,7 @@ options=('staticlibs') source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \ http://www.luxrender.net/release/luxmark/room_scene_v2.1.zip \ luxmark_scenes_path.diff QTBUG-22829.diff) -md5sums=('1bece7823fe1f9e177fec4efdf637ca5' +md5sums=('859999e5e07550553fb310a7f48530a4' 'ae917f025e32e20b1d20ebf8d22204cb' '1fd2a6f32e2822b5e0f147304292a1b9' '6e20ee7ea64c578431d51065d0871abc') diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD index 8febf7adf..731b016b9 100644 --- a/community/lxappearance/PKGBUILD +++ b/community/lxappearance/PKGBUILD @@ -1,24 +1,25 @@ -#$Id: PKGBUILD 99433 2013-10-28 19:01:06Z bpiotrowski $ +#$Id: PKGBUILD 101232 2013-11-20 09:52:30Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxappearance pkgver=0.5.3 -pkgrel=1 +pkgrel=2 pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop' arch=('i686' 'x86_64') license=('GPL2') url='http://lxde.org/' groups=('lxde') -depends=('gtk2') +depends=('gtk2' 'dbus-glib') makedepends=('intltool') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) md5sums=('9dfdc9bd45519d51b9df2ad6650c36f5') build() { cd $pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr + ./configure --sysconfdir=/etc --prefix=/usr \ + --enable-dbus make } diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index 354f1cafc..a357ac070 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93086 2013-06-24 09:48:17Z spupykin $ +# $Id: PKGBUILD 103083 2013-12-26 10:01:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Zucchelli <zukka77@gmail.com> # Contributor: Daniel Micay <danielmicay@gmail.com> @@ -8,16 +8,21 @@ pkgname=lxc pkgver=0.9.0 epoch=1 -pkgrel=4 +pkgrel=5 pkgdesc="Linux Containers" arch=('i686' 'x86_64') -url="http://lxc.sourceforge.net/" +url="http://linuxcontainers.org" depends=('bash' 'perl' 'libseccomp') makedepends=('docbook2x') optdepends=('arch-install-scripts: for archlinux template') license=('LGPL') -source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz") -md5sums=('8552a4479090616f4bc04d8473765fc9') +install=lxc.install +source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz" + "lxc.tmpfiles.d" + "lxc@.service") +md5sums=('8552a4479090616f4bc04d8473765fc9' + 'df94c9fb8a753011c86ee664e9f521ff' + '8003139e60ea66c05460660f31780706') prepare() { cd "$srcdir/$pkgname-${pkgver/_/-}" @@ -45,6 +50,8 @@ package() { make DESTDIR="$pkgdir" install install -d -m755 "$pkgdir/var/lib/lxc" + install -D -m644 ${srcdir}/lxc@.service ${pkgdir}/usr/lib/systemd/system/lxc@.service + install -D -m644 ${srcdir}/lxc.tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/lxc.conf cd doc find . -type f -name '*.1' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man1/{}" \; diff --git a/community/lxc/lxc.install b/community/lxc/lxc.install new file mode 100644 index 000000000..618910953 --- /dev/null +++ b/community/lxc/lxc.install @@ -0,0 +1,8 @@ +post_upgrade() { + [[ $(vercmp "$1" 1:1) -le 0 ]] && return 0 + cat << EOF +* Since v1.0, lxc-shutdown(1) is gone and its functionality is provided by +* lxc-stop(1) by default. The old lxc-stop(1) behavior can be recovered +* with 'lxc-stop --kill'. +EOF +} diff --git a/community/lxc/lxc.tmpfiles.d b/community/lxc/lxc.tmpfiles.d new file mode 100644 index 000000000..04bac4db4 --- /dev/null +++ b/community/lxc/lxc.tmpfiles.d @@ -0,0 +1 @@ +w /sys/fs/cgroup/memory/memory.use_hierarchy - - - - 1 diff --git a/community/glusterfs/glusterd.service b/community/lxc/lxc@.service index b1dd5c18d..7bc87b5dd 100644 --- a/community/glusterfs/glusterd.service +++ b/community/lxc/lxc@.service @@ -1,10 +1,11 @@ [Unit] -Description=Distributed filesystem daemon +Description=%I LXC After=network.target [Service] Type=forking -ExecStart=/usr/bin/glusterd +ExecStart=/usr/bin/lxc-start -d -n %I +ExecStop=/usr/bin/lxc-stop -n %I [Install] WantedBy=multi-user.target diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 4ccae3d07..5b5edba39 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 97132 2013-09-13 13:17:58Z bgyorgy $ +# $Id: PKGBUILD 101508 2013-11-26 19:15:27Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=27 +pkgrel=29 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64') url="http://sourceforge.net/projects/lxdm/" license=('GPL') groups=('lxde') -depends=('gtk2' 'xorg-server' 'iso-codes') -makedepends=('intltool') +depends=('gtk2' 'xorg-server') +makedepends=('intltool' 'iso-codes') optdepends=('gtk-engines: default GTK+ theme' 'librsvg: display the default background') install=$pkgname.install @@ -21,10 +21,14 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz git-fixes.patch - default-config.patch) + default-config.patch + lxdm.pam + Xsession) md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' - '03d0779fbac1a9964776c82e69fbc53e' - 'c61ec8ffd3fe8bd2a6a9178393622f4c') + 'e9367cec197fa2919531f5c623ecec47' + '2ba18992efef43f84061717f0550e4b6' + 'c941ef896248bc7c03901b513490425c' + 'd9c8f8c9e6de52dbc389696454c8f572') prepare(){ cd "$srcdir/$pkgname-$pkgver" @@ -35,8 +39,12 @@ prepare(){ # Adjust Arch-specific settings patch -Np1 -i ../default-config.patch - # Fix version number - sed -i 's/3.6.0/3.8/' gnome-shell/LXDM_User_Switch@dgod/metadata.json + # Use our custom pam and Xsession files + cp ../lxdm.pam pam/lxdm + cp ../Xsession data/Xsession + + # Fix for pulseaudio + echo 'test -x /usr/bin/pax11publish && /usr/bin/pax11publish -r' >>data/PostLogout.in } build() { @@ -56,8 +64,4 @@ package() { install -dm 755 "$pkgdir/var/lib/lxdm" echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment chown -R 121:121 "$pkgdir/var/lib/lxdm" - - # GNOME Shell extension - mkdir -p "$pkgdir/usr/share/gnome-shell/extensions" - cp -r gnome-shell/LXDM_User_Switch@dgod "$pkgdir/usr/share/gnome-shell/extensions" } diff --git a/community/lxdm/Xsession b/community/lxdm/Xsession new file mode 100755 index 000000000..c34de14eb --- /dev/null +++ b/community/lxdm/Xsession @@ -0,0 +1,64 @@ +#!/bin/sh +# +# LXDM wrapper to run around X sessions. + +echo "Running X session wrapper" + +if [ $# -eq 1 -a -n "$1" ]; then + LXSESSION=$1 +else +# default session + LXSESSION=/usr/bin/startlxde +fi + +# Load profile +for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do + if [ -f "$file" ]; then + echo "Loading profile from $file"; + . "$file" + fi +done + +# Load resources +for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do + if [ -f "$file" ]; then + echo "Loading resource: $file" + xrdb -nocpp -merge "$file" + fi +done + +# Load keymaps +for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do + if [ -f "$file" ]; then + echo "Loading keymap: $file" + setxkbmap `cat "$file"` + XKB_IN_USE=yes + fi +done + +# Load xmodmap if not using XKB +if [ -z "$XKB_IN_USE" ]; then + for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do + if [ -f "$file" ]; then + echo "Loading modmap: $file" + xmodmap "$file" + fi + done +fi + +unset XKB_IN_USE + +# Run all system xinitrc shell scripts. +xinitdir="/etc/X11/xinit/xinitrc.d" +if [ -d "$xinitdir" ]; then + for script in $xinitdir/*; do + echo "Loading xinit script $script" + if [ -x "$script" -a ! -d "$script" ]; then + . "$script" + fi + done +fi + +echo "X session wrapper complete, running session $LXSESSION" + +exec $LXSESSION diff --git a/community/lxdm/default-config.patch b/community/lxdm/default-config.patch index 78c9bc00b..67435f94b 100644 --- a/community/lxdm/default-config.patch +++ b/community/lxdm/default-config.patch @@ -10,7 +10,7 @@ diff -Naur lxdm.orig/data/lxdm.conf.in lxdm/data/lxdm.conf.in # uncomment this if you really want xserver listen to tcp # tcp_listen=1 # uncoment this if you want reset the xserver after logou -@@ -34,7 +34,7 @@ +@@ -34,13 +34,13 @@ gtk_theme=Clearlooks ## background of the greeter @@ -19,61 +19,10 @@ diff -Naur lxdm.orig/data/lxdm.conf.in lxdm/data/lxdm.conf.in ## if show bottom pane bottom_pane=1 -diff -Naur lxdm.orig/data/lxdm.in lxdm/data/lxdm.in ---- lxdm.orig/data/lxdm.in 2013-08-30 17:56:16.097006000 +0200 -+++ lxdm/data/lxdm.in 2013-09-04 01:57:56.950799946 +0200 -@@ -1,21 +1,13 @@ - #!/bin/sh --[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n -- --if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then -- . /etc/sysconfig/language -- if [ -n "$RC_LANG"]; then -- LANG=$RC_LANG -- fi -+if [ -r /etc/profile.d/locale.sh ]; then -+ . /etc/profile.d/locale.sh - fi + ## if show language select control +-lang=1 ++lang=0 - if [ -n "$LANG" ]; then - export LANG - fi - --[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop --[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager -- - if [ -n "$DEFAULT_WM" ]; then - PREFERRED=$DEFAULT_WM - fi -diff -Naur lxdm.orig/data/Xsession lxdm/data/Xsession ---- lxdm.orig/data/Xsession 2013-08-30 17:56:16.097006000 +0200 -+++ lxdm/data/Xsession 2013-09-04 01:58:19.941348762 +0200 -@@ -9,6 +9,8 @@ - LXSESSION=/usr/bin/startlxde - fi - -+[ -f /etc/profile ] && . /etc/profile -+[ -f ~/.profile ] && . ~/.profile - [ -f /etc/xprofile ] && . /etc/xprofile - [ -f ~/.xprofile ] && . ~/.xprofile - -diff -Naur lxdm.orig/pam/lxdm lxdm/pam/lxdm ---- lxdm.orig/pam/lxdm 2013-08-30 17:56:16.100339000 +0200 -+++ lxdm/pam/lxdm 2013-08-30 17:58:35.543771605 +0200 -@@ -1,9 +1,7 @@ - #%PAM-1.0 --auth substack system-auth --auth optional pam_gnome_keyring.so --account include system-auth --session optional pam_keyinit.so force revoke --session include system-auth --session optional pam_console.so --session optional pam_gnome_keyring.so auto_start --session optional pam_selinux.so -+auth include system-login -+-auth optional pam_gnome_keyring.so -+account include system-login -+password include system-login -+session include system-login -+-session optional pam_gnome_keyring.so auto_start + ## if show keyboard layout select control + keyboard=0 diff --git a/community/lxdm/git-fixes.patch b/community/lxdm/git-fixes.patch index 6a331cf0b..fed4800ee 100644 --- a/community/lxdm/git-fixes.patch +++ b/community/lxdm/git-fixes.patch @@ -20,7 +20,7 @@ index bfac56b..6f997b8 100644 rpmbuild -bb \ --define "_sourcedir `pwd`" \ diff --git a/configure.ac b/configure.ac -index e952473..8958c9c 100644 +index e952473..22d2e17 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ @@ -30,7 +30,7 @@ index e952473..8958c9c 100644 -AC_INIT([lxdm], [0.4.1], [http://lxde.org/]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) +AC_INIT([lxdm], [0.5.0], [http://lxde.org/]) -+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) ++AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz]) AC_CONFIG_SRCDIR([src/lxdm.c]) AC_CONFIG_HEADERS([config.h]) @@ -690,7 +690,7 @@ index 51ffda4..41c95f4 100644 session optional pam_gnome_keyring.so auto_start +session optional pam_selinux.so diff --git a/src/Makefile.am b/src/Makefile.am -index 7fdfd99..4f9a11c 100644 +index 7fdfd99..8b27291 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,6 +8,7 @@ lxdm_binary_CFLAGS = \ @@ -706,7 +706,7 @@ index 7fdfd99..4f9a11c 100644 lxdm_binary_SOURCES = \ - lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h \ -+ lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h auth.c lxcommon.h \ ++ lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h auth.c auth.h lxcommon.h \ $(NULL) -libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk @@ -748,10 +748,10 @@ index 7fdfd99..4f9a11c 100644 + diff --git a/src/auth.c b/src/auth.c new file mode 100644 -index 0000000..10c047c +index 0000000..7651fbb --- /dev/null +++ b/src/auth.c -@@ -0,0 +1,632 @@ +@@ -0,0 +1,638 @@ +/* + * lxdm.c - main entry of lxdm + * @@ -851,8 +851,8 @@ index 0000000..10c047c +{ + struct passwd *pw; + struct spwd *sp; -+ char *real; -+ char *enc; ++ char *real; ++ char *enc; + if(!user || !user[0]) + { + g_debug("user==NULL\n"); @@ -866,45 +866,45 @@ index 0000000..10c047c + return AUTH_BAD_USER; + } + if(strstr(pw->pw_shell, "nologin")) -+ { -+ g_debug("user %s have nologin shell\n",user); -+ return AUTH_PRIV; -+ } -+ if(type==AUTH_TYPE_AUTO_LOGIN && !pass) -+ { ++ { ++ g_debug("user %s have nologin shell\n",user); ++ return AUTH_PRIV; ++ } ++ if(type==AUTH_TYPE_AUTO_LOGIN && !pass) ++ { + goto out; + } -+ sp = getspnam(user); -+ if( !sp ) -+ { ++ sp = getspnam(user); ++ if( !sp ) ++ { ++ return AUTH_FAIL; ++ } ++ endspent(); ++ real = sp->sp_pwdp; ++ if( !real || !real[0] ) ++ { ++ if( !pass || !pass[0] ) ++ { ++ *ppw = pw; ++ g_debug("user %s auth with no password ok\n",user); ++ return AUTH_SUCCESS; ++ } ++ else ++ { ++ g_debug("user %s password not match\n",user); ++ return AUTH_FAIL; ++ } ++ } ++ enc = crypt(pass, real); ++ if( strcmp(real, enc) ) ++ { ++ g_debug("user %s password not match\n",user); + return AUTH_FAIL; + } -+ endspent(); -+ real = sp->sp_pwdp; -+ if( !real || !real[0] ) -+ { -+ if( !pass || !pass[0] ) -+ { -+ *ppw = pw; -+ g_debug("user %s auth with no password ok\n",user); -+ return AUTH_SUCCESS; -+ } -+ else -+ { -+ g_debug("user %s password not match\n",user); -+ return AUTH_FAIL; -+ } -+ } -+ enc = crypt(pass, real); -+ if( strcmp(real, enc) ) -+ { -+ g_debug("user %s password not match\n",user); -+ return AUTH_FAIL; -+ } +out: -+ g_debug("user %s auth ok\n",pw->pw_name); ++ g_debug("user %s auth ok\n",pw->pw_name); + passwd_copy(&a->pw,pw); -+ return AUTH_SUCCESS; ++ return AUTH_SUCCESS; +} + +int lxdm_auth_session_begin(LXDM_AUTH *a,int tty,int display,char mcookie[16]) @@ -1004,10 +1004,10 @@ index 0000000..10c047c + return AUTH_BAD_USER; + } + if(strstr(pw->pw_shell, "nologin")) -+ { -+ g_debug("user %s have nologin shell\n",user); -+ return AUTH_PRIV; -+ } ++ { ++ g_debug("user %s have nologin shell\n",user); ++ return AUTH_PRIV; ++ } + if(a->handle) pam_end(a->handle,0); + if(PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, (pam_handle_t**)&a->handle)) + { @@ -1046,15 +1046,15 @@ index 0000000..10c047c + char x[256]; + + if(!a->handle) -+ { -+ g_message("begin session without auth\n"); -+ return -1; -+ } ++ { ++ g_message("begin session without auth\n"); ++ return -1; ++ } + sprintf(x, "tty%d", tty); -+ pam_set_item(a->handle, PAM_TTY, x); ++ pam_set_item(a->handle, PAM_TTY, x); +#ifdef PAM_XDISPLAY + sprintf(x,":%d",display); -+ pam_set_item(a->handle, PAM_XDISPLAY, x); ++ pam_set_item(a->handle, PAM_XDISPLAY, x); +#endif +#if !defined(DISABLE_XAUTH) && defined(PAM_XAUTHDATA) + struct pam_xauth_data value; @@ -1064,28 +1064,34 @@ index 0000000..10c047c + value.datalen=16; + pam_set_item (a->handle, PAM_XAUTHDATA, &value); +#endif -+ if(name && name[0]) -+ { -+ char *env; -+ env = g_strdup_printf ("DESKTOP_SESSION=%s", name); -+ pam_putenv (a->handle, env); -+ g_free (env); -+ } ++ if(name && name[0]) ++ { ++ char *env; ++ env = g_strdup_printf ("DESKTOP_SESSION=%s", name); ++ pam_putenv (a->handle, env); ++ g_free (env); ++ } + err = pam_open_session(a->handle, 0); /* FIXME pam session failed */ -+ if( err != PAM_SUCCESS ) -+ g_warning( "pam open session error \"%s\"\n", pam_strerror(a->handle, err)); ++ if( err != PAM_SUCCESS ) ++ g_warning( "pam open session error \"%s\"\n", pam_strerror(a->handle, err)); ++ else ++ a->in_session=1; + return 0; +} + +int lxdm_auth_session_end(LXDM_AUTH *a) +{ + int err; -+ if(!a->handle) ++ if(!a->handle) + return 0; -+ err = pam_close_session(a->handle, 0); -+ pam_end(a->handle, err); -+ a->handle = NULL; -+ passwd_clean(&a->pw); ++ if(a->in_session) ++ { ++ err = pam_close_session(a->handle, 0); ++ a->in_session=0; ++ } ++ pam_end(a->handle, err); ++ a->handle = NULL; ++ passwd_clean(&a->pw); + return 0; +} + @@ -1268,7 +1274,7 @@ index 0000000..10c047c +#include <assert.h> +int lxdm_auth_session_begin(LXDM_AUTH *a,const char *name,int tty,int display,char mcookie[16]) +{ -+ char temp[32]; ++ char temp[256]; + char res[8]; + gchar *b64; + int ret; @@ -1386,10 +1392,10 @@ index 0000000..10c047c + diff --git a/src/auth.h b/src/auth.h new file mode 100644 -index 0000000..84d2267 +index 0000000..5db944e --- /dev/null +++ b/src/auth.h -@@ -0,0 +1,44 @@ +@@ -0,0 +1,45 @@ +/* + * lxdm.c - main entry of lxdm + * @@ -1418,6 +1424,7 @@ index 0000000..84d2267 + struct passwd pw; + int pipe[2]; + int child; ++ int in_session; +}LXDM_AUTH; + +enum{ @@ -2158,10 +2165,74 @@ index 095227b..2c6e5be 100644 g_free(str); return TRUE; diff --git a/src/lxcom.c b/src/lxcom.c -index 02763eb..eef3d1b 100644 +index 02763eb..9491cb2 100644 --- a/src/lxcom.c +++ b/src/lxcom.c -@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout) +@@ -12,37 +12,56 @@ + #include <sys/types.h> + #include <sys/wait.h> + #include <sys/stat.h> ++ ++#if defined(__sun) ++#include <ucred.h> ++#include <sys/filio.h> ++#elif !defined(linux) && !defined(__NetBSD__) ++#include <sys/ucred.h> ++#endif ++ + #include <sys/socket.h> + #include <sys/un.h> + #include <sys/ioctl.h> +-#if !defined(linux) && !defined(__NetBSD__) +-#include <sys/ucred.h> +-#endif + + #ifndef SCM_CREDS +-#define SCM_CREDS SCM_CREDENTIALS ++ #if defined(SCM_CREDENTIALS) ++ #define SCM_CREDS SCM_CREDENTIALS ++ #elif defined(SCM_UCRED) ++ #define SCM_CREDS SCM_UCRED ++ #else ++ #error not support unix socket creds ++ #endif + #endif + + #ifndef linux +-# ifndef __NetBSD__ ++# if defined(__sun) ++# define LXDM_PEER_UID(c) ucred_geteuid(c) ++# define LXDM_PEER_GID(c) ucred_getegid(c) ++# define LXDM_PEER_PID(c) ucred_getpid(c) ++# elif !defined(__NetBSD__) + # define LXDM_PEER_UID(c) ((c)->cr_uid) + # define LXDM_PEER_GID(c) ((c)->cr_groups[0]) ++# define LXDM_PEER_PID -1 + # else + # define LXDM_PEER_UID(c) ((c)->sc_uid) + # define LXDM_PEER_GID(c) ((c)->sc_gid) ++# define LXDM_PEER_PID -1 + # endif +-# define LXDM_PEER_PID -1 + #else + # define LXDM_PEER_UID(c) ((c)->uid) + # define LXDM_PEER_GID(c) ((c)->gid) + # define LXDM_PEER_PID(c) ((c)->pid) + #endif + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) + typedef struct sockcred LXDM_CRED; ++#elif defined(__sun) ++typedef ucred_t LXDM_CRED; + #else + typedef struct ucred LXDM_CRED; + #endif ++ + #include <glib.h> + #include "lxcom.h" + +@@ -89,13 +108,13 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout) static gboolean lxcom_check(GSource *source) { @@ -2170,7 +2241,51 @@ index 02763eb..eef3d1b 100644 } static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data) -@@ -272,6 +272,7 @@ void lxcom_init(const char *sock) + { + char buf[4096]; +- char ctrl[CMSG_SPACE(sizeof(struct ucred))]; ++ char ctrl[/*CMSG_SPACE(sizeof(LXDM_CRED))*/1024]; + struct sockaddr_un peer; + struct iovec v={buf,sizeof(buf)}; + struct msghdr h={&peer,sizeof(peer),&v,1,ctrl,sizeof(ctrl),0}; +@@ -118,16 +137,18 @@ static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer us + char **argv; + GString *res; + +- #ifndef __NetBSD__ +- size = sizeof(LXDM_CRED); +- #else ++ #if defined(__sun) ++ size = ucred_size(); ++ #elif defined(__NetBSD__) + if (cmptr->cmsg_len < SOCKCREDSIZE(0)) break; + size = SOCKCREDSIZE(((cred *)CMSG_DATA(cmptr))->sc_ngroups); ++ #else ++ size = sizeof(LXDM_CRED); + #endif + if (cmptr->cmsg_len != CMSG_LEN(size)) break; +- if (cmptr->cmsg_level != SOL_SOCKET) break; +- if (cmptr->cmsg_type != SCM_CREDS) break; +- c=(LXDM_CRED*)CMSG_DATA(cmptr); ++ if (cmptr->cmsg_level != SOL_SOCKET) break; ++ if (cmptr->cmsg_type != SCM_CREDS) break; ++ c=(LXDM_CRED*)CMSG_DATA(cmptr); + if(g_shell_parse_argv(buf,&argc,&argv,NULL)) + { + res=((LXComFunc)callback)(user_data,LXDM_PEER_UID(c),LXDM_PEER_PID(c),argc,argv); +@@ -259,7 +280,11 @@ void lxcom_init(const char *sock) + strcpy(su.sun_path,sock); + self_server_fd=socket(AF_UNIX,SOCK_DGRAM,0); + assert(self_server_fd!=-1); ++#if defined(__sun) ++ ret=setsockopt(self_server_fd,SOL_SOCKET,SO_RECVUCRED,&on,sizeof(on)); ++#else + ret=setsockopt(self_server_fd,SOL_SOCKET,SO_PASSCRED,&on,sizeof(on)); ++#endif + assert(ret==0); + fcntl(self_server_fd,F_SETFL,O_NONBLOCK|fcntl(self_server_fd,F_GETFL)); + ret=bind(self_server_fd,(struct sockaddr*)&su,sizeof(su)); +@@ -272,6 +297,7 @@ void lxcom_init(const char *sock) s->poll.fd=self_server_fd; s->poll.events=G_IO_IN; @@ -2178,6 +2293,55 @@ index 02763eb..eef3d1b 100644 g_source_add_poll((GSource*)s,&s->poll); self_source_id=g_source_attach((GSource*)s,NULL); +@@ -289,22 +315,28 @@ void lxcom_init(const char *sock) + static ssize_t lxcom_write(int s,const void *buf,size_t count) + { + struct iovec iov[1] ={{(void*)buf,count,}}; +- struct msghdr msg = { 0, 0, iov, 1, 0, 0, 0 }; ++ struct msghdr msg = { 0, 0, iov, 1, 0, 0, 0 }; + #if !defined(linux) && !defined(__NetBSD__) +- char ctrl[CMSG_SPACE(sizeof(LXDM_CRED))]; +- struct cmsghdr *cmptr; ++ ++#if defined(__sun) ++ int size = ucred_size(); ++#else ++ int size = sizeof(LXDM_CRED); ++#endif ++ char ctrl[CMSG_SPACE(size)]; ++ struct cmsghdr *cmptr; + char *p; + int i; + +- msg.msg_control = ctrl; +- msg.msg_controllen = sizeof(ctrl); ++ msg.msg_control = ctrl; ++ msg.msg_controllen = sizeof(ctrl); + +- cmptr = CMSG_FIRSTHDR(&msg); +- cmptr->cmsg_len = CMSG_LEN(sizeof(LXDM_CRED)); +- cmptr->cmsg_level = SOL_SOCKET; +- cmptr->cmsg_type = SCM_CREDS; ++ cmptr = CMSG_FIRSTHDR(&msg); ++ cmptr->cmsg_len = CMSG_LEN(size); ++ cmptr->cmsg_level = SOL_SOCKET; ++ cmptr->cmsg_type = SCM_CREDS; + p=(char*)CMSG_DATA(cmptr); +- for(i=0;i<sizeof(LXDM_CRED);i++) ++ for(i=0;i<size;i++) + p[i]=0; + #endif + return sendmsg(s,&msg,0); +@@ -332,9 +364,6 @@ gboolean lxcom_send(const char *sock,const char *buf,char **res) + su.sun_family=AF_UNIX; + s=socket(AF_UNIX,SOCK_DGRAM,0); + assert(s!=-1); +- fcntl(s,F_SETFL,O_NONBLOCK|fcntl(self_server_fd,F_GETFL)); +- s=socket(AF_UNIX,SOCK_DGRAM,0); +- assert(s!=-1); + fcntl(s,F_SETFL,O_NONBLOCK|fcntl(self_client_fd,F_GETFL)); + strcpy(su.sun_path,sock); + ret=connect(s,(struct sockaddr*)&su,sizeof(su)); diff --git a/src/lxcommon.h b/src/lxcommon.h new file mode 100644 index 0000000..24a6c38 @@ -2192,7 +2356,7 @@ index 0000000..24a6c38 +#endif /*_LXCOMMON_H_*/ + diff --git a/src/lxdm.c b/src/lxdm.c -index 5c279af..8ac8478 100644 +index 5c279af..638c30f 100644 --- a/src/lxdm.c +++ b/src/lxdm.c @@ -24,9 +24,6 @@ @@ -2398,7 +2562,7 @@ index 5c279af..8ac8478 100644 if(plymouth) { nr_tty=1; -@@ -550,13 +559,13 @@ void lxdm_quit_self(int code) +@@ -550,20 +559,20 @@ void lxdm_quit_self(int code) static void log_init(void) { int fd_log; @@ -2413,27 +2577,39 @@ index 5c279af..8ac8478 100644 } static void log_ignore(const gchar *log_domain, GLogLevelFlags log_level, -@@ -647,6 +656,19 @@ static void replace_env(char** env, const char* name, const char* new_val) - *(penv + 1) = NULL; + const gchar *message, gpointer user_data) + { } +- ++#if 0 + GSList *do_scan_xsessions(void) + { + GSList *xsessions = NULL; +@@ -630,22 +639,7 @@ void free_xsessions(GSList *l) + } + g_slist_free(l); + } +- +-static void replace_env(char** env, const char* name, const char* new_val) +-{ +- register char** penv; +- for(penv = env; *penv; ++penv) +- { +- if(g_str_has_prefix(*penv, name)) +- { +- g_free(*penv); +- *penv = g_strconcat(name, new_val, NULL); +- return; +- } +- } +- *penv = g_strconcat(name, new_val, NULL); +- *(penv + 1) = NULL; +-} ++#endif -+static const char *get_env(char **env, const char *name) -+{ -+ register char** penv; -+ for(penv = env; *penv; ++penv) -+ { -+ if(g_str_has_prefix(*penv, name)) -+ { -+ return *penv+strlen(name); -+ } -+ } -+ return NULL; -+} -+ #ifndef DISABLE_XAUTH - static inline void xauth_write_uint16(int fd,uint16_t data) -@@ -665,15 +687,20 @@ static inline void xauth_write_string(int fd,const char *s) +@@ -665,15 +659,20 @@ static inline void xauth_write_string(int fd,const char *s) write(fd,s,len); } @@ -2458,7 +2634,7 @@ index 5c279af..8ac8478 100644 xauth_write_string(fd,"MIT-MAGIC-COOKIE-1"); xauth_write_uint16(fd,16); write(fd,data,16); -@@ -695,139 +722,55 @@ static void create_server_auth(LXSession *s) +@@ -695,139 +694,57 @@ static void create_server_auth(LXSession *s) authfile = g_strdup_printf("/var/run/lxdm/lxdm-:%d.auth",s->display); @@ -2471,7 +2647,7 @@ index 5c279af..8ac8478 100644 } -static void create_client_auth(char *home,char **env) -+static void create_client_auth(struct passwd *pw,char **env) ++static char ** create_client_auth(struct passwd *pw,char **env) { LXSession *s; char *authfile; @@ -2479,19 +2655,21 @@ index 5c279af..8ac8478 100644 - char *path; - if((user=getuid())== 0 ) /* root don't need it */ +- return; + if(pw->pw_uid==0) /* root don't need it */ - return; ++ return env; - s=lxsession_find_user(user); + s=lxsession_find_user(pw->pw_uid); if(!s) - return; +- return; - - path=g_key_file_get_string(config,"base","xauth_path",NULL); - if(path) ++ return env; + + /* pam_mktemp may provide XAUTHORITY to DM, just use it */ -+ if((authfile=(char*)get_env(env,"XAUTHORITY="))!=NULL) ++ if((authfile=(char*)g_environ_getenv(env,"XAUTHORITY"))!=NULL) { - authfile = g_strdup_printf("%s/.Xauth%d", path,getuid()); - g_free(path); @@ -2514,10 +2692,13 @@ index 5c279af..8ac8478 100644 } remove(authfile); - xauth_write_file(authfile,s->mcookie); +- replace_env(env,"XAUTHORITY=",authfile); + xauth_write_file(authfile,s->display,s->mcookie); - replace_env(env,"XAUTHORITY=",authfile); ++ env=g_environ_setenv(env,"XAUTHORITY",authfile,TRUE); + chown(authfile,pw->pw_uid,pw->pw_gid); g_free(authfile); ++ ++ return env; } #endif @@ -2525,8 +2706,7 @@ index 5c279af..8ac8478 100644 -static char *user_pass[2]; - -static int do_conv(int num, const struct pam_message **msg,struct pam_response **resp, void *arg) -+int lxdm_auth_user(int type,char *user, char *pass, struct passwd **ppw) - { +-{ - int result = PAM_SUCCESS; - int i; - *resp = (struct pam_response *) calloc(num, sizeof(struct pam_response)); @@ -2555,7 +2735,8 @@ index 5c279af..8ac8478 100644 -#endif - -int lxdm_auth_user(char *user, char *pass, struct passwd **ppw) --{ ++int lxdm_auth_user(int type,char *user, char *pass, struct passwd **ppw) + { - struct passwd *pw; -#if !HAVE_LIBPAM - struct spwd *sp; @@ -2622,7 +2803,7 @@ index 5c279af..8ac8478 100644 s=lxsession_find_greeter(); if(!s) s=lxsession_find_idle(); if(!s) s=lxsession_add(); -@@ -836,97 +779,12 @@ int lxdm_auth_user(char *user, char *pass, struct passwd **ppw) +@@ -836,97 +753,12 @@ int lxdm_auth_user(char *user, char *pass, struct passwd **ppw) g_critical("lxsession_add fail\n"); exit(0); } @@ -2724,7 +2905,7 @@ index 5c279af..8ac8478 100644 static void close_left_fds(void) { struct dirent **list; -@@ -945,9 +803,15 @@ static void close_left_fds(void) +@@ -945,32 +777,35 @@ static void close_left_fds(void) close(fd); } free(list); @@ -2739,19 +2920,137 @@ index 5c279af..8ac8478 100644 -void switch_user(struct passwd *pw, char *run, char **env) +void switch_user(struct passwd *pw, const char *run, char **env) { - int fd; +- int fd; ++ int fd; -@@ -968,9 +832,6 @@ void switch_user(struct passwd *pw, char *run, char **env) - dup2(fd,STDERR_FILENO); - close(fd); - } +- setenv("USER",pw->pw_name,1); +- setenv("LOGNAME",pw->pw_name,1); +- setenv("SHELL",pw->pw_shell,1); +- setenv("HOME",pw->pw_dir,1); +- +- g_spawn_command_line_sync ("/etc/lxdm/PreLogin",NULL,NULL,NULL,NULL); +- +- if( !pw || initgroups(pw->pw_name, pw->pw_gid) || +- setgid(pw->pw_gid) || setuid(pw->pw_uid) || setsid() == -1 ) +- exit(EXIT_FAILURE); +- chdir(pw->pw_dir); +- fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR); +- if(fd!=-1) +- { +- dup2(fd,STDERR_FILENO); +- close(fd); +- } -#ifndef DISABLE_XAUTH - create_client_auth(pw->pw_dir,env); -#endif ++ setenv("USER",pw->pw_name,1); ++ setenv("LOGNAME",pw->pw_name,1); ++ setenv("SHELL",pw->pw_shell,1); ++ setenv("HOME",pw->pw_dir,1); ++ ++ g_spawn_command_line_sync ("/etc/lxdm/PreLogin",NULL,NULL,NULL,NULL); ++ ++ if( !pw || initgroups(pw->pw_name, pw->pw_gid) || ++ setgid(pw->pw_gid) || setuid(pw->pw_uid) || setsid() == -1 ) ++ exit(EXIT_FAILURE); ++ chdir(pw->pw_dir); ++ fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR); ++ if(fd!=-1) ++ { ++ dup2(fd,STDERR_FILENO); ++ close(fd); ++ } /* reset signal */ signal(SIGCHLD, SIG_DFL); -@@ -1114,7 +975,7 @@ void lxdm_startx(LXSession *s) +@@ -987,45 +822,45 @@ void switch_user(struct passwd *pw, char *run, char **env) + + static void get_lock(void) + { +- FILE *fp; +- char *lockfile; ++ FILE *fp; ++ char *lockfile; + +- lockfile = g_key_file_get_string(config, "base", "lock", 0); +- if( !lockfile ) lockfile = g_strdup("/var/run/lxdm.pid"); ++ lockfile = g_key_file_get_string(config, "base", "lock", 0); ++ if( !lockfile ) lockfile = g_strdup("/var/run/lxdm.pid"); + +- fp = fopen(lockfile, "r"); +- if( fp ) +- { +- int pid; +- int ret; +- ret = fscanf(fp, "%d", &pid); +- fclose(fp); +- if(ret == 1 && pid!=getpid()) ++ fp = fopen(lockfile, "r"); ++ if( fp ) ++ { ++ int pid; ++ int ret; ++ ret = fscanf(fp, "%d", &pid); ++ fclose(fp); ++ if(ret == 1 && pid!=getpid()) + { +- if(kill(pid, 0) == 0 || (ret == -1 && errno == EPERM)) +- { +- /* we should only quit if the pid running is lxdm */ ++ if(kill(pid, 0) == 0 || (ret == -1 && errno == EPERM)) ++ { ++ /* we should only quit if the pid running is lxdm */ + #ifdef __linux__ +- char path[64],buf[128]; +- sprintf(path,"/proc/%d/exe",pid); +- ret=readlink(path,buf,128); +- if(ret<128 && ret>0 && strstr(buf,"lxdm-binary")) +- lxdm_quit_self(1); +-#else ++ char path[64],buf[128]; ++ sprintf(path,"/proc/%d/exe",pid); ++ ret=readlink(path,buf,128); ++ if(ret<128 && ret>0 && strstr(buf,"lxdm-binary")) + lxdm_quit_self(1); ++#else ++ lxdm_quit_self(1); + #endif +- } ++ } + } +- } +- fp = fopen(lockfile, "w"); +- if( !fp ) +- { +- g_critical("open lock file %s fail\n",lockfile); +- lxdm_quit_self(0); +- } +- fprintf( fp, "%d", getpid() ); +- fclose(fp); +- g_free(lockfile); ++ } ++ fp = fopen(lockfile, "w"); ++ if( !fp ) ++ { ++ g_critical("open lock file %s fail\n",lockfile); ++ lxdm_quit_self(0); ++ } ++ fprintf( fp, "%d", getpid() ); ++ fclose(fp); ++ g_free(lockfile); + } + + static void put_lock(void) +@@ -1083,6 +918,8 @@ void lxdm_startx(LXSession *s) + int i; + char display[16]; + ++ lxsession_set_active(s); ++ + sprintf(display,":%d",s->display); + setenv("DISPLAY",display,1); + +@@ -1114,7 +951,7 @@ void lxdm_startx(LXSession *s) g_strfreev(args); lxcom_add_child_watch(s->server, on_xserver_stop, s); @@ -2760,7 +3059,7 @@ index 5c279af..8ac8478 100644 for( i = 0; i < 100; i++ ) { if(lxcom_last_sig==SIGINT || lxcom_last_sig==SIGTERM) -@@ -1124,6 +985,7 @@ void lxdm_startx(LXSession *s) +@@ -1124,6 +961,7 @@ void lxdm_startx(LXSession *s) g_usleep(50 * 1000); //g_message("retry %d\n",i); } @@ -2768,7 +3067,7 @@ index 5c279af..8ac8478 100644 if(s->dpy==NULL) exit(EXIT_FAILURE); -@@ -1200,6 +1062,11 @@ static void on_session_stop(void *data,int pid, int status) +@@ -1200,6 +1038,11 @@ static void on_session_stop(void *data,int pid, int status) { lxsession_free(s); } @@ -2780,7 +3079,7 @@ index 5c279af..8ac8478 100644 gchar *argv[] = { "/etc/lxdm/PostLogout", NULL }; g_spawn_async(NULL, argv, s->env, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); } -@@ -1212,7 +1079,7 @@ gboolean lxdm_get_session_info(char *session,char **pname,char **pexec) +@@ -1212,7 +1055,7 @@ gboolean lxdm_get_session_info(char *session,char **pname,char **pexec) name=g_key_file_get_string(config, "base", "session", 0); if(!name && getenv("PREFERRED")) name = g_strdup(getenv("PREFERRED")); @@ -2789,7 +3088,7 @@ index 5c279af..8ac8478 100644 name = g_strdup(getenv("DESKTOP")); if(!name) name=g_strdup("LXDE"); } -@@ -1291,7 +1158,7 @@ static void lxdm_save_login(char *session,char *lang) +@@ -1291,7 +1134,7 @@ static void lxdm_save_login(char *session,char *lang) lang=""; var=g_key_file_new(); g_key_file_set_list_separator(var, ' '); @@ -2798,7 +3097,7 @@ index 5c279af..8ac8478 100644 old=g_key_file_get_string(var,"base","last_session",0); if(0!=g_strcmp0(old,session)) { -@@ -1343,7 +1210,7 @@ static void lxdm_save_login(char *session,char *lang) +@@ -1343,7 +1186,7 @@ static void lxdm_save_login(char *session,char *lang) char* data = g_key_file_to_data(var, &len, NULL); mkdir("/var/lib/lxdm",0755); chmod("/var/lib/lxdm",0755); @@ -2807,7 +3106,7 @@ index 5c279af..8ac8478 100644 g_free(data); } g_key_file_free(var); -@@ -1357,6 +1224,8 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) +@@ -1357,6 +1200,8 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) LXSession *s,*prev; lxdm_save_login(session,lang); @@ -2816,7 +3115,16 @@ index 5c279af..8ac8478 100644 if(!session ||!session[0] || !lang || !lang[0]) { -@@ -1423,12 +1292,10 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) +@@ -1398,7 +1243,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) + } + prev=lxsession_find_user(pw->pw_uid); + s=lxsession_find_greeter(); +- if(prev) ++ if(prev && prev->child>0) + { + if(s) lxsession_free(s); + lxsession_set_active(prev); +@@ -1423,12 +1268,10 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) s->ckc=NULL; } #endif @@ -2831,7 +3139,7 @@ index 5c279af..8ac8478 100644 #else if(!s->ckc) #endif -@@ -1451,9 +1318,20 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) +@@ -1451,49 +1294,58 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) "x11-display", &n, "is-local",&is_local, NULL)) @@ -2849,18 +3157,51 @@ index 5c279af..8ac8478 100644 + g_message("create ConsoleKit connector fail\n"); } #endif -+ - char** env, *path; - int n_env,i; - n_env = g_strv_length(environ); -@@ -1483,17 +1361,22 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) - replace_env(env, "LANGUAGE=", lang); +- char** env, *path; +- int n_env,i; +- n_env = g_strv_length(environ); +- /* copy all environment variables and override some of them */ +- env = g_new(char*, n_env + 1 + 13); +- for( i = 0; i < n_env; ++i ) +- env[i] = g_strdup(environ[i]); +- env[i] = NULL; +- +- replace_env(env, "HOME=", pw->pw_dir); +- replace_env(env, "SHELL=", pw->pw_shell); +- replace_env(env, "USER=", pw->pw_name); +- replace_env(env, "LOGNAME=", pw->pw_name); ++ char **env, *path; ++ env=g_get_environ(); ++ ++ env=g_environ_setenv(env, "HOME", pw->pw_dir, TRUE); ++ env=g_environ_setenv(env, "SHELL", pw->pw_shell, TRUE); ++ env=g_environ_setenv(env, "USER", pw->pw_name, TRUE); ++ env=g_environ_setenv(env, "LOGNAME", pw->pw_name, TRUE); + + /* override $PATH if needed */ + path = g_key_file_get_string(config, "base", "path", 0); + if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */ +- replace_env(env, "PATH=", path); /* override current $PATH with config value */ ++ env=g_environ_setenv(env, "PATH", path, TRUE); /* override current $PATH with config value */ + else /* don't use the global env, they are bad for user */ +- replace_env(env, "PATH=", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin"); /* set proper default */ ++ env=g_environ_setenv(env, "PATH", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin", TRUE); /* set proper default */ + g_free(path); + /* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */ + if( lang && lang[0] ) + { +- replace_env(env, "LANG=", lang); +- replace_env(env, "LC_MESSAGES=", lang); +- replace_env(env, "LANGUAGE=", lang); ++ env=g_environ_setenv(env, "LANG", lang, TRUE); ++ env=g_environ_setenv(env, "LC_MESSAGES", lang, TRUE); ++ env=g_environ_setenv(env, "LANGUAGE", lang, TRUE); } - s->env = env; + +#ifndef DISABLE_XAUTH -+ create_client_auth(pw,env); ++ env=create_client_auth(pw,env); +#endif + s->env = env; - s->child = pid = fork(); + /*s->child = pid = fork(); @@ -2882,7 +3223,7 @@ index 5c279af..8ac8478 100644 g_free(session_name); g_free(session_exec); if(alloc_session) -@@ -1519,7 +1402,7 @@ void lxdm_do_shutdown(void) +@@ -1519,7 +1371,7 @@ void lxdm_do_shutdown(void) char *cmd; cmd = g_key_file_get_string(config, "cmd", "shutdown", 0); if( !cmd ) cmd = g_strdup("shutdown -h now"); @@ -2891,7 +3232,7 @@ index 5c279af..8ac8478 100644 g_spawn_command_line_async(cmd,0); g_free(cmd); lxdm_quit_self(0); -@@ -1548,10 +1431,30 @@ int lxdm_do_auto_login(void) +@@ -1548,10 +1400,30 @@ int lxdm_do_auto_login(void) if(count==1) pass = g_key_file_get_string(config, "base", "password", 0); #endif @@ -2922,7 +3263,7 @@ index 5c279af..8ac8478 100644 if(p[0]=='@') { option=p+1; -@@ -1559,11 +1462,16 @@ int lxdm_do_auto_login(void) +@@ -1559,11 +1431,16 @@ int lxdm_do_auto_login(void) session=g_key_file_get_string(config,option,"session",0); lang=g_key_file_get_string(config,option,"lang",0); } @@ -2940,7 +3281,7 @@ index 5c279af..8ac8478 100644 if(ret==AUTH_SUCCESS) { lxdm_do_login(pw,session,lang,option); -@@ -1571,9 +1479,11 @@ int lxdm_do_auto_login(void) +@@ -1571,9 +1448,11 @@ int lxdm_do_auto_login(void) } g_free(user);g_free(session);g_free(lang); } @@ -2953,7 +3294,7 @@ index 5c279af..8ac8478 100644 } static void log_sigsegv(void) -@@ -1677,8 +1587,23 @@ GKeyFile *lxdm_user_list(void) +@@ -1677,8 +1556,23 @@ GKeyFile *lxdm_user_list(void) g_key_file_set_comment(kf,NULL,NULL,"lxdm user list",NULL); while((pw=getpwent())!=NULL) { @@ -2977,7 +3318,7 @@ index 5c279af..8ac8478 100644 if(strncmp(pw->pw_dir,"/home/",6)) { if(!strv_find(white,pw->pw_name)) -@@ -1780,21 +1705,21 @@ int main(int arc, char *arg[]) +@@ -1780,21 +1674,21 @@ int main(int arc, char *arg[]) return res?0:-1; } } @@ -3003,7 +3344,7 @@ index 5c279af..8ac8478 100644 g_log_set_handler(NULL, G_LOG_LEVEL_DEBUG, log_ignore, NULL); } -@@ -1832,3 +1757,4 @@ int main(int arc, char *arg[]) +@@ -1832,3 +1726,4 @@ int main(int arc, char *arg[]) return 0; } @@ -3028,10 +3369,10 @@ index 4c79ca3..568573f 100644 { diff --git a/src/pam.c b/src/pam.c new file mode 100644 -index 0000000..810e44f +index 0000000..7277a50 --- /dev/null +++ b/src/pam.c -@@ -0,0 +1,578 @@ +@@ -0,0 +1,586 @@ +/* + * lxdm.c - main entry of lxdm + * @@ -3075,6 +3416,7 @@ index 0000000..810e44f +#include <dirent.h> +#include <errno.h> +#include <poll.h> ++#include <sys/stat.h> + +#include <pwd.h> +#include <grp.h> @@ -3123,8 +3465,8 @@ index 0000000..810e44f +{ + struct passwd *pw; + struct spwd *sp; -+ char *real; -+ char *enc; ++ char *real; ++ char *enc; + if(!user || !user[0]) + { + g_debug("user==NULL\n"); @@ -3138,44 +3480,44 @@ index 0000000..810e44f + return AUTH_BAD_USER; + } + if(strstr(pw->pw_shell, "nologin")) -+ { -+ g_debug("user %s have nologin shell\n",user); -+ return AUTH_PRIV; -+ } -+ if(type==AUTH_TYPE_AUTO_LOGIN && !pass) -+ { ++ { ++ g_debug("user %s have nologin shell\n",user); ++ return AUTH_PRIV; ++ } ++ if(type==AUTH_TYPE_AUTO_LOGIN && !pass) ++ { + goto out; + } -+ sp = getspnam(user); -+ if( !sp ) -+ { ++ sp = getspnam(user); ++ if( !sp ) ++ { + return AUTH_FAIL; + } -+ endspent(); -+ real = sp->sp_pwdp; -+ if( !real || !real[0] ) -+ { -+ if( !pass || !pass[0] ) -+ { -+ *ppw = pw; -+ g_debug("user %s auth with no password ok\n",user); -+ return AUTH_SUCCESS; -+ } -+ else -+ { -+ g_debug("user %s password not match\n",user); -+ return AUTH_FAIL; -+ } -+ } -+ enc = crypt(pass, real); -+ if( strcmp(real, enc) ) -+ { -+ g_debug("user %s password not match\n",user); -+ return AUTH_FAIL; -+ } -+ g_debug("user %s auth ok\n",pw->pw_name); ++ endspent(); ++ real = sp->sp_pwdp; ++ if( !real || !real[0] ) ++ { ++ if( !pass || !pass[0] ) ++ { ++ *ppw = pw; ++ g_debug("user %s auth with no password ok\n",user); ++ return AUTH_SUCCESS; ++ } ++ else ++ { ++ g_debug("user %s password not match\n",user); ++ return AUTH_FAIL; ++ } ++ } ++ enc = crypt(pass, real); ++ if( strcmp(real, enc) ) ++ { ++ g_debug("user %s password not match\n",user); ++ return AUTH_FAIL; ++ } ++ g_debug("user %s auth ok\n",pw->pw_name); + passwd_copy(&a->pw,pw); -+ return AUTH_SUCCESS; ++ return AUTH_SUCCESS; +} + +int lxdm_auth_session_begin(LXDM_AUTH *a,int tty,int display,char mcookie[16]) @@ -3329,6 +3671,8 @@ index 0000000..810e44f + err = pam_open_session(a->handle, 0); /* FIXME pam session failed */ + if( err != PAM_SUCCESS ) + g_warning( "pam open session error \"%s\"\n", pam_strerror(a->handle, err)); ++ else ++ a->in_session=1; + return 0; +} + @@ -3337,9 +3681,13 @@ index 0000000..810e44f + int err; + if(!a->handle) + return 0; -+ err = pam_close_session(a->handle, 0); ++ if(a->in_session) ++ { ++ err = pam_close_session(a->handle, 0); ++ a->in_session=0; ++ } + pam_end(a->handle, err); -+ a->handle = NULL; ++ a->handle = NULL; + passwd_clean(&a->pw); + return 0; +} @@ -3413,7 +3761,7 @@ index 0000000..810e44f +void switch_user(struct passwd *pw, const char *run, char **env) +{ + int fd; -+ ++ + setenv("USER",pw->pw_name,1); + setenv("LOGNAME",pw->pw_name,1); + setenv("SHELL",pw->pw_shell,1); @@ -3424,13 +3772,13 @@ index 0000000..810e44f + if( !pw || initgroups(pw->pw_name, pw->pw_gid) || + setgid(pw->pw_gid) || setuid(pw->pw_uid)/* || setsid() == -1 */) + exit(EXIT_FAILURE); -+ chdir(pw->pw_dir); -+ fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR); -+ if(fd!=-1) -+ { -+ dup2(fd,STDERR_FILENO); -+ close(fd); -+ } ++ chdir(pw->pw_dir); ++ fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR); ++ if(fd!=-1) ++ { ++ dup2(fd,STDERR_FILENO); ++ close(fd); ++ } + + /* reset signal */ + signal(SIGCHLD, SIG_DFL); @@ -3441,7 +3789,7 @@ index 0000000..810e44f + close_left_fds(); + + g_spawn_command_line_async ("/etc/lxdm/PostLogin",NULL); -+ execle("/etc/lxdm/Xsession", "/etc/lxdm/Xsession", run, NULL, environ); ++ execl("/etc/lxdm/Xsession","/etc/lxdm/Xsession",run,NULL); + perror("execle"); + exit(EXIT_FAILURE); +} @@ -3606,6 +3954,7 @@ index 0000000..810e44f + } + //fprintf(stderr,"end\n"); + } ++ lxdm_auth_session_end(&a); + lxdm_auth_cleanup(&a); + return 0; +} @@ -3666,6 +4015,22 @@ index 2691a03..f233589 100644 if( AUTH_SUCCESS == ret && pw != NULL ) { ui_drop(); +diff --git a/src/xconn.c b/src/xconn.c +index f0bdbf2..5c62d4b 100644 +--- a/src/xconn.c ++++ b/src/xconn.c +@@ -55,9 +55,9 @@ void xconn_clean(xconn_t c) + unsigned int nchildren; + unsigned int i; + Window Root; +- ++ + if(!c) return; +- ++ + XSetErrorHandler(CatchErrors); + XSetIOErrorHandler(CatchIOErrors); + diff --git a/systemd/Makefile.am b/systemd/Makefile.am new file mode 100644 index 0000000..b568c5a diff --git a/community/lxdm/lxdm.pam b/community/lxdm/lxdm.pam new file mode 100644 index 000000000..76b8869a2 --- /dev/null +++ b/community/lxdm/lxdm.pam @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth include system-login +-auth optional pam_gnome_keyring.so +account include system-login +password include system-login +session include system-login +-session optional pam_gnome_keyring.so auto_start diff --git a/community/lxlauncher/PKGBUILD b/community/lxlauncher/PKGBUILD index bbfefe933..5c33b9b94 100644 --- a/community/lxlauncher/PKGBUILD +++ b/community/lxlauncher/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 96678 2013-09-03 01:34:25Z bgyorgy $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# $Id: PKGBUILD 101965 2013-12-03 01:02:57Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxlauncher pkgver=0.2.2 -pkgrel=4 +pkgrel=5 pkgdesc='Open source clone of the Asus launcher for EeePC' arch=('i686' 'x86_64') license=('GPL2') @@ -13,7 +14,8 @@ url='http://lxde.org/' groups=('lxde') depends=('gtk2' 'startup-notification' 'lxmenu-data' 'menu-cache') makedepends=('intltool') -source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz +backup=('etc/xdg/lxlauncher/gtkrc' 'etc/xdg/lxlauncher/settings.conf') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz fix-empty-launcher.patch) md5sums=('16df627447838b170a72cc3a9ee21497' '4dd715f9cccf04ef87c662cee1dcb798') diff --git a/community/lxmusic/PKGBUILD b/community/lxmusic/PKGBUILD index 197adf4ec..72bcd4fdb 100644 --- a/community/lxmusic/PKGBUILD +++ b/community/lxmusic/PKGBUILD @@ -1,30 +1,36 @@ -# $Id: PKGBUILD 71871 2012-06-02 14:59:08Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# $Id: PKGBUILD 102077 2013-12-04 20:12:10Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Marcus Schulderinsky <mmaacceess at gmail dot com> pkgname=lxmusic pkgver=0.4.5 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight XMMS2 client' arch=('i686' 'x86_64') url="http://lxde.org/" license=('GPL') groups=('lxde') -depends=('gtk2' 'xmms2') -makedepends=('pkgconfig' 'intltool') +depends=('gtk2' 'libnotify' 'xmms2') +makedepends=('intltool') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz libnotify-0.7.patch) md5sums=('9c3e5eb636f05e8c190d359cd0c8b679' '770c63254a7369613daeb6d1260d123f') -build() { - cd $srcdir/$pkgname-$pkgver +prepare() { + cd $pkgname-$pkgver + # Port to libnotify-0.7 patch -Np1 -i $srcdir/libnotify-0.7.patch +} + +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/lxpolkit/PKGBUILD b/community/lxpolkit/PKGBUILD index 2455ab0be..f212c37ef 100644 --- a/community/lxpolkit/PKGBUILD +++ b/community/lxpolkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96579 2013-09-01 20:36:18Z bgyorgy $ +# $Id: PKGBUILD 102844 2013-12-22 01:57:44Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=lxpolkit pkgver=0.1.0 -pkgrel=2 -pkgdesc="Simple policykit authentication agent for LXDE" +pkgrel=3 +pkgdesc="Simple polkit authentication agent for LXDE" arch=('i686' 'x86_64') url="http://blog.lxde.org/?p=674" license=('GPL') @@ -14,14 +14,20 @@ makedepends=('intltool') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) md5sums=('2597b00035fe1d695219e0f9bfa8c26f') +prepare() { + cd $pkgname-$pkgver + # Don't conflict with MATE and Razor-qt (they have their own polkit agents) + sed -i '/^NotShowIn/ s/GNOME;KDE;/GNOME;KDE;MATE;Razor;/' data/lxpolkit.desktop.in.in +} + build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/lxsession/PKGBUILD b/community/lxsession/PKGBUILD index 5e4d01536..6f6cb73c3 100644 --- a/community/lxsession/PKGBUILD +++ b/community/lxsession/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 95018 2013-08-03 12:52:23Z bpiotrowski $ +# $Id: PKGBUILD 100813 2013-11-11 11:27:29Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxsession pkgver=0.4.6.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Lightweight X11 session manager' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ conflicts=('lxsession-lite' 'lxde-settings-daemon') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz lxsession-0.4.6.1-logind-support.patch) md5sums=('e456b64c5ab3652a4dec661ec706dc6e' - 'd99fb337cba343306df71c85034def3b') + '0ec60da2c876b14928ea22a6c29fc0a7') prepare() { cd $pkgname-$pkgver diff --git a/community/lxsession/lxsession-0.4.6.1-logind-support.patch b/community/lxsession/lxsession-0.4.6.1-logind-support.patch index 2c12a01c5..978223207 100644 --- a/community/lxsession/lxsession-0.4.6.1-logind-support.patch +++ b/community/lxsession/lxsession-0.4.6.1-logind-support.patch @@ -436,13 +436,13 @@ +{ + const gchar* program = NULL; + -+ if (g_find_program_in_path("xdg-screensaver")) ++ if (g_find_program_in_path("lxlock")) + { -+ program = "xdg-screensaver lock"; ++ program = "lxlock"; + } -+ else if (g_find_program_in_path("lxlock")) ++ else if (g_find_program_in_path("xdg-screensaver")) + { -+ program = "lxlock"; ++ program = "xdg-screensaver lock"; + } + return program; +} diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD index ea5e83ec7..d9f56aa5d 100644 --- a/community/lz4/PKGBUILD +++ b/community/lz4/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 100408 2013-11-03 17:44:50Z seblu $ +# $Id: PKGBUILD 102089 2013-12-04 21:52:14Z seblu $ # Maintainer: Sébastien Luttringer # Contacted by mail, author use svn commit as release version. # He only push tested release code into svn and support using revision as version pkgname=lz4 -pkgver=108 -pkgrel=1 +pkgver=109 +pkgrel=2 pkgdesc='Very fast lossless compression algorithm' arch=('i686' 'x86_64') url='https://code.google.com/p/lz4/' -license=('BSD' 'GPL2') +license=('GPL2') makedepends=('svn') depends=('glibc') source=("$pkgname::svn+http://lz4.googlecode.com/svn/trunk/#revision=$pkgver") @@ -25,7 +25,7 @@ package() { cd $pkgname install -Dm755 lz4 "$pkgdir/usr/bin/lz4" install -Dm755 lz4c "$pkgdir/usr/bin/lz4c" - install -Dm644 cmake/pack/release_COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 lz4.1 "$pkgdir/usr/share/man/man1/lz4.1" } # vim:set ts=2 sw=2 et: diff --git a/community/macchanger/PKGBUILD b/community/macchanger/PKGBUILD index 6992f1f08..b2d4e9bc5 100644 --- a/community/macchanger/PKGBUILD +++ b/community/macchanger/PKGBUILD @@ -1,14 +1,16 @@ -# $Id: PKGBUILD 87606 2013-04-04 02:46:04Z kkeen $ +# $Id: PKGBUILD 101347 2013-11-23 01:20:53Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=macchanger pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="A small utility to change your NIC's MAC address" arch=('i686' 'x86_64') url="http://ftp.gnu.org/gnu/macchanger" license=('GPL') +depends=('glibc') +install='macchanger.install' source=(http://ftp.gnu.org/gnu/macchanger/${pkgname}-${pkgver}.tar.gz) md5sums=('1257b18e9067a8192c9747da52aabdda') @@ -16,7 +18,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --mandir=/usr/share/man \ - --infodir=/usr/share/man + --infodir=/usr/share/info make } diff --git a/community/macchanger/macchanger.install b/community/macchanger/macchanger.install new file mode 100644 index 000000000..c595c6290 --- /dev/null +++ b/community/macchanger/macchanger.install @@ -0,0 +1,21 @@ +infodir=/usr/share/info +filelist=(macchanger.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + diff --git a/community/mailman/PKGBUILD b/community/mailman/PKGBUILD index 5bbe42856..02c73f151 100644 --- a/community/mailman/PKGBUILD +++ b/community/mailman/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99571 2013-10-29 21:25:25Z seblu $ +# $Id: PKGBUILD 101380 2013-11-24 00:43:57Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Paul Mattal <paul@archlinux.org> pkgname=mailman -pkgver=2.1.16 +pkgver=2.1.17 pkgrel=1 pkgdesc='The GNU Mailing List Manager' arch=(i686 x86_64) @@ -20,7 +20,7 @@ source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz" "$pkgname.profile.sh" "$pkgname.profile.csh" "$pkgname.service") -md5sums=('ab8969dc68661f7a7af3beb797a46b3e' +md5sums=('39043257f91eb876082fa90470aa8d28' 'ed04d062379eb21e39ce1e70e6b1ade2' 'a9c71ec940c56173415fbd49087d10b0' '85a8c30ffc444e677b286f54df530482' diff --git a/community/manedit/PKGBUILD b/community/manedit/PKGBUILD new file mode 100644 index 000000000..2631d4730 --- /dev/null +++ b/community/manedit/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 102171 2013-12-06 11:59:39Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=manedit +pkgver=1.2.1 +pkgrel=4 +pkgdesc="An editor specifically tailored for UNIX manual pages" +arch=('i686' 'x86_64') +license=('GPL') +url="http://freecode.com/projects/manedit" +depends=('gcc-libs' 'bzip2' 'zlib' 'gtk') +source=("http://wolfsinger.com/~wolfpack/packages/${pkgname}-${pkgver}.tar.bz2" + 'manedit-1.2.1-fix-man-page.patch' + 'manedit.desktop') +md5sums=('a7ee1835e32ed3c9279412af7caf13ef' + '60cb0c224a6659f8a8183006608f368b' + 'bac6986fc25dda6f0e27e3673eef4600') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Patch to fix generate man page + patch -Np1 -i ${srcdir}/manedit-1.2.1-fix-man-page.patch + + env CFLAGS="${CFLAGS}" \ + ./configure Linux \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --datadir=/usr/share \ + --enable=bzip2 \ + --enable=zlib \ + --disable="arch-i486" \ + --disable="arch-i586" \ + --disable="arch-i686" \ + --disable="arch-pentiumpro" + + make all +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix strip error (tries to strip a shell script) + cp manedit/Makefile.install.UNIX{,.orig} + sed -e '/INST.*FLAGS.*-s$/s:-s::' \ + manedit/Makefile.install.UNIX.orig > manedit/Makefile.install.UNIX + + # Set man dir too or FHS is violated + make PREFIX="${pkgdir}/usr" \ + MAN_DIR="${pkgdir}/usr/share/man/man1" \ + ICONS_DIR="${pkgdir}/usr/share/pixmaps" install + + # Install desktop file + install -Dm644 ${srcdir}/manedit.desktop "${pkgdir}/usr/share/applications/manedit.desktop" +} diff --git a/community/manedit/manedit-1.2.1-fix-man-page.patch b/community/manedit/manedit-1.2.1-fix-man-page.patch new file mode 100644 index 000000000..77aad9a79 --- /dev/null +++ b/community/manedit/manedit-1.2.1-fix-man-page.patch @@ -0,0 +1,15 @@ +--- a/manedit/makefile_append.ini 2008-10-11 16:00:00.000000000 -0700 ++++ b/manedit/makefile_append.ini 2009-11-20 15:33:47.000000000 -0800 +@@ -39,9 +39,9 @@ + + manpage: + @echo "Generating manual page $(BIN).1.bz2" +- @-$(SED) 's|%%PREFIX%%|$(PREFIX)|g ; \ +- s|%%LOCALBASE%%|${LOCALBASE}|g ; \ +- s|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out ++ @-$(SED) -e 's|%%PREFIX%%|$(PREFIX)|g ;' \ ++ -e 's|%%LOCALBASE%%|${LOCALBASE}|g ;' \ ++ -e 's|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out + @-$(BZIP2) $(BIN).1.out --stdout > $(BIN).1.bz2 + + modules: $(OBJ_C) $(OBJ_CPP) diff --git a/community/manedit/manedit.desktop b/community/manedit/manedit.desktop new file mode 100644 index 000000000..030fb0ccf --- /dev/null +++ b/community/manedit/manedit.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Manpage Editor +Comment=Create and edit UNIX manual pages +Icon=/usr/share/pixmaps/manedit.xpm +Exec=manedit +Terminal=false +Type=Application +Categories=GNOME;Application;Development; +StartupNotify=true
\ No newline at end of file diff --git a/community/mangler/PKGBUILD b/community/mangler/PKGBUILD new file mode 100644 index 000000000..f2c0e140d --- /dev/null +++ b/community/mangler/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 101650 2013-11-29 19:09:30Z arcanis $ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> +# Contributor: Simon Perry <pezz at sanxion dot net> +# Contributor: Sigitas Mazaliauskas <sigisnn at gmail dot com> +# Contributor: LinkMaster03 <linkmaster032000 at gmail dot com> + +pkgname=mangler +pkgver=1.2.5 +pkgrel=2 +pkgdesc="Ventrilo compatible VOIP client for Linux" +arch=('i686' 'x86_64') +url="http://www.mangler.org/" +license=('GPL3') +depends=('dbus-glib' 'gsm' 'gtkmm' 'libpulse' 'speex') +makedepends=('librsvg' 'pkg-config') +optdepends=('alsa-lib: ALSA support' + 'celt: CELT codec support' + 'espeak: TTS support' + 'g15daemon: G15 keyboard support' + 'xosd: Information overlay support') +conflicts=('mangler-svn') +source=(http://www.mangler.org/downloads/$pkgname-$pkgver.tar.bz2) +md5sums=('28bb40c91d8e778a95a0845f858be503') +options=(!libtool) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 909b0177b..6f0eb0f6f 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 98743 2013-10-17 14:01:50Z andyrtr $ +# $Id: PKGBUILD 102259 2013-12-07 10:36:44Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=2.2.0 -pkgrel=4 +pkgrel=5 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/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index d8fa8daba..19364319c 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99528 2013-10-29 10:58:03Z spupykin $ +# $Id: PKGBUILD 101328 2013-11-22 17:36:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.64 +pkgver=0.7.65 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('f5cb798cf3b121359ab3173d70526518') +md5sums=('19d7992a7d0cba0f5f731f993e8c537c') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index 951ec689f..9c262984d 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99526 2013-10-29 10:57:46Z spupykin $ +# $Id: PKGBUILD 101325 2013-11-22 17:32:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.64 +pkgver=0.7.65 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('f5cb798cf3b121359ab3173d70526518') +md5sums=('19d7992a7d0cba0f5f731f993e8c537c') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 2344db419..5f4953b1a 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94891 2013-08-01 06:55:07Z bpiotrowski $ +# $Id: PKGBUILD 101155 2013-11-18 15:23:29Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest -pkgver=3.8.0beta1 -_pkgver=3.8.0-beta1 -pkgrel=2 +pkgver=3.9.0 +_pkgver=3.9.0 +pkgrel=1 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') url="http://sourceforge.net/projects/megaglest/" @@ -14,7 +14,7 @@ depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' ' 'libircclient' 'miniupnpc' 'wxgtk' 'glu') makedepends=('ftjam' 'cmake' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${_pkgver}.tar.xz") -md5sums=('1da8707d435ffb2342f03ca466d4eeed') +md5sums=('b599e8a71376640bc0d191d6c92c9073') build() { cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/ diff --git a/community/metamail/PKGBUILD b/community/metamail/PKGBUILD deleted file mode 100644 index 8809c5f68..000000000 --- a/community/metamail/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 99911 2013-10-31 02:25:40Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sekenre <sekenre at ukfsn dot org> -# Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com> - -pkgname=metamail -pkgver=2.7 -pkgrel=6 -pkgdesc="Used to display and process MIME messages" -arch=('i686' 'x86_64') -url="http://packages.debian.org/stable/mail/metamail" -license=('custom') -depends=('ncurses') -noextract=(metamail_$pkgver-52.diff.gz) -source=("http://ftp.de.debian.org/debian/pool/main/m/metamail/metamail_$pkgver.orig.tar.gz" \ - "http://ftp.de.debian.org/debian/pool/main/m/metamail/metamail_$pkgver-54.diff.gz" \ - license) -md5sums=('c6967e9bc5d3c919764b02df24efca01' - '2071dc7b9c33345443ab9a619e640a69' - '38be502570f3ce5b5a2bafd6a876373f') - -build() { - cd $srcdir/metamail-$pkgver.orig - - patch -p1 <$srcdir/metamail_$pkgver-54.diff - sed -i 's|getline|xgetline|' metamail/uue.c src/metamail/uue.c - - sh ./bootstrap - sh ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install - - install -D -m0644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license -} diff --git a/community/metamail/license b/community/metamail/license deleted file mode 100644 index 3b186faa4..000000000 --- a/community/metamail/license +++ /dev/null @@ -1,37 +0,0 @@ -This is the Debian GNU/Linux prepackaged version of Metamail. - -This package was put together by Michael Meskes <meskes@debian.org>, -from sources obtained from: - ftp.bellcore.com:/pub/nsb/mm2.7.tar.Z and /pub/nsb/contrib2.7.tar.Z - -This package was then worked on by Herbert Xu <herbert@debian.org>. - -**************************************************************** -Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore) - -Permission to use, copy, modify, and distribute this material -for any purpose and without fee is hereby granted, provided -that the above copyright notice and this permission notice -appear in all copies, and that the name of Bellcore not be -used in advertising or publicity pertaining to this -material without the specific, prior written permission -of an authorized representative of Bellcore. BELLCORE -MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY -OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS", -WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. -**************************************************************** - -Most scripts are: - -# Conversion from C shell to Bourne shell by Z-Code Software Corp. -# Conversion Copyright (c) 1992 Z-Code Software Corp. -# Permission to use, copy, modify, and distribute this material -# for any purpose and without fee is hereby granted, provided -# that the above copyright notice and this permission notice -# appear in all copies, and that the name of Z-Code Software not -# be used in advertising or publicity pertaining to this -# material without the specific, prior written permission -# of an authorized representative of Z-Code. Z-CODE SOFTWARE -# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY -# OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS", -# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD index 711a96e51..bad14900d 100644 --- a/community/milkytracker/PKGBUILD +++ b/community/milkytracker/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88664 2013-04-21 13:23:51Z arodseth $ +# $Id: PKGBUILD 101204 2013-11-19 15:27:04Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Christopher O'Neill <milkytracker@chrisoneill.co.uk> # Contributor: Maks Verver <maksverver@geocities.com> pkgname=milkytracker -pkgver=0.90.85 -pkgrel=8 +pkgver=0.90.86 +pkgrel=1 pkgdesc='Fast Tracker II inspired music tracker' arch=('x86_64' 'i686') url="http://www.milkytracker.org/" @@ -15,29 +15,23 @@ makedepends=('jack-audio-connection-kit' 'gendesk') optdepends=('jack-audio-connection-kit: JACK audio support') options=('docs' '!strip') install="$pkgname.install" -source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2" - "$pkgname.patch") -sha256sums=('59a0d294d63752be74b157e07b0c70252c9198c312d9b1ad0ca460129fe5bd80' - '0b701bf97375343f13d1af8a30df052c85b526e527bf6402634c37c7e9fa5b42') -_name=('MilkyTracker') -_categories=('AudioVideo;Audio;AudioVideoEditing;') +source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2") +sha256sums=('eb93000ed4855e198dfb02df54f3e3536dc891084ca47cdd5393121137ba3bed') prepare() { - cd "$srcdir" - - gendesk -n - patch -p0 -i "$pkgname.patch" + gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'MilkyTracker' \ + --categories 'AudioVideo;Audio;AudioVideoEditing;' } build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --with-alsa --with-jack - make + make CXXFLAGS="$CXXFLAGS -lasound" } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install mkdir -p "$pkgdir/usr/share/applications" \ diff --git a/community/milkytracker/milkytracker.patch b/community/milkytracker/milkytracker.patch deleted file mode 100644 index ee292a87c..000000000 --- a/community/milkytracker/milkytracker.patch +++ /dev/null @@ -1,632 +0,0 @@ -*** milkytracker-0.90.85/src/tracker/sdl/SDL_Main.cpp 2009-02-22 10:20:39.140388000 +0000 ---- milkytracker-trunk/src/tracker/sdl/SDL_Main.cpp 2010-01-03 18:11:52.541377210 +0000 -*************** -*** 751,758 **** - case SDLUserEventLMouseRepeat: - { - PPPoint p; -! p.x = (pp_int32)event.data1; -! p.y = (pp_int32)event.data2; - PPEvent myEvent(eLMouseRepeat, &p, sizeof(PPPoint)); - RaiseEventSerialized(&myEvent); - break; ---- 751,758 ---- - case SDLUserEventLMouseRepeat: - { - PPPoint p; -! p.x = reinterpret_cast<intptr_t> (event.data1); -! p.y = reinterpret_cast<intptr_t> (event.data2); - PPEvent myEvent(eLMouseRepeat, &p, sizeof(PPPoint)); - RaiseEventSerialized(&myEvent); - break; -*************** -*** 761,768 **** - case SDLUserEventRMouseRepeat: - { - PPPoint p; -! p.x = (pp_int32)event.data1; -! p.y = (pp_int32)event.data2; - PPEvent myEvent(eRMouseRepeat, &p, sizeof(PPPoint)); - RaiseEventSerialized(&myEvent); - break; ---- 761,768 ---- - case SDLUserEventRMouseRepeat: - { - PPPoint p; -! p.x = reinterpret_cast<intptr_t> (event.data1); -! p.y = reinterpret_cast<intptr_t> (event.data2); - PPEvent myEvent(eRMouseRepeat, &p, sizeof(PPPoint)); - RaiseEventSerialized(&myEvent); - break; -*************** -*** 770,777 **** - - case SDLUserEventMidiKeyDown: - { -! pp_int32 note = (pp_int32)event.data1; -! pp_int32 volume = (pp_int32)event.data2; - globalMutex->lock(); - myTracker->sendNoteDown(note, volume); - globalMutex->unlock(); ---- 770,777 ---- - - case SDLUserEventMidiKeyDown: - { -! pp_int32 note = reinterpret_cast<intptr_t> (event.data1); -! pp_int32 volume = reinterpret_cast<intptr_t> (event.data2); - globalMutex->lock(); - myTracker->sendNoteDown(note, volume); - globalMutex->unlock(); -*************** -*** 780,786 **** - - case SDLUserEventMidiKeyUp: - { -! pp_int32 note = (pp_int32)event.data1; - globalMutex->lock(); - myTracker->sendNoteUp(note); - globalMutex->unlock(); ---- 780,786 ---- - - case SDLUserEventMidiKeyUp: - { -! pp_int32 note = reinterpret_cast<intptr_t> (event.data1); - globalMutex->lock(); - myTracker->sendNoteUp(note); - globalMutex->unlock(); -diff -c -x .svn milkytracker-0.90.85/docs/FAQ.html milkytracker-trunk/docs/FAQ.html -*** milkytracker-0.90.85/docs/FAQ.html 2010-01-01 23:00:57.183928000 +0000 ---- milkytracker-trunk/docs/FAQ.html 2010-01-05 10:34:37.212763931 +0000 -*************** -*** 49,65 **** - { - questions = document.getElementsByTagName('a'); - answers = document.getElementsByTagName('ul'); -! for (i = 1; i <= questions.length; i++) - { -! questions.item(i-1).id = "q"+i; -! var question = questions.item(i-1).id; -! document.getElementById(question).href="javascript:flip('a"+i+"')"; - } -! for (i = 1; i <= answers.length; i++) - { -! answers.item(i-1).id = "a"+i; -! var answer = answers.item(i-1).id; -! document.getElementById(answer).style.display="none"; - } - } - } ---- 49,66 ---- - { - questions = document.getElementsByTagName('a'); - answers = document.getElementsByTagName('ul'); -! q = 0; -! for (i = 0; i < questions.length; i++) - { -! if(questions.item(i).href != "") continue; -! questions.item(i).id = "q"+q; -! questions.item(i).href="javascript:flip('a"+q+"')"; -! q++; - } -! for (i = 0; i < answers.length; i++) - { -! answers.item(i).id = "a"+i; -! answers.item(i).style.display="none"; - } - } - } -*************** -*** 87,96 **** - <ol> - - <li> -! <a>Where can I find a list of all the effect codes?</a> - <ul> - <li> -! Read the manual: <a href="milkytracker.html">milkytracker.html</a> - </li> - </ul> - </li> ---- 88,97 ---- - <ol> - - <li> -! <a id="question">Where can I find a list of all the effect codes?</a> - <ul> - <li> -! Read the manual: <a href="MilkyTracker.html">milkytracker.html</a> - </li> - </ul> - </li> -*************** -*** 99,105 **** - <a>Where can I find a list of all the keyboard shortcuts?</a> - <ul> - <li> -! Read the manual: <a href="milkytracker.html">milkytracker.html</a> - </li> - </ul> - ---- 100,106 ---- - <a>Where can I find a list of all the keyboard shortcuts?</a> - <ul> - <li> -! Read the manual: <a href="MilkyTracker.html">milkytracker.html</a> - </li> - </ul> - -diff -c -x .svn milkytracker-0.90.85/docs/MilkyTracker.html milkytracker-trunk/docs/MilkyTracker.html -*** milkytracker-0.90.85/docs/MilkyTracker.html 2010-01-01 23:00:57.183928000 +0000 ---- milkytracker-trunk/docs/MilkyTracker.html 2010-01-05 10:34:37.212763931 +0000 -*************** -*** 183,189 **** - <body> - <h1>MilkyTracker Manual <span id="version" style="font-size: 10pt; font-weight: normal;">v0.90.85</span></h1> - <p> -! Hello and welcome to MilkyTracker, an open source multi-platform Fasttracker II compatible music tracker program. This document holds a lot of valuable information about the tracker but it's not a tracking manual. If you want to learn more about tracking and how it's done, the Internet is your friend. We host some resources on <a href="http://www.milkytracker.net/">MilkyTracker.net</a> as well. - </p> - <h4>Disclaimer:</h4> - <p> ---- 183,189 ---- - <body> - <h1>MilkyTracker Manual <span id="version" style="font-size: 10pt; font-weight: normal;">v0.90.85</span></h1> - <p> -! Hello and welcome to MilkyTracker, an open source multi-platform Fasttracker II compatible music tracker program. This document holds a lot of valuable information about the tracker but it's not a tracking manual. If you want to learn more about tracking and how it's done, the Internet is your friend. We host some resources on <a href="http://www.milkytracker.org/">MilkyTracker.net</a> as well. - </p> - <h4>Disclaimer:</h4> - <p> -*************** -*** 3111,3122 **** - and everybody who donated or dropped a letter. - </p> - <p> -! Special greetings to everyone at <a href="http://www.milkytracker.net/?community">#MilkyTracker</a> for making it a daily active channel. - </p> - - <h2><a id="contact">10. Contact</a></h2> - <p> -! You can contact the MilkyTracker team by email (<span class="email">ten.rekcartyklim@troppus</span>), through the forum at <a href="http://www.milkytracker.net/?community">http://www.milkytracker.net/?community</a> or in IRC. To chat with the community live, you can connect to #MilkyTracker on <a href="http://www.esper.net/">EsperNet</a> with your IRC client or use the java client on our website. - </p> - - ---- 3111,3122 ---- - and everybody who donated or dropped a letter. - </p> - <p> -! Special greetings to everyone at <a href="http://www.milkytracker.org/?community">#MilkyTracker</a> for making it a daily active channel. - </p> - - <h2><a id="contact">10. Contact</a></h2> - <p> -! You can contact the MilkyTracker team by email (<span class="email">ten.rekcartyklim@troppus</span>), through the forum at <a href="http://www.milkytracker.org/?community">http://www.milkytracker.org/?community</a> or in IRC. To chat with the community live, you can connect to #MilkyTracker on <a href="http://www.esper.net/">EsperNet</a> with your IRC client or use the java client on our website. - </p> - - -Only in milkytracker-0.90.85/docs/: MilkyTracker.rtf ---- milkytracker-0.90.85/src/compression/DecompressorGZIP.cpp 2012-08-28 17:54:46.000000000 +0200 -+++ milkytracker-trunk/src/compression/DecompressorGZIP.cpp 2012-08-28 17:55:21.000000000 +0200 -@@ -57,11 +57,11 @@ - - bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint) - { -- gzFile *gz_input_file = NULL; -+ gzFile gz_input_file = NULL; - int len = 0; - pp_uint8 *buf; - -- if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL) -+ if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL) - return false; - - if ((buf = new pp_uint8[0x10000]) == NULL) -diff -cx .svn milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp -*** milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp 2009-03-28 11:19:41.392162000 +0000 ---- milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp 2010-01-03 18:48:15.616918068 +0000 -*************** -*** 102,124 **** - // Each function has to be cast.. surely there must be an easier way? - dlerror(); - jack_port_get_buffer = (void* (*)(jack_port_t*, jack_nframes_t)) -! dlsym(libJack, "jack_port_get_buffer"); - jack_client_new = (jack_client_t* (*)(const char*)) -! dlsym(libJack, "jack_client_new"); - jack_port_register = (jack_port_t* (*)(jack_client_t*, const char*, const char*, long unsigned int, long unsigned int)) -! dlsym(libJack, "jack_port_register"); - jack_set_process_callback = (int (*)(jack_client_t*, int (*)(jack_nframes_t, void*), void*)) -! dlsym(libJack, "jack_set_process_callback"); - jack_get_buffer_size = (jack_nframes_t (*)(jack_client_t*)) -! dlsym(libJack, "jack_get_buffer_size"); - jack_deactivate = (int (*)(jack_client_t*)) -! dlsym(libJack, "jack_deactivate"); - jack_client_close = (int (*)(jack_client_t*)) -! dlsym(libJack, "jack_client_close"); - jack_activate = (int (*)(jack_client_t*)) -! dlsym(libJack, "jack_activate"); - jack_get_sample_rate = (jack_nframes_t (*)(jack_client_t *)) -! dlsym(libJack, "jack_get_sample_rate"); - if(dlerror()) { - fprintf(stderr, "JACK: An error occured whilst loading symbols, aborting.\n"); - return -1; ---- 102,130 ---- - // Each function has to be cast.. surely there must be an easier way? - dlerror(); - jack_port_get_buffer = (void* (*)(jack_port_t*, jack_nframes_t)) -! dlsym(libJack, "jack_port_get_buffer"); - jack_client_new = (jack_client_t* (*)(const char*)) -! dlsym(libJack, "jack_client_new"); - jack_port_register = (jack_port_t* (*)(jack_client_t*, const char*, const char*, long unsigned int, long unsigned int)) -! dlsym(libJack, "jack_port_register"); - jack_set_process_callback = (int (*)(jack_client_t*, int (*)(jack_nframes_t, void*), void*)) -! dlsym(libJack, "jack_set_process_callback"); - jack_get_buffer_size = (jack_nframes_t (*)(jack_client_t*)) -! dlsym(libJack, "jack_get_buffer_size"); - jack_deactivate = (int (*)(jack_client_t*)) -! dlsym(libJack, "jack_deactivate"); - jack_client_close = (int (*)(jack_client_t*)) -! dlsym(libJack, "jack_client_close"); - jack_activate = (int (*)(jack_client_t*)) -! dlsym(libJack, "jack_activate"); - jack_get_sample_rate = (jack_nframes_t (*)(jack_client_t *)) -! dlsym(libJack, "jack_get_sample_rate"); -! jack_get_ports = (const char** (*)(jack_client_t *, const char *, const char *, unsigned long)) -! dlsym(libJack, "jack_get_ports"); -! jack_connect = (int (*)(jack_client_t *, const char *source_port, const char *destination_port)) -! dlsym(libJack, "jack_connect"); -! jack_port_name = (const char* (*)(const jack_port_t *)) -! dlsym(libJack, "jack_port_name"); - if(dlerror()) { - fprintf(stderr, "JACK: An error occured whilst loading symbols, aborting.\n"); - return -1; -*************** -*** 179,184 **** ---- 185,196 ---- - - mp_sint32 AudioDriver_JACK::start() - { -+ jack_get_ports = (const char** (*)(jack_client_t *, const char *, const char *, unsigned long)) -+ dlsym(libJack, "jack_get_ports"); -+ jack_connect = (int (*)(jack_client_t *, const char *source_port, const char *destination_port)) -+ dlsym(libJack, "jack_connect"); -+ jack_port_name = (const char* (*)(const jack_port_t *)) -+ dlsym(libJack, "jack_port_name"); - jack_activate(hJack); - deviceHasStarted = true; - return 0; -diff -cx .svn milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.h milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.h -*** milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.h 2009-03-28 11:19:41.392162000 +0000 ---- milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.h 2010-01-03 18:38:35.835648568 +0000 -*************** -*** 57,74 **** - jack_client_t *(*jack_client_new) (const char *client_name); - int (*jack_client_close) (jack_client_t *client); - int (*jack_set_process_callback) (jack_client_t *client, -! JackProcessCallback process_callback, -! void *arg); - int (*jack_activate) (jack_client_t *client); - int (*jack_deactivate) (jack_client_t *client); - jack_port_t *(*jack_port_register) (jack_client_t *client, -! const char *port_name, -! const char *port_type, -! unsigned long flags, -! unsigned long buffer_size); - void *(*jack_port_get_buffer) (jack_port_t *, jack_nframes_t); - jack_nframes_t (*jack_get_buffer_size) (jack_client_t *); - jack_nframes_t (*jack_get_sample_rate) (jack_client_t *); - - public: - AudioDriver_JACK(); ---- 57,83 ---- - jack_client_t *(*jack_client_new) (const char *client_name); - int (*jack_client_close) (jack_client_t *client); - int (*jack_set_process_callback) (jack_client_t *client, -! JackProcessCallback process_callback, -! void *arg); - int (*jack_activate) (jack_client_t *client); - int (*jack_deactivate) (jack_client_t *client); - jack_port_t *(*jack_port_register) (jack_client_t *client, -! const char *port_name, -! const char *port_type, -! unsigned long flags, -! unsigned long buffer_size); - void *(*jack_port_get_buffer) (jack_port_t *, jack_nframes_t); - jack_nframes_t (*jack_get_buffer_size) (jack_client_t *); - jack_nframes_t (*jack_get_sample_rate) (jack_client_t *); -+ const char ** (*jack_get_ports) (jack_client_t *, -+ const char *port_name_pattern, -+ const char *type_name_pattern, -+ unsigned long flags); -+ int (*jack_connect) (jack_client_t *, -+ const char *source_port, -+ const char *destination_port); -+ const char* (*jack_port_name) (const jack_port_t *); -+ - - public: - AudioDriver_JACK(); -*** milkytracker-0.90.85/configure.in 2009-09-17 20:35:47.231496000 +0100 ---- milkytracker-trunk/configure.in 2010-01-05 10:03:17.292774154 +0000 -*************** -*** 43,49 **** - - AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the 'libz' library.]),) - #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip")) -! PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75]) - - SDL_VERSION=1.2.0 - AM_PATH_SDL($SDL_VERSION,, AC_MSG_ERROR([Please install libSDL])) ---- 43,49 ---- - - AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the 'libz' library.]),) - #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip")) -! #PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75]) - - SDL_VERSION=1.2.0 - AM_PATH_SDL($SDL_VERSION,, AC_MSG_ERROR([Please install libSDL])) -*** milkytracker-0.90.85/configure 2010-01-02 00:03:37.602601121 +0000 ---- milkytracker-trunk/configure 2010-01-05 10:03:38.372781464 +0000 -*************** -*** 599,607 **** - SDL_LIBS - SDL_CFLAGS - SDL_CONFIG -- ZZIP_LIBS -- ZZIP_CFLAGS -- PKG_CONFIG - ALSA_LIBS - ALSA_CFLAGS - RTMIDI_DIR ---- 599,604 ---- -*************** -*** 717,726 **** - CCC - CC - CFLAGS -! CPP -! PKG_CONFIG -! ZZIP_CFLAGS -! ZZIP_LIBS' - - - # Initialize some variables set by options. ---- 714,720 ---- - CCC - CC - CFLAGS -! CPP' - - - # Initialize some variables set by options. -*************** -*** 1363,1371 **** - CC C compiler command - CFLAGS C compiler flags - CPP C preprocessor -- PKG_CONFIG path to pkg-config utility -- ZZIP_CFLAGS C compiler flags for ZZIP, overriding pkg-config -- ZZIP_LIBS linker flags for ZZIP, overriding pkg-config - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. ---- 1357,1362 ---- -*************** -*** 5313,5524 **** - fi - - #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip")) -! -! -! if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -! if test -n "$ac_tool_prefix"; then -! # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -! set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -! $as_echo_n "checking for $ac_word... " >&6; } -! if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : -! $as_echo_n "(cached) " >&6 -! else -! case $PKG_CONFIG in -! [\\/]* | ?:[\\/]*) -! ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -! ;; -! *) -! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -! for as_dir in $PATH -! do -! IFS=$as_save_IFS -! test -z "$as_dir" && as_dir=. -! for ac_exec_ext in '' $ac_executable_extensions; do -! if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -! ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -! break 2 -! fi -! done -! done -! IFS=$as_save_IFS -! -! ;; -! esac -! fi -! PKG_CONFIG=$ac_cv_path_PKG_CONFIG -! if test -n "$PKG_CONFIG"; then -! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -! $as_echo "$PKG_CONFIG" >&6; } -! else -! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -! $as_echo "no" >&6; } -! fi -! -! -! fi -! if test -z "$ac_cv_path_PKG_CONFIG"; then -! ac_pt_PKG_CONFIG=$PKG_CONFIG -! # Extract the first word of "pkg-config", so it can be a program name with args. -! set dummy pkg-config; ac_word=$2 -! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -! $as_echo_n "checking for $ac_word... " >&6; } -! if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : -! $as_echo_n "(cached) " >&6 -! else -! case $ac_pt_PKG_CONFIG in -! [\\/]* | ?:[\\/]*) -! ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -! ;; -! *) -! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -! for as_dir in $PATH -! do -! IFS=$as_save_IFS -! test -z "$as_dir" && as_dir=. -! for ac_exec_ext in '' $ac_executable_extensions; do -! if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -! ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -! break 2 -! fi -! done -! done -! IFS=$as_save_IFS -! -! ;; -! esac -! fi -! ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -! if test -n "$ac_pt_PKG_CONFIG"; then -! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -! $as_echo "$ac_pt_PKG_CONFIG" >&6; } -! else -! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -! $as_echo "no" >&6; } -! fi -! -! if test "x$ac_pt_PKG_CONFIG" = x; then -! PKG_CONFIG="" -! else -! case $cross_compiling:$ac_tool_warned in -! yes:) -! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -! ac_tool_warned=yes ;; -! esac -! PKG_CONFIG=$ac_pt_PKG_CONFIG -! fi -! else -! PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -! fi -! -! fi -! if test -n "$PKG_CONFIG"; then -! _pkg_min_version=0.9.0 -! { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -! $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } -! if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -! $as_echo "yes" >&6; } -! else -! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -! $as_echo "no" >&6; } -! PKG_CONFIG="" -! fi -! -! fi -! -! pkg_failed=no -! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZZIP" >&5 -! $as_echo_n "checking for ZZIP... " >&6; } -! -! if test -n "$PKG_CONFIG"; then -! if test -n "$ZZIP_CFLAGS"; then -! pkg_cv_ZZIP_CFLAGS="$ZZIP_CFLAGS" -! else -! if test -n "$PKG_CONFIG" && \ -! { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5 -! ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5 -! ac_status=$? -! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -! test $ac_status = 0; }; then -! pkg_cv_ZZIP_CFLAGS=`$PKG_CONFIG --cflags "zziplib >= 0.10.75" 2>/dev/null` -! else -! pkg_failed=yes -! fi -! fi -! else -! pkg_failed=untried -! fi -! if test -n "$PKG_CONFIG"; then -! if test -n "$ZZIP_LIBS"; then -! pkg_cv_ZZIP_LIBS="$ZZIP_LIBS" -! else -! if test -n "$PKG_CONFIG" && \ -! { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5 -! ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5 -! ac_status=$? -! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -! test $ac_status = 0; }; then -! pkg_cv_ZZIP_LIBS=`$PKG_CONFIG --libs "zziplib >= 0.10.75" 2>/dev/null` -! else -! pkg_failed=yes -! fi -! fi -! else -! pkg_failed=untried -! fi -! -! -! -! if test $pkg_failed = yes; then -! -! if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -! _pkg_short_errors_supported=yes -! else -! _pkg_short_errors_supported=no -! fi -! if test $_pkg_short_errors_supported = yes; then -! ZZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "zziplib >= 0.10.75"` -! else -! ZZIP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zziplib >= 0.10.75"` -! fi -! # Put the nasty error message in config.log where it belongs -! echo "$ZZIP_PKG_ERRORS" >&5 -! -! as_fn_error "Package requirements (zziplib >= 0.10.75) were not met: -! -! $ZZIP_PKG_ERRORS -! -! Consider adjusting the PKG_CONFIG_PATH environment variable if you -! installed software in a non-standard prefix. -! -! Alternatively, you may set the environment variables ZZIP_CFLAGS -! and ZZIP_LIBS to avoid the need to call pkg-config. -! See the pkg-config man page for more details. -! " "$LINENO" 5 -! elif test $pkg_failed = untried; then -! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -! as_fn_error "The pkg-config script could not be found or is too old. Make sure it -! is in your PATH or set the PKG_CONFIG environment variable to the full -! path to pkg-config. -! -! Alternatively, you may set the environment variables ZZIP_CFLAGS -! and ZZIP_LIBS to avoid the need to call pkg-config. -! See the pkg-config man page for more details. -! -! To get pkg-config, see <http://pkg-config.freedesktop.org/>. -! See \`config.log' for more details." "$LINENO" 5; } -! else -! ZZIP_CFLAGS=$pkg_cv_ZZIP_CFLAGS -! ZZIP_LIBS=$pkg_cv_ZZIP_LIBS -! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -! $as_echo "yes" >&6; } -! : -! fi - - SDL_VERSION=1.2.0 - ---- 5304,5310 ---- - fi - - #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip")) -! #PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75]) - - SDL_VERSION=1.2.0 - diff --git a/community/minetest/PKGBUILD b/community/minetest/PKGBUILD index a4673ea18..f54209b0f 100644 --- a/community/minetest/PKGBUILD +++ b/community/minetest/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 92558 2013-06-08 12:13:58Z lcarlier $ +# $Id: PKGBUILD 101392 2013-11-24 18:49:30Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Konsta Kokkinen <kray@tsundere.fi> pkgname=minetest -pkgver=0.4.7 +pkgver=0.4.8 pkgrel=1 pkgdesc='An Infiniminer/Minecraft inspired game' arch=('i686' 'x86_64') url='http://minetest.net/' license=('GPL') -depends=('sqlite' 'libgl' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'hicolor-icon-theme') -makedepends=('cmake' 'irrlicht' 'mesa') +depends=('sqlite' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'irrlicht' 'hicolor-icon-theme') +makedepends=('cmake') install=minetest.install source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver} ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver}) -md5sums=('232b87ef5c4300ddad7bc883f8f1a1c5' - '30a9965667470ebc785979de665d4df4') +md5sums=('90dd6a3c2c587a3e55df59ba4458cd65' + 'df88f4a28ad10e9ab8c445bd28a504e2') build() { cd "$srcdir"/minetest-minetest-* diff --git a/community/mingw-w64-binutils/PKGBUILD b/community/mingw-w64-binutils/PKGBUILD new file mode 100644 index 000000000..469ced17d --- /dev/null +++ b/community/mingw-w64-binutils/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 101172 2013-11-18 17:41:58Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com + +_targets="i686-w64-mingw32 x86_64-w64-mingw32" + +pkgname=mingw-w64-binutils +pkgver=2.23.2 +pkgrel=2 +pkgdesc="Cross binutils for the MinGW-w64 cross-compiler" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/binutils" +license=('GPL') +groups=('mingw-w64-toolchain' 'mingw-w64') +depends=('zlib') +options=('!libtool' '!emptydirs') +source=("http://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz" + "binutils-2.23.2-texinfo-5.0.patch.txt") +md5sums=('cda9dcc08c86ff2fd3f27e4adb250f6f' + '34e439ce23213a91e2af872dfbb5094c') + +prepare() { + cd ${srcdir}/binutils-${pkgver} + # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935 + # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542 + patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch.txt + + #do not install libiberty + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure +} + +build() { + for _target in $_targets; do + msg "Building ${_target} cross binutils" + mkdir -p ${srcdir}/binutils-${_target} && cd "${srcdir}/binutils-${_target}" + $srcdir/binutils-${pkgver}/configure --prefix=/usr \ + --target=${_target} \ + --infodir=/usr/share/info/${_target} \ + --enable-lto --enable-plugins \ + --disable-multilib --disable-nls + make + done +} + +package() { + for _target in ${_targets}; do + msg "Installing ${_target} cross binutils" + cd ${srcdir}/binutils-${_target} + make DESTDIR=${pkgdir} install + done +} diff --git a/community/mingw-w64-binutils/binutils-2.23.2-texinfo-5.0.patch.txt b/community/mingw-w64-binutils/binutils-2.23.2-texinfo-5.0.patch.txt new file mode 100644 index 000000000..38dc19fb0 --- /dev/null +++ b/community/mingw-w64-binutils/binutils-2.23.2-texinfo-5.0.patch.txt @@ -0,0 +1,162 @@ +diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo +index 45ffa73..3aa3300 100644 +--- a/bfd/doc/bfd.texinfo ++++ b/bfd/doc/bfd.texinfo +@@ -322,7 +324,7 @@ All of BFD lives in one directory. + @printindex cp + + @tex +-% I think something like @colophon should be in texinfo. In the ++% I think something like @@colophon should be in texinfo. In the + % meantime: + \long\def\colophon{\hbox to0pt{}\vfill + \centerline{The body of this manual is set in} +@@ -333,7 +335,7 @@ All of BFD lives in one directory. + \centerline{{\sl\fontname\tensl\/}} + \centerline{are used for emphasis.}\vfill} + \page\colophon +-% Blame: doc@cygnus.com, 28mar91. ++% Blame: doc@@cygnus.com, 28mar91. + @end tex + + @bye +diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi +index 56a0510..fb1802b 100644 +--- a/binutils/doc/binutils.texi ++++ b/binutils/doc/binutils.texi +@@ -148,18 +148,18 @@ in the section entitled ``GNU Free Documentation License''. + * objcopy:: Copy and translate object files + * objdump:: Display information from object files + * ranlib:: Generate index to archive contents +-* readelf:: Display the contents of ELF format files + * size:: List section sizes and total size + * strings:: List printable strings from files + * strip:: Discard symbols +-* elfedit:: Update the ELF header of ELF files + * c++filt:: Filter to demangle encoded C++ symbols + * cxxfilt: c++filt. MS-DOS name for c++filt + * addr2line:: Convert addresses to file and line + * nlmconv:: Converts object code into an NLM +-* windres:: Manipulate Windows resources + * windmc:: Generator for Windows message resources ++* windres:: Manipulate Windows resources + * dlltool:: Create files needed to build and use DLLs ++* readelf:: Display the contents of ELF format files ++* elfedit:: Update the ELF header of ELF files + * Common Options:: Command-line options for all utilities + * Selecting the Target System:: How these utilities determine the target + * Reporting Bugs:: Reporting Bugs +@@ -2907,7 +2907,7 @@ the Info entries for @file{binutils}. + @c man end + @end ignore + +-@node c++filt, addr2line, elfedit, Top ++@node c++filt, addr2line, strip, Top + @chapter c++filt + + @kindex c++filt +@@ -4384,7 +4384,7 @@ equivalent. At least one of the @option{--output-mach}, + + @table @env + +-@itemx --input-mach=@var{machine} ++@item --input-mach=@var{machine} + Set the matching input ELF machine type to @var{machine}. If + @option{--input-mach} isn't specified, it will match any ELF + machine types. +@@ -4392,21 +4392,21 @@ machine types. + The supported ELF machine types are, @var{L1OM}, @var{K1OM} and + @var{x86-64}. + +-@itemx --output-mach=@var{machine} ++@item --output-mach=@var{machine} + Change the ELF machine type in the ELF header to @var{machine}. The + supported ELF machine types are the same as @option{--input-mach}. + +-@itemx --input-type=@var{type} ++@item --input-type=@var{type} + Set the matching input ELF file type to @var{type}. If + @option{--input-type} isn't specified, it will match any ELF file types. + + The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}. + +-@itemx --output-type=@var{type} ++@item --output-type=@var{type} + Change the ELF file type in the ELF header to @var{type}. The + supported ELF types are the same as @option{--input-type}. + +-@itemx --input-osabi=@var{osabi} ++@item --input-osabi=@var{osabi} + Set the matching input ELF file OSABI to @var{osabi}. If + @option{--input-osabi} isn't specified, it will match any ELF OSABIs. + +@@ -4416,7 +4416,7 @@ The supported ELF OSABIs are, @var{none}, @var{HPUX}, @var{NetBSD}, + @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS}, + @var{NSK}, @var{AROS} and @var{FenixOS}. + +-@itemx --output-osabi=@var{osabi} ++@item --output-osabi=@var{osabi} + Change the ELF OSABI in the ELF header to @var{osabi}. The + supported ELF OSABI are the same as @option{--input-osabi}. + +diff --git a/ld/ld.texinfo b/ld/ld.texinfo +index c7ae2a5..4777ad5 100644 +--- a/ld/ld.texinfo ++++ b/ld/ld.texinfo +@@ -142,12 +144,12 @@ in the section entitled ``GNU Free Documentation License''. + @ifset ARM + * ARM:: ld and the ARM family + @end ifset +-@ifset HPPA +-* HPPA ELF32:: ld and HPPA 32-bit ELF +-@end ifset + @ifset M68HC11 + * M68HC11/68HC12:: ld and the Motorola 68HC11 and 68HC12 families + @end ifset ++@ifset HPPA ++* HPPA ELF32:: ld and HPPA 32-bit ELF ++@end ifset + @ifset M68K + * M68K:: ld and Motorola 68K family + @end ifset +@@ -6012,6 +6014,9 @@ functionality are not listed. + @ifset I960 + * i960:: @command{ld} and the Intel 960 family + @end ifset ++@ifset M68HC11 ++* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families ++@end ifset + @ifset ARM + * ARM:: @command{ld} and the ARM family + @end ifset +@@ -6027,9 +6032,6 @@ functionality are not listed. + @ifset MSP430 + * MSP430:: @command{ld} and MSP430 + @end ifset +-@ifset M68HC11 +-* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families +-@end ifset + @ifset POWERPC + * PowerPC ELF32:: @command{ld} and PowerPC 32-bit ELF Support + @end ifset +@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same + @printindex cp + + @tex +-% I think something like @colophon should be in texinfo. In the ++% I think something like @@colophon should be in texinfo. In the + % meantime: + \long\def\colophon{\hbox to0pt{}\vfill + \centerline{The body of this manual is set in} +@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same + \centerline{{\sl\fontname\tensl\/}} + \centerline{are used for emphasis.}\vfill} + \page\colophon +-% Blame: doc@cygnus.com, 28mar91. ++% Blame: doc@@cygnus.com, 28mar91. + @end tex + + @bye +-- +1.7.1 + diff --git a/community/mingw-w64-gcc-base/PKGBUILD b/community/mingw-w64-gcc-base/PKGBUILD new file mode 100644 index 000000000..d1d33407e --- /dev/null +++ b/community/mingw-w64-gcc-base/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 101177 2013-11-18 17:42:31Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com + +_targets="i686-w64-mingw32 x86_64-w64-mingw32" + +pkgname=mingw-w64-gcc-base +pkgver=4.8.2 +pkgrel=2 +pkgdesc="Cross GCC for the MinGW-w64 cross-compiler (bootstrap)" +arch=('i686' 'x86_64') +url="http://gcc.gnu.org" +license=('GPL' 'LGPL' 'FDL' 'custom') +groups=('mingw-w64-bootstrap' 'mingw-w64') +depends=('zlib' 'libmpc' 'ppl' 'cloog' 'mingw-w64-binutils' 'mingw-w64-headers' 'mingw-w64-headers-bootstrap') +conflicts=('mingw-w64-gcc') +options=('staticlibs' '!emptydirs') +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) +md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d') + +prepare() { + cd ${srcdir}/gcc-${pkgver} + + #do not install libiberty + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + # hack! - some configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure +} + +build() { + for _target in ${_targets}; do + msg "Building ${_target} GCC C compiler" + mkdir -p ${srcdir}/gcc-build-${_target} && cd ${srcdir}/gcc-build-${_target} + + ${srcdir}/gcc-${pkgver}/configure --prefix=/usr \ + --target=${_target} \ + --enable-languages=c,lto \ + --enable-shared --enable-static \ + --enable-threads=win32 \ + --with-system-zlib --enable-cloog-backend=isl \ + --disable-cloog-version-check --disable-isl-version-check \ + --enable-lto --disable-dw2-exceptions --enable-libgomp \ + --disable-nls --enable-version-specific-runtime-libs \ + --disable-multilib --enable-checking=release + make all-gcc + done +} + +package() { + for _target in ${_targets}; do + msg "Installing ${_target} GCC C compiler" + cd ${srcdir}/gcc-build-${_target} + make DESTDIR=${pkgdir} install-gcc + strip ${pkgdir}/usr/bin/${_target}-* + strip ${pkgdir}/usr/libexec/gcc/${_target}/${pkgver}/{cc1,collect2,lto*} + done + # remove unnecessary files + msg "Removing man and info pages" + rm -r ${pkgdir}/usr/share/man + rm -r ${pkgdir}/usr/share/info +} diff --git a/community/mingw-w64-gcc/PKGBUILD b/community/mingw-w64-gcc/PKGBUILD new file mode 100644 index 000000000..999fc9584 --- /dev/null +++ b/community/mingw-w64-gcc/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 101210 2013-11-19 19:03:58Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com + +_targets="i686-w64-mingw32 x86_64-w64-mingw32" + +pkgname=mingw-w64-gcc +pkgver=4.8.2 +pkgrel=4 +pkgdesc="Cross GCC for the MinGW-w64 cross-compiler" +arch=('i686' 'x86_64') +url="http://gcc.gnu.org" +license=('GPL' 'LGPL' 'FDL' 'custom') +groups=('mingw-w64-toolchain' 'mingw-w64') +depends=('zlib' 'libmpc' 'ppl' 'cloog' 'mingw-w64-crt' 'mingw-w64-binutils' 'mingw-w64-winpthreads' 'mingw-w64-headers' 'mingw-w64-headers-bootstrap') +makedepends=("gcc-ada=${pkgver}" 'mingw-w64-gcc-base') +#checkdepends=('dejagnu') # Windows executables could run on Arch through bin_mft and Wine +optdepends=() +provides=('mingw-w64-gcc-base') +conflicts=('mingw-w64-gcc-base') +replaces=() +backup=() +options=('!strip' 'staticlibs' '!emptydirs' '!buildflags') +source=("ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2" + 'gcc-make-xmmintrin-header-cplusplus-compatible.patch') +md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d' + 'da6c9ba6baebe1286f3219d4181cdbb8') + +prepare() { + cd ${srcdir}/gcc-${pkgver} + + #do not install libiberty + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + # hack! - some configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure + + # The file xmmintrin.h doesn't contain an extern "C" part + # This conflicts with mingw-w64 intrin.h and results in build + # failure like this one in mingw-w64-qt5-qtbase: + # /usr/lib/gcc/i686-w64-mingw32/4.8.0/include/xmmintrin.h:997:1: error: previous declaration of 'int _m_pextrw(__m64, int)' with 'C++' linkage + # /usr/i686-w64-mingw32/include/intrin.h:561:28: error: conflicts with new declaration with 'C' linkage + patch -p0 -i ${srcdir}/gcc-make-xmmintrin-header-cplusplus-compatible.patch +} + +build() { + for _target in ${_targets}; do + mkdir -p ${srcdir}/gcc-build-${_target} && cd ${srcdir}/gcc-build-${_target} + + ${srcdir}/gcc-${pkgver}/configure --prefix=/usr \ + --target=${_target} \ + --enable-languages=c,lto,c++,objc,obj-c++,fortran,ada \ + --enable-shared --enable-static \ + --enable-threads=posix --enable-fully-dynamic-string --enable-libstdcxx-time=yes \ + --with-system-zlib --enable-cloog-backend=isl \ + --disable-cloog-version-check --disable-isl-version-check \ + --enable-lto --disable-dw2-exceptions --enable-libgomp \ + --disable-multilib --enable-checking=release + make all + done +} + +package() { + for _target in ${_targets}; do + cd ${srcdir}/gcc-build-${_target} + make DESTDIR=${pkgdir} install + ${_target}-strip ${pkgdir}/usr/${_target}/lib/*.dll + strip ${pkgdir}/usr/bin/${_target}-* + strip ${pkgdir}/usr/libexec/gcc/${_target}/${pkgver}/{cc1*,collect2,gnat1,f951,lto*} + ln -s ${_target}-gcc $pkgdir/usr/bin/${_target}-cc + done + strip ${pkgdir}/usr/bin/* + # remove unnecessary files + rm -r ${pkgdir}/usr/share +} diff --git a/community/mingw-w64-gcc/gcc-make-xmmintrin-header-cplusplus-compatible.patch b/community/mingw-w64-gcc/gcc-make-xmmintrin-header-cplusplus-compatible.patch new file mode 100644 index 000000000..c5ca43209 --- /dev/null +++ b/community/mingw-w64-gcc/gcc-make-xmmintrin-header-cplusplus-compatible.patch @@ -0,0 +1,24 @@ +--- gcc/config/i386/xmmintrin.h.orig 2013-01-18 14:57:27.762645582 +0100 ++++ gcc/config/i386/xmmintrin.h 2013-01-18 14:58:27.604561940 +0100 +@@ -37,6 +37,10 @@ + /* Get _mm_malloc () and _mm_free (). */ + #include <mm_malloc.h> + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + /* The Intel API is flexible enough that we must allow aliasing with other + vector types, and their scalar components. */ + typedef float __m128 __attribute__ ((__vector_size__ (16), __may_alias__)); +@@ -1241,6 +1245,10 @@ + (row3) = __builtin_ia32_movhlps (__t3, __t2); \ + } while (0) + ++#ifdef __cplusplus ++} ++#endif ++ + /* For backward source compatibility. */ + #ifdef __SSE2__ + # include <emmintrin.h> diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD deleted file mode 100644 index 1b462e15f..000000000 --- a/community/mingw32-binutils/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 83337 2013-01-29 19:58:19Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Ondrej Jirman <megous@megous.com> -# Contributor: mosra <mosra@centrum.cz> - -pkgname=mingw32-binutils -pkgver=2.23.1 -pkgrel=3 -_uprel=1 -arch=(i686 x86_64) -url="https://sourceforge.net/projects/mingw/files/MinGW/Base/binutils/" -pkgdesc="A set of programs to assemble and manipulate binary and object files (mingw)" -depends=('glibc' 'zlib') -license=(GPL) -source=("https://downloads.sourceforge.net/project/mingw/MinGW/Base/binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma" - "260cd952.patch::http://sourceware.org/git/?p=binutils.git;a=patch;h=260cd95271cdf002ed8e419898fd29c42e257841") -md5sums=('5d76604f545b151230d1c86e1b8cfab3' - '9226501a8258a12c81956252ba3b4ba1') - -build() { - [ $NOEXTRACT -eq 1 ] || tar --lzma -xf binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma - [ $NOEXTRACT -eq 1 ] || tar xjf binutils-$pkgver-${_uprel}-mingw32-src/binutils-$pkgver.tar.bz2 - - cd $srcdir/binutils-$pkgver - patch -Np1 <$srcdir/260cd952.patch || true - ./configure \ - --target=i486-mingw32 \ - --host=$CHOST \ - --build=$CHOST \ - --prefix=/usr \ - --disable-nls \ - --enable-shared - make - make install DESTDIR=$pkgdir - rm -rf $pkgdir/usr/lib - rm -rf $pkgdir/usr/share/{info,man} -} diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD deleted file mode 100644 index 73f13fce9..000000000 --- a/community/mingw32-gcc-base/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 79594 2012-11-08 15:25:54Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Ondrej Jirman <megous@megous.com> - -pkgname=mingw32-gcc-base -pkgver=4.7.2 -_w32apiver=3.17 -_runtimever=3.20 -_uprel=1 -_upw32rel=1 -pkgrel=1 -arch=(i686 x86_64) -pkgdesc="A C cross-compiler for building Windows executables on Linux" -depends=(mingw32-binutils) -makedepends=(p7zip mingw32-runtime mingw32-w32api) -conflicts=(mingw32-gcc) -options=(!strip) -license=(GPL LGPL) -url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/" -source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma - http://downloads.sourceforge.net/project/mingw/MinGW/Base/w32api/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma - http://downloads.sourceforge.net/project/mingw/MinGW/Base/mingw-rt/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz - gcc-1-mingw-float.patch) -md5sums=('bc2d1828dd6c53683600545ca6a901e1' - '89e5800096aa334009f98e7c1743d825' - '26c0886cc60729b94956cc6d81cd076c' - '2407123c35c0aa92ee5ffc27decca9a7') - -build() -{ - if [ $NOEXTRACT -ne 1 ]; then - # prepare headers - mkdir -p $srcdir/mingw/include/ - cp -r $srcdir/w32api-${_w32apiver}-${_upw32rel}-mingw32/include/* \ - $srcdir/mingwrt-${_runtimever}-mingw32/include/* \ - $srcdir/mingw/include/ - - unset CFLAGS CXXFLAGS - -# tar xJf gcc-$pkgver-${_uprel}-mingw32-src.tar.xz - cd $srcdir - tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2 - - patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch - - mkdir -p $srcdir/build - cd $srcdir/build - - chmod ugo+x $srcdir/gcc-$pkgver/configure - chmod ugo+x $srcdir/gcc-$pkgver/move-if-change - - $srcdir/gcc-$pkgver/configure \ - --target=i486-mingw32 \ - --host=$CHOST \ - --build=$CHOST \ - --prefix=/usr \ - --enable-languages=c \ - --enable-sjlj-exceptions \ - --enable-hash-synchronization \ - --disable-nls \ - --disable-shared \ - --disable-libssp \ - --disable-libgomp \ - --with-build-sysroot=$srcdir \ - --with-headers=$srcdir/include - else - cd $srcdir/build - fi - - make - make install DESTDIR=$pkgdir - - cd $pkgdir - rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \ - usr/{include,lib/libiberty.a} usr/i486-mingw32 \ - usr/share/{info,man} usr/i486-mingw32 - strip usr/bin/* - strip usr/libexec/gcc/i486-mingw32/$pkgver/{cc1*,collect2} - i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a -} diff --git a/community/mingw32-gcc-base/gcc-1-mingw-float.patch b/community/mingw32-gcc-base/gcc-1-mingw-float.patch deleted file mode 100644 index 365949ad7..000000000 --- a/community/mingw32-gcc-base/gcc-1-mingw-float.patch +++ /dev/null @@ -1,18 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html -http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 - -diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h ---- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 -+++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 -@@ -275,3 +275,7 @@ - #endif /* __STDC_WANT_DEC_FP__ */ - - #endif /* _FLOAT_H___ */ -+ -+#ifdef __MINGW32__ -+#include_next<float.h> -+#endif diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD deleted file mode 100644 index e6cb07938..000000000 --- a/community/mingw32-gcc/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# $Id: PKGBUILD 79591 2012-11-08 15:24:17Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Ondrej Jirman <megous@megous.com> - -pkgname=mingw32-gcc -pkgver=4.7.2 -pkgrel=1 -_uprel=1 -arch=(i686 x86_64) -pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" -depends=('mingw32-pthreads' 'mingw32-runtime' 'mingw32-binutils' 'mingw32-w32api' - 'libmpc' 'elfutils' 'gmp') -replaces=('mingw32-gcc-base') -provides=('mingw32-gcc-base') -options=(!strip) -url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/" -license=(GPL LGPL) -source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma - gcc-1-mingw-float.patch) -md5sums=('bc2d1828dd6c53683600545ca6a901e1' - '2407123c35c0aa92ee5ffc27decca9a7') - -build() -{ - [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2 - - patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch - - mkdir -p $srcdir/build - cd $srcdir/build - - unset CFLAGS CXXFLAGS - - chmod ugo+x $srcdir/gcc-$pkgver/configure - chmod ugo+x $srcdir/gcc-$pkgver/move-if-change - - msg "gcc" - [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \ - --target=i486-mingw32 \ - --host=$CHOST \ - --build=$CHOST \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++ \ - --enable-shared \ - --enable-sjlj-exceptions \ - --enable-hash-synchronization \ - --disable-nls \ - --disable-libssp \ - --enable-libgomp - - make - make install DESTDIR=$pkgdir - - msg "libgcc" - make -j1 -C i486-mingw32/libgcc DESTDIR=${pkgdir} libgcc_eh.a install - - msg "libstdc++" - make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install - - msg "fixes" - cd $pkgdir/usr/i486-mingw32/lib - mkdir -p $pkgdir/usr/i486-mingw32/bin/ - for i in `ls -1 *.dll`; do - ln -s ../lib/$i $pkgdir/usr/i486-mingw32/bin/$i - done - - cd $pkgdir - rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \ - usr/{include,lib/libiberty.a} \ - usr/share/{info,man} \ - usr/share/gcc-$pkgver/python - - strip usr/bin/* - strip usr/lib/gcc/i486-mingw32/$pkgver/{cc1*,collect2} - i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a -} diff --git a/community/mingw32-gcc/gcc-1-mingw-float.patch b/community/mingw32-gcc/gcc-1-mingw-float.patch deleted file mode 100644 index 365949ad7..000000000 --- a/community/mingw32-gcc/gcc-1-mingw-float.patch +++ /dev/null @@ -1,18 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html -http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 - -diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h ---- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 -+++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 -@@ -275,3 +275,7 @@ - #endif /* __STDC_WANT_DEC_FP__ */ - - #endif /* _FLOAT_H___ */ -+ -+#ifdef __MINGW32__ -+#include_next<float.h> -+#endif diff --git a/community/mingw32-pthreads/PKGBUILD b/community/mingw32-pthreads/PKGBUILD deleted file mode 100644 index f34d87ddf..000000000 --- a/community/mingw32-pthreads/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 73530 2012-07-09 08:46:34Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Marcel Schneider marcelATcoopmastersDOTde - -pkgname=mingw32-pthreads -pkgver=2.9.1 -pkgrel=1 -arch=(i686 x86_64) -pkgdesc="The POSIX 1003.1-2001 standard for writing multithreaded applications." -license=(LGPL) -makedepends=('mingw32-gcc-base' 'mingw32-runtime' 'mingw32-w32api') -url="http://sourceware.org/pthreads-win32/" -options=(!strip) -source=(ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${pkgver//./-}-release.tar.gz) -md5sums=('36ba827d6aa0fa9f9ae740a35626e2e3') - -build() { - cd $srcdir/pthreads-w32-${pkgver//./-}-release - make CROSS=i486-mingw32- clean GC -} - -package() { - cd $srcdir/pthreads-w32-${pkgver//./-}-release - mkdir $pkgdir/usr - mkdir $pkgdir/usr/i486-mingw32 - mkdir $pkgdir/usr/i486-mingw32/include - mkdir $pkgdir/usr/i486-mingw32/lib - install $srcdir/pthreads-w32-${pkgver//./-}-release/pthread.h $pkgdir/usr/i486-mingw32/include/pthread.h - install $srcdir/pthreads-w32-${pkgver//./-}-release/sched.h $pkgdir/usr/i486-mingw32/include/sched.h - install $srcdir/pthreads-w32-${pkgver//./-}-release/semaphore.h $pkgdir/usr/i486-mingw32/include/semaphore.h - install $srcdir/pthreads-w32-${pkgver//./-}-release/libpthreadGC2.a $pkgdir/usr/i486-mingw32/lib/libpthread.a - install $srcdir/pthreads-w32-${pkgver//./-}-release/pthreadGC2.dll $pkgdir/usr/i486-mingw32/lib/ -} diff --git a/community/minicom/PKGBUILD b/community/minicom/PKGBUILD new file mode 100644 index 000000000..42961ce69 --- /dev/null +++ b/community/minicom/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 102303 2013-12-07 19:40:29Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Denis Tikhomirov <dvtikhomirov@gmail.com> + +pkgname=minicom +pkgver=2.6.2 +pkgrel=2 +pkgdesc="A serial communication program" +arch=('i686' 'x86_64') +url="http://alioth.debian.org/projects/minicom/" +license=('GPL') +depends=('bash') +optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols') +backup=('etc/minirc.dfl') +source=("https://alioth.debian.org/frs/download.php/file/3869/${pkgname}-${pkgver}.tar.gz") +md5sums=('203c56c4b447f45e2301b0cc4e83da3c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install + install -Dm644 doc/minirc.dfl ${pkgdir}/etc/minirc.dfl +} diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index d06bc7cc6..8716ee72d 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94892 2013-08-01 06:55:08Z bpiotrowski $ +# $Id: PKGBUILD 101843 2013-12-02 10:48:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -6,8 +6,8 @@ # Contributor: Kamil Kaminski <kyle@kkaminsk.com> pkgname=minidlna -pkgver=1.1.0 -pkgrel=3 +pkgver=1.1.1 +pkgrel=2 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/minidlna/" @@ -20,7 +20,7 @@ changelog=changelog source=(http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minidlna-$pkgver.tar.gz minidlna.service minidlna.tmpfiles) -md5sums=('26484a84af3fceafdee26595aae097f7' +md5sums=('653405555ac3f8eb4aacc54c1be7b5fa' '7e3890ee50aa4dfa4d1754261e6cc965' '26de27b12d6a37c47d9714107d07aac9') @@ -36,4 +36,6 @@ package() { install -Dm644 minidlna.conf ${pkgdir}/etc/minidlna.conf install -Dm0644 $srcdir/minidlna.tmpfiles $pkgdir/usr/lib/tmpfiles.d/minidlna.conf install -Dm0644 $srcdir/minidlna.service $pkgdir/usr/lib/systemd/system/minidlna.service + install -Dm644 $srcdir/$pkgname-$pkgver/minidlna.conf.5 $pkgdir/usr/share/man/man5/minidlna.conf.5 + install -Dm644 $srcdir/$pkgname-$pkgver/minidlnad.8 $pkgdir/usr/share/man/man8/minidlnad.8 } diff --git a/community/minidlna/minidlna.install b/community/minidlna/minidlna.install index c9cdc0f13..0f6951379 100644 --- a/community/minidlna/minidlna.install +++ b/community/minidlna/minidlna.install @@ -1,5 +1,7 @@ post_install() { systemd-tmpfiles --create minidlna.conf + touch var/log/minidlna.log + chown nobody:nobody var/log/minidlna.log } post_upgrade() { diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index d8998635f..e7dda9909 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99147 2013-10-25 05:02:21Z fyan $ +# $Id: PKGBUILD 102260 2013-12-07 10:36:45Z bpiotrowski $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,8 +6,8 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.4.7 -pkgrel=1 +pkgver=2.4.8 +pkgrel=2 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64') url='http://www.mongodb.org' @@ -74,7 +74,7 @@ package() { install -dm755 "$pkgdir/var/log/mongodb" } -sha512sums=('bd682944f5388cef9115ccdf0d8488d2a7a699974f395dd9eea62562528a7a6205fceb92c148187f003362f1ef983ead672cacacc678b2f2b77cdd827812b6c9' +sha512sums=('33202f101d00c796253c5fd333242ce2c5399352bf325e0af1df92d9c291d7a768bbed56f7b7fccfaa3cea2385cec941bd05cb27a635ca034485bd39ef4129a1' '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c' '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9' 'e709f76fa71a10d6b72d2eeae65d715e0a0a7e6cb93704114f22db8662d7102de77bd1e6706049351beb159aaa04548cfe4b14fe6ee498a166c5ad54c8275f84') diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD index 41df99725..a2fc499b6 100644 --- a/community/mosh/PKGBUILD +++ b/community/mosh/PKGBUILD @@ -5,7 +5,7 @@ pkgname=mosh pkgver=1.2.4 -pkgrel=1 +pkgrel=2 pkgdesc='Mobile shell, surviving disconnects with local echo and line editing' arch=('x86_64' 'i686') url='http://mosh.mit.edu/' @@ -13,11 +13,10 @@ license=('GPL3') depends=('protobuf' 'ncurses' 'zlib' 'openssh' 'perl' 'perl-io-tty' 'libutempter') source=("http://$pkgname.mit.edu/$pkgname-$pkgver.tar.gz") sha256sums=('e74d0d323226046e402dd469a176075fc2013b69b0e67cea49762c957175df46') -optdepends=('ufw-extras') options=('!emptydirs') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./autogen.sh ./configure --prefix=/usr @@ -25,10 +24,8 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 "conf/bash_completion.d/$pkgname" \ + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + install -Dm644 "$pkgname-$pkgver/conf/bash_completion.d/$pkgname" \ "$pkgdir/usr/share/bash-completion/completions/$pkgname" } diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index 4ea19c68e..1c1b87aa8 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100387 2013-11-03 11:15:18Z bpiotrowski $ +# $Id: PKGBUILD 102925 2013-12-24 08:38:45Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Eivind Uggedal <eivind@uggedal.com> pkgname=mpv -pkgver=0.2.2 -pkgrel=1 +pkgver=0.2.4 +pkgrel=3 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') license=('GPL') @@ -12,24 +12,21 @@ url='http://mpv.io' depends=( 'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libxinerama' 'libquvi' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils' - 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua51' + 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua' ) makedepends=('mesa' 'python-docutils') options=(!emptydirs) install=mpv.install source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz) -md5sums=('632d1ee368fe7355563047bbdcd7b08a') +md5sums=('465e99ed24478f3a2afe5ae1c4fdd7f4') build() { - unset CFLAGS - unset LDFLAGS - cd $pkgname-$pkgver ./configure --prefix=/usr \ --confdir=/etc/mpv \ - --disable-lircc \ - --disable-joystick \ + --enable-joystick \ + --enable-wayland \ --disable-radio \ --disable-radio-capture \ --disable-radio-v4l2 \ diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 6bfd97463..93b0d294e 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99916 2013-10-31 02:27:20Z allan $ +# $Id: PKGBUILD 101571 2013-11-28 01:27:47Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Adam Hani Schakaki <adam@schakaki.net> # Contributor: Ner0 pkgname=muffin -pkgver=2.0.3 +pkgver=2.0.5 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz") -sha256sums=('5d3f3916dce25f1e4398b28452688db540800eec379cf8891a925d4d56322b8c') +sha256sums=('81a57d452ea88ea926b284248033f021960400b3b9d13f5a334a77cf3bd4c7ee') build() { cd ${pkgname}-${pkgver} diff --git a/community/multitail/PKGBUILD b/community/multitail/PKGBUILD index 49b813ba2..e9626e58e 100644 --- a/community/multitail/PKGBUILD +++ b/community/multitail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92994 2013-06-21 13:00:51Z kkeen $ +# $Id: PKGBUILD 101979 2013-12-03 09:00:37Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Roberto Carvajal <roberto@archlinux.org> pkgname=multitail -pkgver=5.2.13 +pkgver=6.0 pkgrel=1 pkgdesc="Lets you view one or multiple files like the original tail program" arch=('i686' 'x86_64') @@ -13,10 +13,12 @@ url="http://www.vanheusden.com/multitail" depends=('ncurses') backup=('etc/multitail.conf') source=("${url}/${pkgname}-${pkgver}.tgz") -md5sums=('71a774b6d6bb430672c8a9252baac6e6') +md5sums=('fb8efc547d389257021885fe5402255c') build() { cd "$srcdir/$pkgname-$pkgver" + sed -i 's|ncursesw/panel.h|panel.h|' mt.h + sed -i 's|ncursesw/ncurses.h|ncurses.h|' mt.h make } diff --git a/community/mupen64plus/PKGBUILD b/community/mupen64plus/PKGBUILD index 016e0deba..82029c433 100644 --- a/community/mupen64plus/PKGBUILD +++ b/community/mupen64plus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94277 2013-07-18 16:50:52Z jelle $ +# $Id: PKGBUILD 102261 2013-12-07 10:36:45Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -7,7 +7,7 @@ pkgname=mupen64plus pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc='Nintendo64 Emulator' arch=('i686' 'x86_64') url='http://code.google.com/p/mupen64plus/' diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD index 7ed4936bb..e5331abf4 100644 --- a/community/mygui/PKGBUILD +++ b/community/mygui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94034 2013-07-13 12:34:24Z svenstaro $ +# $Id: PKGBUILD 102262 2013-12-07 10:36:46Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrew Belitsky <belitsky.a@gmail.com> pkgbase=mygui pkgname=('mygui' 'mygui-docs') pkgver=3.2.0 -pkgrel=6 +pkgrel=9 pkgdesc="A multilayer and overlappable GUI System for OGRE" arch=('i686' 'x86_64') url="http://mygui.info/" @@ -37,25 +37,19 @@ build() { -DMYGUI_INSTALL_TOOLS=TRUE \ -DMYGUI_INSTALL_DOCS=TRUE \ -DMYGUI_INSTALL_MEDIA=TRUE \ - -DCMAKE_BUILD_TYPE=Release # set=Debug for debugging version + -DFREETYPE_INCLUDE_DIR=/usr/include/freetype2/ \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=TRUE - # compile make - - # generate docs - if [[ $(which dot) && $(which doxygen) ]]; then - make api-docs 2>/dev/null - fi + make api-docs } package_mygui() { optdepends=('mygui-docs: documentation') - cd $srcdir/MyGUI_$pkgver + cd $srcdir/MyGUI_$pkgver/build - cd build - - # install the whole bunch make DESTDIR="$pkgdir" install # make demos work @@ -67,10 +61,8 @@ package_mygui-docs() { pkgdesc="Documentation for mygui" depends=() - cd $srcdir/MyGUI_$pkgver + cd $srcdir/MyGUI_$pkgver/build - cd build - # install docs install -d $pkgdir/usr/share/doc/ cp -r Docs/html $pkgdir/usr/share/doc/MYGUI diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index be3e9f3cf..a9709614c 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 94357 2013-07-22 11:20:31Z spupykin $ +# $Id: PKGBUILD 100622 2013-11-06 14:11:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc -pkgver=5.2.5 +pkgver=5.2.6 pkgrel=1 pkgdesc="ODBC driver/connector for mariadb" arch=(i686 x86_64) @@ -12,12 +12,16 @@ makedepends=('cmake') license=('GPL') options=('libtool') source=("http://cdn.mysql.com/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-$pkgver-src.tar.gz") -md5sums=('909e0c3c9c341fe777d0a620c4084442') +md5sums=('066bfed7dc472ef4b68bafc95ca45027') build() { cd $srcdir/mysql-connector-odbc-${pkgver}-src - unset LDFLAGS - cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_UNIXODBC=1 . + unset CFLAGS + export LDFLAGS="-lpthread -ldl" + cmake -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.so \ + -DWITH_UNIXODBC=1 . make } diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index 0309720e4..cbcc78c6f 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99365 2013-10-27 17:21:57Z jconder $ +# $Id: PKGBUILD 102726 2013-12-17 20:17:14Z bgyorgy $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -14,7 +14,7 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') pkgver=0.27 -pkgrel=2 +pkgrel=4 epoch=1 arch=('i686' 'x86_64') url="http://www.mythtv.org" @@ -23,28 +23,28 @@ makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif' 'libvorbis' 'mesa' 'mesa-libgl' 'mplayer' 'mythtv' 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' - 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging' + 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python2-pillow' 'python2-pycurl' 'zlib') -source=("mythtv-$pkgver.tar.gz::http://www.mythtv.org/download/mythtv/$pkgver" - "mythweb-$pkgver.tar.gz::http://www.mythtv.org/download/mythweb/$pkgver" +source=("mythtv-$pkgver.tar.gz::https://github.com/MythTV/mythtv/archive/v$pkgver.tar.gz" + "mythweb-$pkgver.tar.gz::https://github.com/MythTV/mythweb/archive/v$pkgver.tar.gz" 'cdparanoia.patch') -sha256sums=('49789de705be73275325b1a4984b727cf8284fdc4ae6b041ad152857c830dc46' - 'c6574a9d3029e00ef9e2fb4eff33be60804d06c71d517ad8cae27bed9b5275d3' - '004f1e4734830709d2ab5ebb804560514f2bf525abc2f11142501a81eba0754c') +sha256sums=('494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0' + '7e54d6b388e2e8f3e50515c3fe46113f4217e3989242459a0fa73c928dcca494' + '004f1e4734830709d2ab5ebb804560514f2bf525abc2f11142501a81eba0754c') prepare() { - cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase" + cd "$srcdir/mythtv-$pkgver/$pkgbase" find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' patch -Np1 -i "$srcdir/cdparanoia.patch" - cd "$srcdir/mythweb-fixes-$pkgver" + cd "$srcdir/mythweb-$pkgver" sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php' } build() { - cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase" + cd "$srcdir/mythtv-$pkgver/$pkgbase" ./configure --prefix=/usr \ --enable-all \ @@ -56,9 +56,9 @@ build() { package_mythplugins-mytharchive() { pkgdesc="Create DVDs or archive recorded shows in MythTV" depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv' - 'python-imaging') + 'python2-pillow') - cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mytharchive" + cd "$srcdir/mythtv-$pkgver/$pkgbase/mytharchive" make INSTALL_ROOT="$pkgdir" install } @@ -66,7 +66,7 @@ package_mythplugins-mythbrowser() { pkgdesc="Mini web browser for MythTV" depends=('mythtv') - cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythbrowser" + cd "$srcdir/mythtv-$pkgver/$pkgbase/mythbrowser" make INSTALL_ROOT="$pkgdir" install } @@ -74,7 +74,7 @@ package_mythplugins-mythgallery() { pkgdesc="Image gallery plugin for MythTV" depends=('libexif' 'mythtv') - cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgallery" + cd "$srcdir/mythtv-$pkgver/$pkgbase/mythgallery" make INSTALL_ROOT="$pkgdir" install } @@ -82,7 +82,7 @@ package_mythplugins-mythgame() { pkgdesc="Game emulator plugin for MythTV" depends=('mythtv') - cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgame" + cd "$srcdir/mythtv-$pkgver/$pkgbase/mythgame" make INSTALL_ROOT="$pkgdir" install } @@ -90,7 +90,7 @@ package_mythplugins-mythmusic() { pkgdesc="Music playing plugin for MythTV" depends=('mythtv' 'libcdio-paranoia') - cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythmusic" + cd "$srcdir/mythtv-$pkgver/$pkgbase/mythmusic" make INSTALL_ROOT="$pkgdir" install } @@ -98,7 +98,7 @@ package_mythplugins-mythnetvision() { pkgdesc="MythNetvision plugin for MythTV" depends=('mythtv' 'python2-oauth') - cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnetvision" + cd "$srcdir/mythtv-$pkgver/$pkgbase/mythnetvision" make INSTALL_ROOT="$pkgdir" install } @@ -106,7 +106,7 @@ package_mythplugins-mythnews() { pkgdesc="News checking plugin for MythTV" depends=('mythtv') - cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnews" + cd "$srcdir/mythtv-$pkgver/$pkgbase/mythnews" make INSTALL_ROOT="$pkgdir" install } @@ -116,7 +116,7 @@ package_mythplugins-mythweather() { 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size' 'perl-datetime-format-iso8601') - cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythweather" + cd "$srcdir/mythtv-$pkgver/$pkgbase/mythweather" make INSTALL_ROOT="$pkgdir" install } @@ -128,7 +128,7 @@ package_mythplugins-mythweb() { install='mythplugins-mythweb.install' mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions} - cp -R "$srcdir/mythweb-fixes-$pkgver"/* "$pkgdir/var/lib/mythtv/mythweb" + cp -R "$srcdir/mythweb-$pkgver"/* "$pkgdir/var/lib/mythtv/mythweb" chown -R http:http "$pkgdir/var/lib/mythtv/mythweb" chmod g+rw "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions} } @@ -138,6 +138,6 @@ package_mythplugins-mythzoneminder() { depends=('mythtv') install='mythplugins-mythzoneminder.install' - cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythzoneminder" + cd "$srcdir/mythtv-$pkgver/$pkgbase/mythzoneminder" make INSTALL_ROOT="$pkgdir" install } diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 669c837ad..cf58bb1ac 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99201 2013-10-25 13:44:56Z giovanni $ +# $Id: PKGBUILD 102723 2013-12-17 19:52:17Z bgyorgy $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.27 -pkgrel=3 +pkgrel=6 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -22,27 +22,27 @@ optdepends=('glew: for GPU commercial flagging' 'libcec: for consumer electronics control capabilities' 'libxml2: to read blu-ray metadata' 'openssl: for AirTunes (RAOP) support' + 'udisks: detect changes to removable media' 'xmltv: to download tv listings') conflicts=('myththemes' 'mythplugins-mythvideo') replaces=('myththemes' 'mythplugins-mythvideo') -backup=() install='mythtv.install' -source=("$pkgname-$pkgver.tar.gz::http://www.$pkgname.org/download/$pkgname/$pkgver" +source=("$pkgname-$pkgver.tar.gz::https://github.com/MythTV/$pkgname/archive/v$pkgver.tar.gz" 'mythbackend.service' 'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch') -sha256sums=('49789de705be73275325b1a4984b727cf8284fdc4ae6b041ad152857c830dc46' - 'f628f44164ce773ae54d320fb2f65353cacf9deec16981e4e56316ac33000a2f' +sha256sums=('494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0' + 'ecfde779ded8332cc62c86fac6b432b09cbf5d254135798287ada688af9a1302' '8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3') prepare() { - cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname" + cd "$srcdir/$pkgname-$pkgver/$pkgname" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' patch -Np2 -i "$srcdir/libcec-2-support.2.patch" } build() { - cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname" + cd "$srcdir/$pkgname-$pkgver/$pkgname" ARCH="${CARCH/_/-}" ./configure --prefix=/usr \ @@ -61,7 +61,7 @@ build() { } package() { - cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname" + cd "$srcdir/$pkgname-$pkgver/$pkgname" make INSTALL_ROOT="$pkgdir" install install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service" diff --git a/community/mythtv/mythbackend.service b/community/mythtv/mythbackend.service index 2a2b8b7db..aa9427ced 100644 --- a/community/mythtv/mythbackend.service +++ b/community/mythtv/mythbackend.service @@ -1,5 +1,6 @@ [Unit] Description=MythTV Backend +Wants=network-online.target After=network.target mysqld.service [Service] diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index 0709dcf76..dcd2cc694 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96567 2013-09-01 12:07:41Z svenstaro $ +# $Id: PKGBUILD 101824 2013-12-02 01:03:13Z 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.4 +pkgver=3.5 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.bz2 backup=('etc/nbd-server/config') depends=('glib2') install=nbd.install -md5sums=('40ce12dfe408288b4eab36103b48fec0' +md5sums=('d89133bf9b681c17ed9d09a21b19f1ee' '2d05d426b8c2708d5f8a0d028fcbae05' '5d1acc143018117174f79eff15afa038') diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD index c3ccc6166..99efaa71d 100644 --- a/community/ncmpcpp/PKGBUILD +++ b/community/ncmpcpp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80358 2012-11-20 16:00:53Z bpiotrowski $ +# $Id: PKGBUILD 101796 2013-12-01 11:32:10Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: graysky <graysky AT archlinux DOT us> # Contributor: Mateusz Herych <heniekk@gmail.com> @@ -6,7 +6,7 @@ pkgname=ncmpcpp pkgver=0.5.10 -pkgrel=4 +pkgrel=5 pkgdesc='Almost exact clone of ncmpc with some new features' arch=('i686' 'x86_64') url='http://ncmpcpp.rybczak.net/' @@ -17,22 +17,22 @@ source=(http://ncmpcpp.rybczak.net/stable/$pkgname-$pkgver.tar.bz2) md5sums=('298ed66325bcfe358e37e186c7ea4861') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-clock \ - --enable-outputs \ - --enable-unicode \ - --enable-visualizer \ - --with-curl \ - --with-fftw \ - --with-taglib + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --enable-clock \ + --enable-outputs \ + --enable-unicode \ + --enable-visualizer \ + --with-curl \ + --with-fftw \ + --with-taglib make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - make -C extras/ - install -Dm755 extras/artist_to_albumartist $pkgdir/usr/bin/ + make -C extras + install -Dm755 extras/artist_to_albumartist "$pkgdir"/usr/bin/ } diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 0b93b8ed6..29e7553b3 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100062 2013-11-01 02:29:31Z bgyorgy $ +# $Id: PKGBUILD 101573 2013-11-28 01:30:36Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Ner0 pkgname=nemo -pkgver=2.0.4 +pkgver=2.0.8 pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common') options=('!emptydirs') install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver") -sha256sums=('5ce99da6371d9ec62eaf947ae11dd3c2e88e605f3cc66411329b8c90192d2702') +sha256sums=('6a40868e46fd2ed6c27e694e76c160996d16e2d27681bf5126e6b0e647c24033') prepare() { cd linuxmint-nemo-* diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index a8f8a83b3..f0510838a 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 98429 2013-10-10 07:58:09Z seblu $ +# $Id: PKGBUILD 102927 2013-12-24 08:43:25Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Maintainer: Sébastien Luttringer # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> pkgname=nginx -pkgver=1.4.3 -pkgrel=1 +pkgver=1.4.4 +pkgrel=2 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') url='http://nginx.org' @@ -26,7 +26,7 @@ install=install source=("http://nginx.org/download/nginx-$pkgver.tar.gz" 'service' 'logrotate') -sha256sums=('ae123885c923a6c3f5bab0a8b7296ef21c4fdf6087834667ebbc16338177de84' +sha256sums=('7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9' '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b' '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98') @@ -41,7 +41,7 @@ build() { --user=http \ --group=http \ --http-log-path=/var/log/nginx/access.log \ - --error-log-path=/var/log/nginx/error.log \ + --error-log-path=stderr \ --http-client-body-temp-path=/var/lib/nginx/client-body \ --http-proxy-temp-path=/var/lib/nginx/proxy \ --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD index e43750133..360daaeb1 100644 --- a/community/ngircd/PKGBUILD +++ b/community/ngircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96762 2013-09-04 10:49:37Z kkeen $ +# $Id: PKGBUILD 101976 2013-12-03 08:19:51Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ngircd -pkgver=20.3 +pkgver=21 pkgrel=1 pkgdesc="Next Generation IRC Daemon" arch=('x86_64' 'i686') @@ -14,7 +14,7 @@ license=('GPL') depends=('openssl' 'libident') source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz" ngircd.service) -sha256sums=('55d7c74c6df790b11a68c07f39836d581965087efb618d3e9a6bec855364c2f9' +sha256sums=('0edbd41304186e43f9d907a7017b40520cc90c2ce29b1339bdcd7622fffe19a0' 'f02e30f6864ba1130bcc85bedc44ad782687f572c06f10e0501b0ddcf532b404') build() { diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index f1541fa4e..f9f3fdedf 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98813 2013-10-19 09:02:32Z bpiotrowski $ +# $Id: PKGBUILD 102828 2013-12-21 15:00:24Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.10.21 +pkgver=0.10.24 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('7c125bf22c1756064f2a68310d4822f77c8134ce178b2faa6155671a8124140d') +sha256sums=('610cd733186842cb7f554336d6851a61b2d3d956050d62e49fa359a47640377a') prepare() { cd node-v$pkgver diff --git a/community/nomacs/PKGBUILD b/community/nomacs/PKGBUILD index 2d68c1826..ce73fca29 100644 --- a/community/nomacs/PKGBUILD +++ b/community/nomacs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 98765 2013-10-17 21:51:03Z speps $ +# $Id: PKGBUILD 102808 2013-12-20 19:30:50Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> pkgname=nomacs -pkgver=1.6.0.2 +pkgver=1.6.2 pkgrel=1 pkgdesc="A Qt image viewer" arch=(i686 x86_64) @@ -11,19 +11,23 @@ license=('GPL3') depends=('qt4' 'exiv2' 'libraw' 'opencv') makedepends=('cmake') install="$pkgname.install" -source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-${pkgver%.*}/$pkgname-$pkgver-source.tar.bz2") -md5sums=('a5556ca94053eec9539c11454f633316') +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver-source.tar.bz2") +md5sums=('3e8782b7bf792933ba673a2e9340841b') + +prepare() { + cd $pkgname-$pkgver + [ -d b ] || mkdir b +} build() { - cd "$srcdir/$pkgname-$pkgver" - [ -d bld ] || mkdir bld && cd bld + cd $pkgname-$pkgver/b cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 make } package() { - cd "$srcdir/$pkgname-$pkgver/bld" + cd $pkgname-$pkgver/b make DESTDIR="$pkgdir/" install } diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index a94cee35b..067b21921 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88793 2013-04-22 10:31:24Z spupykin $ +# $Id: PKGBUILD 102889 2013-12-23 13:28:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20130422 +pkgver=20131223 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" @@ -16,15 +16,15 @@ makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr' 'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra') provides=('libtu' 'libextl') changelog=ChangleLog -source=("git://notion.git.sourceforge.net/gitroot/notion/notion" - "git://notion.git.sourceforge.net/gitroot/notion/libtu" - "git://notion.git.sourceforge.net/gitroot/notion/libextl" - "git://notion.git.sourceforge.net/gitroot/notion/notion-doc" - "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama" - "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" - "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr" - "git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux" - "git://notion.git.sourceforge.net/gitroot/notion/contrib") +source=("notion::git://notion.git.sourceforge.net/gitroot/notion/notion" + "$pkgname-libtu::git://notion.git.sourceforge.net/gitroot/notion/libtu" + "$pkgname-libextl::git://notion.git.sourceforge.net/gitroot/notion/libextl" + "$pkgname-notion-doc::git://notion.git.sourceforge.net/gitroot/notion/notion-doc" + "$pkgname-mod_xinerama::git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama" + "$pkgname-mod_xkbevents::git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" + "$pkgname-mod_xrandr::git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr" + "$pkgname-mod_notionflux::git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux" + "$pkgname-contrib::git://notion.git.sourceforge.net/gitroot/notion/contrib") md5sums=('SKIP' 'SKIP' 'SKIP' @@ -35,22 +35,30 @@ md5sums=('SKIP' 'SKIP' 'SKIP') -build() { +prepare() { cd ${srcdir} + sed -i 's|lua5.2|lua|g' notion/system-autodetect.mk + sed -i 's|luac5.2|luac|g' notion{,-libextl}/system-autodetect.mk for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr mod_notionflux notion-doc; do - cp -r ${srcdir}/$i ${srcdir}/notion/ + mkdir -p ${srcdir}/notion/$i + cp -r ${srcdir}/$pkgname-$i/* ${srcdir}/notion/$i/ done - # build notion cd ${srcdir}/notion - msg "Starting make..." sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ + -e 's|/usr/local|/usr|g' \ -i system-autodetect.mk - make INCLUDES=-I${srcdir}/notion +} + +build() { + cd ${srcdir}/notion + + # build notion + make INCLUDES=-I${srcdir}/notion PREFIX=/usr ETCDIR=/etc/notion # build doc and modules for i in mod_xinerama mod_xkbevents mod_xrandr; do @@ -70,12 +78,12 @@ package() { for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do (cd $i && make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install) done - cp ${srcdir}/mod_xinerama/*.lua $pkgdir/etc/notion/ - cp ${srcdir}/mod_xkbevents/*.lua $pkgdir/etc/notion/ + cp ${srcdir}/notion/mod_xinerama/*.lua $pkgdir/etc/notion/ + cp ${srcdir}/notion/mod_xkbevents/*.lua $pkgdir/etc/notion/ # contrib mkdir -p $pkgdir/usr/share/notion/contrib - cp -a ${srcdir}/contrib/* $pkgdir/usr/share/notion/contrib + cp -a ${srcdir}/$pkgname-contrib/* $pkgdir/usr/share/notion/contrib # license install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/notion/LICENSE diff --git a/community/nss-pam-ldapd/PKGBUILD b/community/nss-pam-ldapd/PKGBUILD index 773c57b2f..8a32d9c79 100644 --- a/community/nss-pam-ldapd/PKGBUILD +++ b/community/nss-pam-ldapd/PKGBUILD @@ -3,7 +3,7 @@ pkgname=nss-pam-ldapd pkgver=0.8.13 -pkgrel=4 +pkgrel=5 pkgdesc='LDAP module for NSS and PAM' arch=('i686' 'x86_64') url="http://arthurdejong.org/$pkgname/" diff --git a/community/nss-pam-ldapd/nss-pam-ldapd.install b/community/nss-pam-ldapd/nss-pam-ldapd.install index a8b93f218..e4b0a1f1d 100644 --- a/community/nss-pam-ldapd/nss-pam-ldapd.install +++ b/community/nss-pam-ldapd/nss-pam-ldapd.install @@ -1,12 +1,11 @@ post_install() { - getent passwd nslcd >> /dev/null || useradd -r -M -d /var/run/nslcd -s /bin/false nslcd + getent passwd nslcd >> /dev/null || useradd -r -M -U -d /var/run/nslcd -s /bin/false nslcd } post_upgrade() { - getent passwd nslcd >> /dev/null || useradd -r -M -s /bin/false nslcd + getent passwd nslcd >> /dev/null || useradd -r -M -U -d /var/run/nslcd -s /bin/false nslcd } pre_remove() { userdel nslcd >/dev/null 2>&1 || true } - diff --git a/community/obexftp/PKGBUILD b/community/obexftp/PKGBUILD new file mode 100644 index 000000000..0ed07065a --- /dev/null +++ b/community/obexftp/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 102177 2013-12-06 12:11:56Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> + +pkgname=obexftp +pkgver=0.24 +pkgrel=1 +pkgdesc="A tool for transfer files to/from any OBEX enabled device" +arch=('i686' 'x86_64') +url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" +license=('GPL') +depends=('openobex') +makedepends=('cmake' 'asciidoc' 'xmlto' 'fuse' 'swig' 'ruby' 'tk') +optdepends=('ruby: ruby bindings' + 'tk: TCL/Tk bindings') +options=('!makeflags' '!docs') +source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}-Source.tar.gz") +md5sums=('31a50dbbd09c63cbb5399772aaff7936') + +build() { + cd "${srcdir}/" + + mkdir build + cd build + cmake ../${pkgname}-${pkgver}-Source \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_SBINDIR=bin \ + -DENABLE_PERL=YES \ + -DENABLE_PYTHON=YES \ + -DENABLE_RUBY=YES \ + -DENABLE_TCL=YES + make doc +} + +package() { + cd "${srcdir}/build" + + make DESTDIR="${pkgdir}" install +} diff --git a/community/ocrad/PKGBUILD b/community/ocrad/PKGBUILD new file mode 100644 index 000000000..bf3ebf7b3 --- /dev/null +++ b/community/ocrad/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 102179 2013-12-06 12:13:24Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=ocrad +pkgver=0.22 +pkgrel=1 +pkgdesc="An Optical Character Recognition program" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/ocrad/ocrad.html" +license=('GPL3') +depends=('gcc-libs' 'texinfo') +install=ocrad.install +options=('staticlibs') +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz") +md5sums=('e84f0fb0dcd9b7b067201f9a3b89e06c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install install-man + rm $pkgdir/usr/share/info/dir + gzip $pkgdir/usr/share/info/* +} diff --git a/community/ocrad/ocrad.install b/community/ocrad/ocrad.install new file mode 100644 index 000000000..eb599d04e --- /dev/null +++ b/community/ocrad/ocrad.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(ocrad.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/community/ode/PKGBUILD b/community/ode/PKGBUILD new file mode 100644 index 000000000..efd509bd3 --- /dev/null +++ b/community/ode/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 102181 2013-12-06 12:14:44Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au> + +pkgname=ode +pkgver=0.12 +pkgrel=5 +pkgdesc="An open source, high performance library for simulating rigid body dynamics" +arch=('i686' 'x86_64') +url="http://www.ode.org" +license=('LGPL' 'BSD') +depends=('gcc-libs' 'bash') +source=("http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2") +md5sums=('48fdd41fae1a7e7831feeded09826599') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --enable-shared \ + --enable-libccd \ + --enable-double-precision + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR=${pkgdir}/ install + + install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/ou/LICENSE-BSD.TXT \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT + install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/GIMPACT/GIMPACT-LICENSE-BSD.TXT \ + ${pkgdir}/usr/share/licenses/${pkgname}/GIMPACT-LICENSE-BSD.TXT + install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/libccd/BSD-LICENSE \ + ${pkgdir}/usr/share/licenses/${pkgname}/BSD-LICENSE +} diff --git a/community/ogmtools/PKGBUILD b/community/ogmtools/PKGBUILD new file mode 100644 index 000000000..8bd1c7f9b --- /dev/null +++ b/community/ogmtools/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 102185 2013-12-06 12:18:26Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=ogmtools +pkgver=1.5 +pkgrel=4 +pkgdesc="Information, extraction or creation for OGG media streams" +arch=('i686' 'x86_64') +url="http://www.bunkus.org/videotools/ogmtools" +license=('GPL') +depends=('libvorbis' 'libdvdread' 'gcc-libs') +source=("http://www.bunkus.org/videotools/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('02d356e3d21d53b1d9715bab223d8996') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/opencolorio/PKGBUILD b/community/opencolorio/PKGBUILD index 18bc01a39..4c3b01a98 100644 --- a/community/opencolorio/PKGBUILD +++ b/community/opencolorio/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Dumitru Ursu <dima@ceata.org> pkgname=opencolorio -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="A color management framework for visual effects and animation" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('BSD') depends=('python') makedepends=('cmake') source=(http://github.com/imageworks/OpenColorIO/tarball/v$pkgver) -sha1sums=('9b9bac9ed85c84f53775686eb72f3d612b148fef') +sha1sums=('a015cb51b9b0ea0cdb3989fc23e1c18ad69511e0') build() { diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index e735ca6a5..4b03b9895 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 100261 2013-11-02 08:44:51Z spupykin $ +# $Id: PKGBUILD 102395 2013-12-10 10:40:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim -pkgver=2.8.4 -pkgrel=2 +pkgver=2.9.0 +pkgrel=1 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) url="http://www.opendkim.org/" license=('BSD' 'custom:Sendmail') -depends=("db" "openssl") +depends=("db" "openssl" "libstrl") makedepends=("libmilter") options=(!emptydirs) backup=(etc/conf.d/opendkim) @@ -17,7 +17,7 @@ install=opendkim.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz opendkim.conf opendkim.service) -md5sums=('17f667d022c167c7874a993e928d4a6d' +md5sums=('af682e58877bf9153b6af4400aad6d4d' '3e2bb1058ac0662f01e675aa6ac7ee8f' '85010750a21954e2d3cf5d57fe210d3f') diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index 55314055a..8f47b1d4d 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96492 2013-08-30 17:23:45Z svenstaro $ +# $Id: PKGBUILD 102264 2013-12-07 10:36:49Z bpiotrowski $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio -pkgver=1.2.1 +pkgver=1.2.3 pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa') optdepends=('qt4: iv image viewer' 'python2: bindings support') source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('c98d002c9ec843b7cc35d7aec5f03326') +md5sums=('20066ae0e9026717242f64f107f7ee8e') build() { cd "$srcdir"/$_pkgname* diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD index 210f2c82e..18803f55d 100644 --- a/community/openocd/PKGBUILD +++ b/community/openocd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100265 2013-11-02 08:45:37Z spupykin $ +# $Id: PKGBUILD 102001 2013-12-03 16:51:56Z eric $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Matthias Bauch <matthias.bauch@gmail.com> # Contributor: Laszlo Papp <djszapi2 at gmail com> @@ -6,12 +6,12 @@ pkgname=openocd pkgver=0.7.0 -pkgrel=2 +pkgrel=3 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices' arch=('i686' 'x86_64') url='http://openocd.berlios.de' license=('GPL') -depends=('libftdi') +depends=('libftdi' 'libusb-compat') options=(!strip) install=openocd.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) @@ -19,8 +19,17 @@ sha256sums=('52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63') _features=(amtjtagaccel arm-jtag-ew at91rm9200 buspirate ep93xx ft2232_libftdi ftdi gw16012 jlink oocd_trace opendous osbdm parport presto_libftdi remote-bitbang rlink stlink ti-icdi ulink usbprog vsllink) +# FIXME: needs /dev/bus/usb and cannot be compiled in chroot +prepare() { + cd $pkgname-$pkgver + sed -i 's|$CC -E|$CC -O2 -E|g' configure + sed -i 's|\${CC} -E|$CC -O2 -E|g' configure + sed -i 's|-lftdi -lusb|-lftdi1 -lusb-1.0|g' configure src/Makefile* +} + build() { cd $pkgname-$pkgver + export CFLAGS="-I/usr/include/libftdi1" ./configure --prefix=/usr ${_features[@]/#/--enable-} --disable-werror make } diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD index 04e565ad8..f663d9ac9 100644 --- a/community/openshadinglanguage/PKGBUILD +++ b/community/openshadinglanguage/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 96490 2013-08-30 17:18:19Z svenstaro $ +# $Id: PKGBUILD 102265 2013-12-07 10:36:50Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openshadinglanguage -pkgver=1.3.3 -pkgrel=4 +pkgver=1.4.0 +pkgrel=2 pkgdesc="Advanced shading language for production GI renderers" arch=(i686 x86_64) url="https://github.com/imageworks/OpenShadingLanguage" @@ -10,7 +10,7 @@ license=('custom') depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' 'libtiff' 'llvm') makedepends=('boost' 'cmake' 'clang') source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) -md5sums=('17aaa01987963220e164522c29281f14') +md5sums=('dcc7b6dfbc68d7af0d5cfa2940ff205b') build() { cd OpenShadingLanguage-Release-$pkgver @@ -23,7 +23,7 @@ build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLLVM_STATIC=0 \ - .. + ../.. make } diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD index e56eebe63..0e452fb82 100644 --- a/community/opensmtpd/PKGBUILD +++ b/community/opensmtpd/PKGBUILD @@ -1,50 +1,45 @@ -# $Id: PKGBUILD 93322 2013-07-01 22:20:09Z seblu $ +# $Id: PKGBUILD 102612 2013-12-16 18:31:48Z seblu $ # Maintainer: Sébastien Luttringer pkgname=opensmtpd -pkgver=5.3.3p1 -pkgrel=1 +pkgver=5.4.1p1 +pkgrel=2 pkgdesc='Free implementation of the server-side SMTP protocol' arch=('i686' 'x86_64') url='http://www.opensmtpd.org/' license=('custom') -depends=('libevent') +depends=('libevent' 'openssl') provides=('smtp-server' 'smtp-forwarder') conflicts=('smtp-server' 'smtp-forwarder') backup=('etc/smtpd/smtpd.conf' 'etc/smtpd/aliases') +options=('emptydirs') install=opensmtpd.install source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz" 'smtpd.service' 'smtpd.socket') -md5sums=('795982f9b0b45c7645f897ba2ead0024' +md5sums=('74551342985b78eb687995f7953d1790' 'a278f272d97a9fe5a8aac784a7c98d67' 'c2c01e9ca78df3f65efe40a7c0e17ee0') prepare() { - cd $pkgname-$pkgver - sed -i 's,etc/aliases,etc/smtpd/aliases,' smtpd/smtpd.conf - # regen configure. don't use bootstrap script (doesn't support automake 1.14) - libtoolize --copy --force - aclocal -I m4 - autoconf - autoheader - automake --foreign --add-missing --copy + sed -ri 's,/etc/mail,/etc/smtpd,g' $pkgname-$pkgver/smtpd/smtpd.conf } build() { cd $pkgname-$pkgver + # Remove _FORTIFY_SOURCES: FS#38124 + export CPPFLAGS='' ./configure \ --prefix=/usr \ --sysconfdir=/etc/smtpd \ --sbindir=/usr/bin \ - --libexecdir=/usr/bin \ + --libexecdir=/usr/lib/smtpd \ --with-maildir=/var/spool/mail \ --with-privsep-path=/var/empty \ --with-sock-dir=/run \ + --with-ca-file=/etc/ssl/certs/ca-certificates.crt \ --with-privsep-user=smtpd \ - --with-lookup-user=smtpd \ --with-queue-user=smtpq \ - --with-filter-user=smtpf \ --with-pam make } @@ -56,17 +51,11 @@ package() { install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # working directory cd "$pkgdir" - install -dm711 var/spool/smtpd + # install systemd units install -Dm644 "$srcdir/smtpd.service" usr/lib/systemd/system/smtpd.service install -Dm644 "$srcdir/smtpd.socket" usr/lib/systemd/system/smtpd.socket - # remove duplicate hardlink into a subfolder - rm -vr usr/bin/opensmtpd # empty aliases file (used by default config) - install -Dm644 /dev/null "$pkgdir/etc/smtpd/aliases" - # fake sendmail binary (used to be smtp-forwarder) - # use hardlink as upstream does - cd "$pkgdir/usr/bin" - ln smtpctl "$pkgdir/usr/bin/sendmail" + install -Dm644 /dev/null etc/smtpd/aliases } # vim:set ts=2 sw=2 et: diff --git a/community/opensmtpd/opensmtpd.install b/community/opensmtpd/opensmtpd.install index 48366c15c..4b0df73c6 100644 --- a/community/opensmtpd/opensmtpd.install +++ b/community/opensmtpd/opensmtpd.install @@ -3,10 +3,7 @@ post_install() { # create users getent passwd smtpd >/dev/null || useradd -d / -u 91 -g 1 smtpd getent passwd smtpq >/dev/null || useradd -d /var/spool/smtpd -u 92 -g 1 smtpq - getent passwd smtpf >/dev/null || useradd -d / -u 93 -g 1 smtpf - # initialise aliase db - #[[ -e /etc/smtpd/aliases.db ]] || makemap -t aliases /etc/smtpd/aliases - true + : } # arg 1: the new package version @@ -17,13 +14,22 @@ post_upgrade() { echo 'Configuration files have been moved to /etc/smtpd.' echo 'New users have been added.' echo 'Check your configuration!' + elif (( $(vercmp $2 5.4) < 0 )); then + echo 'User smtpf is no more required. It will be removed!' + echo 'Check your configuration!' + userdel -f smtpf fi + : } # arg 1: the old package version post_remove() { - for _u in smtpd smtpq smtpf; do userdel -f "$_u"; done - true + userdel -f smtpd + userdel -f smtpq + if (( $(vercmp $1 5.4) <= 0 )); then + userdel -f smtpf + fi + : } # vim:set ts=2 sw=2 et: diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index b189d2ce7..bcfb893a7 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98744 2013-10-17 14:01:51Z andyrtr $ +# $Id: PKGBUILD 102297 2013-12-07 12:05:54Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd -pkgver=1.3.2 -pkgrel=2 +pkgver=1.3.3 +pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64') url='http://www.openttd.org' @@ -13,7 +13,7 @@ install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") -sha256sums=('f6efc0cd0c4f4315a98844c331acc2e02322d5671ec376b9f0a11795b0eb270b') +sha256sums=('6991ed2c0170481800c3a92a1b43546821a658de91d3ac7efe868588387eca5d') package() { cd ${pkgname}-${pkgver} diff --git a/community/opus-tools/PKGBUILD b/community/opus-tools/PKGBUILD index 6f64d97ed..be421d277 100644 --- a/community/opus-tools/PKGBUILD +++ b/community/opus-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96976 2013-09-09 15:45:45Z bpiotrowski $ +# $Id: PKGBUILD 102289 2013-12-07 11:00:38Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Michael Düll <mail@akurei.me> # Contributor: pumbur pkgname=opus-tools -pkgver=0.1.7 +pkgver=0.1.8 pkgrel=1 pkgdesc='Collection of tools for Opus audio codec' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url='http://wiki.xiph.org/Opus-tools' license=('BSD') depends=('flac' 'libogg' 'opus') source=(http://downloads.xiph.org/releases/opus/$pkgname-$pkgver.tar.gz) -md5sums=('62af32d1669bcabf1aabaf7187a377f6') +md5sums=('b424790eda9357a4df394e2d7ca19eac') build(){ cd $pkgname-$pkgver diff --git a/community/opusfile/PKGBUILD b/community/opusfile/PKGBUILD index d6038e896..c61e4d72c 100644 --- a/community/opusfile/PKGBUILD +++ b/community/opusfile/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 99942 2013-10-31 02:36:12Z allan $ +# $Id: PKGBUILD 102291 2013-12-07 11:02:30Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com> pkgname=opusfile -pkgver=0.2 -pkgrel=3 +pkgver=0.4 +pkgrel=1 pkgdesc='Library for opening, seeking, and decoding .opus files' arch=('i686' 'x86_64') url='http://www.opus-codec.org/' license=('custom') depends=('libogg' 'openssl' 'opus') source=(http://downloads.xiph.org/releases/opus/${pkgname}-${pkgver}.tar.gz) -md5sums=('454375f51fb2f84bef9bf2fbf9535bb1') +md5sums=('80f3d4106106905255ff84def1b5d9ae') build() { cd $pkgname-$pkgver diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index f7b298cf3..bc9104bfe 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99944 2013-10-31 02:36:53Z allan $ +# $Id: PKGBUILD 102883 2013-12-23 10:36:15Z bgyorgy $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit') pkgver=0.7.6 -pkgrel=10 +pkgrel=11 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64') url="http://www.packagekit.org" @@ -20,7 +20,7 @@ sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d' 'c7f6da04f5b8f09e6d884ae4f480c064eae10de1d2528bf14d2f55b34e472c23' '0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2') -build() { +prepare() { cd "$srcdir/PackageKit-$pkgver" sed -i 's@SUBDIRS = test@SUBDIRS =@' 'backends/Makefile.in' @@ -31,6 +31,10 @@ build() { patch -Np1 -i "$srcdir/alpm.patch" patch -Np1 -i "$srcdir/libarchive.patch" sed -i 's@sbin_PROGRAMS@bin_PROGRAMS@' 'contrib/device-rebind/Makefile.am' +} + +build() { + cd "$srcdir/PackageKit-$pkgver" export PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr \ diff --git a/community/pantheon-terminal/PKGBUILD b/community/pantheon-terminal/PKGBUILD new file mode 100644 index 000000000..06579d00f --- /dev/null +++ b/community/pantheon-terminal/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 102538 2013-12-13 11:19:00Z alucryd $ +# Maintainer: alucryd <alucryd at gmail dot com> + +pkgname=pantheon-terminal +pkgver=0.2.4.1 +pkgrel=3 +pkgdesc='The Pantheon Terminal Emulator' +arch=('i686' 'x86_64') +url="https://launchpad.net/${pkgname}" +license=('GPL3') +depends=('desktop-file-utils' 'granite' 'libnotify' 'vte3') +makedepends=('cmake' 'vala') +install="${pkgname}.install" +source=("${url}/0.x/${pkgver}/+download/${pkgname}-${pkgver}.tgz") +sha256sums=('0c03dc4023d3a78924d8b21658c62dd23ea0c93cd55af2f398686d28574dac04') + +build() { + cd ${pkgname}-${pkgver} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DGSETTINGS_COMPILE='OFF' + make +} + +package() { + cd ${pkgname}-${pkgver}/build + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/community/clinica/clinica.install b/community/pantheon-terminal/pantheon-terminal.install index 326aa98a2..77c350fb9 100644 --- a/community/clinica/clinica.install +++ b/community/pantheon-terminal/pantheon-terminal.install @@ -1,5 +1,6 @@ post_install() { glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q } post_upgrade() { @@ -9,3 +10,5 @@ post_upgrade() { post_remove() { post_install } + +# vim: ts=2 sw=2 et: diff --git a/community/par2cmdline/PKGBUILD b/community/par2cmdline/PKGBUILD index 127c4256a..5107178ed 100644 --- a/community/par2cmdline/PKGBUILD +++ b/community/par2cmdline/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 63354 2012-01-31 06:44:37Z seblu $ +# $Id: PKGBUILD 102557 2013-12-14 14:03:38Z idevolder $ +# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org -# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > pkgname=par2cmdline -pkgver=0.5.4 +pkgver=0.6.3 pkgrel=1 pkgdesc='A PAR 2.0 compatible file verification and repair tool' url='https://github.com/BlackIkeEagle/par2cmdline' license=('GPL2') arch=('i686' 'x86_64') -source=("https://github.com/downloads/BlackIkeEagle/$pkgname/$pkgname-$pkgver.tar.xz") -md5sums=('96b4fb91859c0214d2c562636abea3af') +source=("$pkgname-$pkgver.tar.gz::https://github.com/BlackIkeEagle/$pkgname/archive/v$pkgver.tar.gz") +sha256sums=('903bff9d1720523683cb04db76d37169ebab3a5157f0ae1d5f9065f371929288') build() { - cd ${pkgname}-${pkgver} + cd "$pkgname-$pkgver" aclocal automake --add-missing autoconf ./configure --prefix=/usr - make + make } check() { - cd ${pkgname}-${pkgver} + cd "$pkgname-$pkgver" make check } package() { - cd ${pkgname}-${pkgver} + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD index 5b26e980c..ab156dbab 100644 --- a/community/parcellite/PKGBUILD +++ b/community/parcellite/PKGBUILD @@ -1,18 +1,25 @@ -# $Id: PKGBUILD 99050 2013-10-23 12:05:36Z spupykin $ +# $Id: PKGBUILD 100807 2013-11-11 10:58:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=parcellite -pkgver=1.1.6 -pkgrel=1 +pkgver=1.1.7 +pkgrel=2 pkgdesc="Lightweight GTK+ clipboard manager" arch=('i686' 'x86_64') url="http://parcellite.sourceforge.net/" license=('GPL3') depends=('gtk2') makedepends=('intltool') -source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz) -md5sums=('4b0a89aeb885a2f7d2ace3e4ea7e153e') +source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz + fix-crash.patch) +md5sums=('a542aab0df50ac7a7de6501957e78fb3' + 'f2cc1986e573d49c92ea3d81efd5d574') + +prepare() { + cd "$srcdir/parcellite-$pkgver" + patch -Np1 <$srcdir/fix-crash.patch +} build() { cd "$srcdir/parcellite-$pkgver" diff --git a/community/parcellite/fix-crash.patch b/community/parcellite/fix-crash.patch new file mode 100644 index 000000000..a8ce712e1 --- /dev/null +++ b/community/parcellite/fix-crash.patch @@ -0,0 +1,11 @@ +--- a/src/preferences.c.orig 2013-11-11 14:39:32.000000000 +0400 ++++ b/src/preferences.c 2013-11-11 14:40:03.970776522 +0400 +@@ -381,7 +381,7 @@ + } + /**now go through and make sure we have no duplicates */ + for (i=0;NULL != keylist[i].name; ++i){ +- if(0 != keylist[i].keyval[0]){ ++ if(NULL != keylist[i].keyval && 0 != keylist[i].keyval[0]){ + /**see if it exists elsewhere */ + for (l=0;NULL != keylist[l].name; ++l){ + if(l!=i && 0 != keylist[l].keyval[0]){ diff --git a/community/parcellite/history_menu_crash_patch b/community/parcellite/history_menu_crash_patch deleted file mode 100644 index 961106839..000000000 --- a/community/parcellite/history_menu_crash_patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: main.c -=================================================================== ---- main.c (revision 232) -+++ main.c (working copy) -@@ -1199,24 +1199,28 @@ - { - GString* string = g_string_new((gchar*)element->data); - /* Ellipsize text */ -- if (string->len > prefs.item_length) -+ glong len = g_utf8_strlen(string->str, string->len); -+ if (len > prefs.item_length) - { - switch (prefs.ellipsize) - { - case PANGO_ELLIPSIZE_START: -- string = g_string_erase(string, 0, string->len-(prefs.item_length)); -+ string = g_string_erase(string, 0, g_utf8_offset_to_pointer(string->str, len - prefs.item_length) - string->str); - string = g_string_prepend(string, "..."); - break; - case PANGO_ELLIPSIZE_MIDDLE: -- string = g_string_erase(string, (prefs.item_length/2), string->len-(prefs.item_length)); -- string = g_string_insert(string, (string->len/2), "..."); -+ ; /* to avoid wierd gcc error */ -+ gchar* p1 = g_utf8_offset_to_pointer(string->str, prefs.item_length / 2); -+ gchar* p2 = g_utf8_offset_to_pointer(string->str, len - prefs.item_length / 2); -+ string = g_string_erase(string, p1 - string->str, p2 - p1); -+ string = g_string_insert(string, p1 - string->str, "..."); - break; - case PANGO_ELLIPSIZE_END: -- string = g_string_truncate(string, prefs.item_length); -+ string = g_string_truncate(string, g_utf8_offset_to_pointer(string->str, prefs.item_length) - string->str); - string = g_string_append(string, "..."); - break; - } -- } -+ } - /* Remove control characters */ - gsize i = 0; - while (i < string->len) diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index be186180d..8262860d4 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99947 2013-10-31 02:37:53Z allan $ +# $Id: PKGBUILD 102146 2013-12-05 21:14:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> pkgname=parole -pkgver=0.5.3 +pkgver=0.5.4 pkgrel=1 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('xulrunner: browser plugin' conflicts=('parole-media-player-git') install=parole.install source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2) -md5sums=('51c49684322079c216d80fe6193f1614') +md5sums=('19ae948309472429b669eed8ac290dcd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 401cefd29..79ac5f1f6 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99543 2013-10-29 12:13:00Z spupykin $ +# $Id: PKGBUILD 100819 2013-11-11 12:06:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger pkgver=4.0.21 -pkgrel=1 +pkgrel=2 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64') url="http://www.modrails.com" @@ -12,7 +12,7 @@ license=('GPL') depends=('ruby' 'ruby-rack' 'curl') makedepends=('apache') install=passenger.install -options=('!emptydirs') +options=('!emptydirs' 'staticlibs') source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz) md5sums=('200ba8636baa06c9a44d30c7bbb50ac3') diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index f5ca0f6d8..eb00ccd78 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95095 2013-08-05 14:15:47Z andyrtr $ +# $Id: PKGBUILD 101793 2013-12-01 09:52:06Z andyrtr $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu pkgver=0.7.17 -pkgrel=1 +pkgrel=2 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" diff --git a/community/pdfedit/PKGBUILD b/community/pdfedit/PKGBUILD deleted file mode 100644 index b46eff23f..000000000 --- a/community/pdfedit/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Firmicus <firmicus α gmx δ net> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=pdfedit -pkgver=0.4.5 -pkgrel=2 -pkgdesc='Full featured editor for manipulating PDF documents' -arch=('i686' 'x86_64') -url='http://pdfedit.petricek.net/index_e.html' -license=('GPL') -depends=('qt3' 't1lib' 'gsfonts') -makedepends=('boost' 'doxygen') -source=("http://downloads.sourceforge.net/pdfedit/${pkgname}-${pkgver}.tar.bz2" - 'pdfedit.png' - 'pdfedit.desktop') -md5sums=('80502ee7f08cdfb867ffdaa92d160a23' - '70fd938b2ef9da748a093df7e20d1d7d' - 'c0572c2dd54065322321718aa49ed6b8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' src/xpdf/xpdf/GlobalParams.cc - QTDIR=/usr ./configure --prefix=/usr - make CXXFLAGS+="-I/usr/include/qt3" MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 QTDIR=/usr -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make INSTALL_ROOT="${pkgdir}" install - - install -Dm0644 ../pdfedit.desktop "${pkgdir}/usr/share/applications/pdfedit.desktop" - install -Dm0644 ../pdfedit.png "${pkgdir}/usr/share/pixmaps/pdfedit.png" -} diff --git a/community/pdfedit/pdfedit.desktop b/community/pdfedit/pdfedit.desktop deleted file mode 100644 index 35b8defc0..000000000 --- a/community/pdfedit/pdfedit.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=PDF Editor -GenericName=PDF Editor -Exec=pdfedit -Categories=Utility;TextEditor; -Icon=pdfedit -Terminal=false diff --git a/community/pdfedit/pdfedit.png b/community/pdfedit/pdfedit.png Binary files differdeleted file mode 100644 index 3bfc3f2e9..000000000 --- a/community/pdfedit/pdfedit.png +++ /dev/null diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD index c72dba5fa..f647660fd 100644 --- a/community/pdns/PKGBUILD +++ b/community/pdns/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99950 2013-10-31 02:38:53Z allan $ +# $Id: PKGBUILD 102266 2013-12-07 10:36:51Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kevin Mihelich <kevin@archlinuxarm.org> pkgname=pdns pkgver=3.3 -pkgrel=2 +pkgrel=3 pkgdesc='Modern, advanced and high performance authoritative-only nameserver' arch=('x86_64' 'i686') url='http://www.powerdns.com/' @@ -15,7 +15,6 @@ makedepends=('boost') provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') conflicts=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') -install="$pkgname.install" options=('!makeflags') backup=('etc/powerdns/pdns.conf') source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz" @@ -26,13 +25,11 @@ sha256sums=('93417bb418ccd1eaf85fc98aa9f687ed175de388fa2624a1978b7cd40dc2b0b6' 'a1afcccb0d2fb6a6f7a5960de95f8d38ce1ac75ac5e3dcecf09e49f0de10166e') prepare() { - cd "$srcdir/$pkgname-$pkgver" - - touch AUTHORS NEWS + touch "$pkgname-$pkgver/AUTHORS" "$pkgname-$pkgver/NEWS" } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr \ @@ -49,9 +46,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install install -m644 "$srcdir/pdns.conf" "$pkgdir/etc/powerdns/" install -Dm644 "$srcdir/pdns.service" \ "$pkgdir/usr/lib/systemd/system/pdns.service" diff --git a/community/pdns/pdns.install b/community/pdns/pdns.install deleted file mode 100644 index f41b36b20..000000000 --- a/community/pdns/pdns.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - cat << 'EOM' -==> PowerDNS is built without recursor now. To use the recursor, -==> please install the pdns-recursor package and update the -==> configuration in /etc/powerdns/recursor.conf -EOM -} - -post_upgrade() { - post_install $1 -} diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD index 478186965..8d3316ba4 100644 --- a/community/pekwm/PKGBUILD +++ b/community/pekwm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 92159 2013-06-01 21:53:18Z arodseth $ +# $Id: PKGBUILD 102208 2013-12-06 13:59:32Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Eddie Lozon <almostlucky@attbi.com> pkgname=pekwm pkgver=0.1.17 -pkgrel=1 +pkgrel=2 pkgdesc='Small, fast, functional, and flexible window manager' arch=('x86_64' 'i686') license=('GPL') url='https://www.pekwm.org/projects/pekwm' depends=('gcc-libs' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'libxpm' 'libxrandr') -makedepends=('gendesk') +makedepends=('gendesk>=0.6') optdepends=('lxappearance: feature-rich GTK+ theme switcher' 'nitrogen: background browser and setter' 'tint2: basic, good-looking task manager') @@ -27,28 +27,23 @@ backup=(etc/pekwm/autoproperties etc/pekwm/mouse_system etc/pekwm/start etc/pekwm/vars) -source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2" - "${pkgname}_kdm.desktop") -sha256sums=('8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00' - '4c1817d328dad84407c9ba7219015eb3be0345be9e98fc03fa693b6b443a8dc6') +source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2") +sha256sums=('8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00') prepare() { - cd "$srcdir" - - gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc" + gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name PekWM + gendesk -f -wm --pkgname "${pkgname}_kdm" --exec "$pkgname" --name PekWM } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install install -Dm644 "$srcdir/$pkgname.desktop" \ "$pkgdir/usr/share/xsessions/$pkgname.desktop" install -Dm644 "$srcdir/${pkgname}_kdm.desktop" \ diff --git a/community/pekwm/pekwm_kdm.desktop b/community/pekwm/pekwm_kdm.desktop deleted file mode 100644 index b77722d03..000000000 --- a/community/pekwm/pekwm_kdm.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=XSession -Exec=pekwm -TryExec=pekwm -Name=PekWM diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index a05839753..b5130e6c2 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99951 2013-10-31 02:39:14Z allan $ +# $Id: PKGBUILD 102804 2013-12-20 12:34:07Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.6.14_rel62.0 +pkgver=5.6.15_rel63.0 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ url="http://www.percona.com/software/percona-server/" options=('emptydirs') backup=('etc/mysql/my.cnf') install=percona.install -source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/release-${pkgver/_rel/-}/483/source/Percona-Server-${pkgver/_/-}.tar.gz" +source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/source/Percona-Server-${pkgver/_/-}.tar.gz" 'mysqld-post.sh' 'mysqld.service' 'mysqld-tmpfile.conf' @@ -102,7 +102,7 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 } -sha256sums=('69edc04585e72ac94c32598221c0762704e75190c2abe4fa680ad42ce202e280' +sha256sums=('0d433310c374025e4aae05038b1542a5c90b35d01842c5b9718dcc0ed66ea0cc' '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48' '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869' 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60' diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 5145f5624..301048099 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94902 2013-08-01 06:55:27Z bpiotrowski $ +# $Id: PKGBUILD 102267 2013-12-07 10:36:52Z bpiotrowski $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.7.0 -pkgrel=10 +pkgrel=11 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" @@ -30,6 +30,8 @@ prepare() { patch -Np1 -i ../fix-noisy-sound-output.patch # fix building with ffmpeg-2.0 patch -Np1 -i ../ffmpeg-2.0.patch + # since freetype2-2.5.1 include files aren't anymore in the freetype subdir + sed -i "s#freetype/freetype.h#freetype.h#g" cmake/Modules/FindFreetype.cmake } build() { diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD index 598d127e3..7a5ce812a 100644 --- a/community/perl-berkeleydb/PKGBUILD +++ b/community/perl-berkeleydb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99506 2013-10-29 10:25:03Z spupykin $ +# $Id: PKGBUILD 100904 2013-11-13 09:48:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-berkeleydb -pkgver=0.53 -pkgrel=2 +pkgver=0.54 +pkgrel=1 pkgdesc="Interface to Berkeley DB version 2, 3 or 4" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/BerkeleyDB/" @@ -13,7 +13,7 @@ license=('GPL' 'PerlArtistic') depends=('perl' 'db') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz) -md5sums=('899c6967316c7a36b1d5b6a4c7ffbb02') +md5sums=('7efc0aaaf6ca4a2a629eadea24d34fad') build() { cd $srcdir/BerkeleyDB-$pkgver diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD index ca5b8ce33..7cf769802 100644 --- a/community/perl-fuse/PKGBUILD +++ b/community/perl-fuse/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99530 2013-10-29 10:58:33Z spupykin $ +# $Id: PKGBUILD 100908 2013-11-13 09:49:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-fuse -pkgver=0.16 +pkgver=0.16.1 pkgrel=1 pkgdesc="write filesystems in Perl using FUSE" arch=('i686' 'x86_64') @@ -12,12 +12,12 @@ depends=('perl' 'fuse') license=('GPL') source=(http://search.cpan.org/CPAN/authors/id/D/DP/DPATES/Fuse-$pkgver.tar.gz build-fix.patch) -md5sums=('d7f36eb55392270d2c6b2f05737b553f' +md5sums=('29534329808d8cf42fc78ca26c6fa698' '16d985400e620286efdf4610d78cb5d6') prepare() { cd $srcdir/Fuse-$pkgver - patch -p1 <$srcdir/build-fix.patch +# patch -p1 <$srcdir/build-fix.patch } build() { diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD index 40e637e1f..fb628567f 100644 --- a/community/perl-json-xs/PKGBUILD +++ b/community/perl-json-xs/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 100056 2013-10-31 21:46:48Z spupykin $ +# $Id: PKGBUILD 100497 2013-11-05 10:05:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> pkgname=perl-json-xs pkgver=3.01 -pkgrel=1 +pkgrel=2 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" url="http://search.cpan.org/dist/JSON-XS/" license=("GPL") arch=('i686' 'x86_64') -depends=('perl' 'perl-common-sense') +depends=('perl' 'perl-common-sense' 'perl-types-serialiser') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz) md5sums=('b7be65295baf6dd9233c6494782c1153') build() { cd $srcdir/JSON-XS-$pkgver -# eval `perl -V:archname` perl Makefile.PL INSTALLDIRS=vendor make } diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD index 26eae9f38..9c9977059 100644 --- a/community/perl-xml-libxslt/PKGBUILD +++ b/community/perl-xml-libxslt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93874 2013-07-11 16:16:39Z jsteel $ +# $Id: PKGBUILD 100900 2013-11-12 23:39:12Z eric $ # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: Justin "juster" Davis <jrcd83@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-xml-libxslt -pkgver=1.81 +pkgver=1.82 pkgrel=1 pkgdesc="Interface to the gnome libxslt library" arch=('i686' 'x86_64') @@ -13,20 +13,20 @@ license=('GPL') depends=('perl-xml-libxml' 'libxslt') options=('!emptydirs') source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz) -md5sums=('a721424c905eca40b1b7af9abe32ff76') +md5sums=('91b5432b2c68fcf88b25cfd825b23b14') build() { - cd "$srcdir/XML-LibXSLT-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + cd XML-LibXSLT-$pkgver + perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$srcdir/XML-LibXSLT-$pkgver" + cd XML-LibXSLT-$pkgver make test } package() { - cd "$srcdir/XML-LibXSLT-$pkgver" - make install DESTDIR="$pkgdir" + cd XML-LibXSLT-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/php-mongo/PKGBUILD b/community/php-mongo/PKGBUILD index de13f8385..ce46c64a5 100644 --- a/community/php-mongo/PKGBUILD +++ b/community/php-mongo/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jarek Sedlacek <jareksedlacek@gmail.com> pkgname=php-mongo -pkgver=1.4.3 -pkgrel=3 +pkgver=1.4.5 +pkgrel=1 pkgdesc="Officially supported PHP driver for MongoDB" arch=("i686" "x86_64") url="http://www.mongodb.org/display/DOCS/PHP+Language+Center" @@ -26,5 +26,5 @@ package() { make INSTALL_ROOT="$pkgdir" install install -Dm644 "$srcdir/mongo.ini" "$pkgdir/etc/php/conf.d/mongo.ini" } -sha256sums=('43686e8c9fabfec6852fa42eb664aa662a6d423b4bd3eba41f42514892d8d4a4' +sha256sums=('45b20d4fc37e2ce1bc85dfb79418993ecfe61c519d6ad24e7d28cb4e1b380a55' 'c89685eee842d5c3a85149a5bb8e310e62bf1a17f94183bb66401593ab2b191b') diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 15292ee86..4df6f1f60 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98142 2013-10-06 16:28:12Z fyan $ +# $Id: PKGBUILD 102564 2013-12-15 04:07:26Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.2c -_commit=41f9151c2273e8d3321458a1bbabf918b4e050c6 +pkgver=0.2c.20131206 +_commit=41f92cb7d8b4cfb26e51eded734e8110f845cff3 pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64') @@ -11,12 +11,12 @@ url="https://github.com/xiehuc/pidgin-lwqq" license=('GPL3') depends=('libpurple' 'curl' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'libev' 'js185') optdepends=('pidgin: Multi-protocol instant messaging client' - 'telepathy-haze: Empathy plugin support') + 'telepathy-haze: Empathy plugin support') makedepends=('git' 'cmake') install=$pkgname.install options=(debug) -#source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit" -source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver" +source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit" +#source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver" "git://github.com/xiehuc/lwqq.git") prepare() { diff --git a/community/pidgin-talkfilters/PKGBUILD b/community/pidgin-talkfilters/PKGBUILD deleted file mode 100644 index b2cb6daa8..000000000 --- a/community/pidgin-talkfilters/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Connor Behan <connor.behan@gmail.com> - -pkgname=pidgin-talkfilters -pkgver=2.7.0 -pkgrel=1 -pkgdesc="Implements GNU Talkfilters in pidgin chats" -arch=(i686 x86_64) -url="http://www.guifications.org/projects/purple-plugin-pack" -license=('GPL') -depends=('pidgin' 'talkfilters') -makedepends=('intltool' 'gettext' 'python2') -source=(https://www.guifications.org/attachments/download/201/purple-plugin-pack-${pkgver}.tar.bz2) - -build() { - cd "$srcdir"/purple-plugin-pack-${pkgver} - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --with-plugins=talkfilters - make -} - -package() { - cd "$srcdir"/purple-plugin-pack-${pkgver} - make DESTDIR="$pkgdir" install - rm -rf "${pkgdir}"/usr/share -} - -md5sums=('a1ee405e81ad955798af7b2a6a8564fb') diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index ccc794cc4..373badb46 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94040 2013-07-13 12:35:34Z svenstaro $ +# $Id: PKGBUILD 102268 2013-12-07 10:36:53Z bpiotrowski $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus pkgver=0.7.6 -pkgrel=9 +pkgrel=10 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64') url="http://pingus.seul.org" diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD index 93d5c3a2e..a13d717c7 100644 --- a/community/pinot/PKGBUILD +++ b/community/pinot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94041 2013-07-13 12:35:45Z svenstaro $ +# $Id: PKGBUILD 102269 2013-12-07 10:36:55Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> @@ -7,7 +7,7 @@ pkgname=pinot pkgver=1.06 -pkgrel=1 +pkgrel=2 pkgdesc='Personal search and metasearch tool' arch=('i686' 'x86_64') url='http://code.google.com/p/pinot-search/' @@ -26,8 +26,9 @@ optdepends=('unzip: ZIP files extraction' options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog -source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha256sums=('bba6f412553890ef7cccd6d7bb28df9a6c4d122ea74a2902e5de33953cd1872d') +source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz namespace_clash.patch) +sha256sums=('bba6f412553890ef7cccd6d7bb28df9a6c4d122ea74a2902e5de33953cd1872d' + '7b4fee7b43f73539803954075af2ce577b65ca732ab8115d257068ffaa5a750f') build() { cd $srcdir/$pkgname-$pkgver @@ -42,6 +43,9 @@ build() { ${x}LM/russian-koi8_r.lm russian-koi8_r\n\ ${x}LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt + patch -Np1 -i $srcdir/namespace_clash.patch + + LIBS="-lboost_system" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/community/pinot/namespace_clash.patch b/community/pinot/namespace_clash.patch new file mode 100644 index 000000000..40d7c9eac --- /dev/null +++ b/community/pinot/namespace_clash.patch @@ -0,0 +1,12 @@ +diff -aur pinot-1.06/UI/GTK2/src/mainWindow.cc pinot-1.06.new/UI/GTK2/src/mainWindow.cc +--- pinot-1.06/UI/GTK2/src/mainWindow.cc 2013-01-14 13:47:06.000000000 +0100 ++++ pinot-1.06.new/UI/GTK2/src/mainWindow.cc 2013-11-30 19:22:17.792587309 +0100 +@@ -1766,7 +1766,7 @@ + viewDoc = true; + } + +- close(inFd); ++ ::close(inFd); + } + + if (viewDoc == true) diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD index 4468e1bd0..8aa2a3910 100644 --- a/community/pion/PKGBUILD +++ b/community/pion/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 99025 2013-10-22 18:18:59Z stativ $ +# $Id: PKGBUILD 102770 2013-12-19 14:12:44Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=pion -pkgver=5.0.4 +pkgver=5.0.5 pkgrel=1 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" url="https://github.com/cloudmeter/pion" @@ -13,7 +13,7 @@ provides=('pion-net') conflicts=('pion-net') replaces=('pion-net') source=(https://github.com/cloudmeter/pion/archive/$pkgver.zip) -md5sums=('5807d39beb0c80fdef5b8ad5cee71c1c') +md5sums=('b8bf0fdac882d9bd4332d3c6d3bccbd8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pitivi/PKGBUILD b/community/pitivi/PKGBUILD index 4d6b35f4a..8849804ba 100644 --- a/community/pitivi/PKGBUILD +++ b/community/pitivi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100076 2013-11-01 09:49:26Z spupykin $ +# $Id: PKGBUILD 100501 2013-11-05 10:06:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: Gabor Nyekhelyi (n0gabor) <n0gabor@vipmail.hu> pkgname=pitivi -pkgver=0.91 -pkgrel=4 +pkgver=0.92 +pkgrel=1 pkgdesc="Editor for audio/video projects using the GStreamer framework" arch=('i686' 'x86_64') url="http://www.pitivi.org/" @@ -19,8 +19,8 @@ optdepends=('frei0r-plugins: additional video effects, clip transformation featu 'gst-plugins-bad: additional multimedia codecs' 'gst-plugins-ugly: additional multimedia codecs') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.91/$pkgname-$pkgver.tar.xz) -md5sums=('30f520587885d231aeb9a7ddb2585e45') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) +md5sums=('6c84db8a647c9151c3890e9cd15a8fc1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index 909641caa..d7082d675 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 99408 2013-10-28 11:45:43Z arodseth $ +# $Id: PKGBUILD 102625 2013-12-16 21:54:40Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: phrakture <aaronmgriffin--gmail--com> # Contributor: Fazlul Shahriar # Contributor: Chris Brannon <cmbrannon79@gmail.com> pkgname=plan9port -pkgver=20130927 -pkgrel=3 +pkgver=20131024 +pkgrel=2 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' arch=('x86_64' 'i686') url='http://swtch.com/plan9port/' @@ -16,23 +16,25 @@ optdepends=('python2: for the codereview script') provides=('plan9') install='plan9.install' options=('!zipman' 'staticlibs') -source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz" +source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tgz" 'plan9.sh') -sha256sums=('580927688ae2df295bf7f78d0ba19588104c6b0403558ffa3cd9ed0b7b110542' +sha256sums=('5cba7856bdb35a96a923120e61d320d424fee1a6f09b7af3e87eb7814a747d4f' 'c216efa3455ba0b22b1723ae62e4c1e21b3a776a760d8fcedb902ff994b701c1') package() { - cd plan9 + cd "$pkgname" - d=/usr/local # /opt + # TODO: Find a way to install in a better directory than /usr/local/plan9 + + d=usr/local ./INSTALL -b install -Dm755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh" - install -d "$pkgdir$d" + install -d "$pkgdir/$d" install -d "$pkgdir/usr/share/doc/$pkgname" - cp -r "$srcdir/plan9" "$pkgdir/$d/" - cd "$pkgdir$d/plan9" - ./INSTALL -c -r "$pkgdir$d/plan9" + cp -r "$srcdir/$pkgname" "$pkgdir/$d/plan9" + cd "$pkgdir/$d/plan9" + ./INSTALL -c -r "$pkgdir/$d/plan9" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # Clean up @@ -43,10 +45,10 @@ package() { LICENSE # Fix hardcoded paths - for f in `grep -H -r "$pkgdir$d/plan9" | cut -d: -f1`; do - echo -n "\t$f" - [ -e "$f" ] && sed -i "s:$pkgdir$d/plan9:$d/plan9:" "$f" || true - done + #for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do + # echo -n "\t$f" + # [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true + #done # Fix python scripts find "$pkgdir" -name '*.py' -print0 |xargs -0 \ @@ -60,7 +62,7 @@ package() { done # Decompress the plan9 man pages - for i in `find $pkgdir$d/plan9/man -type f`; do + for i in `find $pkgdir/$d/plan9/man -type f`; do if [ ${i##*.} = "gz" ]; then gunzip "$i" fi diff --git a/community/plan9port/plan9.install b/community/plan9port/plan9.install index 5c76552f3..1d361127f 100644 --- a/community/plan9port/plan9.install +++ b/community/plan9port/plan9.install @@ -6,16 +6,3 @@ post_install() { echo "==> Run '9 man 1 intro | less' to begin" source /etc/profile.d/plan9.sh } - -post_upgrade() { - post_install -} - -pre_upgrade() { - post_remove -} - -post_remove() { - #we had to unpack them so they won't get removed.... - rm -rf /opt/plan9/man -} diff --git a/community/plank/PKGBUILD b/community/plank/PKGBUILD index 94521202e..063652177 100644 --- a/community/plank/PKGBUILD +++ b/community/plank/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99552 2013-10-29 14:43:20Z alucryd $ +# $Id: PKGBUILD 101218 2013-11-19 21:08:43Z alucryd $ # Maintainer: Maxime Gauduin <alucryd at gmail dot com> # Contributor: Ner0 <darkelfdarkelf666 at yahoo dot co dot uk> # Contributor: dcelasun <dcelasun at gmaild dot com> pkgname=plank -pkgver=0.4.0 -pkgrel=2 +pkgver=0.5.0 +pkgrel=1 pkgdesc="Elegant, simple, clean dock" arch=('i686' 'x86_64') url="https://launchpad.net/plank" @@ -14,7 +14,7 @@ depends=('bamf' 'libdbusmenu-gtk3' 'libgee06' 'python2') makedepends=('gnome-common' 'intltool' 'vala') install="${pkgname}.install" source=("https://launchpad.net/${pkgname}/1.0/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz") -sha256sums=('b8417bce7d88ac1f339e948c964822049a9261f9d9dedc0d0e636c73442856fe') +sha256sums=('bf0e14dbdc9d30d57e55cc88644ef6e6c296be924bbfc1b345cba1e0c9be1804') prepare() { cd ${pkgname}-${pkgver} diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index f800a1c2b..98cee0a12 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94043 2013-07-13 12:36:03Z svenstaro $ +# $Id: PKGBUILD 102271 2013-12-07 10:36:58Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> @@ -8,8 +8,8 @@ pkgname=pokerth _realname=PokerTH pkgver=1.0.1 -pkgrel=2 -pkgdesc="Poker game written in C++/QT4" +pkgrel=3 +pkgdesc="Poker game written in C++/Qt4" arch=('i686' 'x86_64') url="http://www.pokerth.net/" license=('GPL' 'custom') diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index 553dbc763..5f868c1fc 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99962 2013-10-31 02:42:56Z allan $ +# $Id: PKGBUILD 100837 2013-11-11 18:56:33Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=postgis -pkgver=2.1.0 -pkgrel=2 +pkgver=2.1.1 +pkgrel=1 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64') url="http://postgis.net/" @@ -13,7 +13,7 @@ license=('GPL') depends=('postgresql' 'gdal' 'json-c') changelog=$pkgname.changelog source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz) -sha256sums=('fc00481aec904661f3eb11da4305b1666f2040c28b0651de7eac6c22f217b26c') +sha256sums=('f55acf056362e7e78766bec7a403e02a3b6b087a6d18b4222647b6a932d5c945') build() { cd ${pkgname}-${pkgver} diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index ce4c3b267..bb9b27fdd 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,6 @@ +2013-11-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * postgis-2.1.1-1 + 2013-08-22 Maxime Gauduin <alucryd@gmail.com> * postgis-2.1.0-1 * Fixes FS#35816 diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD index 0c0cf4ce8..fe3b066ca 100644 --- a/community/powertop/PKGBUILD +++ b/community/powertop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95046 2013-08-04 10:58:38Z lcarlier $ +# $Id: PKGBUILD 101505 2013-11-26 18:13:32Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Xilon <xilonmu@gmail.com> pkgname=powertop -pkgver=2.4 +pkgver=2.5 pkgrel=1 pkgdesc='A tool to diagnose issues with power consumption and power management' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL2') depends=('gcc-libs' 'libnl' 'ncurses' 'pciutils') changelog=$pkgname.changelog source=(https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz) -sha256sums=('42796c94546ae7f3d232e41b7fa09b2532396ca389908ff528870311db6327b7') +sha256sums=('8b2c08a555d79e1c428863470c41cb023971d74ba4801d80a05e35adeec23c0b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index 1bf363351..5c7a68974 100644 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96288 2013-08-24 07:44:52Z ttoepper $ +# $Id: PKGBUILD 101337 2013-11-22 22:20:43Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: J0k3r <moebius282 e4a t gmail D0_T com> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)hotmail.com> pkgname=pragha -pkgver=1.1.2.1 +pkgver=1.1.2.2 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64') @@ -22,8 +22,8 @@ optdepends=('notification-daemon: OSD notification' makedepends=('intltool') replaces=('dissonance') install=pragha.install -source=("http://dissonance.googlecode.com/files/pragha-$pkgver.tar.bz2") -sha1sums=('f8fe9f1f6fa89b6d9657dedad26a90db494b200b') +source=("https://github.com/matiasdelellis/pragha/releases/download/v$pkgver/pragha-$pkgver.tar.bz2") +sha1sums=('b415432020c2e1aefc6640cef778ddc70bbeff7f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/primus/PKGBUILD b/community/primus/PKGBUILD index e7f024443..31c6f3a31 100644 --- a/community/primus/PKGBUILD +++ b/community/primus/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Alexander Monakov <amonakov@gmail.com> pkgname=primus -pkgver=20131027 +pkgver=20131226 pkgrel=1 pkgdesc="Faster OpenGL offloading for Bumblebee" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="https://github.com/amonakov/primus" license=('custom:ISC') depends=('bumblebee') makedepends=('git') -source=("git://github.com/amonakov/primus.git#commit=31ca47e644") +source=("git://github.com/amonakov/primus.git#commit=074817614c") sha1sums=('SKIP') build() { diff --git a/community/proj/PKGBUILD b/community/proj/PKGBUILD index c6a2592d0..eefbc6b4d 100644 --- a/community/proj/PKGBUILD +++ b/community/proj/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99963 2013-10-31 02:43:16Z allan $ +# $Id: PKGBUILD 103035 2013-12-25 17:37:50Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org @@ -6,7 +6,7 @@ pkgname=proj pkgver=4.8.0 -pkgrel=2 +pkgrel=3 pkgdesc='Cartographic Projections library.' arch=('i686' 'x86_64') url="http://trac.osgeo.org/proj/" diff --git a/community/proj/proj.changelog b/community/proj/proj.changelog index 24041ea60..52e6673d7 100644 --- a/community/proj/proj.changelog +++ b/community/proj/proj.changelog @@ -1,3 +1,6 @@ +2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * proj 4.8.0-3 static library removed + 2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * proj 4.8.0-2 chenyx06a.zip file location fix diff --git a/community/protobuf-c/PKGBUILD b/community/protobuf-c/PKGBUILD new file mode 100644 index 000000000..325077e30 --- /dev/null +++ b/community/protobuf-c/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 101362 2013-11-23 15:09:26Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Maintainer: Aurélien Wailly <aurelien.wailly@gmail.com> + +pkgname=protobuf-c +pkgver=0.15 +pkgrel=3 +pkgdesc='Protocol Buffers implementation in C' +arch=('i686' 'x86_64') +url='https://github.com/protobuf-c/protobuf-c' +license=('BSD') +depends=('protobuf') +source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('73ff0c8df50d2eee75269ad8f8c07dc8') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 68fd24c76..a46526035 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9893 +pkgver=10098 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64') diff --git a/community/pymol/PKGBUILD b/community/pymol/PKGBUILD new file mode 100644 index 000000000..352ea5f1c --- /dev/null +++ b/community/pymol/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com> +# Contributor: graysky +# Contributor: Tomasz Żok <tomasz dot zok at gmail dot com> + +pkgname=pymol +pkgver=1.6.0.0 +pkgrel=2 +pkgdesc="A USER-SPONSORED molecular visualization system on an OPEN-SOURCE foundation" +arch=('i686' 'x86_64') +url="http://pymol.org/" +license=('custom') +depends=('glut' 'glew' 'mesa' 'python-pmw' 'tcl' 'tcsh' 'tk') +source=("http://downloads.sourceforge.net/project/pymol/pymol/1.6/pymol-v${pkgver}.tar.bz2") +md5sums=('6f5db5beea7497f5a414c8e0cf1ae53d') + +prepare() { + # suppress non-zero exit code that breaks makepkg + sed -i '/sys.exit/ s,2,0,' "${srcdir}/${pkgname}/setup.py" +} + +build() { + cd "${srcdir}/${pkgname}" + python2 setup.py build +} + +package() { + cd "${srcdir}/${pkgname}" + python2 setup.py install --prefix="usr/" --root="${pkgdir}" + + sed -i "s|${pkgdir}||g" pymol + install -D -m755 "pymol" "${pkgdir}/usr/bin/pymol" + + # change python to python2 + sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/run" + sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/cyg" + sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pmg_tk/startup/apbs_tools.py" + sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/show" + + install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/python-apsw/PKGBUILD b/community/python-apsw/PKGBUILD index 99b0954f6..9336e6e1e 100644 --- a/community/python-apsw/PKGBUILD +++ b/community/python-apsw/PKGBUILD @@ -4,26 +4,25 @@ pkgbase=python-apsw pkgname=('python-apsw' 'python2-apsw') -pkgver=3.7.17_r1 +pkgver=3.8.1 pkgrel=1 arch=('i686' 'x86_64') url="http://code.google.com/p/apsw/" license=('MIT') makedepends=('python' 'python2') -source=("http://apsw.googlecode.com/files/apsw-${pkgver//_/-}.zip" 'LICENSE') - -md5sums=('5393765e7ef55def11dae08149133136' +source=("http://apsw.googlecode.com/files/apsw-${pkgver}-r1.zip" 'LICENSE') +md5sums=('83ffdbda803f9ea2091705d35ca6b0e5' 'efc704d50cb39441d00f9dc76cbe6665') build() { cd $srcdir - cp -rf apsw-${pkgver//_/-} apsw2 + cp -rf apsw-${pkgver}-r1 apsw2 } package_python-apsw() { depends=('python' 'sqlite3>=3.7.5') pkgdesc="Python wrapper for SQLite" - cd $srcdir/apsw-${pkgver//_/-} + cd $srcdir/apsw-${pkgver}-r1 python setup.py install --root=$pkgdir/ install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE diff --git a/community/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD index 9f2704036..6bc90397f 100644 --- a/community/python-pillow/PKGBUILD +++ b/community/python-pillow/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 98694 2013-10-17 06:08:29Z kkeen $ +# $Id: PKGBUILD 102812 2013-12-21 01:57:46Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: minder pkgbase=python-pillow pkgname=(python-pillow python2-pillow) -pkgver=2.2.1 -pkgrel=2 +pkgver=2.2.2 +pkgrel=1 _appname=Pillow _py2basever=2.7 _py3basever=3.3m @@ -15,7 +15,7 @@ url="http://python-imaging.github.io/" license=('BSD') makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane') source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip") -md5sums=('d1d20d3db5d1ab312da0951ff061e6bf') +md5sums=('6a76a16f6db45744ff2e9327bf0608b4') build() { cd "$srcdir" diff --git a/community/python-pmw/LICENSE.txt b/community/python-pmw/LICENSE.txt new file mode 100644 index 000000000..de9a58260 --- /dev/null +++ b/community/python-pmw/LICENSE.txt @@ -0,0 +1,21 @@ +Copyright (c) 2007,2008 David M. Cooke <david.m.cooke@gmail.com> +Copyright (c) 2009,2010 Francesc Alted <faltet@pytables.org> +Copyright (c) 2011- See AUTHORS.txt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/community/python-pmw/PKGBUILD b/community/python-pmw/PKGBUILD new file mode 100644 index 000000000..dd43ef0b5 --- /dev/null +++ b/community/python-pmw/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com> +# Contributor: kfgz <kfgz at interia pl> +# Contributor: Michael Krauss <hippodriver at gmx dot net> +# Contributor: dsa + +pkgname=python-pmw +pkgver=1.3.3b +pkgrel=2 +pkgdesc="A toolkit for high-level compound widgets in Python using the Tkinter module" +arch=('i686' 'x86_64') +url="http://pmw.sourceforge.net/doc/index.html" +license=('MIT') +depends=('python2' 'tk') +source=(${pkgname}-${pkgver}.tar.gz::http://sourceforge.net/projects/pmw/files/Pmw/Pmw.1.3.3/Pmw_1_3_3b.tar.gz/download + "LICENSE.txt") +md5sums=('d8b998b921584db32a5eeeddc6bc606c' + '28b047a148c1780eddcf4bed6b150123') + +package() { + cd "Pmw" + python2 setup.py build + python2 setup.py install --prefix=/usr --root="${pkgdir}" + + # change python to python2 + sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/tests/ManualTests.py" + sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/demos/All.py" + sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/tests/All.py" + sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/bin/bundlepmw.py" + + install -D -m644 "${srcdir}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index 0346c6098..498ef4296 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 99570 2013-10-29 21:24:23Z seblu $ +# $Id: PKGBUILD 102223 2013-12-06 21:38:55Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') -pkgver=1.1.2 +pkgver=1.2.1 pkgrel=1 arch=('i686' 'x86_64') url='http://code.google.com/p/psutil/' license=('custom: BSD') makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools') source=("https://pypi.python.org/packages/source/p/psutil/psutil-$pkgver.tar.gz") -md5sums=('fe9c9a3ed95fe6564acf8b4500c7b5da') +md5sums=('80c3b251389771ab472e554e6c729c36') build() { cd psutil-$pkgver diff --git a/community/python-pyopencl/PKGBUILD b/community/python-pyopencl/PKGBUILD index 14865460f..07f720db3 100644 --- a/community/python-pyopencl/PKGBUILD +++ b/community/python-pyopencl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100072 2013-11-01 09:31:30Z jelle $ +# $Id: PKGBUILD 102275 2013-12-07 10:37:03Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgbase=python-pyopencl pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers') pkgver=2013.2 -pkgrel=1 +pkgrel=2 pkgdesc="A complete, object-oriented language binding of OpenCL to Python" arch=('i686' 'x86_64') url="http://mathema.tician.de/software/pyopencl" diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD index 4b45e70c1..0a466281d 100644 --- a/community/python-pyzmq/PKGBUILD +++ b/community/python-pyzmq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 100379 2013-11-03 07:15:10Z kkeen $ +# $Id: PKGBUILD 102641 2013-12-17 01:18:22Z kkeen $ # Maintainer: Kyle Keen <keenerd at gmail dot com> pkgbase=python-pyzmq pkgname=(python2-pyzmq python-pyzmq) -pkgver=14.0.0 +pkgver=14.0.1 pkgrel=1 pkgdesc="Python bindings for zeromq, written in Cython" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=(zeromq python) makedepends=(python python2 zeromq) #source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) source=(https://pypi.python.org/packages/source/p/pyzmq/pyzmq-$pkgver.tar.gz) -md5sums=('ce62ce9807b0b5da0076eaa9cf6cc24e') +md5sums=('c35fa03e58d48e6f3df2ab2c2dfa1413') build() { cd "$srcdir" diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 9d6f55c92..b7f7618d1 100644 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Andrzej Giniewicz <gginiu@gmail.com> pkgname=('python-scipy' 'python2-scipy') -pkgver=0.13.0 +pkgver=0.13.2 pkgrel=1 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64') @@ -15,7 +15,6 @@ license=('BSD') makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy' 'python-setuptools' 'python2-setuptools') checkdepends=('python-nose' 'python2-nose') source=("https://pypi.python.org/packages/source/s/scipy/scipy-${pkgver}.tar.gz") -md5sums=('ffa1e9bfd2bbdf3f17f4cf8139084098') build() { # Changing the arithmetic parameter (Thanks to Fabrizio Castellano) @@ -81,3 +80,4 @@ package_python2-scipy() { } # vim:set ts=2 sw=2 et: +md5sums=('fcd110802b0bf3505ba567cf831566e1') diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD index b412e0272..c0652ae7e 100644 --- a/community/python-sqlalchemy/PKGBUILD +++ b/community/python-sqlalchemy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 96127 2013-08-20 06:33:00Z lcarlier $ +# $Id: PKGBUILD 102482 2013-12-12 10:34:55Z jelle $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-sqlalchemy pkgname=('python-sqlalchemy' 'python2-sqlalchemy') -pkgver=0.8.2 +pkgver=0.8.4 pkgrel=1 arch=('i686' 'x86_64') # python2 package contain .so url="http://www.sqlalchemy.org/" license=('custom: MIT') makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-nose' 'python2-nose') -source=(http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz) -md5sums=('78c5bc43fcbc3dea77fa85caa432625d') +source=("https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz") +md5sums=('fd517e1bb4031cac1e3fa00108111b38') build() { cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver diff --git a/community/python2-gevent-beta/PKGBUILD b/community/python2-gevent-beta/PKGBUILD deleted file mode 100644 index 820a03cb6..000000000 --- a/community/python2-gevent-beta/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 97219 2013-09-15 11:50:12Z fyan $ -# Maintainer: Felix Yan <felixonmars@gmail.com> - -_pkgbase=gevent -pkgname=python2-${_pkgbase}-beta -pkgver=1.0rc3 -pkgrel=1 -pkgdesc="Python networking library based on greenlet and libev - Beta version" -arch=('i686' 'x86_64') -url="http://www.gevent.org/" -license=('MIT') -depends=('python2-greenlet') -makedepends=('cython2') -conflicts=('python2-gevent') -provides=("python2-gevent=$pkgver") -source=("https://github.com/surfly/gevent/archive/$pkgver.tar.gz") - -package() { - cd "$srcdir/${_pkgbase}-${pkgver}" - msg "Starting make..." - - LIBEV_EMBED=1 \ - CARES_EMBED=1 \ - CYTHON=cython2 \ - PYTHON=python2 \ - python2 setup.py install \ - --prefix=/usr \ - --root="$pkgdir" - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -sha512sums=('b0c978a7d3690051175edb862ab5a3132ba31e58c6aaa12ea2715d16679650ec05b239c1fb776a410749dc60ff32f53882c2810789f4e89e1bcb76a7a32b1f48') diff --git a/community/python2-gevent/PKGBUILD b/community/python2-gevent/PKGBUILD index 5b62ecde1..7cffa0137 100644 --- a/community/python2-gevent/PKGBUILD +++ b/community/python2-gevent/PKGBUILD @@ -4,27 +4,33 @@ # Contributor: Ralf Schmitt <ralf@systemexit.de> pkgname=python2-gevent -pkgver=0.13.8 -pkgrel=2 +pkgver=1.0 +pkgrel=1 arch=('i686' 'x86_64') -pkgdesc="Python network library that uses greenlet and libevent for easy and scalable concurrency" +pkgdesc="Python network library that uses greenlet and libev for easy and scalable concurrency" license=("MIT") url="http://www.gevent.org/" -depends=('libevent' 'python2-greenlet') -makedepends=('python2-distribute') - -source=(http://pypi.python.org/packages/source/g/gevent/gevent-$pkgver.tar.gz) +depends=('python2-greenlet') +makedepends=('git' 'cython2') +provides=('python2-gevent-beta') +conflicts=('python2-gevent-beta') +replaces=('python2-gevent-beta') +source=("git://github.com/surfly/gevent.git#tag=$pkgver") build() { - cd "$srcdir/gevent-$pkgver" + cd gevent + + LIBEV_EMBED=1 \ + CARES_EMBED=1 \ + CYTHON=cython2 \ + PYTHON=python2 \ python2 setup.py build } package() { - cd "$srcdir/gevent-$pkgver" + cd gevent python2 setup.py install -O1 --root="$pkgdir" install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm0644 LICENSE.pyevent "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pyevent" } -md5sums=('ca9dcaa7880762d8ebbc266b11252960') +md5sums=('SKIP') diff --git a/community/python2-gnutls/PKGBUILD b/community/python2-gnutls/PKGBUILD index 3a7c86a04..42912d1bd 100644 --- a/community/python2-gnutls/PKGBUILD +++ b/community/python2-gnutls/PKGBUILD @@ -4,20 +4,27 @@ # Contributor: N3RD3X <n3rd3x@linuxmail.org> pkgname=python2-gnutls -pkgver=1.2.4 -pkgrel=2 +pkgver=1.2.5 +pkgrel=3 pkgdesc="Python wrapper for the GNUTLS library" arch=('i686' 'x86_64') url="http://cheeseshop.python.org/pypi/python-gnutls" -depends=('python2' 'gnutls') +depends=('python2' 'gnutls' 'libgcrypt') license=('LGPL') source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${pkgver}.tar.gz - gnutls3.patch) -md5sums=('e3536c421291a791869d875a41dcb26a' - '24bc95d9f5e71e9f5e180706cbb09248') + libraryinit.patch + libraryfunctions.patch) +md5sums=('a398a75b1f366857cf2628cf4d62dd34' + '28227b8626e8a7df81cf3b7dae88bd80' + '9907d3a446fdc3b33a70e57925d67298') build() { cd ${srcdir}/python-gnutls-${pkgver} - patch -Np0 <$srcdir/gnutls3.patch + patch -Np0 <$srcdir/libraryinit.patch + patch -Np0 <$srcdir/libraryfunctions.patch +} + +package() { + cd ${srcdir}/python-gnutls-${pkgver} python2 setup.py install --root=${pkgdir} } diff --git a/community/python2-gnutls/gnutls3.patch b/community/python2-gnutls/libraryfunctions.patch index 5110de2f2..da5ad390f 100644 --- a/community/python2-gnutls/gnutls3.patch +++ b/community/python2-gnutls/libraryfunctions.patch @@ -1,6 +1,5 @@ -diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py ---- gnutls/library/functions.py 2011-08-19 04:48:14.000000000 +0100 -+++ gnutls.fixed/library/functions.py 2012-08-01 11:56:43.450975419 +0100 +--- gnutls/library/functions.py 2011-08-19 07:48:14.000000000 +0400 ++++ gnutls.fixed/library/functions.py 2013-12-17 21:08:35.512682514 +0400 @@ -4,7 +4,7 @@ import sys from ctypes import * @@ -223,49 +222,3 @@ diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)] gnutls_x509_rdn_get.restype = c_int -diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py ---- gnutls/library/__init__.py 2011-11-11 17:23:49.000000000 +0000 -+++ gnutls.fixed/library/__init__.py 2012-08-01 11:57:42.284290997 +0100 -@@ -53,6 +53,9 @@ - else: - raise RuntimeError('cannot find lib%s on this system' % name) - -+def do_nothing(*args, **kwargs): -+ pass -+ - - def initialize_gcrypt(): - from ctypes import c_void_p -@@ -104,7 +107,7 @@ - libgcrypt = load_library(name='gcrypt', version=11) - gcry_control = libgcrypt.gcry_control - else: -- gcry_control = libgnutls.gcry_control -+ gcry_control = do_nothing - - gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr)) - if system == 'cygwin': -@@ -117,12 +120,10 @@ - - - --libgnutls = load_library(name='gnutls', version=26) --libgnutls_extra = load_library(name='gnutls-extra', version=26) -+libgnutls = load_library(name='gnutls', version=28) - - initialize_gcrypt() - libgnutls.gnutls_global_init() --libgnutls_extra.gnutls_global_init_extra() - - - from gnutls.library import constants -@@ -136,9 +137,6 @@ - if functions.gnutls_check_version(__need_version__) is None: - version = functions.gnutls_check_version(None) - raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__)) --if functions.gnutls_extra_check_version(__need_version__) is None: -- version = functions.gnutls_extra_check_version(None) -- raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__)) - - - del get_system_name, library_locations, load_library, initialize_gcrypt diff --git a/community/python2-gnutls/libraryinit.patch b/community/python2-gnutls/libraryinit.patch new file mode 100644 index 000000000..5f987b513 --- /dev/null +++ b/community/python2-gnutls/libraryinit.patch @@ -0,0 +1,40 @@ +--- gnutls/library/__init__.py 2013-12-12 20:29:45.000000000 +0400 ++++ gnutls.fixed/library/__init__.py 2013-12-17 20:56:48.637256402 +0400 +@@ -104,10 +104,11 @@ + libgcrypt = load_library(name='gcrypt', version=11) + gcry_control = libgcrypt.gcry_control + else: +- gcry_control = libgnutls.gcry_control ++ libgcrypt = load_library(name='gcrypt', version=11) ++ gcry_control = libgcrypt.gcry_control + + gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr)) +- libgnutls.gcry_check_version('1.2.4') # GNUTLS_MIN_LIBGCRYPT_VERSION ++ libgcrypt.gcry_check_version('1.2.4') # GNUTLS_MIN_LIBGCRYPT_VERSION + if system == 'cygwin': + gcry_control(GCRYCTL_DISABLE_SECMEM, 0) + else: +@@ -118,12 +119,10 @@ + + + +-libgnutls = load_library(name='gnutls', version=26) +-libgnutls_extra = load_library(name='gnutls-extra', version=26) ++libgnutls = load_library(name='gnutls', version=28) + + initialize_gcrypt() + libgnutls.gnutls_global_init() +-libgnutls_extra.gnutls_global_init_extra() + + + from gnutls.library import constants +@@ -137,9 +136,6 @@ + if functions.gnutls_check_version(__need_version__) is None: + version = functions.gnutls_check_version(None) + raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__)) +-if functions.gnutls_extra_check_version(__need_version__) is None: +- version = functions.gnutls_extra_check_version(None) +- raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__)) + + + del get_system_name, library_locations, load_library, initialize_gcrypt diff --git a/community/python2-nautilus/PKGBUILD b/community/python2-nautilus/PKGBUILD index bb17c550d..931ff9040 100644 --- a/community/python2-nautilus/PKGBUILD +++ b/community/python2-nautilus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99969 2013-10-31 02:45:16Z allan $ +# $Id: PKGBUILD 101714 2013-11-30 14:43:56Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Giorgio Gilestro <giorgio@gilest.ro> pkgname=python2-nautilus _pkgname=nautilus-python pkgver=1.1 -pkgrel=3 +pkgrel=4 pkgdesc="Python bindings for the Nautilus Extension API" arch=('i686' 'x86_64') url="http://projects.gnome.org/nautilus-python/" diff --git a/community/python2-pycdio/PKGBUILD b/community/python2-pycdio/PKGBUILD index 54f608dbd..813d2572b 100644 --- a/community/python2-pycdio/PKGBUILD +++ b/community/python2-pycdio/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 86447 2013-03-17 10:57:47Z fyan $ +# $Id: PKGBUILD 101971 2013-12-03 03:22:58Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Alessandro Pezzoni <donbex at nerdshack dot com> pkgname=python2-pycdio -pkgver=0.19 -pkgrel=2 +pkgver=0.20 +pkgrel=1 pkgdesc="Python OO interface to libcdio (CD Input and Control library)" arch=("i686" "x86_64") url="http://pypi.python.org/pypi/pycdio/" license=('GPL') depends=('python2' 'libcdio') -makedepends=('python2-distribute' 'pkg-config' 'swig') +makedepends=('python2-setuptools' 'swig') options=(!emptydirs) source=("http://pypi.python.org/packages/source/p/${pkgname#python2-}/${pkgname#python2-}-${pkgver}.tar.gz") -md5sums=('a6b00666ce8d77ab80a4084a8ff1136b') package() { - cd "$srcdir/${pkgname#python2-}-$pkgver" + cd "${pkgname#python2-}-$pkgver" python2 setup.py install --root="$pkgdir/" --optimize=1 } # vim:set ts=2 sw=2 et: +sha512sums=('b53a535440008dc637b31fd2cda22845c91b98e78c30f90c866af3b9bf7cb3faad39f0784b5063a39bd97bb18fc58c75ad0833d53421182d408c2889c491846b') diff --git a/community/python2-tagpy/PKGBUILD b/community/python2-tagpy/PKGBUILD index 5da870be5..ff892dc15 100644 --- a/community/python2-tagpy/PKGBUILD +++ b/community/python2-tagpy/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 94045 2013-07-13 12:36:26Z svenstaro $ +# $Id: PKGBUILD 102273 2013-12-07 10:37:01Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Callan Barrett <wizzomafizzo@gmail.com> # Contributor: Scott Horowitz <stonecrest@gmail.com> pkgname=python2-tagpy -pkgver=0.94.8 -pkgrel=4 +pkgver=2013.1 +pkgrel=1 pkgdesc='Python bindings for TagLib' arch=('x86_64' 'i686') url='http://pypi.python.org/pypi/tagpy' license=('MIT') depends=('python2' 'taglib' 'boost-libs') -makedepends=('python2-distribute' 'boost') +makedepends=('python2-setuptools' 'boost') replaces=('tagpy') conflicts=('tagpy') source=("http://pypi.python.org/packages/source/t/tagpy/tagpy-$pkgver.tar.gz" 'taglib1.7.patch') -sha256sums=('56eab8dd81510f8af18e19375a0ffd5cd25c8e555104be46a92c3dc08634a0dc' +sha256sums=('80481c78ce34878e7a1f3231acd781a3bf1b0b569c70ce0e8d63af58061152f4' 'f6cc34f8d4d1186270943cd7e1ad3c9478ae7064ab9b2cddf7760d493295cd26') prepare() { cd "tagpy-$pkgver" - patch -p1 -i "$srcdir/taglib1.7.patch" +# patch -p1 -i "$srcdir/taglib1.7.patch" sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') + } build() { diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 35fda67b1..df11349c0 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99094 2013-10-24 11:49:04Z spupykin $ +# $Id: PKGBUILD 102798 2013-12-20 11:28:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=qcad -pkgver=3.4.0.0 +pkgver=3.4.5.0 pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') @@ -13,16 +13,15 @@ url="http://www.ribbonsoft.com/qcad.html" license=('GPL3') depends=('qtwebkit') makedepends=('glu') -options=(libtool) +options=('libtool') source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz QCad.desktop) -md5sums=('b781fb8dcf8ba2725bbccf315a1da44f' - '35100eaedbdf6625f6e6a09b177854cd') +md5sums=('d7e5a77d05bdc7f6d5762029ec03fc2d' + '84f189dd152e7614a1265659dac6222d') prepare() { cd ${srcdir}/qcad-$pkgver -# sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp -# sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp + sed -i '1,1i#include <stdint.h>' src/core/RThread.cpp } build() { diff --git a/community/qcad/QCad.desktop b/community/qcad/QCad.desktop index 407319aa2..5476c67d3 100644 --- a/community/qcad/QCad.desktop +++ b/community/qcad/QCad.desktop @@ -6,4 +6,4 @@ Name=QCad StartupNotify=true Terminal=false Type=Application -Categories=Application;Office; +Categories=Application;Development;Electronics;Engineering; diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index d53624260..33c03ec75 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 98072 2013-10-05 17:15:55Z jlichtblau $ +#$Id: PKGBUILD 103152 2013-12-27 20:10:05Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.7.3 +pkgver=0.7.4 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ optdepends=('flac: native FLAC support' install=$pkgname.install changelog=$pkgname.changelog source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('57e4e1a00450a5a094b290df5410f8ab5a80da364ad3f1402835573cb0b75562') +sha256sums=('ba10d0595b99495587643584c9c8400e6eb987bd2e4bbb30c1060c507f44b4f2') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index d279bfb82..ca8e921c9 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2013-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.7.4-1 + 2013-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.7.3-1 diff --git a/community/qt-recordmydesktop/PKGBUILD b/community/qt-recordmydesktop/PKGBUILD index c8704f45e..b6d14a579 100644 --- a/community/qt-recordmydesktop/PKGBUILD +++ b/community/qt-recordmydesktop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92883 2013-06-17 19:06:55Z andrea $ +# $Id: PKGBUILD 101791 2013-12-01 09:48:42Z jelle $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Daniel J Griffiths <griffithsdj@archlinux.us> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,12 +6,12 @@ pkgname=qt-recordmydesktop pkgver=0.3.8 -pkgrel=6 +pkgrel=7 pkgdesc="Qt4 frontend for recordMyDesktop" arch=('i686' 'x86_64') url="http://recordmydesktop.sourceforge.net" license=('GPL') -depends=('recordmydesktop>=0.3.8.1' 'python2-pyqt') +depends=('recordmydesktop>=0.3.8.1' 'python2-pyqt' 'xorg-xwininfo') source=(http://downloads.sourceforge.net/sourceforge/recordmydesktop/${pkgname}-${pkgver}.tar.gz 'pyqt4.patch') md5sums=('bf1525740755615ae172ae27fef68fb5' diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD deleted file mode 100644 index b9bda96e3..000000000 --- a/community/qtcreator/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 96448 2013-08-29 04:44:01Z svenstaro $ -# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: Dan Vratil <progdan@progdansoft.com> -# Contributor: thotypous <matiasΘarchlinux-br·org> -# Contributor: delor <bartekpiech gmail com> - -pkgname=qtcreator -pkgver=2.8.1 -_pkgver=2.8.1 -pkgrel=1 -pkgdesc='Lightweight, cross-platform integrated development environment' -arch=('i686' 'x86_64') -url='http://qt-project.org' -license=('LGPL') -depends=('qt5-quick1' 'qt5-tools') -makedepends=('git') -options=('docs') -optdepends=('qt5-doc: for the integrated Qt documentation' - 'gdb: for the debugger' - 'cmake: for cmake project support' - 'openssh-askpass: for ssh support' - 'git: for git support' - 'mercurial: for mercurial support' - 'bzr: for bazaar support' - 'valgrind: for analyze support') -install=qtcreator.install -source=("http://download.qt-project.org/official_releases/qtcreator/2.8/${pkgver}/qt-creator-${pkgver}-src.tar.gz" - 'qtcreator.desktop') -md5sums=('79ef6c6ece0c00035ef744c9d6e3bd3b' - '82888d4be900e7833d768050a135cd37') - -build() { - [[ -d build ]] && rm -r build - mkdir build && cd build - - qmake ../qt-creator-${pkgver}-src/qtcreator.pro - make - make docs -j1 -} - -package() { - cd build - - make INSTALL_ROOT="${pkgdir}/usr/" install - make INSTALL_ROOT="${pkgdir}/usr/" install_docs - - install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop - install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT -} diff --git a/community/qtcreator/fix-build.patch b/community/qtcreator/fix-build.patch deleted file mode 100644 index 5cf2a503b..000000000 --- a/community/qtcreator/fix-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- qt-creator-2.6.2-src/qtcreator.pri~ 2013-02-27 13:55:23.818990553 +0000 -+++ qt-creator-2.6.2-src/qtcreator.pri 2013-02-27 13:55:52.335454428 +0000 -@@ -147,6 +147,7 @@ - } - - INCLUDEPATH += \ -+ /usr/include \ - $$IDE_BUILD_TREE/src \ # for <app/app_version.h> - $$IDE_SOURCE_TREE/src/libs \ - $$IDE_SOURCE_TREE/tools \ diff --git a/community/qtcreator/qtcreator.desktop b/community/qtcreator/qtcreator.desktop deleted file mode 100644 index 0e8f73e64..000000000 --- a/community/qtcreator/qtcreator.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Exec=/usr/bin/qtcreator -Name=Qt Creator -GenericName=C++ IDE -X-KDE-StartupNotify=true -Icon=/usr/share/icons/hicolor/512x512/apps/QtProject-qtcreator.png -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/community/qtcreator/qtcreator.install b/community/qtcreator/qtcreator.install deleted file mode 100644 index 4d4a283db..000000000 --- a/community/qtcreator/qtcreator.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD index 9e8115f10..7833c5f1d 100644 --- a/community/quassel/PKGBUILD +++ b/community/quassel/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 98503 2013-10-12 08:31:51Z jlichtblau $ +# $Id: PKGBUILD 100661 2013-11-07 19:56:29Z jelle $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgbase=quassel pkgname=('quassel-client' 'quassel-core') pkgver=0.9.1 -pkgrel=1 +pkgrel=3 pkgdesc="QT4 irc client with a separated core" arch=('i686' 'x86_64') url="http://quassel-irc.org/" license=('GPL') -makedepends=('cmake' 'automoc4' 'qt4' 'icu') +makedepends=('cmake' 'automoc4' 'qt4' 'icu' 'kdelibs') source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2 $pkgbase.service $pkgbase.conf) sha256sums=('39e97bd67160d6575a57d4f71c4b1be5c13461ca238baef462ab43164419864e' - '81222ce0a868993dbe80572f34a555d7fedf07f87413803b7e40397ec283161e' + '88b5b693ad7eea7fb2d084da29c6abc26ea5fa990668f9807d462778243f1d6a' 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') build() { diff --git a/community/quassel/quassel.service b/community/quassel/quassel.service index cdc7d0890..25a132c7f 100644 --- a/community/quassel/quassel.service +++ b/community/quassel/quassel.service @@ -3,8 +3,11 @@ Description=Quassel Core After=network.target [Service] +User=quassel +Group=quassel PIDFile=/var/run/quassel.pid -ExecStart=/usr/bin/quasselcore --listen=127.0.0.1 --configdir=/var/lib/quassel +EnvironmentFile=/etc/conf.d/quassel +ExecStart=/usr/bin/quasselcore --listen=${LISTEN} --configdir=/var/lib/quassel [Install] WantedBy=multi-user.target diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD index 2b90f3f32..5c399cd97 100644 --- a/community/quvi/PKGBUILD +++ b/community/quvi/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 99976 2013-10-31 02:47:38Z allan $ +# $Id: PKGBUILD 100868 2013-11-12 17:03:37Z heftig $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us pkgname=quvi -pkgver=0.9.3.1 -pkgrel=2 +pkgver=0.9.5 +pkgrel=1 pkgdesc='Command-line tool for parsing video download links.' arch=('i686' 'x86_64') url='http://quvi.sourceforge.net/' license=('AGPL3') -depends=('libquvi') +depends=('libquvi' 'libxml2' 'json-glib') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}) -md5sums=('24b3173f8662a6bb33d9a8a58662764f' +md5sums=('baa1d7b25e9fd173e952e27d4aa4b933' 'SKIP') build() { diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index 3666b8871..c82d36b9a 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98000 2013-10-02 23:02:19Z seblu $ +# $Id: PKGBUILD 101735 2013-11-30 16:21:06Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd -pkgver=1.9.5 +pkgver=1.9.7 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.gz" "$pkgname.service") -sha1sums=('0e65206803ab2bcb4e6012a0d11ecdad4f64ce9c' +sha1sums=('92f7eadfee951f787e861f41c344689416f3f504' '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc') build() { cd ${pkgname}-${pkgver} diff --git a/community/rdesktop/PKGBUILD b/community/rdesktop/PKGBUILD new file mode 100644 index 000000000..9ed9c79c0 --- /dev/null +++ b/community/rdesktop/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 101267 2013-11-21 12:16:40Z bpiotrowski $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Dan McGee <dan@archlinux.org> + +pkgname=rdesktop +pkgver=1.8.1 +pkgrel=1 +pkgdesc="An open source client for Windows Remote Desktop Services" +arch=('i686' 'x86_64') +url="http://www.rdesktop.org/" +license=('GPL3') +depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + rdesktop-send_physical_buttons.diff) +sha1sums=('57bb41f98ddf9eeef875c613d790fee37971d0f8' + '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d') + +prepare() { + cd ${pkgname}-${pkgver} + # FS#15113 + patch -i "${srcdir}/rdesktop-send_physical_buttons.diff" +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --enable-smartcard \ + --with-ipv6 + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/community/rdesktop/rdesktop-send_physical_buttons.diff b/community/rdesktop/rdesktop-send_physical_buttons.diff new file mode 100644 index 000000000..69620988f --- /dev/null +++ b/community/rdesktop/rdesktop-send_physical_buttons.diff @@ -0,0 +1,70 @@ +? aclocal.m4 +Index: rdesktop.c +=================================================================== +RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v +retrieving revision 1.163 +diff -u -r1.163 rdesktop.c +--- rdesktop.c 5 Apr 2008 06:15:45 -0000 1.163 ++++ rdesktop.c 5 Aug 2008 11:46:04 -0000 +@@ -73,6 +73,7 @@ + int g_win_button_size = 0; /* If zero, disable single app mode */ + RD_BOOL g_bitmap_compression = True; + RD_BOOL g_sendmotion = True; ++RD_BOOL g_send_physical_buttons = True; + RD_BOOL g_bitmap_cache = True; + RD_BOOL g_bitmap_cache_persist_enable = False; + RD_BOOL g_bitmap_cache_precache = True; +@@ -152,6 +153,7 @@ + fprintf(stderr, " -B: use BackingStore of X-server (if available)\n"); + fprintf(stderr, " -e: disable encryption (French TS)\n"); + fprintf(stderr, " -E: disable encryption from client to server\n"); ++ fprintf(stderr, " -M: do not map logical mouse buttons to physical\n"); + fprintf(stderr, " -m: do not send motion events\n"); + fprintf(stderr, " -C: use private colour map\n"); + fprintf(stderr, " -D: hide window manager decorations\n"); +@@ -450,7 +452,7 @@ + #endif + + while ((c = getopt(argc, argv, +- VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?")) != -1) ++ VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitMmzCDKS:T:NX:a:x:Pr:045h?")) != -1) + { + switch (c) + { +@@ -584,6 +586,9 @@ + case 'E': + g_packet_encryption = False; + break; ++ case 'M': ++ g_send_physical_buttons = False; ++ break; + case 'm': + g_sendmotion = False; + break; +Index: xwin.c +=================================================================== +RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v +retrieving revision 1.235 +diff -u -r1.235 xwin.c +--- xwin.c 11 Jul 2008 03:51:23 -0000 1.235 ++++ xwin.c 5 Aug 2008 11:46:06 -0000 +@@ -36,6 +36,7 @@ + extern int g_ypos; + extern int g_pos; + extern RD_BOOL g_sendmotion; ++extern RD_BOOL g_send_physical_buttons; + extern RD_BOOL g_fullscreen; + extern RD_BOOL g_grab_keyboard; + extern RD_BOOL g_hide_decorations; +@@ -2190,7 +2191,8 @@ + receive physical buttons (true in mstsc as well) and + logical button behavior depends on the remote desktop's own + mouse settings */ +- xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1]; ++ if (g_send_physical_buttons) ++ xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1]; + button = xkeymap_translate_button(xevent.xbutton.button); + if (button == 0) + return; + + diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 66d45dcbc..42d8fe7af 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96952 2013-09-09 09:19:39Z spupykin $ +# $Id: PKGBUILD 101662 2013-11-29 20:55:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=recoll -pkgver=1.19.5 +pkgver=1.19.11_p1 pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64') @@ -30,11 +30,11 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'perl-image-exiftool: EXIF data from raw files' 'aspell-en: English stemming support') install=recoll.install -source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('4a770950d47dee4f6b4ef95e1bc16a5a') +source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-${pkgver/_/}.tar.gz") +md5sums=('5d77a74cddba4e21f7f3bb06ad20a7ac') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-${pkgver/_/}" msg2 "Python2 fix" export PYTHON=/usr/bin/python2 @@ -54,7 +54,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-${pkgver/_/}" make DESTDIR="$pkgdir" install } diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 1683734c9..61e8f10c9 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97559 2013-09-24 10:30:40Z spupykin $ +# $Id: PKGBUILD 102497 2013-12-12 12:51:43Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.6.16 -pkgrel=2 +pkgver=2.8.3 +pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') url="http://redis.io/" @@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" "redis.logrotate" "redis.tmpfiles.d") -md5sums=('ca1b81bd56fe0c5e2c8ec443a95c908d' +md5sums=('6327e6786130b556b048beef0edbdfa7' '5320aa6d0f31aadc1d6202ca40425aea' '9e2d75b7a9dc421122d673fe520ef17f' 'dd9ab8022b4d963b2e5899170dfff490') diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 114d1669d..f874e898a 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93287 2013-07-01 06:22:40Z andrea $ +# $Id: PKGBUILD 101077 2013-11-16 03:53:07Z andrea $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq -pkgver=2.3.2 +pkgver=2.4.0 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64') @@ -15,11 +15,14 @@ makedepends=('cmake' 'automoc4') optdepends=('kdebase-konqueror: search engines support' 'qca-ossl: to use the sync handler') install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('9cfdb7e02a08ad4d2b5dd6e8bd1c85c11013f41a3186c8c5c22454093722bc74') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") +sha256sums=('660f40fe612b6706623977d8cdb94b49aaacdb53aac2689d95f02d782ce2715b') -build(){ +prepare() { mkdir build +} + +build(){ cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/community/rocksndiamonds/PKGBUILD b/community/rocksndiamonds/PKGBUILD index b7a265456..ab4ed1842 100644 --- a/community/rocksndiamonds/PKGBUILD +++ b/community/rocksndiamonds/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78773 2012-10-24 12:38:16Z spupykin $ +# $Id: PKGBUILD 101193 2013-11-19 11:01:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jacek Poplawski <jacekpoplawski@gmail.com> pkgname=rocksndiamonds -pkgver=3.3.0.1 -pkgrel=3 +pkgver=3.3.1.1 +pkgrel=2 pkgdesc="game similiar to Boulderdash with lots of levels" arch=(i686 x86_64) url="http://www.artsoft.org/rocksndiamonds/" @@ -13,17 +13,19 @@ depends=('sdl' 'sdl_image' 'sdl_mixer' 'sdl_net' 'smpeg') makedepends=('unzip' 'p7zip') source=(http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-$pkgver.tar.gz rocksndiamonds.desktop) -md5sums=('813ced99d54f89db7c593c518d197d18' +md5sums=('d897ddfb1b14123240a6dbc207ca27ee' '18a3541db4d71feb0ad3b50ea4006738') build() { - depends=('sdl' 'sdl_image' 'sdl_mixer' 'sdl_net' 'smpeg' 'rocksndiamonds-data') - cd $srcdir - - # main cd $srcdir/rocksndiamonds-$pkgver make clean make RO_GAME_DIR=/usr/share/rocksndiamonds RW_GAME_DIR=/usr/share/rocksndiamonds +} + +package() { + depends=('sdl' 'sdl_image' 'sdl_mixer' 'sdl_net' 'smpeg' 'rocksndiamonds-data') + + cd $srcdir/rocksndiamonds-$pkgver install -d $pkgdir/usr/bin install -d $pkgdir/usr/share/man/man1 diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 45ad4d9b0..00b70f628 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99982 2013-10-31 02:49:38Z allan $ +# $Id: PKGBUILD 102435 2013-12-11 10:18:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=7.4.4 +pkgver=7.4.7 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" @@ -22,7 +22,7 @@ options=('strip' 'zipman') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') -md5sums=('ebcc010a6205c28eb505c0fe862f32c6' +md5sums=('c96850bd9d07780ea7398ac86df385ae' '0d990373f5c70ddee989296007b4df5b' 'd61dd424e660eb16401121eed20d98bc') diff --git a/community/rtl-sdr/PKGBUILD b/community/rtl-sdr/PKGBUILD index e19179288..76f5a20ec 100644 --- a/community/rtl-sdr/PKGBUILD +++ b/community/rtl-sdr/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 99146 2013-10-25 04:57:24Z kkeen $ +# $Id: PKGBUILD 100562 2013-11-05 21:31:17Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Michael Düll <mail@akurei.me> pkgname=rtl-sdr # they are just starting to play with tags # consider using tags for the pkgver in the future -pkgver=20131024 -_commit=dbede4e3c0a +pkgver=20131105 +_commit=c5b8a2130007 pkgrel=1 pkgdesc="Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR)." arch=('i686' 'x86_64') @@ -24,6 +24,11 @@ md5sums=('SKIP' _gitname="rtl-sdr" +pkgver() { + cd "$srcdir/$_gitname" + git show -s --format="%ci" HEAD | sed -e 's/-//g' -e 's/ .*//' +} + build() { cd "$srcdir/$_gitname" mkdir build @@ -36,8 +41,8 @@ build() { package() { cd "$srcdir/$_gitname/build" make DESTDIR="$pkgdir" install - install -D -m644 "$srcdir/$_gitname/rtl-sdr.rules" "$pkgdir/usr/lib/udev/rules.d/10-rtl-sdr.rules" - install -D -m644 "$srcdir/rtlsdr.conf" "$pkgdir/etc/modprobe.d/rtlsdr.conf" + install -Dm644 "$srcdir/$_gitname/rtl-sdr.rules" "$pkgdir/usr/lib/udev/rules.d/10-rtl-sdr.rules" + install -Dm644 "$srcdir/rtlsdr.conf" "$pkgdir/etc/modprobe.d/rtlsdr.conf" } # vim:set ts=2 sw=2 et: diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD index a2494068f..593febc0a 100644 --- a/community/rubinius/PKGBUILD +++ b/community/rubinius/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 98826 2013-10-19 20:58:03Z heftig $ +# $Id: PKGBUILD 102860 2013-12-22 14:20:57Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=rubinius pkgname=(rubinius rubinius-ruby) -pkgver=2.1.1 +pkgver=2.2.2 pkgrel=1 pkgdesc="Ruby runtime written in Ruby, designed for concurrency" arch=(i686 x86_64) url="http://rubini.us" license=(custom) depends=(llvm-libs libffi openssl libyaml) -makedepends=(llvm ruby chrpath) +makedepends=(llvm ruby) options=(!emptydirs) source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2 - http://rubygems.org/downloads/bundler-1.3.5.gem - gemrc) -sha256sums=('e142c3f201e4ae9f3a6e6671298baabbd9bd906509c663adcf080bff4181ee96' - '08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4' - '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614') + gemrc dirs.patch) +sha256sums=('a49d596f889405e4fc511da64b8afe5eccfafdcee5ea99be15d3ad36290ec2ba' + '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614' + '93f3918dc2a5679e281e724f9b3cb712ffa784c1e52e6fa7ce75f74ce6655a66') prepare() { export GEM_HOME="$srcdir/gemdir" cd $pkgbase-$pkgver + patch -Np1 -i ../dirs.patch + mkdir -p "$GEM_HOME" - gem install --no-user-install -N ../bundler-1.3.5.gem + gem install --no-user-install -N vendor/cache/bundler-*.gem "$GEM_HOME/bin/bundle" install --local } @@ -39,7 +40,8 @@ build() { --appdir=/usr/lib/rubinius \ --gemsdir=/usr/lib/rubinius/gems \ --preserve-prefix \ - --llvm-shared + --llvm-shared \ + --without-rpath rake build } @@ -51,17 +53,13 @@ check() { } package_rubinius() { - optdepends=('rubinius-docs: Rubinius documentation' - 'ruby-docs: Ruby documentation') + optdepends=('ruby-docs: Ruby documentation') export GEM_HOME="$srcdir/gemdir" cd $pkgbase-$pkgver DESTDIR="$pkgdir" rake install - find "$pkgdir" -name "*.so" -exec chrpath -d {} + - chrpath -d "$pkgdir/usr/bin/rbx" - mkdir -p "$pkgdir/usr/share/ri" ln -s 2.0.0 "$pkgdir/usr/share/ri/2.1" diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD index 803315aa2..e9c37cd9e 100644 --- a/community/ruby-cairo/PKGBUILD +++ b/community/ruby-cairo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87182 2013-03-28 13:42:37Z arodseth $ +# $Id: PKGBUILD 102505 2013-12-12 14:34:05Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Jeremy <reebydobalina@yahoo.ca> pkgname=ruby-cairo -pkgver=1.12.2 -pkgrel=7 +pkgver=1.12.6 +pkgrel=1 pkgdesc='Ruby bindings for cairo' arch=('x86_64' 'i686') url='http://cairographics.org/rcairo/' @@ -13,7 +13,7 @@ license=('GPL') depends=('ruby' 'cairo') makedepends=('ruby-pkgconfig') source=("http://cairographics.org/releases/rcairo-$pkgver.tar.gz") -sha256sums=('f071d6ccb12cb6dc1fc91eb086d6150ce779930fe5af38a6987e378c809362c5') +sha256sums=('e7ff8d49a730662b3f999187fde45ac0b8651996fe7f9a952496be8b6e45800e') build() { cd "$srcdir/rcairo-$pkgver" diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 3046bc23a..1a6718f5c 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,111 +1,155 @@ -# $Id: PKGBUILD 96935 2013-09-09 01:33:22Z dwallace $ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Contributor: Antonio Rojas < nqn1976 @ gmail.com > -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Osman Ugus <ugus11@yahoo.com> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# $Id: PKGBUILD 102937 2013-12-24 15:23:39Z arcanis $ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> +# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Antonio Rojas <nqn1976 at gmail dot com> +# Contributor: Thomas Dziedzic <gostrc at gmail dot com> +# Contributor: Osman Ugus <ugus11 at yahoo dot com> +# Contributor: Stefan Husmann <stefan-husmann at t-online dot de> # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=5.11 -pkgrel=1 -pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' -url='http://www.sagemath.org' +pkgver=6.0 +pkgrel=2 +pkgdesc="SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab" arch=('i686' 'x86_64') +url="http://www.sagemath.org" license=('GPL') -#depends=('xz' 'java-environment=7' 'desktop-file-utils' 'libxmu' 'libtiff' 'sqlite' 'libjpeg-turbo') -depends=('desktop-file-utils') -makedepends=('gcc-fortran' 'freetype2') +#depends=('desktop-file-utils' 'java-environment=7' 'libjpeg-turbo' 'libtiff' 'libxmu' 'sqlite' 'xz') +depends=('freetype2>=2.3.5') +makedepends=('gcc-fortran' 'gendesk' 'desktop-file-utils') optdepends=('imagemagick: some plotting functionality benefits from it' 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' 'openssh: to use the notebook in secure mode' 'ffmpeg: to show animations' 'cairo: R plots') -install="${pkgname}.install" source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" - 'SAGE-notebook.desktop' - 'sage.service') + "fix-pil.patch" + "sage.service") +install="${pkgname}.install" +md5sums=('da1bacf90fc291e736aaa71431e8874e' + 'de54cb818d74c070a524fc3fd5208b2c' + '985da1c1d1dcdc3ea9aa73035cb7996b') -build() { - cd sage-${pkgver} +prepare() { + # create *.desktop file + gendesk -n \ + --pkgname="sage-notebook" \ + --pkgdesc="sage notebook" \ + --name="sage" \ + --exec="/opt/sage/sage -notebook" \ + --terminal=true \ + --categories="Science;Math" \ + --custom="StartupNotify=true +X-DCOP-ServiceType= +X-KDE-SubstituteUID=false +X-KDE-Username=" + + # create DOT_SAGE directory + if [[ -d ${srcdir}/build ]]; then + rm -rf "${srcdir}/build" + fi + mkdir "${srcdir}/build" + + # according to FS#34769 + # NOTE: there is an error in pil build (freetype/fterrors.h not found) + cd "${srcdir}/sage-${pkgver}/upstream/" + tar xjfv pil-1.1.6.tar.bz2 + rm -r pil-1.1.6.tar.bz2 + patch -p0 -i "${srcdir}/fix-pil.patch" + tar cjvf pil-1.1.6.tar.bz2 pil-1.1.6 + rm -rf pil-1.1.6 + # fix checksums + SUMS=$(md5sum pil-1.1.6.tar.bz2 | awk '{print $1}') + sed "s/md5=[0-9a-f]\{32\}/md5=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini" + SUMS=$(sha1sum pil-1.1.6.tar.bz2 | awk '{print $1}') + sed "s/sha1=[0-9a-f]\{40\}/sha1=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini" + SUMS=$(cksum pil-1.1.6.tar.bz2 | awk '{print $1}') + sed "s/cksum=[0-9a-f]\{10\}/cksum=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini" + # disable freetype build + rm -rf freetype-* + sed -i -e 's/FREETYPE/#FREETYPE/' "${srcdir}/sage-${pkgver}/build/install" +} +build() { + cd "sage-${pkgver}" + # fix "missing sage.all error" during build unset CFLAGS unset CXXFLAGS - # fix build errors unset LDFLAGS - - # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS + export MAKE="make -j$(nproc)" - + # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran export FC=/usr/bin/gfortran - + # disable building with debugging support export SAGE_DEBUG='no' - + # enable fat binaries (disables processor specific optimizations) # comment out if you're only building it for yourself export SAGE_FAT_BINARY='yes' - + # can't write to root in a clean chroot - mkdir "$srcdir/buiild" - export DOT_SAGE="$srcdir/build" - - # Singular is broken + export DOT_SAGE="${srcdir}/build" + + # singular is broken export CPP='/usr/bin/cpp' - + # only build sage, no documents #make build make - ./sage --bdist "$pkgver" + ./sage --bdist "${pkgver}" } << COMMENT check() { - cd sage-${pkgver} - + cd "sage-${pkgver}" + + make test + # uncomment if we want to run all the tests (warning: very long) #make ptestlong } COMMENT package() { - cd sage-${pkgver} - + cd "sage-${pkgver}" + # cp because make install is experimental and will corrupt the install - install -d ${pkgdir}/opt/sage - cp -dpr --no-preserve=ownership dist/sage-"$pkgver-$CARCH-Linux/"* ${pkgdir}/opt/sage/ - + install -d "${pkgdir}/opt/sage" + cp -dpr --no-preserve=ownership dist/sage-"${pkgver}-$CARCH-Linux/"* "${pkgdir}/opt/sage/" + # move SageTeX files to more appropriate directory - install -d ${pkgdir}/usr/share - mv ${pkgdir}/opt/sage/local/share/texmf \ - ${pkgdir}/usr/share - - desktop-file-install ${srcdir}/SAGE-notebook.desktop \ - --dir ${pkgdir}/usr/share/applications - - # create link to main binary - install -d ${pkgdir}/usr/bin - ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage - + install -d "${pkgdir}/usr/share" + mv "${pkgdir}/opt/sage/local/share/texmf" "${pkgdir}/usr/share" + # remove build logs - rm -f ${pkgdir}/opt/sage/*.log - rm -rf ${pkgdir}/opt/sage/spkg/logs - + rm -f "${pkgdir}/opt/sage/*.log" + rm -rf "${pkgdir}/opt/sage/spkg/logs" + # remove source packages, since they are rarely needed, they are 300mb in size (compressed) - rm -f ${pkgdir}/opt/sage/spkg/base/*spkg - rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg - + rm -f "${pkgdir}/opt/sage/spkg/base/*spkg" + rm -f "${pkgdir}/opt/sage/spkg/standard/*spkg" + + # according to FS#37090 + # install scripts + install -d "${pkgdir}/usr/bin" + ./sage -c "install_scripts('${pkgdir}/usr/bin', ignore_existing=True)" + # rename scripts to avoid conflicts + for ITEM in $(ls "${pkgdir}/usr/bin"); do + mv "${pkgdir}/usr/bin/${ITEM}" "${pkgdir}/usr/bin/sage-${ITEM}" + done + ln -s "/opt/sage/sage" "${pkgdir}/usr/bin/sage" + # install a systemd user unit - install -Dm755 $srcdir/sage.service $pkgdir/usr/lib/systemd/user/sage.service + install -Dm644 "${srcdir}/sage.service" "${pkgdir}/usr/lib/systemd/user/sage.service" + # install *.desktop and icon files + install -Dm644 "${srcdir}/sage-notebook.desktop" \ + "${pkgdir}/usr/share/applications/SAGE-notebook.desktop" + install -Dm644 "${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.7.2-py2.7.egg/sagenb/data/sage/images/icon128x128.png" \ + "${pkgdir}/usr/share/pixmaps/SAGE-notebook.png" } # vim :set ts=2 sw=2 et: -md5sums=('ceeccaa83f45a4fb674acf10f76543d8' - 'b82f94383829eee26648feb977e2d89b' - '985da1c1d1dcdc3ea9aa73035cb7996b') -md5sums=('ceeccaa83f45a4fb674acf10f76543d8' - 'b82f94383829eee26648feb977e2d89b' - '985da1c1d1dcdc3ea9aa73035cb7996b') diff --git a/community/sage-mathematics/SAGE-notebook.desktop b/community/sage-mathematics/SAGE-notebook.desktop deleted file mode 100644 index e3c1d4d7f..000000000 --- a/community/sage-mathematics/SAGE-notebook.desktop +++ /dev/null @@ -1,19 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=SAGE -Comment=SAGE NOTEBOOK -Comment[en_US]=SAGE NOTEBOOK -Exec=/opt/sage/sage -notebook -GenericName= -GenericName[de]= -Icon=/opt/sage/devel/ext-main/notebook/images/sageicon.png -MimeType= -Name[de]=SAGE -StartupNotify=true -Terminal=true -Type=Application -Categories=Science;Math; -X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= -GenericName[en_US]= diff --git a/community/sage-mathematics/fix-pil.patch b/community/sage-mathematics/fix-pil.patch new file mode 100644 index 000000000..a17f26833 --- /dev/null +++ b/community/sage-mathematics/fix-pil.patch @@ -0,0 +1,12 @@ +diff -ruN pil-1.1.6.orig/_imagingft.c pil-1.1.6/_imagingft.c +--- pil-1.1.6.orig/_imagingft.c 2013-12-23 17:45:39.991183855 +0400 ++++ pil-1.1.6/_imagingft.c 2013-12-23 17:49:06.297861197 +0400 +@@ -65,7 +65,7 @@ + const char* message; + } ft_errors[] = + +-#include <freetype/fterrors.h> ++#include <freetype2/fterrors.h> + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/community/sage-mathematics/sage-mathematics.install b/community/sage-mathematics/sage-mathematics.install index 3da751689..6c55dad2b 100644 --- a/community/sage-mathematics/sage-mathematics.install +++ b/community/sage-mathematics/sage-mathematics.install @@ -2,10 +2,6 @@ post_install() { cd /opt/sage update-desktop-database -q - # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership - # the files it writes to ~/.sage can be safely ignored - HOME=/tmp ./sage -c - # add sagemath user for the daemon useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD index 4aff8641e..82260a849 100644 --- a/community/sakura/PKGBUILD +++ b/community/sakura/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93276 2013-07-01 04:10:57Z angvp $ +# $Id: PKGBUILD 102425 2013-12-10 20:26:05Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=sakura -pkgver=3.1.0 +pkgver=3.1.2 pkgrel=1 pkgdesc="A terminal emulator based on GTK and VTE" arch=('i686' 'x86_64') @@ -11,17 +11,25 @@ url="https://launchpad.net/sakura" license=('GPL') depends=('vte3' 'libxft' 'desktop-file-utils') makedepends=('cmake') -source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") +source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2" + "deprecated_symbols.patch") install=sakura.install -sha1sums=('159abc2f83e912da1bfb35c9b239b092e78a044f') +sha1sums=('c4d5356c228af112dda20b3db3eaf32868e91ab1' + '1c31086360f5ce9d6ca0e4303b6b8cf62266f4d1') -build() { +prepare() { cd $srcdir/${pkgname}-${pkgver} # Set default font size a bit smaller sed -i 's|#define DEFAULT_FONT "Bitstream Vera Sans Mono 14"|#define DEFAULT_FONT "Bitstream Vera Sans Mono 10"|g' src/sakura.c - - # build & install + + # deprecated gtk symbols are used but disabled... enabling + patch -Np1 -i ${srcdir}/deprecated_symbols.patch +} + +build() { + cd $srcdir/${pkgname}-${pkgver} + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE . make } @@ -35,4 +43,3 @@ package() { ${pkgdir}/usr/share/doc/${pkgname}/INSTALL rm ${pkgdir}/usr/share/doc/${pkgname}/INSTALL } - diff --git a/community/sakura/deprecated_symbols.patch b/community/sakura/deprecated_symbols.patch new file mode 100644 index 000000000..6b81efd14 --- /dev/null +++ b/community/sakura/deprecated_symbols.patch @@ -0,0 +1,11 @@ +--- sakura-3.1.2/CMakeLists.txt.bak 2013-12-10 21:02:16.853828972 +0100 ++++ sakura-3.1.2/CMakeLists.txt 2013-12-10 21:02:45.473679293 +0100 +@@ -38,7 +38,7 @@ + IF (${CMAKE_BUILD_TYPE} MATCHES "Debug") + SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") + ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug") +- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED") ++ SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations") + ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug") + + INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS}) diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index c184ad0ad..e1bf8e9eb 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100281 2013-11-02 08:48:53Z spupykin $ +# $Id: PKGBUILD 102276 2013-12-07 10:37:05Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot pkgver=1.6.5 -pkgrel=4 +pkgrel=5 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD deleted file mode 100644 index 8d4792483..000000000 --- a/community/setconf/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 89955 2013-05-06 09:59:45Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> - -pkgname=setconf -pkgver=0.5.3 -pkgrel=4 -pkgdesc='Utility to easily change settings in configuration files or Makefiles' -arch=('x86_64' 'i686') -url='http://setconf.roboticoverlords.org/' -license=('GPL2') -depends=('pcre' 'gc') -makedepends=('shedskin') -source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tar.xz") -sha256sums=('f063b308bcebefe139418587527262ffce776584b1952224ec9a41d0562d55b6') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - shedskin "$pkgname.py" && make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" - install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/setserial/PKGBUILD b/community/setserial/PKGBUILD new file mode 100644 index 000000000..450bc064c --- /dev/null +++ b/community/setserial/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 102187 2013-12-06 12:40:45Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Aurelien Foret <orelien@chez.com> + +pkgname=setserial +pkgver=2.17 +pkgrel=4 +pkgdesc="Allows to change various attributes of a serial device" +arch=('i686' 'x86_64') +url="http://setserial.sourceforge.net/" +license=('GPL') +depends=('glibc') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "$pkgname.patch") +md5sums=('c4867d72c41564318e0107745eb7a0f2' + '99919d3be7c1550721494070a7ace66a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i ../$pkgname.patch + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d ${pkgdir}/usr/{bin,share/man/man8} + make DESTDIR="${pkgdir}" install +} diff --git a/community/setserial/setserial.patch b/community/setserial/setserial.patch new file mode 100644 index 000000000..3cce1f07d --- /dev/null +++ b/community/setserial/setserial.patch @@ -0,0 +1,28 @@ +diff -ur setserial-2.17/Makefile.in setserial-2.17-new/Makefile.in +--- setserial-2.17/Makefile.in 2000-01-27 16:39:07.000000000 +0100 ++++ setserial-2.17-new/Makefile.in 2005-03-09 20:53:31.000000000 +0100 +@@ -17,6 +17,11 @@ + INCS = -I. + TAR = tar + ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++bindir=@bindir@ ++mandir=@mandir@ ++ + all: setserial setserial.cat + + setserial: setserial.c +@@ -26,9 +31,9 @@ + nroff -man setserial.8 > setserial.cat + + install: setserial setserial.8 +- $(INSTALL_PROGRAM) setserial $(DESTDIR)/bin +- $(STRIP) $(DESTDIR)/bin/setserial +- $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/man/man8 ++ $(INSTALL_PROGRAM) setserial $(DESTDIR)$(bindir) ++ $(STRIP) $(DESTDIR)$(bindir)/setserial ++ $(INSTALL_DATA) setserial.8 $(DESTDIR)$(mandir)/man8 + + clean: + $(RM) setserial setserial.o setserial.cat *~ diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD index 4f9e3d965..3290a5d89 100644 --- a/community/sfk/PKGBUILD +++ b/community/sfk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93781 2013-07-10 08:33:37Z seblu $ +# $Id: PKGBUILD 102870 2013-12-23 01:46:34Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Baumi <baumi@gmx.com> pkgname=sfk -pkgver=1.6.8 +pkgver=1.6.9 pkgrel=1 pkgdesc='Swiss File Knife - A Command Line Tools Collection' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url='http://stahlforce.com/dev/?tool=sfk' license=('custom: BSD') depends=('gcc-libs') source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip") -md5sums=('cce2184223597cfe314ca7a5f247d1ce') +md5sums=('3a006bd1f73587ef347838231a5adbb3') build() { cd ${pkgname}${pkgver//./} diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index e866d329c..f9539a454 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,34 +1,36 @@ -# $Id: PKGBUILD 94906 2013-08-01 06:55:35Z bpiotrowski $ +# $Id: PKGBUILD 103129 2013-12-26 21:26:17Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> pkgname=sfml -pkgver=2.1 +_commit=4a300547f3 +pkgver=2.1.0.$_commit pkgrel=1 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' arch=('i686' 'x86_64') url='http://www.sfml-dev.org/' license=('zlib') depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') -makedepends=('mesa' 'cmake' 'doxygen') +makedepends=('mesa' 'cmake' 'doxygen' 'git') install=sfml.install -source=("${pkgname}-${pkgver}::https://github.com/LaurentGomila/SFML/archive/${pkgver}.tar.gz") -md5sums=('6457a5903b156390012773e9ef33f65f') +source=("git+https://github.com/LaurentGomila/SFML.git#commit=${_commit}") +md5sums=('SKIP') build() { - cd "$srcdir"/SFML-${pkgver} + cd "$srcdir"/SFML mkdir build && cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DSFML_BUILD_EXAMPLES=true \ - -DSFML_BUILD_DOC=true + -DSFML_BUILD_EXAMPLES=1 \ + -DSFML_BUILD_DOC=1 \ + -DCMAKE_CXX_FLAGS="-DGLXContextID=XID $CXXFLAGS" make make doc } package() { - cd "$srcdir"/SFML-${pkgver}/build + cd "$srcdir"/SFML/build make DESTDIR="$pkgdir/" install diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD index 286a80c90..26804f905 100644 --- a/community/shapelib/PKGBUILD +++ b/community/shapelib/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99985 2013-10-31 02:50:40Z allan $ +# $Id: PKGBUILD 103038 2013-12-25 17:41:52Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Bob Finch <w9ya@arrl.net> pkgname=shapelib pkgver=1.3.0 -pkgrel=3 +pkgrel=4 pkgdesc='simple C API for reading and writing ESRI Shapefiles' arch=('i686' 'x86_64') url='http://shapelib.maptools.org/' diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index dd699b5e6..f513762f9 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98032 2013-10-04 09:55:22Z spupykin $ +# $Id: PKGBUILD 101260 2013-11-21 10:27:21Z 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.0 +pkgver=0.15.1 pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ depends=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest' makedepends=('intltool' 'vala>=0.17.2' 'libunique3') install=shotwell.install source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz") -md5sums=('8b33dd5df51f49e7f4f451b431d7c133') +md5sums=('5af4cfb819249a879a4649a9c7d089e5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 54e6fa5a5..f5807dc7e 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99361 2013-10-27 16:02:30Z giovanni $ +# $Id: PKGBUILD 102277 2013-12-07 10:37:08Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil pkgver=0.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="WYSIWYG ebook editor" arch=('i686' 'x86_64') url="http://code.google.com/p/sigil/" diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index 369c7daaf..83df26b44 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100283 2013-11-02 08:49:11Z spupykin $ +# $Id: PKGBUILD 101482 2013-11-26 11:05:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=simgear -pkgver=2.12.0 +pkgver=2.12.1 pkgrel=2 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." arch=(i686 x86_64) @@ -13,17 +13,10 @@ makedepends=('boost' 'cmake' 'mesa') license=("GPL") #url="http://www.simgear.org" url="https://gitorious.org/fg" -options=('!makeflags') +options=('!makeflags' 'staticlibs') #source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver") -source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2" - "osg-3.2.patch") -md5sums=('dfc752f4759a2f795b7cdc9dad28411e' - 'd7f35f02d88c6ef9c58e07b8431811e6') - -prepare() { - cd $srcdir/simgear-$pkgver -# patch -p1 <$srcdir/osg-3.2.patch -} +source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2") +md5sums=('8c483e13bce96f1dc27300a087fdb962') build() { cd $srcdir/simgear-$pkgver diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD index 60fd0952c..adcf025a7 100644 --- a/community/skrooge/PKGBUILD +++ b/community/skrooge/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100087 2013-11-01 13:55:59Z eric $ +# $Id: PKGBUILD 102914 2013-12-23 21:56:50Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,12 +6,12 @@ pkgname=skrooge pkgver=1.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="A personal finances manager for KDE" arch=('i686' 'x86_64') url="http://skrooge.org/" license=('GPL') -depends=('kdebase-runtime' 'libofx' 'qca-ossl') +depends=('kdebase-runtime' 'libofx' 'qca-ossl' 'qjson') makedepends=('cmake' 'automoc4' 'docbook-xsl' 'boost' 'kdepim-libkdepim') optdepends=('kdepim-libkdepim: for KDE PIM integration') install=$pkgname.install diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog index b689eae6d..a464d4ad4 100644 --- a/community/skrooge/skrooge.changelog +++ b/community/skrooge/skrooge.changelog @@ -1,3 +1,6 @@ +2013-12-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * skrooge 1.8.0-3 FS#37406 fix + 2013-10-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * skrooge 1.8.0-1 diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD index 9a9a72aee..62cadc319 100644 --- a/community/sleuthkit/PKGBUILD +++ b/community/sleuthkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99988 2013-10-31 02:51:42Z allan $ +# $Id: PKGBUILD 103041 2013-12-25 17:46:25Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=sleuthkit pkgver=4.1.2 -pkgrel=1 +pkgrel=2 pkgdesc='File system and media management forensic analysis tools' arch=('i686' 'x86_64') url='http://www.sleuthkit.org/sleuthkit' diff --git a/community/sleuthkit/sleuthkit.changelog b/community/sleuthkit/sleuthkit.changelog index 7c9c63ae0..86fb29e8b 100644 --- a/community/sleuthkit/sleuthkit.changelog +++ b/community/sleuthkit/sleuthkit.changelog @@ -1,3 +1,6 @@ +2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * sleuthkit 4.1.2-2 static library removed + 2013-10-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * sleuthkit 4.1.2-1 diff --git a/community/snapper/PKGBUILD b/community/snapper/PKGBUILD index 35f66933d..60f581cf9 100644 --- a/community/snapper/PKGBUILD +++ b/community/snapper/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Tom Kuther <gimpel@sonnenkinder.org> pkgname=snapper -pkgver=0.1.7 -pkgrel=1 +pkgver=0.1.8 +pkgrel=2 pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping." arch=('i686' 'x86_64') url="http://snapper.io" @@ -11,15 +11,9 @@ license=('GPL2') depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs') makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git') backup=('etc/conf.d/snapper') -source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2" - 'libbtrfs.patch') +source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2") options=(!libtool) -prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir"/libbtrfs.patch -} - build() { cd "$srcdir/$pkgname-$pkgver" @@ -55,7 +49,9 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/snapper + + rm -f "$pkgdir"/etc/snapper/zypp-plugin.conf + rm -f "$pkgdir"/usr/share/man/man*/snapper-zypp-plugin.*.gz } -sha256sums=('fcb8d98aa36021970b214a2b6ea85f86aa29e107559bf677226e2e4ade2c6ed0' - '0d0289e7448a357c78450f6690d684fef0e889921be152038a73401d37294317') +sha256sums=('989a261411b7bf4f23373222402c37764e4f1714e301a8e9e396bb92a74e0539') diff --git a/community/snapper/libbtrfs.patch b/community/snapper/libbtrfs.patch deleted file mode 100644 index 805c36b44..000000000 --- a/community/snapper/libbtrfs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc -index 2c110c3..be9e974 100644 ---- a/snapper/Btrfs.cc -+++ b/snapper/Btrfs.cc -@@ -982,7 +982,7 @@ namespace snapper - { - boost::this_thread::interruption_point(); - -- int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this); -+ int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0); - - if (r < 0) - { diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index c0b4f49b5..dae8aa4d5 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99024 2013-10-22 17:56:30Z bpiotrowski $ +# $Id: PKGBUILD 102305 2013-12-07 21:26:57Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> pkgname=spacefm -pkgver=0.9.0 +pkgver=0.9.2 pkgrel=1 pkgdesc='Multi-panel tabbed file manager' arch=('i686' 'x86_64') @@ -21,10 +21,10 @@ optdepends=('lsof: device processes' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz) -sha256sums=('cca3fcfecd148dca165a71bb14c66c8b29ae7a488a98b9e9662ae4b686b2c01b') +md5sums=('f7d04110b4dd9c3c434bffe8b04bbb69') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr \ --disable-pixmaps \ --with-gtk3 @@ -32,6 +32,6 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD index 9053dbabf..019c6cc2e 100644 --- a/community/spice-gtk3/PKGBUILD +++ b/community/spice-gtk3/PKGBUILD @@ -1,33 +1,33 @@ -# $Id: PKGBUILD 99990 2013-10-31 02:52:22Z allan $ +# $Id: PKGBUILD 102790 2013-12-20 03:19:02Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Facchini <stefano.facchini@gmail.com> # Contributor: Jonathan Lestrelin <zanko@daemontux.org> # Contributor: Lucio Zara <pennega@gmail.com> pkgname=spice-gtk3 -pkgver=0.21 -pkgrel=3 +pkgver=0.22 +pkgrel=1 pkgdesc="Gtk client and libraries for SPICE remote desktop servers (gtk3 version)" arch=('i686' 'x86_64') url="http://spice-space.org" license=('LGPL2.1') -depends=('celt0.5.1' 'gtk3' 'libcacard' 'libpulse' 'usbredir') -makedepends=('gobject-introspection' 'intltool' 'python2-pyparsing' 'qemu' 'spice-protocol' 'usbutils' 'vala') -source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2" - "usb-fix.patch::https://bugs.freedesktop.org/attachment.cgi?id=86818") -sha256sums=('73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564') -sha256sums=('73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564' - '1b3c7d20ebd3644faf95e387f7d2696fcd773539db8ffdda2e316a7c516ce6d2') +depends=('celt0.5.1' 'dbus-glib' 'gtk3' 'libcacard' 'libpulse' 'usbredir') +makedepends=('gobject-introspection' 'intltool' 'python2-pyparsing' 'spice-protocol' 'usbutils' 'vala') +source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2") +sha256sums=('05e9e5d915a99005a812846f733bba177ef3b1a9de9356690047250fb1b1fa3a') prepare() { cd "$srcdir/spice-gtk-$pkgver" sed -i 's,/usr/bin/env python,/usr/bin/python2,' spice-common/spice_codegen.py - patch -p1 <$srcdir/usb-fix.patch + # Disable broken tests + sed -i 's/ tests//' Makefile.{am,in} } build() { cd "$srcdir/spice-gtk-$pkgver" - PYTHON=python2 ./configure --prefix=/usr --disable-static --enable-vala --with-gtk=3.0 + PYTHON=python2 ./configure --prefix=/usr \ + --disable-static --enable-vala --with-gtk=3.0 \ + --with-coroutine=gthread make } diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index a35994a07..a21949f6b 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 94907 2013-08-01 06:55:37Z bpiotrowski $ +# $Id: PKGBUILD 102279 2013-12-07 10:37:11Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring -pkgver=0.94.1 -_pkgver=94.1 -pkgrel=5 +pkgver=0.95.0 +_pkgver=95.0 +pkgrel=2 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') url="http://springrts.com/" @@ -17,18 +17,14 @@ makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'me optdepends=('python2: python-based bots' 'java-runtime: java-based bots') install=spring.install -source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma - gcc48.patch) -md5sums=('bafc1e889bed31666553efc387a13b49' - '8de391795f4a2e78be51a129dcd4dec2') +source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) +md5sums=('2030100b4c51a1906408aad417a39b1b') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma cd spring_${_pkgver} - patch -Np1 < $srcdir/gcc48.patch - cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATADIR=share/spring \ diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index 2bc24159e..9e67151e4 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94052 2013-07-13 12:37:38Z svenstaro $ +# $Id: PKGBUILD 102280 2013-12-07 10:37:12Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.169 -pkgrel=2 +pkgver=0.180 +pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64') url="http://springlobby.info/" @@ -14,7 +14,7 @@ optdepends=('sdl' 'sdl_sound' 'sdl_mixer') makedepends=('boost' 'asio' 'cmake') install=springlobby.install source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1eb265268ac39d9b7e8fec90df92ff3d') +md5sums=('4e33b20be873660649cf7c369ce81373') build() { cd $srcdir/${pkgname}-$pkgver diff --git a/community/springlobby/springlobby.desktop b/community/springlobby/springlobby.desktop deleted file mode 100644 index 1dce96b90..000000000 --- a/community/springlobby/springlobby.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=SpringLobby -Comment=Lobby for Spring. An open source RTS with similar gameplay to TA -Exec=springlobby -Icon=springlobby.png -Terminal=false -Type=Application -Categories=Application;Game;StrategyGame; diff --git a/community/springlobby/springlobby.png b/community/springlobby/springlobby.png Binary files differdeleted file mode 100644 index 89c7ab0ac..000000000 --- a/community/springlobby/springlobby.png +++ /dev/null diff --git a/community/sqliteman/PKGBUILD b/community/sqliteman/PKGBUILD index 10a21ffba..5e1b1b669 100644 --- a/community/sqliteman/PKGBUILD +++ b/community/sqliteman/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81006 2012-12-09 15:39:03Z andrea $ +# $Id: PKGBUILD 100708 2013-11-09 07:34:10Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Porizka <artee@beer.cz> @@ -6,7 +6,7 @@ pkgname=sqliteman pkgver=1.2.2 -pkgrel=6 +pkgrel=7 pkgdesc="The best developer's and/or admin's GUI tool for Sqlite3 in the world" arch=('i686' 'x86_64') url="http://sqliteman.com/" @@ -17,8 +17,11 @@ install=sqliteman.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('5ecdf710e23606e1b924f740ea69306d') -build() { +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 72cf25647..e706a9343 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 100452 2013-11-04 12:13:15Z spupykin $ +# $Id: PKGBUILD 102758 2013-12-19 10:29:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=squid -pkgver=3.3.10 -pkgrel=1 +pkgver=3.4.1 +pkgrel=2 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' @@ -17,39 +17,15 @@ options=('emptydirs') backup=('etc/squid/squid.conf' 'etc/squid/mime.conf') install=$pkgname.install -source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2" +source=("http://www.squid-cache.org/Versions/v3/3.4/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('ff69d08818ee008f66666f79bb27b9ee' +md5sums=('859cf167499d8a5430070dbde78c8eea' '270977cdd9b47ef44c0c427ab9034777' 'a71425c4951f2e5b640d19e6a5048531' 'ceeb57c69ebb165676219222f109a24e') -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - # gcc 4.6 doesn't support -fhuge-objects. - sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure - - # fix cache_dir, cache_dir size, and effective group. - sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in - sed '/^#cache_dir/ s/100/256/ - /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre - - sed -i '1,1i#include <errno.h>' helpers/external_acl/file_userip/ext_file_userip_acl.cc - - for i in \ - helpers/basic_auth/DB \ - helpers/log_daemon/DB \ - helpers/negotiate_auth/kerberos \ - helpers/external_acl/SQL_session; \ - do - echo -e "#!/bin/sh\nexit 0" >$i/config.test - chmod 0755 $i/config.test - done -} - build() { cd "$srcdir/$pkgname-$pkgver" @@ -88,7 +64,9 @@ build() { --enable-async-io \ --enable-truncate \ --enable-icap-client \ - --enable-ssl-crtd + --enable-ssl-crtd \ + --disable-arch-native \ + --disable-strict-error-checking make } diff --git a/community/srm/PKGBUILD b/community/srm/PKGBUILD new file mode 100644 index 000000000..696b27ccc --- /dev/null +++ b/community/srm/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 102189 2013-12-06 12:44:16Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=srm +pkgver=1.2.11 +pkgrel=2 +pkgdesc="A secure replacement for rm(1) that overwrites data before unlinking" +arch=('i686' 'x86_64') +url="http://srm.sourceforge.net/" +license=('custom') +depends=('glibc') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('ee8269be18de6bbd3f74252d6e3039fe') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}/usr" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/srm/LICENSE" +} diff --git a/community/sshfs/PKGBUILD b/community/sshfs/PKGBUILD new file mode 100644 index 000000000..b42fa1d1d --- /dev/null +++ b/community/sshfs/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 102191 2013-12-06 12:45:33Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=sshfs +pkgver=2.4 +pkgrel=1 +pkgdesc="FUSE client based on the SSH File Transfer Protocol" +arch=('i686' 'x86_64') +url="http://fuse.sourceforge.net/sshfs.html" +license=('GPL') +depends=('fuse' 'glib2' 'openssh') +makedepends=('pkg-config') +source=("http://downloads.sourceforge.net/sourceforge/fuse/${pkgname}-fuse-${pkgver}.tar.gz") +md5sums=('3c7c3647c52ce84d09486f1da3a3ce24') + +build() { + cd "${srcdir}/${pkgname}-fuse-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-fuse-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/community/stfl/PKGBUILD b/community/stfl/PKGBUILD index 1d41d81cf..b418b97c0 100644 --- a/community/stfl/PKGBUILD +++ b/community/stfl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99993 2013-10-31 02:53:24Z allan $ +# $Id: PKGBUILD 103032 2013-12-25 17:28:56Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Sven Pfleiderer <pfleidi@roothausen.de> pkgname=stfl pkgver=0.22 -pkgrel=1 +pkgrel=2 pkgdesc="Library implementing a curses-based widget set for text terminals" arch=('i686' 'x86_64') url="http://clifford.at/stfl/" @@ -18,16 +18,16 @@ sha256sums=('2dddafd331e61ad04baf1251ccecb3a69feaf99880dd75155be8423c1cc55418' 'c7d7c787bcd287a776aad3b26e6a90a3b121c281125c34c7c35a87f36dcdc453') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" - patch -Np1 -i ${srcdir}/$pkgname-archlinux.patch + patch -Np1 -i "${srcdir}"/$pkgname-archlinux.patch make prefix=/usr Makefile.deps make prefix=/usr } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - make prefix=/usr DESTDIR=${pkgdir} install + make prefix=/usr DESTDIR="${pkgdir}" install } diff --git a/community/stfl/stfl.changelog b/community/stfl/stfl.changelog index b72f673ed..257fd66c5 100644 --- a/community/stfl/stfl.changelog +++ b/community/stfl/stfl.changelog @@ -1,3 +1,6 @@ +2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * stfl 0.22-1 static library removed + 2012-02-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * stfl 0.22-1 diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index f09d08dbc..49cd9695b 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakob Gruber <jakob.gruber@gmail.com> pkgname=stone-soup -pkgver=0.13.0 +pkgver=0.13.1 pkgrel=1 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') @@ -66,4 +66,4 @@ package() { } -md5sums=('120adc528f020a6440bf1dbc4ccb6abb') +md5sums=('835825ba4d9863c8e255a8cb916db0c7') diff --git a/community/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD index a00334e7e..45992a3ec 100644 --- a/community/stuntrally/PKGBUILD +++ b/community/stuntrally/PKGBUILD @@ -4,17 +4,17 @@ # Contributor: Jason Melton <jason.melton@gmail.com> pkgname=stuntrally -pkgver=2.1 -pkgrel=1 +pkgver=2.2.1 +pkgrel=3 pkgdesc='Stunt Rally game with track editor, based on VDrift' arch=('x86_64' 'i686') license=('GPL3') url='http://code.google.com/p/vdrift-ogre' -depends=('libvorbis' 'mygui' 'sdl2' 'enet' 'hicolor-icon-theme' 'libxcursor' 'stuntrally-data') -makedepends=('cmake' 'boost') +depends=('libvorbis' 'mygui' 'sdl2' 'enet' 'gtk-update-icon-cache' 'stuntrally-data') +makedepends=('cmake' 'boost' 'git') install=stuntrally.install source=("$pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz") -sha256sums=('d987e8c05ed1f3f54468e75e2c1f68a9a4c59ceefa7429130d4f800b28821ae0') +sha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51') build() { cd "$srcdir/stuntrally-$pkgver/" diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD index 901855851..0e5acbc25 100644 --- a/community/supercollider/PKGBUILD +++ b/community/supercollider/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90361 2013-05-12 02:59:43Z speps $ +# $Id: PKGBUILD 101658 2013-11-29 20:44:59Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> -# Contributor: <farid at archlinux-br.org> +# Contributor: osc <farid at archlinux-br.org> _name=SuperCollider pkgname=supercollider -pkgver=3.6.5 +pkgver=3.6.6 pkgrel=1 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition" arch=('i686' 'x86_64') @@ -18,11 +18,11 @@ optdepends=('emacs: emacs interface' 'ruby: vim support') install="$pkgname.install" source=("http://download.sourceforge.net/project/$pkgname/Source/${pkgver%.*}/$_name-$pkgver-Source-linux.tar.bz2") -md5sums=('ac176ea512fc2b9a9be645322c5b20b4') +md5sums=('14d6063933230c74e42f5923a811e7c6') build() { cd "$srcdir/$_name-Source" - [ -d bld ] || mkdir bld && cd bld + [ -d b ] || mkdir b && cd b cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DLIBSCSYNTH=ON @@ -30,6 +30,6 @@ build() { } package() { - cd "$srcdir/$_name-Source/bld" + cd "$srcdir/$_name-Source/b" make DESTDIR="$pkgdir/" install } diff --git a/community/supertuxkart/PKGBUILD b/community/supertuxkart/PKGBUILD index ce9b35417..dfd389c39 100644 --- a/community/supertuxkart/PKGBUILD +++ b/community/supertuxkart/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 98716 2013-10-17 11:38:17Z svenstaro $ +# $Id: PKGBUILD 102043 2013-12-04 13:01:11Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: rabyte <rabyte__gmail> pkgname=supertuxkart -pkgver=0.8 -pkgrel=4 +pkgver=0.8.1 +pkgrel=3 pkgdesc='Kart racing game featuring Tux and his friends' arch=('i686' 'x86_64') url='http://supertuxkart.sourceforge.net/' license=('GPL2') -depends=('openal' 'libvorbis' 'libgl' 'fribidi' 'curl') +depends=('openal' 'libvorbis' 'libgl' 'fribidi' 'curl' 'bluez-libs') makedepends=('cmake' 'subversion' 'mesa' 'imagemagick' 'setconf') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2") install=supertuxkart.install -md5sums=('0b939ce601374758938119e0b0dd1fec') +md5sums=('aa31ecf883dc35859eec76c667f1a6d6') build() { cd ${srcdir}/SuperTuxKart-${pkgver} _fn="data/${pkgname}_desktop.template" - setconf "$_fn" Exec "$pkgname --log=file" + setconf "$_fn" Exec "$pkgname" setconf "$_fn" TryExec "$pkgname" setconf "$_fn" Icon "$pkgname"_64 diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD new file mode 100644 index 000000000..967ce2907 --- /dev/null +++ b/community/swi-prolog/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 102427 2013-12-10 21:34:55Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Jachym Barvinek <jachymb@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: John Proctor <jproctor@prium.net> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> + +pkgname=swi-prolog +pkgver=6.6.0 +pkgrel=1 +pkgdesc='Prolog environment' +arch=('x86_64' 'i686') +url='http://www.swi-prolog.org/' +license=('GPL' 'LGPL') +depends=('gmp' 'readline' 'openssl' 'libarchive') +makedepends=('libxft' 'libjpeg' 'unixodbc' 'libxpm' 'libxinerama') +optdepends=('unixodbc: for using the odbc4pl library' + 'libjpeg: for using the pl2xpce library' + 'libxpm: for using the pl2xpce library' + 'libxinerama: for using the pl2xpce library' + 'libxft: for using the pl2xpce library') +options=('!makeflags') +source=("http://www.swi-prolog.org/download/stable/src/pl-$pkgver.tar.gz") +sha256sums=('b85ac27a8afeb29640fe2b98c088e5f9c753adacb20114f8c10ba4835b26f9cd') + +build() { + cd "pl-$pkgver" + + ./configure --prefix=/usr --with-world + make +} + +check() { + make -C "pl-$pkgver" check || true +} + +package() { + make -C "pl-$pkgver" DESTDIR="$pkgdir" install + + # fix https://bugs.archlinux.org/task/20873 + chmod +x "$pkgdir/usr/lib/swipl-$pkgver/library/dialect/sicstus/swipl-lfr.pl" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index 8066854cd..f3ec7583b 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -6,7 +6,7 @@ pkgname=synergy pkgver=1.4.15 -pkgrel=1 +pkgrel=3 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" arch=('i686' 'x86_64') @@ -16,16 +16,19 @@ optdepends=('qt4: gui support') license=('GPL2') source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "synergys.socket" - "synergys.service") -sha512sums=('857e8cbfb0b32c7dc325de5765f182f4e4fb198443b4a3e26d38c2d3dec3819e57057b91a202b53c86d4fad18154d1d58b401812dd8fabc384255e44d4b4b01a' - 'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad' - 'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f') + "synergys.service" + "unfuck-cryptopp-thanks-gentoo.patch") +sha1sums=('0766bc3d95d6971746764d30e0853db14926ae73' + '947406e72351145c65ba9884ed175bf781482d46' + '00f2259c31c9551c0830d9e889fd0a0790cf9045' + '129151952e6d25504ca823aee8ebe93ce3d376ce') build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" - # Unzip the crypto library - unzip -d tools/cryptopp562 tools/cryptopp562.zip + # Unfuck the bundled cryptopp stuff. Thanks a lot, Gentoo! + # You and Fedora are our only friends in this crazy world. + patch -Np1 < "${srcdir}/unfuck-cryptopp-thanks-gentoo.patch" cmake -D CMAKE_INSTALL_PREFIX=/usr . make @@ -53,6 +56,6 @@ package() { # install desktop/icon stuff cd ../res - install -Dm644 "synergy.ico" "$pkgdir/usr/share/pixmaps/synergy.ico" + install -Dm644 "synergy.ico" "$pkgdir/usr/share/icons/synergy.ico" install -Dm644 "synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop" } diff --git a/community/synergy/unfuck-cryptopp-thanks-gentoo.patch b/community/synergy/unfuck-cryptopp-thanks-gentoo.patch new file mode 100644 index 000000000..2638c7fd2 --- /dev/null +++ b/community/synergy/unfuck-cryptopp-thanks-gentoo.patch @@ -0,0 +1,97 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -133,6 +133,10 @@ + check_type_size(long SIZEOF_LONG) + check_type_size(short SIZEOF_SHORT) + ++ set(CMAKE_REQUIRED_LIBRARIES crypto++) ++ set(CMAKE_REQUIRED_LIBRARIES) ++ set(CMAKE_INCLUDE_DIRECTORIES) ++ + # pthread is used on both Linux and Mac + check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) + if (HAVE_PTHREAD) +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -13,47 +13,6 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu/licenses/>. + +-set(cryptopp_dir cryptopp562) +- +-# only compile the crypto++ files we need. +-set(cryptopp_src +- ${cryptopp_dir}/3way.cpp +- ${cryptopp_dir}/algparam.cpp +- ${cryptopp_dir}/asn.cpp +- ${cryptopp_dir}/authenc.cpp +- ${cryptopp_dir}/basecode.cpp +- ${cryptopp_dir}/cpu.cpp +- ${cryptopp_dir}/cryptlib.cpp +- ${cryptopp_dir}/des.cpp +- ${cryptopp_dir}/dessp.cpp +- ${cryptopp_dir}/dll.cpp +- ${cryptopp_dir}/ec2n.cpp +- ${cryptopp_dir}/ecp.cpp +- ${cryptopp_dir}/filters.cpp +- ${cryptopp_dir}/fips140.cpp +- ${cryptopp_dir}/gcm.cpp +- ${cryptopp_dir}/gf2n.cpp +- ${cryptopp_dir}/gfpcrypt.cpp +- ${cryptopp_dir}/hex.cpp +- ${cryptopp_dir}/hmac.cpp +- ${cryptopp_dir}/hrtimer.cpp +- ${cryptopp_dir}/integer.cpp +- ${cryptopp_dir}/iterhash.cpp +- ${cryptopp_dir}/misc.cpp +- ${cryptopp_dir}/modes.cpp +- ${cryptopp_dir}/mqueue.cpp +- ${cryptopp_dir}/nbtheory.cpp +- ${cryptopp_dir}/oaep.cpp +- ${cryptopp_dir}/osrng.cpp +- ${cryptopp_dir}/pubkey.cpp +- ${cryptopp_dir}/queue.cpp +- ${cryptopp_dir}/randpool.cpp +- ${cryptopp_dir}/rdtables.cpp +- ${cryptopp_dir}/rijndael.cpp +- ${cryptopp_dir}/rng.cpp +- ${cryptopp_dir}/sha.cpp +-) +- + # if 64-bit windows, compile asm file. + if (CMAKE_CL_64) + list(APPEND cryptopp_src ${cryptopp_dir}/x64dll.asm ${cryptopp_dir}/x64masm.asm) +@@ -83,5 +42,3 @@ + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") + endif() + endif() +- +-add_library(cryptopp STATIC ${cryptopp_src}) +--- a/src/lib/io/CCryptoMode.h ++++ b/src/lib/io/CCryptoMode.h +@@ -17,9 +17,9 @@ + + #pragma once + +-#include <cryptopp562/gcm.h> +-#include <cryptopp562/modes.h> +-#include <cryptopp562/aes.h> ++#include <cryptopp/gcm.h> ++#include <cryptopp/modes.h> ++#include <cryptopp/aes.h> + #include "ECryptoMode.h" + #include "CString.h" + +--- a/src/lib/io/CCryptoStream.h ++++ b/src/lib/io/CCryptoStream.h +@@ -20,8 +20,8 @@ + #include "BasicTypes.h" + #include "CStreamFilter.h" + #include "CCryptoMode.h" +-#include <cryptopp562/osrng.h> +-#include <cryptopp562/sha.h> ++#include <cryptopp/osrng.h> ++#include <cryptopp/sha.h> + + class CCryptoOptions; + diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 3285e000c..2bc7e7d52 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99998 2013-10-31 02:55:04Z allan $ +# $Id: PKGBUILD 102282 2013-12-07 10:37:16Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig -pkgver=0.64.0 -pkgrel=7 +pkgver=0.64.1 +pkgrel=2 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64) url="http://synfig.org" @@ -15,15 +15,23 @@ makedepends=('boost') optdepends=('openexr' 'libsigc++') conflicts=('synfig-core') replaces=('synfig-core') -source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz +source=(http://downloads.sourceforge.net/project/synfig/releases/$pkgver/source/synfig-$pkgver.tar.gz build-fix.patch ffmpeg-0.8.patch ffmpeg-loop.patch) -md5sums=('124cb4059b9f48dc5c37204660053d6f' +md5sums=('548a5d51a48b2be0c3fcaebe917a5d88' 'b5568b06fae1a7ee465b5380b1139b83' 'ebf41046097cfd778dee9a9854561dae' 'c6684c876c093f5e53d2c46592994e9b') +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 -i $srcdir/build-fix.patch + patch -Np1 -i $srcdir/ffmpeg-0.8.patch +# patch -Np1 -i $srcdir/ffmpeg-loop.patch + sed -i '1,1i#include <string.h>' src/modules/mod_png/trgt_png.cpp +} + build() { cd $srcdir/$pkgname-$pkgver export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH @@ -32,10 +40,6 @@ build() { CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; } [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv - patch -p1 -i $srcdir/build-fix.patch - patch -Np1 -i $srcdir/ffmpeg-0.8.patch - patch -Np1 -i $srcdir/ffmpeg-loop.patch - sed -i '1,1i#include <string.h>' src/modules/mod_png/trgt_png.cpp make } diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD index a98c33727..6e0b3f1db 100644 --- a/community/synfigstudio/PKGBUILD +++ b/community/synfigstudio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99999 2013-10-31 02:55:24Z allan $ +# $Id: PKGBUILD 100656 2013-11-07 13:08:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfigstudio -pkgver=0.64.0 +pkgver=0.64.1 pkgrel=1 pkgdesc="Professional vector animation program (GUI)" arch=(i686 x86_64) @@ -13,8 +13,8 @@ depends=('gtkmm' 'synfig') makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi' 'xorg-fonts-misc' 'xorg-fonts-type1' 'intltool') install=synfigstudio.install -source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz) -md5sums=('bbda14359a07254b8efe5e706de192df') +source=(http://downloads.sourceforge.net/project/synfig/releases/$pkgver/source/synfigstudio-$pkgver.tar.gz) +md5sums=('94d3daf5f32d186a44175aedfb9f22cd') build() { cd $srcdir/synfigstudio-$pkgver diff --git a/community/talkfilters/PKGBUILD b/community/talkfilters/PKGBUILD index bb126bf85..0ff31aa59 100644 --- a/community/talkfilters/PKGBUILD +++ b/community/talkfilters/PKGBUILD @@ -1,25 +1,28 @@ +# $Id: PKGBUILD 102629 2013-12-16 22:05:45Z arodseth $ # Maintainer: ConnorBehan <connor.behan@gmail.com> +# Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=talkfilters pkgver=2.3.8 -pkgrel=2 -pkgdesc="Filters to translate text into dialects that GNU finds funny" -arch=(i686 x86_64) -url="http://www.hyperrealm.com/main.php?s=talkfilters" +pkgrel=3 +pkgdesc='Filters to translate text into dialects that GNU finds funny' +arch=('x86_64' 'i686') +url='http://www.hyperrealm.com/main.php?s=talkfilters' depends=('glibc') -license=('custom:Public Domain') -install=$pkgname.install -source=(http://www.hyperrealm.com/${pkgname}/${pkgname}-${pkgver}.tar.gz) +license=('GPL2') +install="$pkgname.install" +source=("http://www.hyperrealm.com/$pkgname/$pkgname-$pkgver.tar.gz") +sha256sums=('4681e71170af06c6bffcd4e454eff67224cde06f0d678d26dc72da45f02ecca6') build() { - cd "$srcdir"/${pkgname}-${pkgver} + cd "$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { - cd "$srcdir"/${pkgname}-${pkgver} - make prefix="$pkgdir"/usr install + make -C "$pkgname-$pkgver" prefix="$pkgdir/usr" install } -md5sums=('c11c6863a1c246a8d49a80a1168b54c8') +# vim:set ts=2 sw=2 et: diff --git a/community/tcplay/PKGBUILD b/community/tcplay/PKGBUILD new file mode 100644 index 000000000..2e11106e0 --- /dev/null +++ b/community/tcplay/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 102520 2013-12-12 22:28:07Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Thomas Weißschuh <thomas t-8ch de> +# Contributor: James Reed <supplantr at archlinux dot info> + +pkgname=tcplay +pkgver=1.1 +pkgrel=1 +pkgdesc="Free and simple TrueCrypt implementation based on dm-crypt." +arch=('i686' 'x86_64') +url="https://github.com/bwalex/tc-play" +license=('custom') +depends=('device-mapper') +makedepends=('cmake') +source=("https://github.com/bwalex/tc-play/archive/v${pkgver}.tar.gz" + tc-play-1.1-fix-paths.patch) +sha256sums=('62346e852c6f781fffebf5c43e5967ceb0e36304626aa27e77c77378f8215d84' + '007b960675400b7e0a10765952041dcc1943e5cb79367e2ed4938f2c5e64ea57') + +prepare() { + cd "tc-play-$pkgver" + patch -Np1 -i ../tc-play-1.1-fix-paths.patch +} + +build() { + cd "tc-play-$pkgver" + mkdir -p objdir + cd objdir + cmake -DCMAKE_INSTALL_PREFIX=/usr .. +} + +package() { + cd "tc-play-$pkgver/objdir" + make DESTDIR="$pkgdir" install + install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/tcplay/LICENSE +} diff --git a/community/tcplay/tc-play-1.1-fix-paths.patch b/community/tcplay/tc-play-1.1-fix-paths.patch new file mode 100644 index 000000000..e2d55df31 --- /dev/null +++ b/community/tcplay/tc-play-1.1-fix-paths.patch @@ -0,0 +1,49 @@ +--- tc-play-1.1/CMakeLists.txt.orig 2013-12-12 22:55:24.788832261 +0100 ++++ tc-play-1.1/CMakeLists.txt 2013-12-12 22:56:16.099181617 +0100 +@@ -63,20 +63,6 @@ + endif() + + +-if (NOT LIB_SUFFIX) +- message(STATUS "") +- message(STATUS "LIB_SUFFIX variable is not defined. It will be autodetected now.") +- message(STATUS "You can set it manually with -DLIB_SUFFIX=<value> (e.g. 64).") +- if (CMAKE_SIZEOF_VOID_P EQUAL 8) +- message(STATUS "\nSetting LIB_SUFFIX=64\n") +- set (LIB_SUFFIX "64") +- else() +- message(STATUS "\nSetting LIB_SUFFIX=\n") +- set (LIB_SUFFIX "") +- endif() +-endif() +- +- + + add_executable(tcplay-bin main.c ${SRCS_COMMON} ${SRCS_LINUX} ${SRCS_PBKDF}) + set_target_properties(tcplay-bin PROPERTIES OUTPUT_NAME tcplay) +@@ -102,7 +88,7 @@ + # Generate pkg-config file tcplay.pc + file(WRITE ${PROJECT_BINARY_DIR}/tcplay.pc "prefix=${CMAKE_INSTALL_PREFIX} + exec_prefix=${CMAKE_INSTALL_PREFIX} +-libdir=${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} ++libdir=${CMAKE_INSTALL_PREFIX}/lib + includedir=${CMAKE_INSTALL_PREFIX}/include + + Name: libtcplay +@@ -117,12 +103,12 @@ + + # Installation targets + install(TARGETS tcplay-bin tcplay-static tcplay-so +- RUNTIME DESTINATION sbin COMPONENT bin +- LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib +- ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT lib-dev ++ RUNTIME DESTINATION bin COMPONENT bin ++ LIBRARY DESTINATION lib COMPONENT lib ++ ARCHIVE DESTINATION lib COMPONENT lib-dev + ) + +-install(FILES ${PROJECT_BINARY_DIR}/tcplay.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig COMPONENT lib-dev) ++install(FILES ${PROJECT_BINARY_DIR}/tcplay.pc DESTINATION lib/pkgconfig COMPONENT lib-dev) + + install(FILES tcplay_api.h DESTINATION include COMPONENT lib-dev) + install(FILES tcplay.3 DESTINATION share/man/man3 COMPONENT lib-dev) diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index cc473f7aa..adffe318f 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98727 2013-10-17 12:44:12Z spupykin $ +# $Id: PKGBUILD 102931 2013-12-24 09:48:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=37.0.0 +pkgver=37.0.1 pkgrel=1 pkgdesc="A Qt-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ depends=('qt4' 'aspell' 'hunspell') install=tea.install source=(http://semiletov.org/tea/dloads/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('2f1113cf5771ba504ae1964aedb0acf2' +md5sums=('587a3c245e414ecb718369a170f1c991' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/texvc/PKGBUILD b/community/texvc/PKGBUILD index 0133225bd..804a2db52 100644 --- a/community/texvc/PKGBUILD +++ b/community/texvc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96626 2013-09-02 13:37:28Z spupykin $ +# $Id: PKGBUILD 102438 2013-12-11 10:30:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=texvc -pkgver=1.21 +pkgver=1.22 pkgrel=1 pkgdesc="tex to HTML/MathML/png converter used by mediawiki" arch=(i686 x86_64) @@ -11,8 +11,14 @@ url="http://www.mediawiki.org/wiki/Extension:Math" license=("GPL") depends=('imagemagick' 'ghostscript' 'texlive-core' 'texlive-latexextra') makedepends=('ocaml' 'git') -source=(mediawiki-math-$pkgver::git+https://git.wikimedia.org/git/mediawiki/extensions/Math.git#branch=REL${pkgver/./_}) -md5sums=('SKIP') +#source=(mediawiki-math-$pkgver::git+https://git.wikimedia.org/git/mediawiki/extensions/Math.git#branch=REL${pkgver/./_}) +source=("mediawiki-math-${_basever}.tar.gz::https://codeload.github.com/wikimedia/mediawiki-extensions-Math/legacy.tar.gz/REL${pkgver/./_}") +md5sums=('b595f6a32b2380040ce5401701a6a3a2') + +prepare() { + cd $srcdir + mv wikimedia-mediawiki-extensions-Math-b3ad6b9 mediawiki-math-$pkgver +} build() { cd $srcdir/mediawiki-math-$pkgver/math diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD index e6da810ea..a7c79c544 100644 --- a/community/the_silver_searcher/PKGBUILD +++ b/community/the_silver_searcher/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99585 2013-10-30 09:27:44Z arodseth $ +# $Id: PKGBUILD 100581 2013-11-06 10:52:39Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jeff Horelick <jdhore1@gmail.com> # Contributor: skydrome <skydrome@i2pmail.org> pkgname=the_silver_searcher -pkgver=0.18 +pkgver=0.18.1 pkgrel=1 pkgdesc='Code searching tool similar to Ack, but faster' url='https://github.com/ggreer/the_silver_searcher' @@ -12,7 +12,7 @@ license=('Apache') depends=('pcre' 'zlib' 'xz') arch=('x86_64' 'i686') source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz") -sha256sums=('9d3cdb7ab42308351f951adf1d149241b25f27d676322d96cdb215e4a0d90ea2') +sha256sums=('1f5cdacf955d5707cdb60f3f46aab3aae7fe96f105f00ab2d6a5a52d0aad5dc5') prepare() { cd "$pkgname-$pkgver" diff --git a/community/tightvnc/PKGBUILD b/community/tightvnc/PKGBUILD deleted file mode 100644 index f911b2e26..000000000 --- a/community/tightvnc/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# $Id: PKGBUILD 79388 2012-11-04 00:54:52Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Paul Mattal <paul@archlinux.org> -# Contributor: Andrew Hills <hills.as@gmail.com> -# Contributor: John <graysky@archlinux.us> - -pkgname=tightvnc -pkgver=1.3.10 -pkgrel=9 -pkgdesc='VNC server and viewer' -arch=('x86_64' 'i686') -license=('GPL') -url='http://www.tightvnc.com' -depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth' 'perl') -makedepends=('imake' 'setconf' 'gendesk') -options=('!makeflags') -source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2" - 'http://people.csail.mit.edu/jaffer/Color/rgb.txt' - 'vncserver.service' - 'tightvnc.png::http://virtual.itca.edu.sv/dokeos/sinapsis/cd/redes/vnc/tightvnc/documentos/TightVNC%20Frequently%20Asked%20Questions_archivos/tightvnc-logo.jpg') -sha256sums=('f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d' - 'af6c056a95ae725f98534db22b9a4916d17f2356fdca84a4a038211a82fa8a73' - 'ccadf1fc708fad601e6113464d6c533a629f6dc9116f6071347cd0b465c1f48b' - '2592196a56444143c2f0c3738dce98f89ea0d46b125a3ea54ac1dbb50914b945') -_exec=('vncviewer') -_name=('TightVNC Viewer') - -build() { - cd $srcdir - gendesk -n - setconf $pkgname.desktop Categories 'Application;Network;' - - cd vnc_unixsrc - setconf vncserver '$vncClasses' \"/usr/share/tightvnc\"\; - setconf vncserver '$fontPath' \ - \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\; - sed -i 's:/lib/cpp:/usr/bin/cpp:' Xvnc/config/cf/linux.cf - xmkmf - make World - - cd Xvnc - ./configure - setconf programs/Xserver/dix/Makefile DEFAULTRGBDATABASE '/usr/share/tightvnc/rgb' - setconf programs/Xserver/os/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L" - setconf lib/font/fc/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L" - make -} - -package() { - cd $srcdir/vnc_unixsrc - mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 - ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man - mkdir -p $pkgdir/usr/share/$pkgname - - cd $srcdir - install -Dm644 vnc_unixsrc/classes/* \ - $pkgdir/usr/share/$pkgname - install -Dm644 rgb.txt $pkgdir/usr/share/$pkgname/rgb.txt - install -Dm644 $pkgname.desktop \ - $pkgdir/usr/share/applications/$pkgname.desktop - install -Dm644 $pkgname.png \ - $pkgdir/usr/share/pixmaps/$pkgname.png - install -Dm644 vncserver.service \ - $pkgdir/usr/lib/systemd/system/vncserver.service -} - -# vim:set ts=2 sw=2 et: diff --git a/community/tightvnc/vncserver.service b/community/tightvnc/vncserver.service deleted file mode 100644 index b64e729a6..000000000 --- a/community/tightvnc/vncserver.service +++ /dev/null @@ -1,29 +0,0 @@ -# The vncserver service unit file -# -# 1. Copy this file to /etc/systemd/system/vncserver@:<display>.service -# 2. Edit User= -# ("User=foo") -# 3. Edit and vncserver parameters appropriately -# ("/usr/bin/vncserver %i -arg1 -arg2 -argn") -# 4. Run `systemctl --system daemon-reload` -# 5. Run `systemctl enable vncserver@:<display>.service` -# -# DO NOT RUN THIS SERVICE if your local area network is untrusted! -# -# See the wiki page for more on security -# https://wiki.archlinux.org/index.php/Vncserver - -[Unit] -Description=Remote desktop service (VNC) -After=syslog.target network.target - -[Service] -Type=forking -User= -# Clean any existing files in /tmp/.X11-unix environment, especially useful for VMs -ExecStartPre=-/usr/bin/vncserver -kill %i -ExecStart=/usr/bin/vncserver %i -ExecStop=/usr/bin/vncserver -kill %i - -[Install] -WantedBy=multi-user.target diff --git a/community/tilda/PKGBUILD b/community/tilda/PKGBUILD index 7852fd2c1..efde54921 100644 --- a/community/tilda/PKGBUILD +++ b/community/tilda/PKGBUILD @@ -1,31 +1,18 @@ -# $Id: PKGBUILD 96258 2013-08-22 23:47:58Z eric $ +# $Id: PKGBUILD 102554 2013-12-14 11:48:13Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=tilda -pkgver=1.1.7 -pkgrel=3 +pkgver=1.1.10 +pkgrel=1 pkgdesc="A Gtk based drop down terminal for Linux and Unix" arch=('i686' 'x86_64') url="https://github.com/lanoxx/tilda" license=('GPL') depends=('vte3' 'confuse') -source=(https://github.com/lanoxx/$pkgname/archive/$pkgname-$pkgver.tar.gz - start-hidden-fix.patch - tab-count-fix.patch) -sha256sums=('ed96ae2cf0ceb2a5b2f4a62948c5c0d28d1d54f89ade5153b2e67515cf4dc5e7' - 'e6d6075bb923c2dcae57706fe0555c28f9094f5115f1a3c60b8f85b8ff267b96' - '5d80a76f904a2094cd7b156654ea6d1860c319fc6c18927f2fb342c0f477c110') - -prepare() { - cd $pkgname-$pkgname-$pkgver - - patch -Np1 -i ../start-hidden-fix.patch - patch -Np1 -i ../tab-count-fix.patch - sed 's/Exec=.*/Exec=tilda/; s/Icon=.*/Icon=tilda/' -i tilda.desktop.in - -} +source=(https://github.com/lanoxx/$pkgname/archive/$pkgname-$pkgver.tar.gz) +sha256sums=('292f98d344c88998a0f7d67372020f1c3c7192de94fabf14a0d4eae18726b267') build() { cd $pkgname-$pkgname-$pkgver diff --git a/community/tilda/start-hidden-fix.patch b/community/tilda/start-hidden-fix.patch deleted file mode 100755 index d42fa0393..000000000 --- a/community/tilda/start-hidden-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/tilda.c b/src/tilda.c -index c0a435f..50daa47 100644 ---- a/src/tilda.c -+++ b/src/tilda.c -@@ -639,18 +639,7 @@ int main (int argc, char *argv[]) - } - } - -- if (config_getbool ("hidden")) -- { -- /* It does not cause graphical glitches to make tilda hidden on start this way. -- * It does make tilda appear much faster on it's first appearance, so I'm leaving -- * it this way, because it has a good benefit, and no apparent drawbacks. */ -- gtk_widget_show (GTK_WIDGET(tw->window)); -- gtk_widget_hide (GTK_WIDGET(tw->window)); -- } -- else -- { -- pull (tw, PULL_DOWN); -- } -+ pull (tw, config_getbool ("hidden") ? PULL_UP : PULL_DOWN); - - g_print ("Tilda has started. Press %s to pull down the window.\n", - config_getstr ("key")); diff --git a/community/tilda/tab-count-fix.patch b/community/tilda/tab-count-fix.patch deleted file mode 100755 index b0e1522a1..000000000 --- a/community/tilda/tab-count-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/tilda_window.c -+++ b/src/tilda_window.c -@@ -378,7 +378,7 @@ static gboolean goto_tab_generic (tilda_window *tw, guint tab_number) - - if (g_list_length (tw->terms) > (tab_number-1)) - { -- goto_tab (tw, g_list_length (tw->terms) - tab_number); -+ goto_tab (tw, tab_number - 1); - return TRUE; - } - diff --git a/community/tilda/tilda.changelog b/community/tilda/tilda.changelog index 9885de98e..f39ba5096 100644 --- a/community/tilda/tilda.changelog +++ b/community/tilda/tilda.changelog @@ -1,3 +1,9 @@ +2013-12-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * tilda 1.1.10-1 + +2013-11-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * tilda 1.1.8-1 + 2013-08-22 Maxime Gauduin <alucryd@gmail.com> * tilda 1.1.7-3 * Fixes FS#36542, FS#36516 and FS#36543 diff --git a/community/tmw/PKGBUILD b/community/tmw/PKGBUILD index 59d8d0c4f..8effb6c13 100644 --- a/community/tmw/PKGBUILD +++ b/community/tmw/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90095 2013-05-06 19:39:43Z foutrelis $ +# $Id: PKGBUILD 100933 2013-11-13 12:48:38Z heftig $ # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=tmw pkgver=0.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG." arch=('i686' 'x86_64') url="http://themanaworld.org" diff --git a/community/tnftp/PKGBUILD b/community/tnftp/PKGBUILD index 25fcc9256..cbf5d0f09 100644 --- a/community/tnftp/PKGBUILD +++ b/community/tnftp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91426 2013-05-22 10:27:16Z spupykin $ +# $Id: PKGBUILD 102893 2013-12-23 14:32:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Previous Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> pkgname=tnftp pkgver=20130505 -pkgrel=1 +pkgrel=2 pkgdesc="NetBSD FTP client with several advanced features" arch=('i686' 'x86_64') url="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/" diff --git a/community/tolua++/PKGBUILD b/community/tolua++/PKGBUILD new file mode 100644 index 000000000..1928a1720 --- /dev/null +++ b/community/tolua++/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Chirantan Ekbote <ekbotec at chromium.org> +# Contributer: Doug Newgard <scimmia22 at outlook dot com> +# Contributer: Stéphane Gaudreault <stephane.gaudreault@gmail.com> + +pkgname=tolua++ +pkgver=1.0.93 +pkgrel=1 +pkgdesc="Tool to integrate C/C++ code with Lua" +arch=('i686' 'x86_64') +url="http://www.codenix.com/~tolua" +license=('MIT') +depends=('lua51') +makedepends=('scons') +options=('staticlibs') +source=(http://www.codenix.com/~tolua/${pkgname}-${pkgver}.tar.bz2 + config_linux.py) +md5sums=('100aa6907b8108582080b37d79c0afd7' + '69ad5067084cec2924f172bb04700da6') +provides=('toluapp') + +build() { + cd ${pkgname}-${pkgver} + cp ../config_linux.py "${srcdir}"/${pkgname}-${pkgver} + + scons all +} + +package() { + cd ${pkgname}-${pkgver} + scons prefix="${pkgdir}/usr" install + + # install license files + install -Dm644 "$srcdir/${pkgname}-${pkgver}/COPYRIGHT" "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" +} diff --git a/community/tolua++/config_linux.py b/community/tolua++/config_linux.py new file mode 100755 index 000000000..dd6c2917d --- /dev/null +++ b/community/tolua++/config_linux.py @@ -0,0 +1,22 @@ +## This is the linux configuration file +# This file was adapted to be used with ArchLinux +# Use 'scons -h' to see the list of command line options available + +# Compiler flags (based on ArchLinux's installation of lua) +#LINKFLAGS = ['-g'] +CCFLAGS = ['-I/usr/include/lua5.1', '-O2', '-ansi', '-Wall', '-fPIC'] +#CCFLAGS = ['-g'] + +# this is the default directory for installation. Files will be installed on +# <prefix>/bin, <prefix>/lib and <prefix>/include when you run 'scons install' +# +# You can also specify this directory on the command line with the 'prefix' +# option +# +# You can see more 'generic' options for POSIX systems on config_posix.py + +prefix = '/usr' + +# libraries (based on ArchLinux's installation of lua) +LIBS = ['lua5.1', 'dl', 'm'] + diff --git a/community/torch/PKGBUILD b/community/torch/PKGBUILD index 6ac1ae427..7bda8ea70 100644 --- a/community/torch/PKGBUILD +++ b/community/torch/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 65413 2012-02-21 03:29:54Z spupykin $ +# $Id: PKGBUILD 100522 2013-11-05 11:47:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=torch pkgver=3.1 -pkgrel=3 +pkgrel=4 pkgdesc="State of the art machine learning library" arch=(i686 x86_64) url="http://packages.debian.org/source/lenny/torch3" license=('GPL') depends=(gcc-libs) source=(http://ftp.de.debian.org/debian/pool/main/t/torch3/torch3_$pkgver.orig.tar.gz - http://ftp.de.debian.org/debian/pool/main/t/torch3/torch3_$pkgver-2.diff.gz) + http://ftp.de.debian.org/debian/pool/main/t/torch3/torch3_$pkgver-2.1.diff.gz) md5sums=('04f7dc72a1e875a12ddf8ac77ec2dcc7' - 'b928c4206abb3209435dca27ad3e3c22') + '4f6c8e743e7a0aa9688f1e20b14797e4') build() { cd "$srcdir/torch3-$pkgver.orig" - [ $NOEXTRACT -eq 1 ] || cat $srcdir/torch3_$pkgver-2.diff | patch -p1 + [ $NOEXTRACT -eq 1 ] || cat $srcdir/torch3_$pkgver-2.1.diff | patch -p1 [ $NOEXTRACT -eq 1 ] || make depend make +} + +package() { + cd "$srcdir/torch3-$pkgver.orig" mkdir -p $pkgdir/usr/{include/torch,lib} diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD index aa4002407..bb0d02f18 100644 --- a/community/torcs/PKGBUILD +++ b/community/torcs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97077 2013-09-12 10:16:00Z spupykin $ +# $Id: PKGBUILD 101128 2013-11-17 21:08:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> pkgname=torcs -pkgver=1.3.4 -pkgrel=4 +pkgver=1.3.5 +pkgrel=1 pkgdesc="A 3D racing cars simulator using OpenGL" url="http://torcs.sourceforge.net" license=("GPL") @@ -13,7 +13,7 @@ depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis' makedepends=('plib' 'mesa') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2) -md5sums=('07dbc9c53e2b177be1f53fe97d53d039') +md5sums=('cd7bc804668af531df9511a6f64a1e84') build() { cd $srcdir/$pkgname-${pkgver/_/-} diff --git a/community/tork/PKGBUILD b/community/tork/PKGBUILD new file mode 100644 index 000000000..fe8a4121b --- /dev/null +++ b/community/tork/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 103134 2013-12-27 05:36:23Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Darwin Bautista <djclue917@gmail.com> +# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com> + +_libname=tor +pkgname=${_libname}k +pkgver=0.33 +pkgrel=5 +pkgdesc="An anonymity manager for KDE" +arch=("i686" "x86_64") +url="http://sourceforge.net/projects/$pkgname/" +license=("GPL") +depends=("geoip" "kdelibs3" "${_libname}" "torsocks" "hicolor-icon-theme" "desktop-file-utils" "xdg-utils") +optdepends=("privoxy: For anonymous browsing with Konqueror") +options=("!emptydirs") +install=${pkgname}.install + +source=( + http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + fix_net_port.patch + fix_getuid.patch +) +sha1sums=( + 'cf94b9579cf24254fcb344f579088a241bbd4028' + '70c450031bf5e603801451fc016e5cfc22cfd19c' + '9fe1de823850e6a0d0a4a18c3b86955206f544bd' +) + +build() { + cd ${pkgname}-${pkgver} + + # Source the KDE and QT profiles + source /etc/profile.d/kde3.sh + #source /etc/profile.d/qt3.sh + + msg "Applying patch(es) ..." + + patch -Np1 -i ../fix_net_port.patch + patch -Np1 -i ../fix_getuid.patch + + # Build + msg "Compiling tork ..." + ./configure --prefix=/opt/kde --mandir=/usr/share/man \ + --sysconfdir=/etc --with-external-geoip --without-arts + + # Fix --as-needed and --hash-style=gnu options not recognized error + find . -name Makefile -exec sed -i "s/-Wl,//g" {} \; + find . -name Makefile -exec sed -i "s/-Wl//g" {} \; + find . -name Makefile -exec sed -i "s/--hash-style=gnu,//g" {} \; + find . -name Makefile -exec sed -i "s/--hash-style=gnu//g" {} \; + find . -name Makefile -exec sed -i "s/--as-needed,//g" {} \; + find . -name Makefile -exec sed -i "s/--as-needed//g" {} \; + + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/tork/fix_getuid.patch b/community/tork/fix_getuid.patch new file mode 100644 index 000000000..6afdae74a --- /dev/null +++ b/community/tork/fix_getuid.patch @@ -0,0 +1,23 @@ +--- A/src/tork.h 2009-08-13 03:41:23.000000000 +0800 ++++ B/src/tork.h 2012-04-04 22:43:55.924940588 +0800 +@@ -45,6 +45,9 @@ + #include <kpopupmenu.h> + #include <qvaluevector.h> + ++#include <unistd.h> ++#include <sys/types.h> ++ + #include "update.h" + #include "trayicon.h" + #include "upnpmanager.h" +--- A/src/likeback.h 2006-10-01 19:58:11.000000000 +0800 ++++ B/src/likeback.h 2012-04-04 22:50:38.024921928 +0800 +@@ -22,6 +22,8 @@ + #define LIKEBACK_H + + #include <qobject.h> ++#include <unistd.h> ++#include <sys/types.h> + + class KConfig; + class KAboutData; diff --git a/community/tork/fix_net_port.patch b/community/tork/fix_net_port.patch new file mode 100644 index 000000000..b5545e0b2 --- /dev/null +++ b/community/tork/fix_net_port.patch @@ -0,0 +1,20 @@ +--- A/src/upnp/upnprouter.h ++++ B/src/upnp/upnprouter.h +@@ -242,7 +242,7 @@ + * @param port The local port to forward + */ + void forward(const net::Port & externalport, +- const net::Port & internalport = net::Port::Port(), ++ const net::Port & internalport = net::Port(), + bool force = false); + + /** +@@ -291,7 +291,7 @@ + bt::HTTPRequest* sendSoapQuery(const QString & query,const QString & soapact,const QString & controlurl,bool fwd, bool at_exit = false ); + bool verbose; + +- void forward(UPnPService* srv,const net::Port & externalport,const net::Port & internalport = net::Port::Port()); ++ void forward(UPnPService* srv,const net::Port & externalport,const net::Port & internalport = net::Port()); + void undoForward(UPnPService* srv,const net::Port & externalport,const net::Port & + internalport,bt::WaitJob* waitjob); + void httpRequestDone(bt::HTTPRequest* r,bool erase_fwd); diff --git a/community/tork/tork.install b/community/tork/tork.install new file mode 100644 index 000000000..5c501dc49 --- /dev/null +++ b/community/tork/tork.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/trickle/PKGBUILD b/community/trickle/PKGBUILD index 018c21816..949e210d6 100644 --- a/community/trickle/PKGBUILD +++ b/community/trickle/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 80164 2012-11-17 02:17:02Z kkeen $ +# $Id: PKGBUILD 102975 2013-12-25 09:36:34Z bgyorgy $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor Romain Bouchaud-Leduc <r0m1.bl@camaris.org> pkgname=trickle pkgver=1.07 -pkgrel=7 +pkgrel=8 pkgdesc="Lightweight userspace bandwidth shaper" arch=('i686' 'x86_64') url="http://monkey.org/~marius/trickle" license=('BSD') depends=('libevent') -source=("http://monkey.org/~marius/trickle/${pkgname}-${pkgver}.tar.gz") -md5sums=('860ebc4abbbd82957c20a28bd9390d7d') +source=("http://monkey.org/~marius/trickle/${pkgname}-${pkgver}.tar.gz" + "fix-crasher.patch") +md5sums=('860ebc4abbbd82957c20a28bd9390d7d' + 'a072091bce131e9f7229bff85ed5858c') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - # FS#23194 + # FS#27549 sed -i 's|^_select(int|select(int|' trickle-overload.c + # FS#35872 + patch -Np1 -i "${srcdir}/fix-crasher.patch" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ --mandir=/usr/share/man sed -i "s|.*in_addr_t.*||g" config.h diff --git a/community/trickle/fix-crasher.patch b/community/trickle/fix-crasher.patch new file mode 100644 index 000000000..c660f1ad1 --- /dev/null +++ b/community/trickle/fix-crasher.patch @@ -0,0 +1,86 @@ +diff --git a/trickle-overload.c b/trickle-overload.c +index e72eb0c..9254e89 100644 +--- a/trickle-overload.c ++++ b/trickle-overload.c +@@ -393,18 +393,14 @@ struct _pollfd { + } + + static struct delay * +-select_shift(struct delayhead *dhead, struct timeval *inittv, ++select_shift(struct delayhead *dhead, struct timeval *difftv, + struct timeval **delaytv) + { +- struct timeval curtv, difftv; + struct delay *d; + struct sockdesc *sd; + +- gettimeofday(&curtv, NULL); +- timersub(&curtv, inittv, &difftv); +- + TAILQ_FOREACH(d, dhead, next) { +- if (timercmp(&d->delaytv, &difftv, >)) ++ if (timercmp(&d->delaytv, difftv, >)) + break; + sd = d->sd; + +@@ -413,7 +409,7 @@ struct _pollfd { + } + + if (d != NULL) +- timersub(&d->delaytv, &difftv, *delaytv); ++ timersub(&d->delaytv, difftv, *delaytv); + else + *delaytv = NULL; + +@@ -431,8 +427,8 @@ struct _pollfd { + { + struct sockdesc *sd; + fd_set *fdsets[] = { wfds, rfds }, *fds; +- struct timeval *delaytv, *selecttv = NULL, *timeout = NULL, _timeout, +- inittv, curtv, difftv; ++ struct timeval *delaytv, _delaytv, *selecttv = NULL, *timeout = NULL, ++ _timeout, inittv, curtv, difftv; + short which; + struct delayhead dhead; + struct delay *d, *_d; +@@ -462,15 +458,18 @@ struct _pollfd { + FD_ISSET(sd->sock, fds) && + select_delay(&dhead, sd, which)) { + FD_CLR(sd->sock, fds); +- nfds--; + } + + gettimeofday(&inittv, NULL); + curtv = inittv; + d = TAILQ_FIRST(&dhead); +- delaytv = d != NULL ? &d->delaytv : NULL; ++ if (d != NULL) { ++ _delaytv = d->delaytv; ++ delaytv = &_delaytv; ++ } else ++ delaytv = NULL; ++ timersub(&curtv, &inittv, &difftv); + again: +- timersub(&inittv, &curtv, &difftv); + selecttv = NULL; + + if (delaytv != NULL) +@@ -498,15 +497,15 @@ struct _pollfd { + #endif /* DEBUG */ + + if (ret == 0 && delaytv != NULL && selecttv == delaytv) { +- _d = select_shift(&dhead, &inittv, &delaytv); ++ gettimeofday(&curtv, NULL); ++ timersub(&curtv, &inittv, &difftv); ++ _d = select_shift(&dhead, &difftv, &delaytv); + while ((d = TAILQ_FIRST(&dhead)) != _d) { + FD_SET(d->sd->sock, fdsets[d->which]); +- nfds++; + TAILQ_REMOVE(&dhead, d, next); + free(d); + } + +- gettimeofday(&curtv, NULL); + goto again; + } + diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD deleted file mode 100644 index 05eebd3af..000000000 --- a/community/ubuntuone-client-gnome/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 100006 2013-10-31 02:57:45Z allan $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=ubuntuone-client-gnome -pkgver=4.2.0 -pkgrel=2 -pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME" -arch=('i686' 'x86_64') -url="https://launchpad.net/ubuntuone-client-gnome" -license=('GPL') -depends=('nautilus' 'gconf' 'ubuntuone-client') -makedepends=('intltool' 'gnome-settings-daemon') -install=$pkgname.install -source=(https://launchpad.net/ubuntuone-client-gnome/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz - disable-gsd-plugin.patch) -md5sums=('e2f5e4ef6f4eca6ffcf838b3aa46c3ef' - 'e2b1b677844c3b61530f3653808b6644') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Disable gsd plugin, as it's not compatible with gnome-settings-daemon 3.8 - patch -Np1 -i "$srcdir/disable-gsd-plugin.patch" - - autoreconf -fi - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-compile - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community/ubuntuone-client-gnome/disable-gsd-plugin.patch b/community/ubuntuone-client-gnome/disable-gsd-plugin.patch deleted file mode 100644 index 2199536e2..000000000 --- a/community/ubuntuone-client-gnome/disable-gsd-plugin.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur ubuntuone-client-gnome-4.2.0.orig/configure.ac ubuntuone-client-gnome-4.2.0/configure.ac ---- ubuntuone-client-gnome-4.2.0.orig/configure.ac 2013-03-26 20:48:40.000000000 +0100 -+++ ubuntuone-client-gnome-4.2.0/configure.ac 2013-04-09 22:26:38.135983473 +0200 -@@ -5,7 +5,7 @@ - AC_CONFIG_SRCDIR([config.h.in]) - - AM_INIT_AUTOMAKE([1.10 foreign]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -diff -Naur ubuntuone-client-gnome-4.2.0.orig/Makefile.am ubuntuone-client-gnome-4.2.0/Makefile.am ---- ubuntuone-client-gnome-4.2.0.orig/Makefile.am 2013-03-21 18:13:58.000000000 +0100 -+++ ubuntuone-client-gnome-4.2.0/Makefile.am 2013-04-09 22:22:05.109626589 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = gsd nautilus po -+SUBDIRS = nautilus po - - # Shut libtoolize up - ACLOCAL_AMFLAGS = -I m4 diff --git a/community/ubuntuone-client-gnome/ubuntuone-client-gnome.install b/community/ubuntuone-client-gnome/ubuntuone-client-gnome.install deleted file mode 100644 index 7a903e80c..000000000 --- a/community/ubuntuone-client-gnome/ubuntuone-client-gnome.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD deleted file mode 100644 index f1d262d6d..000000000 --- a/community/ubuntuone-client/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 100005 2013-10-31 02:57:26Z allan $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=ubuntuone-client -pkgver=4.2.0 -pkgrel=2 -pkgdesc="Ubuntu One helps you store, sync and share files between your computers" -arch=('i686' 'x86_64') -url="https://launchpad.net/ubuntuone-client" -license=('GPL' 'CCPL:cc-by-sa') -depends=('dbus-glib' 'python2-configglue' 'python2-setuptools' 'python2-gobject' 'libnotify' 'python2-pyinotify' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool' 'imake' 'python2-distutils-extra') -install=$pkgname.install -source=(https://launchpad.net/ubuntuone-client/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz - https://launchpad.net/ubuntuone-client-data/stable-4-2/$pkgver/+download/$pkgname-data-$pkgver.tar.gz - fix-notify-hint.patch) -md5sums=('37d2de5c6e795e75f447682ee1c3bacc' - 'd3c445a9957a80471a84f323f24e8f84' - 'c38cb043e3241f12610ed6eb9ae0f087') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Python2 fix - sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/* - - # Workaround for crash in notification-daemon - # https://bugzilla.gnome.org/show_bug.cgi?id=665166 - patch -Np1 -i "$srcdir/fix-notify-hint.patch" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ - --disable-static \ - PYTHON=python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - # Install data - cd "$srcdir/$pkgname-data-$pkgver" - python2 setup.py install --root=$pkgdir/ --optimize=1 - - # We don't have Apport in Arch Linux - rm -r "$pkgdir"/{etc/apport,usr/share/apport} -} diff --git a/community/ubuntuone-client/fix-notify-hint.patch b/community/ubuntuone-client/fix-notify-hint.patch deleted file mode 100644 index 58a0888ef..000000000 --- a/community/ubuntuone-client/fix-notify-hint.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur ubuntuone-client-4.2.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.2.0/ubuntuone/platform/notification/linux.py ---- ubuntuone-client-4.2.0.orig/ubuntuone/platform/notification/linux.py 2013-04-01 16:37:48.530956424 +0000 -+++ ubuntuone-client-4.2.0/ubuntuone/platform/notification/linux.py 2013-04-01 16:38:32.333945773 +0000 -@@ -32,7 +32,7 @@ - USE_NOTIFY = False - - try: -- from gi.repository import Notify -+ from gi.repository import GLib, Notify - USE_NOTIFY = True - except ImportError: - pass -@@ -67,5 +67,5 @@ - if append: - self.notification.set_hint_string('x-canonical-append', '') - -- self.notification.set_hint_int32('transient', int(True)) -+ self.notification.set_hint('transient', GLib.Variant.new_boolean(1)) - self.notification.show() diff --git a/community/ubuntuone-client/ubuntuone-client.install b/community/ubuntuone-client/ubuntuone-client.install deleted file mode 100644 index 2c455e952..000000000 --- a/community/ubuntuone-client/ubuntuone-client.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD index 79939c3c7..4fecdcba1 100644 --- a/community/udevil/PKGBUILD +++ b/community/udevil/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86567 2013-03-19 17:52:24Z bpiotrowski $ +# $Id: PKGBUILD 102368 2013-12-09 14:28:01Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ pkgname=udevil -pkgver=0.4.1 +pkgver=0.4.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Mount and unmount without password' @@ -23,17 +23,16 @@ optdepends=('davfs2: mount WebDAV shares' provides=('devmon') backup=('etc/udevil/udevil.conf') install=$pkgname.install -source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz) -sha256sums=('fa4a3d85361d17bb69dd7dabdcfeecd2b0f5fff95698113975d8fbd504af6c2e') +source=(https://github.com/IgnorantGuru/udevil/archive/$pkgver.tar.gz) +md5sums=('7b00971f875aa8e0b436213209c6b61c') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } - diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index 8bd1ab53c..45277b142 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 100008 2013-10-31 02:58:26Z allan $ +# $Id: PKGBUILD 101740 2013-11-30 16:23:34Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sébastien Luttringer # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Sergej Pupykin <ps@lx-ltd.ru> pkgname=ulogd -pkgver=2.0.2 -pkgrel=4 +pkgver=2.0.3 +pkgrel=1 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' @@ -27,7 +27,7 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" "$pkgname.logrotate" "$pkgname.conf" "$pkgname.service") -md5sums=('660516de4b5b1e110c12dae414619e0f' +md5sums=('4dcd7e7a68022318759b8d3b9fff7519' '95f05af0a0c8f5fdea5bd92ccb2fd465' '2c8cbedb2fb455cba220ca35186ad846' '092d72209e30c132e0a08112e4062772') diff --git a/community/umurmur/PKGBUILD b/community/umurmur/PKGBUILD new file mode 100644 index 000000000..6af6b8cb3 --- /dev/null +++ b/community/umurmur/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 101363 2013-11-23 15:13:00Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Robert Knauer <robert@privatdemail.net> +# Contributor: xav <xav at ethertricks dot net> + +pkgname=umurmur +pkgver=0.2.13 +pkgrel=1 +pkgdesc='Minimalistic Mumble server' +arch=('i686' 'x86_64') +url='http://code.google.com/p/umurmur/' +license=('custom') +depends=('openssl' 'libconfig' 'protobuf-c') +install=$pkgname.install +backup=('etc/umurmur/umurmur.conf') +source=(http://umurmur.googlecode.com/files/umurmur-$pkgver.tar.gz + umurmur.service) +md5sums=('04d0ea7a90b7858c16df26317b318bf4' + 'd9d556e4ffa77e193fb40ce508804720') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man --with-ssl=openssl + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -Dm644 umurmur.conf.example "$pkgdir"/etc/umurmur/umurmur.conf + install -Dm644 ../umurmur.service "$pkgdir"/usr/lib/systemd/system/umurmur.service + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community/umurmur/umurmur.install b/community/umurmur/umurmur.install new file mode 100644 index 000000000..41332e9ba --- /dev/null +++ b/community/umurmur/umurmur.install @@ -0,0 +1,13 @@ +post_install() { + getent group umurmur > /dev/null || groupadd -r umurmur 1>/dev/null + getent passwd umurmur > /dev/null || useradd -r -M -g umurmur -s /bin/false umurmur 1>/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + getent passwd umurmur > /dev/null && userdel umurmur 1>/dev/null + getent group umurmur > /dev/null && groupdel umurmur 1>/dev/null +} diff --git a/community/umurmur/umurmur.service b/community/umurmur/umurmur.service new file mode 100644 index 000000000..329f16803 --- /dev/null +++ b/community/umurmur/umurmur.service @@ -0,0 +1,15 @@ +[Unit] +Description=A minimalistic Mumble server +After=network.target + +[Service] +Type=simple +User=umurmur +Group=umurmur +PIDFile=/run/umurmurd.pid +ExecStartPre=/usr/bin/umurmurd -t -c /etc/umurmur/umurmur.conf +ExecStart=/usr/bin/umurmurd -d -r -p /run/umurmurd.pid -c /etc/umurmur/umurmur.conf +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/community/unclutter/PKGBUILD b/community/unclutter/PKGBUILD index 263708422..b9514cd2f 100644 --- a/community/unclutter/PKGBUILD +++ b/community/unclutter/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65341 2012-02-21 02:13:14Z spupykin $ +# $Id: PKGBUILD 102123 2013-12-05 14:32:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Callan Barrett <wizzomafizzo@gmail.com> @@ -6,20 +6,27 @@ pkgname=unclutter pkgver=8 -pkgrel=8 +pkgrel=10 pkgdesc="A small program for hiding the mouse cursor" url="http://ftp.x.org/contrib/utilities/unclutter-8.README" arch=('i686' 'x86_64') license=('Public Domain') depends=('libxext') makedepends=('imake') -source=(http://ftp.x.org/contrib/utilities/$pkgname-$pkgver.tar.Z) -md5sums=('83d7a6498b69078f869378f801b6a84b') +source=(http://ftp.x.org/contrib/utilities/$pkgname-$pkgver.tar.Z + http://ftp.x.org/contrib/utilities/unclutter-8.README) +md5sums=('83d7a6498b69078f869378f801b6a84b' + '90ea7ff9f64945a6ca979d08a60c28dd') build() { cd ${srcdir}/$pkgname xmkmf -a make +} + +package() { + cd ${srcdir}/$pkgname make DESTDIR=${pkgdir} install - install -D -m 644 unclutter.man ${pkgdir}/usr/share/man/man1/unclutter.1 + install -Dm0644 unclutter.man ${pkgdir}/usr/share/man/man1/unclutter.1 + install -Dm0644 $srcdir/unclutter-8.README ${pkgdir}/usr/share/licenses/$pkgname/unclutter-8.README } diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 813d6c0bd..883e1f088 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94846 2013-07-31 07:46:49Z spupykin $ +# $Id: PKGBUILD 101548 2013-11-27 16:02:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd -pkgver=3.2.10.1 +pkgver=3.2.10.2 pkgrel=1 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64') @@ -12,26 +12,29 @@ license=('GPL2') depends=('openssl' 'curl' 'c-ares') conflicts=('ircd') provides=('ircd') -backup=('etc/unrealircd/unrealircd.conf' - 'etc/conf.d/unrealircd') +backup=('etc/unrealircd/unrealircd.conf') +install=unrealircd.install source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.service arch-fixes.patch) -md5sums=('97b4bd68a804e517355efa756f401a90' +md5sums=('21c460dc04d221b401a1701ca96e9e58' '93276a1cd426e4a811c072c35fc31e94' '77807313c4578f2c30286b9f9e3fb21c') -build() { +prepare() { cd $srcdir/Unreal$pkgver - patch -p1 <$srcdir/arch-fixes.patch +} + +build() { + cd $srcdir/Unreal$pkgver ac_cv_ip6=yes ./configure --with-showlistmodes \ - --enable-hub --enable-prefixaq --with-listen=5 \ + --enable-prefixaq --with-listen=5 \ --with-dpath=/etc/unrealircd \ --with-spath=/usr/bin \ --with-nick-history=2000 --with-sendq=3000000 \ - --with-bufferpool=18 --with-hostname=archlinux \ + --with-bufferpool=18 \ --with-permissions=0600 --with-fd-setsize=1024 \ --enable-dynamic-linking \ --enable-ziplinks \ @@ -62,9 +65,6 @@ package() { touch $pkgdir/var/log/unrealircd/ircd.log ln -s /var/log/unrealircd/ircd.log $pkgdir/etc/unrealircd/ircd.log - mkdir -p $pkgdir/etc/conf.d/ - echo 'UNREALIRCD_USER=root' >$pkgdir/etc/conf.d/unrealircd - find $pkgdir/usr -type f -exec chmod ugo+r {} \; find $pkgdir/usr -type d -exec chmod ugo+rx {} \; diff --git a/community/unrealircd/unrealircd.install b/community/unrealircd/unrealircd.install new file mode 100644 index 000000000..274d8b13f --- /dev/null +++ b/community/unrealircd/unrealircd.install @@ -0,0 +1,14 @@ +post_install() { + echo "Create ircd user and chown /etc/unrealircd and /var/log/unrealircd recursively" + echo "SSL is enabled by default, so you need to create pem files" + echo "Also unrealircd.conf needs adjustments" + echo "See also: https://wiki.archlinux.org/index.php/UnrealIRCd" +} + +post_upgrade() { + post_install +} + +post_remove() { + echo "Don't forget to remove ircd user" +} diff --git a/community/unshield/PKGBUILD b/community/unshield/PKGBUILD index e8530f935..e1f794569 100644 --- a/community/unshield/PKGBUILD +++ b/community/unshield/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100010 2013-10-31 02:59:06Z allan $ +# $Id: PKGBUILD 101042 2013-11-15 12:43:16Z spupykin $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=unshield pkgver=0.6 -pkgrel=3 +pkgrel=4 pkgdesc="Extracts CAB files from InstallShield installers" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/synce/files/" @@ -14,12 +14,21 @@ source=(http://downloads.sourceforge.net/sourceforge/synce/${pkgname}-${pkgver}. md5sums=('31a829192a255160d1f71cda4c865c9c' 'aa731ca6fd7c7dfb03f8b07e232b37d3') +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + sed -i 's|CFLAGS="-ansi -Wall -Werror"|CFLAGS="-ansi -Wall"|g' configure +} + build() { cd ${srcdir}/${pkgname}-${pkgver} # See http://www.mail-archive.com/synce-devel@lists.sourceforge.net/msg01796.html patch -Np0 -i "${srcdir}/libunshield.c.patch" ./configure --prefix=/usr make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/unshield/LICENSE } diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD index 0c9d41a5a..9dabf550b 100644 --- a/community/uriparser/PKGBUILD +++ b/community/uriparser/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100078 2013-11-01 09:49:54Z spupykin $ +# $Id: PKGBUILD 102887 2013-12-23 12:45:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> pkgname=uriparser -pkgver=0.7.8 -pkgrel=2 +pkgver=0.8.0 +pkgrel=1 pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode" url="http://sourceforge.net/projects/uriparser/" depends=() @@ -12,7 +12,7 @@ makedepends=(doxygen graphviz) arch=('i686' 'x86_64') license=("custom") source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2) -md5sums=('1ff590e25e8d9f5eaaa409c741fc387b') +md5sums=('77601f52ab91c0e100fc5d783d9c1ee5') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD index 447d415b4..cce6fe1a9 100644 --- a/community/uwsgi/PKGBUILD +++ b/community/uwsgi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98834 2013-10-20 05:56:09Z dwallace $ +# $Id: PKGBUILD 102953 2013-12-24 23:07:41Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -19,18 +19,18 @@ pkgname=(uwsgi uwsgi-plugin-lua51 uwsgi-plugin-carbon uwsgi-plugin-rrdtool - uwsgi-plugin-erlang uwsgi-plugin-pam uwsgi-plugin-zergpool ) -pkgver=1.9.18.1 + #uwsgi-plugin-erlang +pkgver=1.9.21.1 pkgrel=1 arch=(i686 x86_64) url="http://projects.unbit.it/$pkgbase" license=(GPL2) conflicts=(python-$pkgbase) makedepends=(gcc python python2 ruby python2-greenlet php-embed curl libxml2 libyaml - perl lua51 pcre libedit openssl bzip2 gmp erlang pam java-environment=7 + perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7 jansson classpath) source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz archlinux.ini @@ -41,8 +41,8 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch) -md5sums=('9925e4c189cb0fcd26d4b2efd732b6ca' - 'fcd57c37372e6afe5b1fae151dd43bc9' +md5sums=('82df3eeacc0d4e661459bc50d50e757b' + '2f21e871e81698c88c7ec2dbb4e3833e' 'b05ba1d796e1ea608a40635bc4f3ec67' '740a7718bd341b03d916a13ddbbbe694' 'db70315bbc8cb886a278ba59d5fd8d57' @@ -197,13 +197,13 @@ package_uwsgi-plugin-rrdtool(){ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} } -package_uwsgi-plugin-erlang(){ - depends=(uwsgi-plugin-common erlang) - pkgdesc="Plugin for Erlang support" - install -dm755 $pkgdir/usr/bin - install -Dm755 $pkgbase-$pkgver/erlang_plugin.so $pkgdir/usr/lib/uwsgi/erlang_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} -} +#package_uwsgi-plugin-erlang(){ +# depends=(uwsgi-plugin-common erlang) +# pkgdesc="Plugin for Erlang support" +# install -dm755 $pkgdir/usr/bin +# install -Dm755 $pkgbase-$pkgver/erlang_plugin.so $pkgdir/usr/lib/uwsgi/erlang_plugin.so +# ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} +#} package_uwsgi-plugin-pam(){ diff --git a/community/uwsgi/archlinux.ini b/community/uwsgi/archlinux.ini index e3770bf5b..f2550757f 100644 --- a/community/uwsgi/archlinux.ini +++ b/community/uwsgi/archlinux.ini @@ -14,4 +14,4 @@ yaml_implementation = auto malloc_implementation = libc embedded_plugins = echo, ping, http, corerouter plugin_dir = /usr/lib/uwsgi -plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios, admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, erlang, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter +plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios, admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index 7ea03206f..d66afde41 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99451 2013-10-29 09:00:10Z svenstaro $ +# $Id: PKGBUILD 100934 2013-11-13 12:48:39Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2012.07.22 -pkgrel=6 +pkgrel=7 pkgdesc="Open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD index eba08e232..550c690f2 100644 --- a/community/vifm/PKGBUILD +++ b/community/vifm/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 91037 2013-05-18 13:22:47Z jlichtblau $ +# $Id: PKGBUILD 100834 2013-11-11 18:48:45Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=vifm -pkgver=0.7.5 +pkgver=0.7.6 pkgrel=1 pkgdesc="Ncurses based file manager with vi like keybindings" arch=('i686' 'x86_64') url="http://vifm.sourceforge.net/" license=('GPL') -depends=('ncurses' 'gtk2') +depends=('ncurses') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('01346f3573fa40d3c851b4844fb19ea2f1f63416bc8500bacb243997bf482de4') +sha256sums=('861798592d6fccc5d330a66e68f1c5a747732b9df587f15d892c6ff72a04650f') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr make } diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog index 62411bb21..57a4b3831 100644 --- a/community/vifm/vifm.changelog +++ b/community/vifm/vifm.changelog @@ -1,3 +1,6 @@ +2013-11-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vifm 0.7.6-1 + 2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * vifm 0.7.5-1 diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD index ebc70ad93..3d40ed441 100644 --- a/community/vile/PKGBUILD +++ b/community/vile/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 100013 2013-10-31 03:00:12Z allan $ +# $Id: PKGBUILD 101122 2013-11-17 20:12:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=vile -pkgver=9.8_i +pkgver=9.8_k _basever=9.8 pkgrel=1 pkgdesc="vi like emacs" @@ -19,7 +19,9 @@ source=("ftp://invisible-island.net/vile/vile-${_basever}.tgz" "ftp://invisible-island.net/vile/patches/vile-${_basever}f.patch.gz" "ftp://invisible-island.net/vile/patches/vile-${_basever}g.patch.gz" "ftp://invisible-island.net/vile/patches/vile-${_basever}h.patch.gz" - "ftp://invisible-island.net/vile/patches/vile-${_basever}i.patch.gz") + "ftp://invisible-island.net/vile/patches/vile-${_basever}i.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}j.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}k.patch.gz") md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f' '685cb681943e9315a1689a6a6f4734cb' 'f3842ea427c635d0ee96f6da8566fa56' @@ -29,16 +31,20 @@ md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f' '7f8a38272395f07e1377cc1943d37e7f' '26ab76a7305b7ec97b22855810911ceb' '6ea4cf22e29f5418f26ba6632985c70e' - '908e8f9cf3c9a681c3ef76a3cd04a0c3') + '908e8f9cf3c9a681c3ef76a3cd04a0c3' + '66f4136ab1ce33f491080c0fb3c87b06' + 'e4a60ed7e3959269201c5a937b206272') -build() { +prepare() { cd $srcdir/$pkgname-${_basever} - for i in $srcdir/vile-${_basever}?.patch; do patch -p1 <$i done sed -i 's|FLEX_BETA|FLEX_NOBETA|g' filters/filters.h +} +build() { + cd $srcdir/$pkgname-${_basever} ./configure --prefix=/usr make } @@ -46,7 +52,6 @@ build() { package() { cd $srcdir/$pkgname-${_basever} make install DESTDIR=$pkgdir - mkdir -p $pkgdir/usr/share/licenses/$pkgname cat <<EOF >$pkgdir/usr/share/licenses/$pkgname/license Copyright diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index 364dc97ba..d4f458448 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 100234 2013-11-02 01:49:57Z seblu $ +# $Id: PKGBUILD 102983 2013-12-25 11:05:37Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') -pkgver=4.3.2 -pkgrel=1 +pkgver=4.3.6 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -63,3 +63,4 @@ package_virtualbox-guest-modules-lts(){ } # vim:set ts=2 sw=2 et: +md5sums=() diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 18d8dd712..ec8bd87b6 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 100230 2013-11-02 00:53:56Z seblu $ +# $Id: PKGBUILD 103140 2013-12-27 12:02:56Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.3.2 -pkgrel=1 +pkgver=4.3.6 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux>=3.11' 'linux<3.12' - 'linux-headers>=3.11' 'linux-headers<3.12' +makedepends=('linux>=3.12' 'linux<3.13' + 'linux-headers>=3.12' 'linux-headers<3.13' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver") # remember to also adjust the .install files and the package deps below -_extramodules=extramodules-3.11-ARCH +_extramodules=extramodules-3.12-ARCH build() { _kernver="$(cat /usr/lib/modules/$_extramodules/version)" @@ -33,7 +33,7 @@ build() { package_virtualbox-host-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.11' 'linux<3.12') + depends=('linux>=3.12' 'linux<3.13') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install @@ -48,7 +48,7 @@ package_virtualbox-guest-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux>=3.11' 'linux<3.12') + depends=('linux>=3.12' 'linux<3.13') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install @@ -60,3 +60,4 @@ package_virtualbox-guest-modules(){ } # vim:set ts=2 sw=2 et: +md5sums=() diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index af7f5b278..424121a1a 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES=extramodules-3.11-ARCH + EXTRAMODULES=extramodules-3.12-ARCH depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index cfbefde89..864e3389c 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES=extramodules-3.11-ARCH + EXTRAMODULES=extramodules-3.12-ARCH depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/vor/PKGBUILD b/community/vor/PKGBUILD index f14b16d91..16f0651f0 100644 --- a/community/vor/PKGBUILD +++ b/community/vor/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 82073 2013-01-07 10:20:03Z arodseth $ +# $Id: PKGBUILD 101359 2013-11-23 12:39:11Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: tdy <tdy@gmx.com> # Contributor: nut543 <kfs1@online.no> pkgname=vor pkgver=0.5.5 -pkgrel=1 +pkgrel=2 pkgdesc='Classic spaceship versus asteroid field arcade game' -arch=('i686' 'x86_64') -url="http://jasonwoof.org/vor?" +arch=('x86_64' 'i686') +url='http://jasonwoof.org/vor' license=('GPL') depends=('sdl_image' 'sdl_mixer') makedepends=('gendesk') @@ -16,27 +16,22 @@ optdepends=('netpbm: for customizing game graphics' 'povray: for customizing game graphics') options=('!emptydirs') source=("http://qualdan.com/$pkgname/$pkgname-$pkgver.tar.bz2" - "$pkgname.png") + "$pkgname.png") sha256sums=('ead1b9786741e26d37ff7c5185b7fe1e91f90f76ebed3785225312e323b7c7da' '07a805928f5cf2b3351e2b9ff820ea69352ad80faad43311889ffbd5f62da872') -_exec=('vor -f') build() { - cd "$srcdir" - gendesk - + gendesk -f --pkgname "$pkgname" --pkgdesc "$pkgdesc" cd "$pkgname-$pkgver" ./configure --prefix=/usr make LDFLAGS=-lm } package() { - cd "$srcdir/$pkgname-$pkgver" - - mkdir -p "$pkgdir/usr/bin" - make prefix=/usr DESTDIR="$pkgdir" install - install -Dm644 "../$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm644 "../$pkgname.desktop" \ + install -d "$pkgdir/usr/bin" + make -C "$pkgname-$pkgver" prefix=/usr DESTDIR="$pkgdir" install + install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" } diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD index 9a35825f6..9d94d0609 100644 --- a/community/warmux/PKGBUILD +++ b/community/warmux/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 90103 2013-05-06 19:39:59Z foutrelis $ +# $Id: PKGBUILD 100935 2013-11-13 12:48:40Z heftig $ # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: pukyxd # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=warmux pkgver=11.04.1 -pkgrel=6 +pkgrel=7 pkgdesc="A clone of the worms game" arch=('i686' 'x86_64') -url="http://www.wormux.org/" +url="http://gna.org/projects/warmux/" license=('GPL') makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') replaces=('wormux') diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index b9958a37a..ee3858b98 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94912 2013-08-01 06:55:47Z bpiotrowski $ +# $Id: PKGBUILD 102852 2013-12-22 08:25:23Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 -pkgver=3.1.0 -pkgrel=4 +pkgver=3.1.1 +pkgrel=1 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64') @@ -12,12 +12,12 @@ license=('GPL') depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt4') makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa') source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('7f061f3e5a2a6a83c146508ccefabd86') +md5sums=('0b81a0012098a1310f5351a3ace2021b') build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --with-distributor="Arch linux" + ./configure --prefix=/usr --with-distributor="Archlinux" make } diff --git a/community/wdm/PKGBUILD b/community/wdm/PKGBUILD deleted file mode 100644 index 76e858c53..000000000 --- a/community/wdm/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 88268 2013-04-15 11:14:13Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: eric <eric@archlinux.org> -# Contributor: Aurelien Foret <orelien@chez.com> - -pkgname=wdm -pkgver=1.28 -pkgrel=6 -pkgdesc="An replacement X window display manager similar to, and based on XDM" -arch=(i686 x86_64) -depends=('windowmaker' 'pam' 'bash' 'libxmu') -license=('GPL') -source=(http://voins.program.ru/$pkgname/$pkgname-$pkgver.tar.bz2) -url="http://voins.program.ru/wdm/" -md5sums=('4da8ffe3af233305786d9b6aab78b838') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --with-nlsdir=/usr/share/locale \ - --sysconfdir=/etc/wdm --with-wdmdir=/etc/wdm --mandir=/usr/share/man \ - --with-fakehome=/var/empty - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - # used /etc/pam.d/xscreensaver as an example - # - echo "auth required pam_unix_auth.so" > $pkgdir/etc/pam.d/wdm - chmod 0644 $pkgdir/etc/wdm/wdm-config - chmod 0755 $pkgdir/etc/wdm/authdir -} diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD index b22e9bd50..4ffc89eae 100644 --- a/community/wesnoth/PKGBUILD +++ b/community/wesnoth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96161 2013-08-20 15:02:17Z svenstaro $ +# $Id: PKGBUILD 102283 2013-12-07 10:37:17Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -7,7 +7,7 @@ pkgname=wesnoth pkgver=1.10.7 -pkgrel=1 +pkgrel=2 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index 1416e693b..8d3cf8684 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100093 2013-11-01 14:31:04Z seblu $ +# $Id: PKGBUILD 103053 2013-12-25 21:25:19Z andyrtr $ # Maintainer: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=weston pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64') url='http://wayland.freedesktop.org' diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index ee72052d3..b24052d85 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94913 2013-08-01 06:55:50Z bpiotrowski $ +# $Id: PKGBUILD 102284 2013-12-07 10:37:19Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,7 +6,7 @@ pkgname=widelands pkgver=17 _realver=build17 -pkgrel=9 +pkgrel=11 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64') url="http://widelands.org/" diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD deleted file mode 100644 index bcca41378..000000000 --- a/community/wings3d/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 95698 2013-08-15 18:31:52Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: kappa <kappacurve@gmail.com> - -pkgname=wings3d -_pkgname=wings -pkgver=1.4.1 -pkgrel=18 -pkgdesc='3D modeling program' -arch=('x86_64' 'i686') -url='http://www.wings3d.com/' -license=('GPL') -depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang') -makedepends=('gendesk') -optdepends=('povray: rendering support via POV-Ray') -install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/dgud/wings/archive/master.tar.gz" - "$pkgname.sh" - "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png") -sha256sums=('02be0f1a2494b5243ecf027e6cc6e95e0fbe6d6dca6393b3a202c9d12c6bd5e6' - '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' - '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a') - -prepare() { - gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc" \ - --genericname '3D Modeler' --categories 'Graphics;3DGraphics' -} - -build() { - cd "$_pkgname-master" - - export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*) - make - make lang -} - -package() { - cd "$_pkgname-master" - - mkdir -p "$pkgdir/usr/lib/$pkgname" - for subdir in ebin fonts patches plugins shaders textures; do - cp -r "$srcdir/$_pkgname-master/$subdir/" "$pkgdir/usr/lib/$pkgname" - done - cd "$srcdir" - install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname" - install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm644 "$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/wings3d/wings3d.install b/community/wings3d/wings3d.install deleted file mode 100644 index 98f3ea190..000000000 --- a/community/wings3d/wings3d.install +++ /dev/null @@ -1,14 +0,0 @@ -post_upgrade() { - #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor - update-desktop-database -q -} - -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community/wings3d/wings3d.sh b/community/wings3d/wings3d.sh deleted file mode 100644 index c0fd3b2fb..000000000 --- a/community/wings3d/wings3d.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"} diff --git a/community/wireshark/PKGBUILD b/community/wireshark/PKGBUILD index 35a985d8b..81c48e4f8 100644 --- a/community/wireshark/PKGBUILD +++ b/community/wireshark/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 100436 2013-11-04 11:50:09Z tredaelli $ +# $Id: PKGBUILD 102796 2013-12-20 11:11:34Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.10.3 +pkgver=1.10.5 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') -makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' +makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio' 'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme') url='http://www.wireshark.org/' source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 wireshark-1.10.3-gtk3.10-compile.patch) -sha256sums=('c1641b36aeb0ca2c1a95fb01d2c647888b65e00a215c9a6464b5fc61e0fd498c' +sha256sums=('a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5' '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0') prepare() { @@ -27,16 +27,19 @@ build() { ./autogen.sh ./configure \ --prefix=/usr \ - --with-ssl \ - --with-zlib=yes \ + --with-gtk3=yes \ + --with-pcap \ + --with-zlib \ --with-lua \ - --with-gtk3=yes + --with-portaudio \ + --with-ssl \ + --with-krb5 make all } package_wireshark-cli() { pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' - depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua') + depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio') install=wireshark.install conflicts=(wireshark) diff --git a/community/wiznote/PKGBUILD b/community/wiznote/PKGBUILD index da1e90b64..76bebe9a3 100644 --- a/community/wiznote/PKGBUILD +++ b/community/wiznote/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100396 2013-11-03 12:29:00Z fyan $ +# $Id: PKGBUILD 101247 2013-11-20 14:03:11Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Albert.Zhou <albert.zhou@wiz.cn> pkgname=wiznote -pkgver=2.0.62 +pkgver=2.0.64 pkgrel=1 pkgdesc="Opensource cross-platform cloud based note-taking client" arch=('i686' 'x86_64') diff --git a/community/workrave/PKGBUILD b/community/workrave/PKGBUILD index a1a35bf10..8640272ea 100644 --- a/community/workrave/PKGBUILD +++ b/community/workrave/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 100122 2013-11-01 17:18:06Z spupykin $ +# $Id: PKGBUILD 103150 2013-12-27 15:56:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=workrave -pkgver=1.10 -pkgrel=3 +pkgver=1.10.1 +pkgrel=1 pkgdesc="a tool to help RSI" arch=('i686' 'x86_64') license=('GPL2') url="http://workrave.org" depends=('libxtst' 'gtkmm3' 'gconf' 'gdome2' 'gstreamer0.10' 'libsm' 'libice' - 'python2-cheetah' 'libxss' 'gobject-introspection') -makedepends=('intltool') + 'python2-cheetah' 'libxss') +makedepends=('intltool' 'gobject-introspection') source=(http://downloads.sourceforge.net/workrave/workrave-$pkgver.tar.gz) -md5sums=('5b76c2ef8e1dfede69c4e0d4bca9dcb9') +md5sums=('6ebc7896de350bf5fc61c24a210f9a6e') build() { cd $srcdir/workrave-$pkgver diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index 53cc6a2f7..5a13a578f 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98707 2013-10-17 10:43:21Z svenstaro $ +# $Id: PKGBUILD 102285 2013-12-07 10:37:21Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> @@ -6,7 +6,7 @@ pkgname=wt pkgver=3.3.1 _pkgver=3.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64') url="http://www.webtoolkit.eu/" diff --git a/community/xbmc-pvr-addons/PKGBUILD b/community/xbmc-pvr-addons/PKGBUILD index 2e007fff3..19fb2c0f0 100644 --- a/community/xbmc-pvr-addons/PKGBUILD +++ b/community/xbmc-pvr-addons/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 100068 2013-11-01 09:00:11Z spupykin $ +# $Id: PKGBUILD 100628 2013-11-06 16:33:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xbmc-pvr-addons -pkgver=20131101git +pkgver=20131106git pkgrel=1 pkgdesc="XBMC PVR add-ons for current stable xbmc" arch=('i686' 'x86_64') @@ -13,7 +13,8 @@ makedepends=('git' 'libmysqlclient' 'boost') optdepends=('tvheadend-git: tvheadend backend' 'mythtv: mythtv backend') conflicts=('xbmc-pvr-addons-git') #source=("$pkgname-$pkgver.tar.gz::https://github.com/opdenkamp/xbmc-pvr-addons/archive/${pkgver/_/-}.tar.gz") -source=("git://github.com/opdenkamp/xbmc-pvr-addons.git") +#source=("git://github.com/opdenkamp/xbmc-pvr-addons.git") +source=("git://github.com/fetzerch/xbmc-pvr-addons.git#branch=frodo") md5sums=('SKIP') build() { diff --git a/community/xcb-util-cursor/PKGBUILD b/community/xcb-util-cursor/PKGBUILD index cc94347a8..c3346a44d 100644 --- a/community/xcb-util-cursor/PKGBUILD +++ b/community/xcb-util-cursor/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 98879 2013-10-21 00:54:20Z seblu $ +# $Id: PKGBUILD 100959 2013-11-13 21:01:51Z seblu $ # Maintainer: Sébastien Luttringer <seblu at seblu dot net> # Contributor: Bastien Dejean <nihilhill@gmail.com> pkgname=xcb-util-cursor -pkgver=0.1.0 -pkgrel=4 +pkgver=0.1.1 +pkgrel=1 pkgdesc='XCB cursor library' arch=('i686' 'x86_64') url='http://cgit.freedesktop.org/xcb/util-cursor' license=('custom:MIT') depends=('libxcb' 'xcb-util-renderutil' 'xcb-util-image') source=("http://xcb.freedesktop.org/dist/xcb-util-cursor-$pkgver.tar.bz2") -md5sums=('40e913aae6fb30a72d423e6bae9a93e9') +md5sums=('568712eaa340f18b357d3748300c1795') build() { cd $pkgname-$pkgver diff --git a/community/xchm/PKGBUILD b/community/xchm/PKGBUILD new file mode 100644 index 000000000..03e29537a --- /dev/null +++ b/community/xchm/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 102193 2013-12-06 12:52:51Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=xchm +pkgver=1.23 +pkgrel=1 +pkgdesc="A cross-platform GUI front-end to chmlib" +arch=('i686' 'x86_64') +url="http://xchm.sourceforge.net/" +license=('GPL') +depends=('chmlib' 'wxgtk' 'desktop-file-utils') +install=xchm.install +source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz" + 'xchm.desktop' + 'xchm.xml') +md5sums=('486d029bd81071a2d04e7181909b1602' + '31fb9692b9ee9f2a205f58b9ff4bc4fe' + '4102b0a393f5c60236143cc034664dd0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR=${pkgdir} install + install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop" + install -D -m644 ${srcdir}/xchm.xml "${pkgdir}/usr/share/mime/packages/xchm.xml" +} diff --git a/community/xchm/xchm.desktop b/community/xchm/xchm.desktop new file mode 100644 index 000000000..ca20876b2 --- /dev/null +++ b/community/xchm/xchm.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Xchm +Comment=Views CHM files +Exec=xchm %f +Terminal=false +Type=Application +Icon=xchm-48 +Categories=Viewer;Utility; +MimeType=application/x-chm; +StartupNotify=true diff --git a/community/xchm/xchm.install b/community/xchm/xchm.install new file mode 100644 index 000000000..df90cb5ac --- /dev/null +++ b/community/xchm/xchm.install @@ -0,0 +1,15 @@ +post_install() { + #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} diff --git a/community/xchm/xchm.xml b/community/xchm/xchm.xml new file mode 100644 index 000000000..08cb9ca3f --- /dev/null +++ b/community/xchm/xchm.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/x-chm"> + <comment>Compiled HTML Help Format</comment> + <glob pattern="*.chm"/> + </mime-type> +</mime-info> diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index dc65c3841..c734e1865 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99387 2013-10-28 09:51:20Z spupykin $ +# $Id: PKGBUILD 102706 2013-12-17 17:42:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Giovanni Scafora <linuxmania@gmail.com> # Contributor: simo <simo@archlinux.org> pkgname=xcircuit -pkgver=3.7.54 +pkgver=3.7.55 pkgrel=1 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL2') depends=('tk' 'libxpm' 'zlib') makedepends=('chrpath') source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz) -md5sums=('25e60837e5db6b4ff71615505493a481') +md5sums=('938bccd7f8309f897ef6c2e742f5dbac') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD index f96430d3c..a2823dea6 100644 --- a/community/xemacs/PKGBUILD +++ b/community/xemacs/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 94932 2013-08-01 07:01:29Z bpiotrowski $ +# $Id: PKGBUILD 103002 2013-12-25 15:01:04Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: juergen <juergen@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=xemacs pkgver=21.5.33 -pkgrel=3 +pkgrel=5 pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" arch=('i686' 'x86_64') url="http://www.xemacs.org/" license=('GPL') -depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib') +depends=('libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib') optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface' 'xorg-fonts-100dpi: X bitmap fonts needed for the interface') makedepends=('xbitmaps') @@ -25,7 +25,7 @@ build() { ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \ --without-postgresql --with-athena=xaw \ - --enable-database=berkdb --without-ldap \ + --with-database=gdbm --without-ldap \ --enable-menubars=lucid --enable-scrollbars=lucid \ --enable-widgets=athena --enable-dialogs=athena \ --enable-external-widget \ @@ -53,5 +53,5 @@ package() { # correct permissions chown -R root:root "${pkgdir}" - rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info} + rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,texinfo.info-3,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info} } diff --git a/community/xfe/PKGBUILD b/community/xfe/PKGBUILD index cfc7665c8..c22a95295 100644 --- a/community/xfe/PKGBUILD +++ b/community/xfe/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96354 2013-08-26 09:21:17Z spupykin $ +# $Id: PKGBUILD 101413 2013-11-25 09:08:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Ravi Desai <ravster3@hotmail.com> pkgname=xfe -pkgver=1.35 +pkgver=1.37 pkgrel=1 pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=("GPL") depends=('fox') makedepends=('intltool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('2cff624a9ee8ee8d8f80e2688fc62feb') +md5sums=('ce2a317ab4f7d728878d815afe13c1be') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/xjadeo/PKGBUILD b/community/xjadeo/PKGBUILD index 24e1d1919..1269ee7ea 100644 --- a/community/xjadeo/PKGBUILD +++ b/community/xjadeo/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 95059 2013-08-04 22:37:03Z speps $ +# $Id: PKGBUILD 101054 2013-11-15 17:47:59Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> pkgname=xjadeo -pkgver=0.7.5 +pkgver=0.7.6 pkgrel=1 pkgdesc="A simple video player that is synchronized to jack transport." arch=('i686' 'x86_64') url="http://xjadeo.sourceforge.net" license=('GPL') -depends=('ffmpeg' 'imlib2' 'jack' 'liblo' 'libxpm' 'libxv' 'portmidi') +depends=('ffmpeg' 'ffmpeg-compat' 'imlib2' 'jack' 'liblo' 'libxpm' 'libxv' 'portmidi') makedepends=('qt4') optdepends=('qt4: for the GUI (qjadeo)') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" "qjadeo.desktop") install="$pkgname.install" -md5sums=('477e1140f1f3c4a89243bf7310aa9907' +md5sums=('9530c3b7b294e3abeb641640512984fc' '315e2ab44ce3edf4068ff6db48942908') build() { diff --git a/community/xkbsel/PKGBUILD b/community/xkbsel/PKGBUILD index cdbf53f43..0fcdd1956 100644 --- a/community/xkbsel/PKGBUILD +++ b/community/xkbsel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100458 2013-11-04 12:14:04Z spupykin $ +# $Id: PKGBUILD 101044 2013-11-15 12:43:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xkbsel pkgver=0.13 -pkgrel=6 +pkgrel=7 pkgdesc="framework for defining, selecting and indicating XKB keyboard mappings" arch=('i686' 'x86_64') url="http://www.meduna.org/sw_xkbsel_en.html" @@ -16,10 +16,15 @@ source=(http://www.meduna.org/code/$pkgname-$pkgver.tar.gz md5sums=('c82196344ef920a072f413df85b9dc00' 'dee0f7de8618d9eff073942f0e08f030') +prepare() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|\${CC-cc}|${CC-cc} -O2 |g' ./configure +} + build() { cd $srcdir/$pkgname-$pkgver - autoreconf +# autoreconf patch -Np1 <../build-fix.patch export CFLAGS="$CFLAGS -I/usr/include/gdbm -DHAVE_NDBM_H" diff --git a/community/xmind/PKGBUILD b/community/xmind/PKGBUILD index c49b9a5c0..be506239e 100644 --- a/community/xmind/PKGBUILD +++ b/community/xmind/PKGBUILD @@ -4,9 +4,9 @@ # Contributor: Jelle van der Waa <jellevdwaa@gmail.com> pkgname=xmind -pkgver=3.3.1 -_pkgdate=201212250029 -pkgrel=2 +pkgver=3.4.0 +_pkgdate=201311050558 +pkgrel=1 pkgdesc="Brainstorming and Mind Mapping Software" arch=('i686' 'x86_64') [ "${CARCH}" = "i686" ] && _arch="i386" @@ -17,8 +17,8 @@ depends=('desktop-file-utils' 'fontconfig' 'libxrender' 'java-runtime' 'shared-m optdepends=('lame: needed for the feature audio notes') install=xmind.install source=(http://dl2.xmind.net/xmind-downloads/${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb) -[ "${CARCH}" = "i686" ] && md5sums=('53d55f189879b4d2f27eb214456c754b') -[ "${CARCH}" = "x86_64" ] && md5sums=('a31c55dab417a8281ec4211f4ac111d7') +[ "${CARCH}" = "i686" ] && md5sums=('7e5d4a8218397cdefa5a6c4ecaed7cbd') +[ "${CARCH}" = "x86_64" ] && md5sums=('6dcaeb46ab9b88c1904f594b9b1eebc8') build() { cd "${srcdir}" @@ -54,3 +54,4 @@ package() { sed -i s!/usr/local/xmind/xmind-logo-36.png!xmind.png! \ "${pkgdir}"/usr/share/applications/xmind.desktop } + diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD index 7b4a527f0..729ad49e5 100755 --- a/community/xnoise/PKGBUILD +++ b/community/xnoise/PKGBUILD @@ -1,37 +1,37 @@ -# $Id: PKGBUILD 100022 2013-10-31 03:03:33Z allan $ +# $Id: PKGBUILD 102565 2013-12-15 04:07:27Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: archtux <antonio dot arias99999 at gmail dot com> pkgname=xnoise -pkgver=0.2.19 +pkgver=0.2.20 pkgrel=1 pkgdesc="Media player with a slick GUI, great speed and lots of features." arch=('i686' 'x86_64') url="http://www.xnoise-media-player.com/" license=('GPL2') -depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo' 'librsvg' 'vala') +depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo>=0.2' 'librsvg') optdepends=('gst-plugins-base: Basic media codecs' 'gst-plugins-bad: Extra media codecs' 'gst-plugins-ugly: Extra media codecs' 'gst-libav: Extra media codecs' 'gvfs: Needed for fetching album art') -makedepends=('gettext' 'intltool') +makedepends=('vala' 'intltool') install=$pkgname.install source=("https://bitbucket.org/shuerhaaken/xnoise/downloads/$pkgname-$pkgver.tar.gz") build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install # Remove obsolete files rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala" } -sha512sums=('3c3a735d005704342d2c27c36738b91f850e2630b431edfc1def5d26f836dc0df1ef752ca8d1eec3e90702eb27f78e46970a147a64c2156fbe53c8471eb978cb') +sha512sums=('d2bcf7c8fa542ef9703a831583ab90e1a03f00a0740b068966cb8bf5c76475832cf04eb55b9f14ac1c5aa50536d8e3965ac3e0d22503af44e1af8e7f908d2390') diff --git a/community/xplanet/PKGBUILD b/community/xplanet/PKGBUILD index a05cfd112..8da9880f9 100644 --- a/community/xplanet/PKGBUILD +++ b/community/xplanet/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 94933 2013-08-01 07:01:30Z bpiotrowski $ +# $Id: PKGBUILD 101195 2013-11-19 11:02:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=xplanet pkgver=1.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="An Xearth wannabe" arch=(i686 x86_64) url="http://xplanet.sourceforge.net/" license=('GPL') -depends=('pango' 'libungif' 'libtiff' 'libxss') +depends=('pango' 'giflib' 'libtiff' 'libxss') source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz giflib6.patch) md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692' @@ -23,7 +23,6 @@ prepare() { build() { cd $srcdir/$pkgname-$pkgver - unset LDFLAGS ./configure --prefix=/usr --with-freetype make } diff --git a/community/xulrunner/PKGBUILD b/community/xulrunner/PKGBUILD new file mode 100644 index 000000000..fe3c629d2 --- /dev/null +++ b/community/xulrunner/PKGBUILD @@ -0,0 +1,68 @@ +# $Id: PKGBUILD 103127 2013-12-26 20:12:06Z bpiotrowski $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=xulrunner +pkgver=23.0.1 +pkgrel=1 +pkgdesc="Mozilla Runtime Environment" +arch=('i686' 'x86_64') +license=('MPL' 'GPL' 'LGPL') +depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13') +url="http://wiki.mozilla.org/XUL:Xul_Runner" +source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2 + mozconfig + mozilla-pkgconfig.patch + shared-libs.patch) +options=('!emptydirs') +replaces=('xulrunner-oss') +sha256sums=('50d70813cee1c966a6037957206626bb62dc047b011d2e4fab11c559008f9336' + '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f' + '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' + 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') + +prepare() { + cd "$srcdir/mozilla-release" + cp "$srcdir/mozconfig" .mozconfig + + #fix libdir/sdkdir - fedora + patch -Np1 -i ../mozilla-pkgconfig.patch + patch -Np1 -i ../shared-libs.patch + + # WebRTC build tries to execute "python" and expects Python 2 + # Workaround taken from chromium PKGBUILD + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure +} + +build() { + cd "$srcdir/mozilla-release" + + export PATH="$srcdir/python2-path:$PATH" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" + + # add xulrunner library path to ld.so.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf + + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ + "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py +} diff --git a/community/xulrunner/mozconfig b/community/xulrunner/mozconfig new file mode 100644 index 000000000..6679dac21 --- /dev/null +++ b/community/xulrunner/mozconfig @@ -0,0 +1,29 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +#ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-startup-notification +#ac_add_options --enable-gstreamer + +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-installer diff --git a/community/xulrunner/mozilla-pkgconfig.patch b/community/xulrunner/mozilla-pkgconfig.patch new file mode 100644 index 000000000..037d4aee0 --- /dev/null +++ b/community/xulrunner/mozilla-pkgconfig.patch @@ -0,0 +1,40 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 +@@ -6,5 +6,6 @@ + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE diff --git a/community/xulrunner/shared-libs.patch b/community/xulrunner/shared-libs.patch new file mode 100644 index 000000000..1f22b2b0d --- /dev/null +++ b/community/xulrunner/shared-libs.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in +--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 ++++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 +@@ -50,7 +50,7 @@ + MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in + # Some files have been already bundled with xulrunner + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/community/yabause-gtk/PKGBUILD b/community/yabause-gtk/PKGBUILD index 64e3e1852..55d4c6681 100755 --- a/community/yabause-gtk/PKGBUILD +++ b/community/yabause-gtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86073 2013-03-11 21:44:40Z alucryd $ +# $Id: PKGBUILD 102820 2013-12-21 04:37:57Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Harley Laue <losinggeneration@gmail.com> # Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr> @@ -7,8 +7,8 @@ # Contributor: robb_force <robb_force@holybuffalo.net> pkgname=yabause-gtk -pkgver=0.9.12 -pkgrel=2 +pkgver=0.9.13 +pkgrel=1 pkgdesc='A Sega Saturn emulator' arch=('i686' 'x86_64') url="http://yabause.org/" @@ -17,26 +17,29 @@ depends=('freeglut' 'gtkglext' 'openal' 'sdl') makedepends=('cmake' 'mesa') conflicts=('yabause-qt') source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname%-*}-${pkgver}.tar.gz" 'rwx.patch') -sha256sums=('f45c9649c379e1e790856f8dfa37d93be5638e8f697319b241951316f817bfb1' +sha256sums=('3913f9c57bb65912eb22a339ec6f9413e0c00c11105baeae6a165b84ad4d32fb' 'd29997d3249683081a2687f31e777f917093101d56815d22103aaaf22ac786b1') -build() { - cd "${srcdir}"/${pkgname%-*}-${pkgver} +prepare() { + cd ${pkgname%-*}-${pkgver} -# Patch - patch -Np1 -i "${srcdir}"/rwx.patch + patch -Np1 -i ../rwx.patch +} + +build() { + cd ${pkgname%-*}-${pkgver} -# Build if [[ -d build ]]; then rm -rf build fi mkdir build && cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=on -DYAB_PERKEYNAME=ON + + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -DYAB_{PORTS='gtk',{NETWORK,OPTIMIZED_DMA}='ON'} make } package() { - cd "${srcdir}"/${pkgname%-*}-${pkgver}/build + cd ${pkgname%-*}-${pkgver}/build # Install make DESTDIR="${pkgdir}" install diff --git a/community/yabause-qt/PKGBUILD b/community/yabause-qt/PKGBUILD index d8d2092f1..881f959e2 100755 --- a/community/yabause-qt/PKGBUILD +++ b/community/yabause-qt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86075 2013-03-11 21:47:54Z alucryd $ +# $Id: PKGBUILD 102822 2013-12-21 05:06:07Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Harley Laue <losinggeneration@gmail.com> # Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr> @@ -7,7 +7,7 @@ # Contributor: robb_force <robb_force@holybuffalo.net> pkgname=yabause-qt -pkgver=0.9.12 +pkgver=0.9.13 pkgrel=1 pkgdesc='A Sega Saturn emulator' arch=('i686' 'x86_64') @@ -17,28 +17,30 @@ depends=('freeglut' 'mesa' 'openal' 'qt4' 'sdl') makedepends=('cmake' 'glu') conflicts=('yabause-gtk') source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname%-*}-${pkgver}.tar.gz" 'rwx.patch') -sha256sums=('f45c9649c379e1e790856f8dfa37d93be5638e8f697319b241951316f817bfb1' +sha256sums=('3913f9c57bb65912eb22a339ec6f9413e0c00c11105baeae6a165b84ad4d32fb' 'd29997d3249683081a2687f31e777f917093101d56815d22103aaaf22ac786b1') -build() { - cd "${srcdir}"/${pkgname%-*}-${pkgver} +prepare() { + cd ${pkgname%-*}-${pkgver} -# Patch - patch -Np1 -i "${srcdir}"/rwx.patch + patch -Np1 -i ../rwx.patch +} + +build() { + cd ${pkgname%-*}-${pkgver} -# Build if [[ -d build ]]; then rm -rf build fi mkdir build && cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DYAB_PORTS=qt -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=on -DYAB_PERKEYNAME=ON + + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -DYAB_{PORTS='qt',{NETWORK,OPTIMIZED_DMA}='ON'} make } package() { - cd "${srcdir}"/${pkgname%-*}-${pkgver}/build + cd ${pkgname%-*}-${pkgver}/build -# Install make DESTDIR="${pkgdir}" install } diff --git a/community/zathura-djvu/PKGBUILD b/community/zathura-djvu/PKGBUILD index 6d83912ef..87380a769 100644 --- a/community/zathura-djvu/PKGBUILD +++ b/community/zathura-djvu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91452 2013-05-22 23:23:11Z dwallace $ +# $Id: PKGBUILD 100916 2013-11-13 11:13:50Z spupykin $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-djvu pkgver=0.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="Adds DjVu support to zathura by using the djvulibre library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/" diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD index 059d7076a..e3c4a653a 100644 --- a/community/zathura-pdf-mupdf/PKGBUILD +++ b/community/zathura-pdf-mupdf/PKGBUILD @@ -5,7 +5,7 @@ pkgname=zathura-pdf-mupdf pkgver=0.2.5 -pkgrel=2 +pkgrel=3 pkgdesc="Adds pdf support to zathura by using the mupdf library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/" diff --git a/community/zathura-pdf-poppler/PKGBUILD b/community/zathura-pdf-poppler/PKGBUILD index 14498ce13..69ce6a14f 100644 --- a/community/zathura-pdf-poppler/PKGBUILD +++ b/community/zathura-pdf-poppler/PKGBUILD @@ -4,17 +4,16 @@ # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-pdf-poppler -pkgver=0.2.3 -pkgrel=2 +pkgver=0.2.4 +pkgrel=1 pkgdesc="Adds pdf support to zathura by using the poppler engine" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/" license=('custom') depends=('poppler-glib' 'zathura') install="$pkgname.install" - source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") -md5sums=('1d8deb2d2ee5a6847267f977b8f2e542') +md5sums=('7a3781a251687d316fcd8bf3df120d9f') build() { make -C "${srcdir}/$pkgname-$pkgver" diff --git a/community/zathura-ps/PKGBUILD b/community/zathura-ps/PKGBUILD index 9440bf22d..af3bd36f0 100644 --- a/community/zathura-ps/PKGBUILD +++ b/community/zathura-ps/PKGBUILD @@ -4,7 +4,7 @@ pkgname=zathura-ps pkgver=0.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="Adds ps support to zathura by using the libspectre library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-ps/" diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index 26c67cfa0..5c8a114f8 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,33 +1,33 @@ -# $Id: PKGBUILD 95629 2013-08-15 09:04:56Z spupykin $ +# $Id: PKGBUILD 101400 2013-11-24 20:34:57Z spupykin $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura -pkgver=0.2.4 +pkgver=0.2.6 pkgrel=1 pkgdesc="a document viewer" arch=('i686' 'x86_64') url="http://pwmt.org/projects/zathura/" license=('custom') -depends=('girara-gtk2' 'sqlite' 'desktop-file-utils') +depends=('girara-gtk3' 'sqlite' 'desktop-file-utils' 'file') makedepends=('python2-docutils') optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-pdf-mupdf' 'zathura-ps') install=zathura.install source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz - bash-completion) -md5sums=('935c6e15f5b7688bf4024ec7fe45f064' + bash-completion) +md5sums=('d155a66ec1862550dfde5a50e3dd6d01' 'cac20c37f0e77ba62a8138788f4ccabb') build() { cd $srcdir/zathura-$pkgver sed -i 's/rst2man/&2/' config.mk - make ZATHURA_GTK_VERSION=2 + make } package() { cd $srcdir/zathura-$pkgver - make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=2 + make install DESTDIR=$pkgdir install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm0644 $srcdir/bash-completion $pkgdir/usr/share/bash-completion/completions/zathura } diff --git a/community/zbar/PKGBUILD b/community/zbar/PKGBUILD new file mode 100644 index 000000000..a18821a4b --- /dev/null +++ b/community/zbar/PKGBUILD @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Marti Raudsepp <marti@juffo.org> +# Contributor: Radu Andries <admiral0@tuxfamily.org> +# Contributor: Andy Weidenbaum <archbaum@gmail.com> + +pkgname=zbar +pkgver=0.10 +pkgrel=4 +pkgdesc="Application and library for reading bar codes from various sources" +arch=('i686' 'x86_64') +url="http://zbar.sourceforge.net/" +license=('LGPL') +depends=('imagemagick' 'libxv' 'python2' 'gtk2' 'qt4' 'pygtk' 'v4l-utils') +conflicts=('zbar-gtk' 'zbar-qt') +provides=("zbar-gtk=$pkgver" "zbar-qt=$pkgver") +source=("http://downloads.sourceforge.net/project/zbar/zbar/$pkgver/zbar-$pkgver.tar.bz2" + v4l1.patch) + +build() { + cd zbar-$pkgver + + msg 'Patching...' + patch -p1 < ../v4l1.patch + + msg 'Running configure...' + ./configure --prefix=/usr --with-qt --with-gtk CFLAGS=-DNDEBUG + + msg 'Running make...' + make +} +package() { + cd zbar-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: +md5sums=('0fd61eb590ac1bab62a77913c8b086a5' + '284f11ca2a5e009744c4a1b9e92d6953') diff --git a/community/zbar/v4l1.patch b/community/zbar/v4l1.patch new file mode 100644 index 000000000..150b0e695 --- /dev/null +++ b/community/zbar/v4l1.patch @@ -0,0 +1,24 @@ +Thanks to Andy Weidenbaum <archbaum@gmail.com> for providing this patch! + +--- ./zbar/video/v4l1.c 2013-03-06 23:24:22.996336417 -0800 ++++ ./zbar/video/v4l1.c 2013-03-06 23:29:29.789662369 -0800 +@@ -41,7 +41,7 @@ + #ifdef HAVE_SYS_MMAN_H + # include <sys/mman.h> + #endif +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include "video.h" + #include "image.h" +--- ./configure 2009-10-23 11:17:24.000000000 -0700 ++++ ./configure 2013-03-06 23:47:33.902966990 -0800 +@@ -18709,7 +18709,7 @@ + if test "x$enable_video" != "xno"; then + if test "x$win32" = "xno"; then + +-for ac_header in linux/videodev.h ++for ac_header in libv4l1-videodev.h + do + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then diff --git a/community/zeromq/LIBZMQ-569.patch b/community/zeromq/LIBZMQ-569.patch deleted file mode 100644 index a1e27f622..000000000 --- a/community/zeromq/LIBZMQ-569.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7ecab54ac3b7a6103c46892990217acafb039eed Mon Sep 17 00:00:00 2001 -From: Martin Hurton <hurtonm@gmail.com> -Date: Fri, 21 Jun 2013 16:23:38 +0200 -Subject: [PATCH] Load identity message to decoder at start - ---- - src/stream_engine.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/stream_engine.cpp b/src/stream_engine.cpp -index 0d87581..2c07889 100644 ---- a/src/stream_engine.cpp -+++ b/src/stream_engine.cpp -@@ -480,6 +480,13 @@ bool zmq::stream_engine_t::handshake () - // header data away. - const size_t header_size = options.identity_size + 1 >= 255 ? 10 : 2; - unsigned char tmp [10], *bufferp = tmp; -+ -+ // Prepare the identity message and load it into encoder. -+ // Then consume bytes we have already sent to the peer. -+ const int rc = tx_msg.init_size (options.identity_size); -+ zmq_assert (rc == 0); -+ memcpy (tx_msg.data (), options.identity, options.identity_size); -+ encoder->load_msg (&tx_msg); - size_t buffer_size = encoder->encode (&bufferp, header_size); - zmq_assert (buffer_size == header_size); - --- -1.8.4 - diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD index 1e1da4244..6c3f2b7ba 100644 --- a/community/zeromq/PKGBUILD +++ b/community/zeromq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99117 2013-10-24 16:13:47Z mtorromeo $ +# $Id: PKGBUILD 102639 2013-12-17 01:13:09Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=zeromq -pkgver=4.0.1 -pkgrel=5 +pkgver=4.0.3 +pkgrel=1 pkgdesc="Fast messaging system built on sockets, C and C++ bindings. aka 0MQ, ZMQ." arch=('i686' 'x86_64') url="http://www.zeromq.org" @@ -11,16 +11,9 @@ depends=('gcc-libs' 'util-linux' 'libsodium') makedepends=('python2') options=('staticlibs') source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz - https://raw.github.com/zeromq/cppzmq/master/zmq.hpp - LIBZMQ-569.patch) -md5sums=('e738c310d135e20fa48c5b348da18e22' - '388ddb07fdd88b040769e8f4c9b397fa' - '2ef4f92027ec2b88e8eec86b2cccf2e4') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/LIBZMQ-569.patch" -} + https://raw.github.com/zeromq/cppzmq/master/zmq.hpp) +md5sums=('8348341a0ea577ff311630da0d624d45' + '388ddb07fdd88b040769e8f4c9b397fa') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/ziproxy/PKGBUILD b/community/ziproxy/PKGBUILD new file mode 100644 index 000000000..a9003f6dc --- /dev/null +++ b/community/ziproxy/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 102371 2013-12-09 14:56:17Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Yejun Yang yejunx AT gmail DOT com + +pkgname=ziproxy +pkgver=3.3.0 +pkgrel=4 +pkgdesc="forwarding, non-caching, compressing HTTP proxy server" +arch=('i686' 'x86_64') +url="http://ziproxy.sourceforge.net/" +license=('GPL2') +depends=('giflib' 'libpng' 'libjpeg' 'zlib' 'jasper' 'libsasl') +backup=(etc/ziproxy/ziproxy.conf + etc/ziproxy/bo_exception.list + etc/ziproxy/http.passwd + etc/ziproxy/noprocess.list + etc/ziproxy/replace.list + etc/xinetd.d/ziproxy + var/lib/ziproxy/error/400.html + var/lib/ziproxy/error/404.html + var/lib/ziproxy/error/407.html + var/lib/ziproxy/error/408.html + var/lib/ziproxy/error/409.html + var/lib/ziproxy/error/500.html + var/lib/ziproxy/error/503.html) +install=ziproxy.install +source=(http://downloads.sourceforge.net/project/ziproxy/ziproxy/ziproxy-$pkgver/ziproxy-$pkgver.tar.bz2 + ziproxy.logrotate + ziproxy.xinetd + build-fix.patch) +md5sums=('a8fda01591d455bb23c64c9c5ed3980d' + 'feb35264391c790cedd5e995182b5ff5' + '3d2f9208b5ab6738c136049e1fd2e433' + '0eb798863234ee0e9066812ef2a73539') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/build-fix.patch +} + +build() { + cd $srcdir/$pkgname-$pkgver + [ -f Makefile ] || ./configure --prefix=/usr --with-jasper + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + install -d $pkgdir/var/lib/ziproxy/error + install -d $pkgdir/etc/conf.d + + sed -i 's#var/ziproxy#var/lib/ziproxy#' etc/ziproxy/ziproxy.conf + cp -a etc/ziproxy $pkgdir/etc/ziproxy + install -m644 var/ziproxy/error/* $pkgdir/var/lib/ziproxy/error + echo "ZIPROXY_ARGS=\"-c /etc/ziproxy/ziproxy.conf\"" >$pkgdir/etc/conf.d/ziproxy + install -Dm0644 $srcdir/ziproxy.logrotate $pkgdir/etc/logrotate.d/ziproxy + install -Dm0644 $srcdir/ziproxy.xinetd $pkgdir/etc/xinetd.d/ziproxy +} diff --git a/community/ziproxy/build-fix.patch b/community/ziproxy/build-fix.patch new file mode 100644 index 000000000..fb23953b6 --- /dev/null +++ b/community/ziproxy/build-fix.patch @@ -0,0 +1,23 @@ +diff -wbBur ziproxy-3.3.0/src/image.c ziproxy-3.3.0.q/src/image.c +--- ziproxy-3.3.0/src/image.c 2013-01-04 20:48:50.000000000 +0400 ++++ ziproxy-3.3.0.q/src/image.c 2013-08-11 00:24:03.868670477 +0400 +@@ -93,6 +93,10 @@ + #define MIN_INSIZE_TO_JPEG 600 + #define MIN_INSIZE_TO_JP2K 800 + ++ ++#define false 0 ++#define true !!0 ++ + //Forwards. There are more utility functions, but they're used only once. + static raw_bitmap *new_raw_bitmap(); + +@@ -905,7 +909,7 @@ + desc.size=insize; + desc.x.pos=0; + +- if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input)) == NULL) ++ if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input, NULL)) == NULL) + return( IMG_RET_ERR_UNKNOWN + IMG_RET_FLG_WHILE_DECOMP);//more possible reasons + + bmp = new_raw_bitmap(); diff --git a/community/ziproxy/ziproxy.install b/community/ziproxy/ziproxy.install new file mode 100644 index 000000000..0f2e7a23f --- /dev/null +++ b/community/ziproxy/ziproxy.install @@ -0,0 +1,11 @@ +post_install() { + mkdir -p /var/log/ziproxy && \ + chown -R root:proxy /var/log/ziproxy && \ + chmod -R ug+w /var/log/ziproxy +} + +post_upgrade() { + mkdir -p /var/log/ziproxy && \ + chown -R root:proxy /var/log/ziproxy && \ + chmod -R ug+w /var/log/ziproxy +} diff --git a/community/ziproxy/ziproxy.logrotate b/community/ziproxy/ziproxy.logrotate new file mode 100644 index 000000000..7cadf5e71 --- /dev/null +++ b/community/ziproxy/ziproxy.logrotate @@ -0,0 +1,13 @@ +/var/log/ziproxy/access.log { + su root proxy + weekly + missingok + rotate 10 + compress + delaycompress + ifempty + nomail + postrotate + killall -HUP ziproxy 1>/dev/null 2>/dev/null || true + endscript +} diff --git a/community/ziproxy/ziproxy.xinetd b/community/ziproxy/ziproxy.xinetd new file mode 100644 index 000000000..195b72454 --- /dev/null +++ b/community/ziproxy/ziproxy.xinetd @@ -0,0 +1,14 @@ +service ziproxy +{ + port = 3128 + type = UNLISTED + disable = yes + socket_type = stream + wait = no + user = proxy + server = /usr/bin/ziproxy + server_args = -i + bind = 0.0.0.0 + log_on_success += HOST DURATION + log_on_failure += HOST +} diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index a840a834a..f75a0d819 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91707 2013-05-26 09:26:32Z bluewind $ +# $Id: PKGBUILD 100560 2013-11-05 20:58:10Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc -pkgver=1.0 -pkgrel=7 +pkgver=1.2 +pkgrel=1 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') @@ -18,7 +18,7 @@ optdepends=('tcl: modtcl module' 'cyrus-sasl: saslauth module') install=$pkgname.install source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz") -md5sums=('23807ca830c27392cccb6774f542df6e') +md5sums=('ef18e5402a82cc3fcab5c2ac5c2e6f3b') build() { cd $pkgname-$pkgver |
