[arch-commits] Commit in lxlauncher/repos (20 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Wed Jul 10 07:02:47 UTC 2013
Date: Wednesday, July 10, 2013 @ 09:02:47
Author: bpiotrowski
Revision: 93768
archrelease: copy trunk to community-i686, community-x86_64
Added:
lxlauncher/repos/community-i686/PKGBUILD
(from rev 93767, lxlauncher/trunk/PKGBUILD)
lxlauncher/repos/community-i686/intltool.patch
(from rev 93767, lxlauncher/trunk/intltool.patch)
lxlauncher/repos/community-i686/lxlauncher-0.2.1-dsofix.patch
(from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-dsofix.patch)
lxlauncher/repos/community-i686/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch
(from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch)
lxlauncher/repos/community-i686/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch
(from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch)
lxlauncher/repos/community-x86_64/PKGBUILD
(from rev 93767, lxlauncher/trunk/PKGBUILD)
lxlauncher/repos/community-x86_64/intltool.patch
(from rev 93767, lxlauncher/trunk/intltool.patch)
lxlauncher/repos/community-x86_64/lxlauncher-0.2.1-dsofix.patch
(from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-dsofix.patch)
lxlauncher/repos/community-x86_64/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch
(from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch)
lxlauncher/repos/community-x86_64/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch
(from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch)
Deleted:
lxlauncher/repos/community-i686/PKGBUILD
lxlauncher/repos/community-i686/intltool.patch
lxlauncher/repos/community-i686/lxlauncher-0.2.1-dsofix.patch
lxlauncher/repos/community-i686/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch
lxlauncher/repos/community-i686/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch
lxlauncher/repos/community-x86_64/PKGBUILD
lxlauncher/repos/community-x86_64/intltool.patch
lxlauncher/repos/community-x86_64/lxlauncher-0.2.1-dsofix.patch
lxlauncher/repos/community-x86_64/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch
lxlauncher/repos/community-x86_64/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch
----------------------------------------------------------------------------------------------+
/PKGBUILD | 56 ++
/intltool.patch | 32 +
/lxlauncher-0.2.1-dsofix.patch | 24
/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch | 64 ++
/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch | 250 ++++++++++
community-i686/PKGBUILD | 28 -
community-i686/intltool.patch | 16
community-i686/lxlauncher-0.2.1-dsofix.patch | 12
community-i686/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch | 32 -
community-i686/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch | 125 -----
community-x86_64/PKGBUILD | 28 -
community-x86_64/intltool.patch | 16
community-x86_64/lxlauncher-0.2.1-dsofix.patch | 12
community-x86_64/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch | 32 -
community-x86_64/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch | 125 -----
15 files changed, 426 insertions(+), 426 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-07-10 07:02:30 UTC (rev 93767)
+++ community-i686/PKGBUILD 2013-07-10 07:02:47 UTC (rev 93768)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-
-pkgname=lxlauncher
-pkgver=0.2.2
-pkgrel=2
-pkgdesc='Open source clone of the Asus launcher for EeePC'
-arch=('i686' 'x86_64')
-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')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --sysconfdir=/etc --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-}
Copied: lxlauncher/repos/community-i686/PKGBUILD (from rev 93767, lxlauncher/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-07-10 07:02:47 UTC (rev 93768)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+
+pkgname=lxlauncher
+pkgver=0.2.2
+pkgrel=3
+pkgdesc='Open source clone of the Asus launcher for EeePC'
+arch=('i686' 'x86_64')
+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')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-i686/intltool.patch
===================================================================
--- community-i686/intltool.patch 2013-07-10 07:02:30 UTC (rev 93767)
+++ community-i686/intltool.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -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
-
Copied: lxlauncher/repos/community-i686/intltool.patch (from rev 93767, lxlauncher/trunk/intltool.patch)
===================================================================
--- community-i686/intltool.patch (rev 0)
+++ community-i686/intltool.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -0,0 +1,16 @@
+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
+
Deleted: community-i686/lxlauncher-0.2.1-dsofix.patch
===================================================================
--- community-i686/lxlauncher-0.2.1-dsofix.patch 2013-07-10 07:02:30 UTC (rev 93767)
+++ community-i686/lxlauncher-0.2.1-dsofix.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -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@
Copied: lxlauncher/repos/community-i686/lxlauncher-0.2.1-dsofix.patch (from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-dsofix.patch)
===================================================================
--- community-i686/lxlauncher-0.2.1-dsofix.patch (rev 0)
+++ community-i686/lxlauncher-0.2.1-dsofix.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -0,0 +1,12 @@
+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@
Deleted: community-i686/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch
===================================================================
--- community-i686/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch 2013-07-10 07:02:30 UTC (rev 93767)
+++ community-i686/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -1,32 +0,0 @@
-From cb99b126dd90a8460c5bd4a837fdb7505658ba52 Mon Sep 17 00:00:00 2001
-From: martyj19 <martyj19 at 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
-
Copied: lxlauncher/repos/community-i686/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch (from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch)
===================================================================
--- community-i686/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch (rev 0)
+++ community-i686/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -0,0 +1,32 @@
+From cb99b126dd90a8460c5bd4a837fdb7505658ba52 Mon Sep 17 00:00:00 2001
+From: martyj19 <martyj19 at 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
+
Deleted: community-i686/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch
===================================================================
--- community-i686/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch 2013-07-10 07:02:30 UTC (rev 93767)
+++ community-i686/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -1,125 +0,0 @@
-From a7dad81b883a783bc1ac4f8092a1571b7f843914 Mon Sep 17 00:00:00 2001
-From: Hong Jen Yee (PCMan) <pcman.tw at 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
-
Copied: lxlauncher/repos/community-i686/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch (from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch)
===================================================================
--- community-i686/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch (rev 0)
+++ community-i686/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -0,0 +1,125 @@
+From a7dad81b883a783bc1ac4f8092a1571b7f843914 Mon Sep 17 00:00:00 2001
+From: Hong Jen Yee (PCMan) <pcman.tw at 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
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-07-10 07:02:30 UTC (rev 93767)
+++ community-x86_64/PKGBUILD 2013-07-10 07:02:47 UTC (rev 93768)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-
-pkgname=lxlauncher
-pkgver=0.2.2
-pkgrel=2
-pkgdesc='Open source clone of the Asus launcher for EeePC'
-arch=('i686' 'x86_64')
-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')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --sysconfdir=/etc --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-}
Copied: lxlauncher/repos/community-x86_64/PKGBUILD (from rev 93767, lxlauncher/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-07-10 07:02:47 UTC (rev 93768)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+
+pkgname=lxlauncher
+pkgver=0.2.2
+pkgrel=3
+pkgdesc='Open source clone of the Asus launcher for EeePC'
+arch=('i686' 'x86_64')
+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')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-x86_64/intltool.patch
===================================================================
--- community-x86_64/intltool.patch 2013-07-10 07:02:30 UTC (rev 93767)
+++ community-x86_64/intltool.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -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
-
Copied: lxlauncher/repos/community-x86_64/intltool.patch (from rev 93767, lxlauncher/trunk/intltool.patch)
===================================================================
--- community-x86_64/intltool.patch (rev 0)
+++ community-x86_64/intltool.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -0,0 +1,16 @@
+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
+
Deleted: community-x86_64/lxlauncher-0.2.1-dsofix.patch
===================================================================
--- community-x86_64/lxlauncher-0.2.1-dsofix.patch 2013-07-10 07:02:30 UTC (rev 93767)
+++ community-x86_64/lxlauncher-0.2.1-dsofix.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -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@
Copied: lxlauncher/repos/community-x86_64/lxlauncher-0.2.1-dsofix.patch (from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-dsofix.patch)
===================================================================
--- community-x86_64/lxlauncher-0.2.1-dsofix.patch (rev 0)
+++ community-x86_64/lxlauncher-0.2.1-dsofix.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -0,0 +1,12 @@
+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@
Deleted: community-x86_64/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch
===================================================================
--- community-x86_64/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch 2013-07-10 07:02:30 UTC (rev 93767)
+++ community-x86_64/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -1,32 +0,0 @@
-From cb99b126dd90a8460c5bd4a837fdb7505658ba52 Mon Sep 17 00:00:00 2001
-From: martyj19 <martyj19 at 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
-
Copied: lxlauncher/repos/community-x86_64/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch (from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch)
===================================================================
--- community-x86_64/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch (rev 0)
+++ community-x86_64/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -0,0 +1,32 @@
+From cb99b126dd90a8460c5bd4a837fdb7505658ba52 Mon Sep 17 00:00:00 2001
+From: martyj19 <martyj19 at 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
+
Deleted: community-x86_64/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch
===================================================================
--- community-x86_64/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch 2013-07-10 07:02:30 UTC (rev 93767)
+++ community-x86_64/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -1,125 +0,0 @@
-From a7dad81b883a783bc1ac4f8092a1571b7f843914 Mon Sep 17 00:00:00 2001
-From: Hong Jen Yee (PCMan) <pcman.tw at 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
-
Copied: lxlauncher/repos/community-x86_64/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch (from rev 93767, lxlauncher/trunk/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch)
===================================================================
--- community-x86_64/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch (rev 0)
+++ community-x86_64/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch 2013-07-10 07:02:47 UTC (rev 93768)
@@ -0,0 +1,125 @@
+From a7dad81b883a783bc1ac4f8092a1571b7f843914 Mon Sep 17 00:00:00 2001
+From: Hong Jen Yee (PCMan) <pcman.tw at 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
+
More information about the arch-commits
mailing list