Update LXDE.
authorMichael Büsch <mb@bu3sch.de>
Mon, 27 Sep 2010 21:40:21 +0000 (21:40 +0000)
committerMichael Büsch <mb@bu3sch.de>
Mon, 27 Sep 2010 21:40:21 +0000 (21:40 +0000)
lxterminal needs an updated version of VTE. This is currently being worked around by disabling a cursor shaping feature.

SVN-Revision: 23139

14 files changed:
lxde/apps/lxappearance/Makefile
lxde/apps/lxpanel/Makefile
lxde/apps/lxrandr/Makefile
lxde/apps/lxsession-edit/Makefile
lxde/apps/lxsession-edit/patches/100-compile-fixes.patch [new file with mode: 0644]
lxde/apps/lxsession-lite/Makefile
lxde/apps/lxshortcut/Makefile
lxde/apps/lxshortcut/patches/100-compile-fixes.patch [new file with mode: 0644]
lxde/apps/lxtask/Makefile
lxde/apps/lxterminal/Makefile
lxde/apps/lxterminal/patches/100-compile-fixes.patch [new file with mode: 0644]
lxde/data/lxde-common/Makefile
lxde/data/lxmenu-data/Makefile
lxde/libs/libmenu-cache/Makefile

index bed4a58e70ed95ac29762a39976a6a94a74f02ac..8ca00f1907e4361406c4be1e6f9b13248b2999f3 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxappearance
-PKG_VERSION:=0.2
+PKG_VERSION:=0.4.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/lxde
-PKG_MD5SUM:=28e436c13ab09af54ffc6b415407ca37
+PKG_MD5SUM:=751426a9c4b6090b9fabb8dde593c50a
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
index fd327ff8b5faa04f5b0c83cf03d24fee1138ec79..968e6ccba73331a882172f20745960d15d10d1b1 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxpanel
-PKG_VERSION:=0.3.99
+PKG_VERSION:=0.5.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/lxde
-PKG_MD5SUM:=91f020d385ee29dcfff820d5c77a0e4f
+PKG_MD5SUM:=3c6b5498b5f4109c3913b10a66809fe6
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
index 3ede3cfb7ffcb462aae9b570d0e3fbf5e547ae2c..373228b54dd9e9ea5f06913d3284f7ca91dbb702 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxrandr
-PKG_VERSION:=0.1
+PKG_VERSION:=0.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/lxde
-PKG_MD5SUM:=d70a41f0230a1b528d66015021b8fa0d
+PKG_MD5SUM:=ab2c7f6be7e4fe6d1a26e324d836453e
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
index 3d1742bb17b872c2c04abf9bbcacc2d9f61a2c6d..02a47f4488c063546fa2783605b4384973741e33 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxsession-edit
-PKG_VERSION:=0.1
+PKG_VERSION:=0.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/lxde
-PKG_MD5SUM:=1035b7e5b4edb96332df8ffd14bb9359
+PKG_MD5SUM:=55b4553869209e0932cc73e8daefc854
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
diff --git a/lxde/apps/lxsession-edit/patches/100-compile-fixes.patch b/lxde/apps/lxsession-edit/patches/100-compile-fixes.patch
new file mode 100644 (file)
index 0000000..554a0e1
--- /dev/null
@@ -0,0 +1,19 @@
+---
+ configure |    6 ------
+ 1 file changed, 6 deletions(-)
+
+--- lxsession-edit-0.1.1.orig/configure
++++ lxsession-edit-0.1.1/configure
+@@ -6174,12 +6174,6 @@ $as_echo "no" >&6; }
+ fi
+-if test "$GTK_BUILDER_CONVERT" = "false"; then
+-  { { $as_echo "$as_me:$LINENO: error: gtk-builder-convert not found" >&5
+-$as_echo "$as_me: error: gtk-builder-convert not found" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+ GETTEXT_PACKAGE=lxsession-edit
index 975d13ea400f2be957130a3eba2c11a3bea0765c..415faf9031f94e240014205b30c370a12af676e7 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxsession-lite
-PKG_VERSION:=0.3.6
+PKG_VERSION:=0.3.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/lxde
-PKG_MD5SUM:=909c3b0f4c6e4855f64dfbb47467c0b3
+PKG_MD5SUM:=4dc3e413f5a314e855ecc93bc67f6bd4
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
index dcae15b5843625a7f1bd27a08294e2d8c783d77c..e7235ccc5612e5e74c55c315d1e21c0607e87d16 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxshortcut
-PKG_VERSION:=0.1
+PKG_VERSION:=0.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/lxde
-PKG_MD5SUM:=63d1d0a4706b580d819b4d51fa057b25
+PKG_MD5SUM:=68419579deaecf696111bef97d3985bc
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
diff --git a/lxde/apps/lxshortcut/patches/100-compile-fixes.patch b/lxde/apps/lxshortcut/patches/100-compile-fixes.patch
new file mode 100644 (file)
index 0000000..e1f2982
--- /dev/null
@@ -0,0 +1,19 @@
+---
+ configure |    6 ------
+ 1 file changed, 6 deletions(-)
+
+--- lxshortcut-0.1.1.orig/configure
++++ lxshortcut-0.1.1/configure
+@@ -6042,12 +6042,6 @@ $as_echo "no" >&6; }
+ fi
+-if test "$GTK_BUILDER_CONVERT" = "false"; then
+-  { { $as_echo "$as_me:$LINENO: error: gtk-builder-convert not found" >&5
+-$as_echo "$as_me: error: gtk-builder-convert not found" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+ GETTEXT_PACKAGE=lxshortcut
index 15b6e83bc577e4cf1f85a369c4a254667818d69d..e78cb44730f9adbf5e60aa3c926468e4292a6436 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxtask
-PKG_VERSION:=0.1
+PKG_VERSION:=0.1.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/lxde
-PKG_MD5SUM:=e69b31ea8169bcf1d9b0c40c06a6e782
+PKG_MD5SUM:=eccfb69ee1a209248b22a5f0a34a4734
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
index ac4aad7af8f5254a7c311c4d7b735f98e4849026..87a97276882b8352e2748b4dd68b5ddc4db792f8 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxterminal
-PKG_VERSION:=0.1.4
+PKG_VERSION:=0.1.9
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/lxde
-PKG_MD5SUM:=996ca3002531a0f251ca06856d32b53b
+PKG_MD5SUM:=cb10cc667611dce3c141294712049c43
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
diff --git a/lxde/apps/lxterminal/patches/100-compile-fixes.patch b/lxde/apps/lxterminal/patches/100-compile-fixes.patch
new file mode 100644 (file)
index 0000000..5f14276
--- /dev/null
@@ -0,0 +1,28 @@
+---
+ src/lxterminal.c |    2 +-
+ src/lxterminal.h |    3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+--- lxterminal-0.1.9.orig/src/lxterminal.c
++++ lxterminal-0.1.9/src/lxterminal.c
+@@ -833,7 +833,7 @@ static void terminal_settings_apply_to_t
+     vte_terminal_set_scrollback_lines(VTE_TERMINAL(term->vte), setting->scrollback);
+     vte_terminal_set_allow_bold(VTE_TERMINAL(term->vte), ! setting->disallow_bold);
+     vte_terminal_set_cursor_blink_mode(VTE_TERMINAL(term->vte), ((setting->cursor_blink) ? VTE_CURSOR_BLINK_ON : VTE_CURSOR_BLINK_OFF));
+-    vte_terminal_set_cursor_shape(VTE_TERMINAL(term->vte), ((setting->cursor_underline) ? VTE_CURSOR_SHAPE_UNDERLINE : VTE_CURSOR_SHAPE_BLOCK));
++//    vte_terminal_set_cursor_shape(VTE_TERMINAL(term->vte), ((setting->cursor_underline) ? VTE_CURSOR_SHAPE_UNDERLINE : VTE_CURSOR_SHAPE_BLOCK));
+     vte_terminal_set_audible_bell(VTE_TERMINAL(term->vte), setting->audible_bell);
+     /* Background and foreground colors. */
+--- lxterminal-0.1.9.orig/src/lxterminal.h
++++ lxterminal-0.1.9/src/lxterminal.h
+@@ -23,6 +23,9 @@
+ #include "setting.h"
++#include <unistd.h>
++#include <sys/types.h>
++
+ #define NEW_WINDOW_ACCEL "<CTRL><SHIFT>N"
+ #define NEW_TAB_ACCEL "<CTRL><SHIFT>T"
+ #define CLOSE_TAB_ACCEL "<CTRL><SHIFT>W"
index c76c006bccfe6d732e2d7511b5e9e9b09a3d1809..c3fa694b2ea0de17b6d0163936057819a465fefd 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxde-common
-PKG_VERSION:=0.3.2.1
+PKG_VERSION:=0.5.0
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/lxde
-PKG_MD5SUM:=f30eee998071ace04e7be33aa8ac6a5b
+PKG_MD5SUM:=23606ab3d6e1039386d62a4b68b4ffc6
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
index 5695a93c74ea8f5dd9ddfc996954116e621a07e5..d70cf2b413e4e09b50e76d1e4ae08303e47d5a33 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxmenu-data
-PKG_VERSION:=0.1
+PKG_VERSION:=0.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/lxde
-PKG_MD5SUM:=1c35ad4bf05cd076ce4a9bb64a246351
+PKG_MD5SUM:=cee3181dd22088f3db0e99ffbedc986d
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
index 1ce1c3834481dbb53a83bd13c5dc95c1c52d92ba..9974f9332b017945f84c1e0d82c491397a3a5cf1 100644 (file)
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=menu-cache
-PKG_VERSION:=0.2.2
+PKG_VERSION:=0.3.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -52,12 +52,10 @@ define Build/InstallDev
 endef
 
 define Package/libmenu-cache/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) \
-               $(PKG_INSTALL_DIR)/usr/bin/menu-{cached,cache-gen} \
-               $(1)/usr/bin
-
        $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/lib/menu-{cached,cache-gen} \
+               $(1)/usr/lib/
        $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/*.so* \
                $(1)/usr/lib/