Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/virtualbox/PKGBUILD

2 files changed, 123 insertions, 5 deletions

diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD
index 92b897bd2..a01cf7932 100644
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@@ -1,9 +1,11 @@
-#$Id: PKGBUILD 56899 2011-10-16 07:36:44Z bpiotrowski $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>  
+#$Id: PKGBUILD 60017 2011-12-03 08:38:35Z 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.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK+ theme switcher of the LXDE Desktop (manages icons and fonts)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -11,17 +13,22 @@ url="http://lxde.org/"
 groups=('lxde')
 depends=('gtk2' 'intltool')
 makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz
+        gtk-3.0.patch)
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
+
+    patch -Np0 -i ../gtk-3.0.patch
     ./configure --sysconfdir=/etc --prefix=/usr 
     make 
 }
 
 package() {
     cd "$srcdir/$pkgname-$pkgver"
+
     make DESTDIR="$pkgdir" install 
 }
 
-md5sums=('34d157a7fe97ef0b93db8fab3f251e07')
+md5sums=('34d157a7fe97ef0b93db8fab3f251e07'
+         '58fd450329972be03181c98e7287f3ae')
diff --git a/community/lxappearance/gtk-3.0.patch b/community/lxappearance/gtk-3.0.patch
new file mode 100644
index 000000000..a65615cd7
--- /dev/null
+++ b/community/lxappearance/gtk-3.0.patch
@@ -0,0 +1,111 @@
+--- src/lxappearance.c	2011-07-29 16:50:19.000000000 +0200
++++ src/lxappearance1.c	2011-07-30 18:51:40.323368701 +0200
+@@ -153,21 +153,33 @@
+ 
+     char* file_path = g_build_filename(g_get_home_dir(), ".gtkrc-2.0", NULL);
+     GString* content = g_string_sized_new(512);
++    GString* content3 = g_string_sized_new(512);
+     g_string_append(content,
+         "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n"
+         "# Any customization should be done in ~/.gtkrc-2.0.mine instead.\n\n");
++    g_string_append(content3, "[Settings]\n"
++        "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n");
++    
+     if(app.widget_theme)
+         g_string_append_printf(content,
+             "gtk-theme-name=\"%s\"\n", app.widget_theme);
++        g_string_append_printf(content3,
++            "gtk-theme-name = %s\n", app.widget_theme);
+     if(app.icon_theme)
+         g_string_append_printf(content,
+-            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);
++            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);        
++        g_string_append_printf(content3,
++            "gtk-icon-theme-name = %s\n", app.icon_theme);
+     if(app.default_font)
+         g_string_append_printf(content,
+             "gtk-font-name=\"%s\"\n", app.default_font);
++        g_string_append_printf(content3,
++            "gtk-font-name = %s\n", app.default_font);
+     if(app.cursor_theme)
+         g_string_append_printf(content,
+             "gtk-cursor-theme-name=\"%s\"\n", app.cursor_theme);
++        g_string_append_printf(content3,
++            "gtk-cursor-theme-name = %s\n", app.cursor_theme);
+     save_cursor_theme_name();
+ 
+     g_string_append_printf(content,
+@@ -196,20 +208,46 @@
+         app.enable_hinting ? 1 : 0
+         );
+ 
++   g_string_append_printf(content3,
++        "gtk-cursor-theme-size = %d\n"
++        "gtk-toolbar-style = %s\n"
++        "gtk-toolbar-icon-size = %s\n"
++        "gtk-button-images = %d\n"
++        "gtk-menu-images = %d\n"
++        "gtk-enable-event-sounds = %d\n"
++        "gtk-enable-input-feedback-sounds = %d\n"
++        "gtk-xft-antialias = %d\n"
++        "gtk-xft-hinting = %d\n",
++        app.cursor_theme_size,
++        tb_styles[app.toolbar_style],
++        tb_icon_sizes[app.toolbar_icon_size],
++        app.button_images ? 1 : 0,
++        app.menu_images ? 1 : 0,
++        app.enable_event_sound ? 1 : 0,
++        app.enable_input_feedback ? 1 : 0,
++        app.enable_antialising ? 1 : 0,
++        app.enable_hinting ? 1 : 0
++        );
++
+     if(app.hinting_style)
+         g_string_append_printf(content,
+             "gtk-xft-hintstyle=\"%s\"\n", app.hinting_style);
++        g_string_append_printf(content3,
++            "gtk-xft-hintstyle = %s\n", app.hinting_style);
+ 
+     if(app.font_rgba)
+         g_string_append_printf(content,
+             "gtk-xft-rgba=\"%s\"\n", app.font_rgba);
++        g_string_append_printf(content3,
++            "gtk-xft-rgba = %s\n", app.font_rgba);
+ 
+     if(app.color_scheme)
+     {
+         char* escaped = g_strescape(app.color_scheme, NULL);
+         g_string_append_printf(content,
+-            "gtk-color-scheme=\"%s\"\n",
+-            escaped);
++            "gtk-color-scheme=\"%s\"\n", escaped);
++        g_string_append_printf(content3,
++            "gtk-color-scheme = %s\n", escaped);
+         g_free(escaped);
+     }
+ 
+@@ -218,20 +256,20 @@
+         g_get_home_dir());
+ 
+     g_file_set_contents(file_path, content->str, content->len, NULL);
++    g_string_free(content, TRUE);
+ 
+     /* Save also for GTK3 */
+-    g_string_prepend(content, "[Settings] \n");
+-    char* file_path_gtk3 = g_build_filename(g_get_home_dir(), "gtk-3.0", NULL);
+-    char* file_path_settings = g_build_filename(g_get_home_dir(), "gtk-3.0", "settings.ini", NULL);
++    char* file_path_gtk3 = g_build_filename(g_get_user_config_dir(), "gtk-3.0", NULL);
++    char* file_path_settings = g_build_filename(g_get_user_config_dir(), "gtk-3.0", "settings.ini", NULL);
+ 
+     if (!g_file_test(file_path_gtk3, G_FILE_TEST_IS_DIR))
+     {
+         g_mkdir_with_parents(file_path_gtk3, 0755);
+     }
+ 
+-    g_file_set_contents(file_path_settings, content->str, content->len, NULL);
++    g_file_set_contents(file_path_settings, content3->str, content3->len, NULL);
+ 
+-    g_string_free(content, TRUE);
++    g_string_free(content3, TRUE);
+     g_free(file_path);
+ }