Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/espeak/PKGBUILD
	core/openldap/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD

6 files changed, 106 insertions, 194 deletions

diff --git a/community/lxlauncher/PKGBUILD b/community/lxlauncher/PKGBUILD
index 4103bc29a..63592c1d1 100644
--- a/community/lxlauncher/PKGBUILD
+++ b/community/lxlauncher/PKGBUILD
@@ -1,28 +1,36 @@
-# $Id: PKGBUILD 93768 2013-07-10 07:02:47Z bpiotrowski $
+# $Id: PKGBUILD 96678 2013-09-03 01:34:25Z bgyorgy $
 # Maintainer:  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=3
+pkgrel=4
 pkgdesc='Open source clone of the Asus launcher for EeePC'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url='http://lxde.org/'
 groups=('lxde')
-depends=('gtk2' 'startup-notification' 'gnome-menus' 'menu-cache' 'intltool')
-makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz)
-md5sums=('16df627447838b170a72cc3a9ee21497')
+depends=('gtk2' 'startup-notification' 'lxmenu-data' 'menu-cache')
+makedepends=('intltool')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz
+        fix-empty-launcher.patch)
+md5sums=('16df627447838b170a72cc3a9ee21497'
+         '4dd715f9cccf04ef87c662cee1dcb798')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix empty launcher
+  patch -Np1 -i ../fix-empty-launcher.patch
+}
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --sysconfdir=/etc --prefix=/usr 
-  make 
+  ./configure --sysconfdir=/etc --prefix=/usr
+  make
 }
 
 package() {
   cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install 
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/lxlauncher/fix-empty-launcher.patch b/community/lxlauncher/fix-empty-launcher.patch
new file mode 100644
index 000000000..20efe1a6b
--- /dev/null
+++ b/community/lxlauncher/fix-empty-launcher.patch
@@ -0,0 +1,89 @@
+From 56a244f2aa3c474b2506847ba9a2f5a21cb8efc2 Mon Sep 17 00:00:00 2001
+From: Julien Lavergne <julien.lavergne@gmail.com>
+Date: Tue, 26 Jul 2011 01:21:04 +0200
+Subject: [PATCH] Fix GtkAllocation to fix empty lxlauncher
+
+---
+ src/exo-wrap-table.c |   26 ++++++++++++++++----------
+ 1 files changed, 16 insertions(+), 10 deletions(-)
+
+diff --git a/src/exo-wrap-table.c b/src/exo-wrap-table.c
+index c691434..f48322f 100644
+--- a/src/exo-wrap-table.c
++++ b/src/exo-wrap-table.c
+@@ -326,14 +326,14 @@ exo_wrap_table_size_request (GtkWidget      *widget,
+   if (G_LIKELY (num_children > 0))
+     {
+ #if GTK_CHECK_VERSION(2,18,0)
+-      GtkAllocation allocation;
+-      gtk_widget_set_allocation(widget, &allocation);
+-      num_cols = exo_wrap_table_get_num_fitting (allocation.width
++      GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
++      gtk_widget_get_allocation(GTK_WIDGET(widget), allocation);
++      num_cols = exo_wrap_table_get_num_fitting (allocation->width
+                                                  - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2,
+                                                  table->priv->col_spacing, max_width);
+ #else
+       num_cols = exo_wrap_table_get_num_fitting (widget->allocation.width
+-                                                 - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2,
++                                                 - GTK_CONTAINER (widget)->border_width * 2,
+                                                  table->priv->col_spacing, max_width);
+ #endif
+       num_rows = num_children / num_cols;
+@@ -345,7 +345,12 @@ exo_wrap_table_size_request (GtkWidget      *widget,
+       requisition->width = -1;
+       requisition->height = (num_rows * max_height)
+                          + (num_rows - 1) * table->priv->col_spacing
++#if GTK_CHECK_VERSION(2,18,0)
+                          + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2;
++      g_free (allocation);
++#else
++                         + GTK_CONTAINER (widget)->border_width * 2;
++#endif
+     }
+   else
+     {
+@@ -479,8 +484,8 @@ exo_wrap_table_layout (ExoWrapTable *table)
+   gint           max_height;
+   gint           max_width;
+ #if GTK_CHECK_VERSION(2,18,0)
+-  GtkAllocation allocation;
+-  gtk_widget_set_allocation(GTK_WIDGET(table), &allocation);
++  GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
++  gtk_widget_get_allocation(GTK_WIDGET(table), allocation);
+ #endif
+ 
+   /* determine the number of visible children and the max size */
+@@ -490,7 +495,7 @@ exo_wrap_table_layout (ExoWrapTable *table)
+ 
+   /* determine the number of columns */
+ #if GTK_CHECK_VERSION(2,18,0)
+-  num_cols = exo_wrap_table_get_num_fitting (allocation.width
++  num_cols = exo_wrap_table_get_num_fitting (allocation->width
+                                              - gtk_container_get_border_width(GTK_CONTAINER (table)) * 2,
+                                              table->priv->col_spacing, max_width);
+ #else
+@@ -509,8 +514,8 @@ exo_wrap_table_layout (ExoWrapTable *table)
+ 
+   /* determine the horizontal bounds */
+ #if GTK_CHECK_VERSION(2,18,0)
+-  x0 = allocation.x + gtk_container_get_border_width(GTK_CONTAINER (table));
+-  x1 = x0 + allocation.width - gtk_container_get_border_width(GTK_CONTAINER (table));
++  x0 = allocation->x + gtk_container_get_border_width(GTK_CONTAINER (table));
++  x1 = x0 + allocation->width - gtk_container_get_border_width(GTK_CONTAINER (table));
+ #else
+   x0 = GTK_WIDGET (table)->allocation.x + GTK_CONTAINER (table)->border_width;
+   x1 = x0 + GTK_WIDGET (table)->allocation.width - GTK_CONTAINER (table)->border_width;
+@@ -519,7 +524,8 @@ exo_wrap_table_layout (ExoWrapTable *table)
+   /* initialize the position */
+   x = x0;
+ #if GTK_CHECK_VERSION(2,18,0)
+-  y = allocation.y + gtk_container_get_border_width(GTK_CONTAINER (table));
++  y = allocation->y + gtk_container_get_border_width(GTK_CONTAINER (table));
++  g_free (allocation);
+ #else
+   y = GTK_WIDGET (table)->allocation.y + GTK_CONTAINER (table)->border_width;
+ #endif
+-- 
+1.7.4.1
+
diff --git a/community/lxlauncher/intltool.patch b/community/lxlauncher/intltool.patch
deleted file mode 100644
index 3829806c8..000000000
--- a/community/lxlauncher/intltool.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -NrU5 lxlauncher-0.2.1.original/configure.in lxlauncher-0.2.1/configure.in
---- lxlauncher-0.2.1.original/configure.in	2009-07-18 21:49:07.000000000 -0600
-+++ lxlauncher-0.2.1/configure.in	2009-07-18 21:49:50.000000000 -0600
-@@ -2,10 +2,11 @@
- 
- AC_INIT(configure.in)
- AM_INIT_AUTOMAKE(lxlauncher, 0.2.1)
- AM_CONFIG_HEADER(config.h)
- AM_MAINTAINER_MODE
-+IT_PROG_INTLTOOL
- 
- AC_ISC_POSIX
- AC_PROG_CC
- AM_PROG_CC_STDC
- AC_HEADER_STDC
-
diff --git a/community/lxlauncher/lxlauncher-0.2.1-dsofix.patch b/community/lxlauncher/lxlauncher-0.2.1-dsofix.patch
deleted file mode 100644
index 7ee0c1c68..000000000
--- a/community/lxlauncher/lxlauncher-0.2.1-dsofix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur lxlauncher-0.2.1.orig/src/Makefile.in lxlauncher-0.2.1/src/Makefile.in
---- lxlauncher-0.2.1.orig/src/Makefile.in	2009-07-07 14:46:41.000000000 +0200
-+++ lxlauncher-0.2.1/src/Makefile.in	2010-02-17 13:34:43.000000000 +0100
-@@ -101,7 +101,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lX11
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LTLIBOBJS = @LTLIBOBJS@
diff --git a/community/lxlauncher/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch b/community/lxlauncher/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch
deleted file mode 100644
index 49a4b3488..000000000
--- a/community/lxlauncher/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From cb99b126dd90a8460c5bd4a837fdb7505658ba52 Mon Sep 17 00:00:00 2001
-From: martyj19 <martyj19@comcast.net>
-Date: Mon, 13 Jul 2009 16:46:09 +0000
-Subject: [PATCH 02/50] Fix SUSE lint warnings
-
----
- src/lxlauncher.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/lxlauncher.c b/src/lxlauncher.c
-index 7dab830..034d308 100644
---- a/src/lxlauncher.c
-+++ b/src/lxlauncher.c
-@@ -311,6 +311,7 @@ static gboolean on_scroll( GtkAdjustment* adj, PageData* data )
- {
-     // Dirty hacks used to force pseudo-transparent background
-     gtk_widget_queue_draw( data->table );
-+    return TRUE;
- }
- 
- // Dirty hacks used to reduce unnecessary redrew during scroll
-@@ -674,6 +675,7 @@ gchar* get_xdg_config_file(const char *name) {
- 	}
- 	free(file);
-     }
-+    return NULL;
- }
- 
- int main(int argc, char** argv)
--- 
-1.6.6
-
diff --git a/community/lxlauncher/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch b/community/lxlauncher/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch
deleted file mode 100644
index 1720d3e62..000000000
--- a/community/lxlauncher/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From a7dad81b883a783bc1ac4f8092a1571b7f843914 Mon Sep 17 00:00:00 2001
-From: Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-Date: Wed, 17 Feb 2010 22:42:01 +0800
-Subject: [PATCH 50/50] Fix for the new behavior of libmenu-cache 0.3 series.
-
----
- src/lxlauncher.c |   67 +++++++++++++++++++++++++++++++++++++----------------
- 1 files changed, 47 insertions(+), 20 deletions(-)
-
-diff --git a/src/lxlauncher.c b/src/lxlauncher.c
-index 6dfbbc9..3a39bc6 100644
---- a/src/lxlauncher.c
-+++ b/src/lxlauncher.c
-@@ -663,21 +663,40 @@ gchar* get_xdg_config_file(const char *name) {
-     gchar *file;
- 
-     file = g_build_filename(user_dir, name, NULL);
--    if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE) {
--	return file;
--    }
-+    if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE)
-+    	return file;
-     free(file);
- 
-     for (dir = system_dirs; *dir; ++dir ) {
--	file = g_build_filename(*dir, name, NULL);
--	if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE) {
--	    return file;
--	}
--	free(file);
-+        file = g_build_filename(*dir, name, NULL);
-+        if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE)
-+            return file;
-+	    free(file);
-     }
-     return NULL;
- }
- 
-+static void on_menu_cache_reload(MenuCache* mc, gpointer user_data)
-+{
-+    GMainLoop* mainloop = (GMainLoop*)user_data;
-+    g_main_loop_quit(mainloop);
-+}
-+
-+MenuCache* _menu_cache_lookup_sync( const char* menu_name )
-+{
-+    MenuCache* mc = menu_cache_lookup(menu_name);
-+    /* ensure that the menu cache is loaded */
-+    if(! menu_cache_get_root_dir(mc)) /* if it's not yet loaded */
-+    {
-+        GMainLoop* mainloop = g_main_loop_new(NULL, FALSE);
-+        gpointer notify_id = menu_cache_add_reload_notify(mc, on_menu_cache_reload, mainloop);
-+        g_main_loop_run(mainloop);
-+        g_main_loop_unref(mainloop);
-+        menu_cache_remove_reload_notify(mc, notify_id);
-+    }
-+    return mc;
-+}
-+
- int main(int argc, char** argv)
- {
-     int i;
-@@ -697,13 +716,14 @@ int main(int argc, char** argv)
-     GError *error = NULL;
-     gchar *config_file = get_xdg_config_file(CONFIG_FILE);
-     if (config_file &&
--	g_key_file_load_from_file(key_file,
--				  config_file,
--				  G_KEY_FILE_NONE,
--				  &error)) {
--	printf("Loaded %s\n", config_file);
--    } else {
--	perror("Error loading " CONFIG_FILE);
-+        g_key_file_load_from_file(key_file,
-+                      config_file,
-+                      G_KEY_FILE_NONE,
-+                      &error)) {
-+    	printf("Loaded %s\n", config_file);
-+    }
-+    else {
-+    	perror("Error loading " CONFIG_FILE);
-     }
-     if (config_file)
- 	free(config_file);
-@@ -719,15 +739,17 @@ int main(int argc, char** argv)
-     gchar* gtkrc_file = get_xdg_config_file("lxlauncher/gtkrc");
-     gtk_rc_parse(gtkrc_file);
-     if (gtkrc_file) {
--	free(gtkrc_file);
-+    	free(gtkrc_file);
-     }
- 
-     button_size = g_key_file_get_integer(key_file, "Main", "BUTTON_SIZE", NULL);
-     img_size = g_key_file_get_integer(key_file, "Main", "IMG_SIZE", NULL);
- 
-     // to prevent from going without configure file
--    if(!button_size) button_size = BUTTON_SIZE_FALLBACK;
--    if(!img_size) img_size = IMG_SIZE_FALLBACK;
-+    if(!button_size)
-+        button_size = BUTTON_SIZE_FALLBACK;
-+    if(!img_size)
-+        img_size = IMG_SIZE_FALLBACK;
- 
-     icon_size = gtk_icon_size_register( "ALIcon", img_size, img_size );
- 
-@@ -758,9 +780,14 @@ int main(int argc, char** argv)
-     gtk_container_add( (GtkContainer*)main_window, notebook );
- 
-     g_setenv("XDG_MENU_PREFIX", "lxlauncher-", TRUE);
--    menu_tree = menu_cache_lookup( "applications.menu" );
-+    menu_tree = _menu_cache_lookup_sync( "applications.menu" );
-+    if(!menu_tree)
-+    {
-+        g_print("Unable to load application menu\n");
-+        return 1;
-+    }
-+    root_dir = menu_cache_item_ref(menu_cache_get_root_dir( menu_tree ));
-     reload_notify_id = menu_cache_add_reload_notify( menu_tree, on_menu_tree_changed, NULL );
--    root_dir = menu_cache_ref(menu_cache_get_root_dir( menu_tree ));
- 
-     create_notebook_pages();
- 
--- 
-1.6.6
-