Update xfce packages to 4.6.0

SVN-Revision: 14959

diff --git a/xfce/app/orage/Makefile b/xfce/app/orage/Makefile
index b44b99937aac02dc5270de0ba818bed3aaf718a3..cc2178e223fade85817f161780557a25c7f7a1d3 100644 (file)
--- a/xfce/app/orage/Makefile
+++ b/xfce/app/orage/Makefile
@@ -9,22 +9,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=orage
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=
+PKG_MD5SUM:=c3f71a922f9032119dbb1b37a09adf93
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-
 TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/orage

diff --git a/xfce/app/thunar/Makefile b/xfce/app/thunar/Makefile
index e6f3dd16a792b706cf6aa60648e72b4e1eed7d2c..231525db8f74f2c9fd6ac6e9ed1df3555034ed2b 100644 (file)
--- a/xfce/app/thunar/Makefile
+++ b/xfce/app/thunar/Makefile
@@ -9,13 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=thunar
-PKG_VERSION:=0.9.93
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=Thunar-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(BUILD_DIR)/Thunar-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-4.5.93/src/
-PKG_MD5SUM:=8fb12c28284503929732dea8c185c413
+PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-4.6.0/src/
+PKG_MD5SUM:=468c240a4f65a217ec2b6132e85cd84e
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -25,6 +26,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/libthunar-vfs
@@ -33,7 +35,7 @@ define Package/libthunar-vfs
   SUBMENU:=libraries
   TITLE:=thunar virtual filesystem library
   DEPENDS:=+libexo +libpng +libxfce4util +libgamin +libstartup-notification \
-           +xfce4-panel
+           +xfce4-panel +dbus-launch-x +gamin-server
 endef
 
 define Package/libthunarx

diff --git a/xfce/app/xarchiver/Makefile b/xfce/app/xarchiver/Makefile
index 976ab416f70a028685c4a8f944395feb7b215195..d9e86176575c4ad66149953e0120e160c2335d23 100644 (file)
--- a/xfce/app/xarchiver/Makefile
+++ b/xfce/app/xarchiver/Makefile
@@ -15,6 +15,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=d57dcae78473681d6cd3b8dcf6e5c3d1
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -24,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xarchiver

diff --git a/xfce/app/xfburn/Makefile b/xfce/app/xfburn/Makefile
index 1701765d7a1ed1fb3a9526773bcdb899b1a838dc..eded68756aa325245b04128089ae874973c4a516 100644 (file)
--- a/xfce/app/xfburn/Makefile
+++ b/xfce/app/xfburn/Makefile
@@ -15,6 +15,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://goodies.xfce.org/releases/$(PKG_NAME)
 PKG_MD5SUM:=621a59415138c191c25e3d30a5ed5742
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -24,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfburn

diff --git a/xfce/app/xfce-mousepad/Makefile b/xfce/app/xfce-mousepad/Makefile
index a7f806b260de548b0b877af6e02f7b050ebd3e29..36028cb10e649ff1d56de2bee31c2365070ac079 100644 (file)
--- a/xfce/app/xfce-mousepad/Makefile
+++ b/xfce/app/xfce-mousepad/Makefile
@@ -9,13 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfce-mousepad
-PKG_VERSION:=0.2.14
+PKG_VERSION:=0.2.16
 PKG_RELEASE:=1
 
 PKG_SOURCE:=mousepad-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(BUILD_DIR)/mousepad-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-4.4.3/src/
-PKG_MD5SUM:=6cfef0e424c778409e2791d0af6ab089
+PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-4.6.0/src/
+
+PKG_MD5SUM:=d98854edb76d823ac20b266fdf5a64a1
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -24,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfce-mousepad

diff --git a/xfce/app/xfce-terminal/Makefile b/xfce/app/xfce-terminal/Makefile
index 2996be43ab8a304d885dc25ea04d0edf46991166..6472b1d0a25b385f5178e3b46596464e1c8de4d7 100644 (file)
--- a/xfce/app/xfce-terminal/Makefile
+++ b/xfce/app/xfce-terminal/Makefile
@@ -9,13 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfce-terminal
-PKG_VERSION:=0.2.5.8rc2
+PKG_VERSION:=0.2.10
 PKG_RELEASE:=1
 
 PKG_SOURCE:=Terminal-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(BUILD_DIR)/Terminal-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://download.berlios.de/xfce-goodies/
-PKG_MD5SUM:=d2785c1b11c48ed012042faa708bbf94
+PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-4.6.0/src/
+
+PKG_MD5SUM:=f6cefa97cf5cad558187267783ffce8a
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -24,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfce-terminal
@@ -31,7 +33,16 @@ define Package/xfce-terminal
   CATEGORY:=Xorg
   SUBMENU:=app
   TITLE:=xfce-terminal
-  DEPENDS:=+libxfcegui4
+  DEPENDS:=+libxfcegui4 +vte
+endef
+
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --libexecdir=/usr/lib/xfce-terminal \
+               --enable-debug=no \
+               --disable-startup-notification \
+               --disable-dbus \
+       )
 endef
 
 define Package/xfce-terminal/install
@@ -56,13 +67,10 @@ define Package/xfce-terminal/install
                $(PKG_INSTALL_DIR)/usr/share/applications/* \
                $(1)/usr/share/applications/
 
-       $(INSTALL_DIR) $(1)/usr/share/Terminal/apps
+       $(INSTALL_DIR) $(1)/usr/share/Terminal
        $(INSTALL_DATA) \
                $(PKG_INSTALL_DIR)/usr/share/Terminal/*.ui \
                $(1)/usr/share/Terminal/
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/share/Terminal/apps/* \
-               $(1)/usr/share/Terminal/apps/
 endef
 
 $(eval $(call BuildPackage,xfce-terminal))

diff --git a/xfce/app/xfce-utils/Makefile b/xfce/app/xfce-utils/Makefile
index 155d65b4196a6fc91e6eaca4bbfe4c9f1a828bb4..5c85fd93ae2b2fef7428af0311494f0293f5a46d 100644 (file)
--- a/xfce/app/xfce-utils/Makefile
+++ b/xfce/app/xfce-utils/Makefile
@@ -9,22 +9,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfce-utils
-PKG_VERSION:=4.5.92
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=8700842ab643838910ec9adfa08aa01d
+PKG_MD5SUM:=b192940801a7bd9bb800e570a299ecde
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-
 TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfce-utils
@@ -32,7 +33,7 @@ define Package/xfce-utils
   CATEGORY:=Xorg
   SUBMENU:=app
   TITLE:=xfce-utils
-  DEPENDS:=+libxfce4util +libxfcegui4 +dbus
+  DEPENDS:=+libxfce4util +libxfcegui4 +dbus-launch-x
 endef
 
 define Build/Configure

diff --git a/xfce/app/xfce4-appfinder/Makefile b/xfce/app/xfce4-appfinder/Makefile
index c1537a34d210988f451789d7521f7a55f31bbdc8..31327d971b504440b2dacbb8b373e969d64bdacf 100644 (file)
--- a/xfce/app/xfce4-appfinder/Makefile
+++ b/xfce/app/xfce4-appfinder/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfce4-appfinder
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=75b37cd228cf85a85b36d227429fe9a3
+PKG_MD5SUM:=414b20e3569130348d96b0e74c7d1f3f
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -24,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfce4-appfinder

diff --git a/xfce/app/xfce4-mixer/Makefile b/xfce/app/xfce4-mixer/Makefile
index 43505e67e688c30b141d72a05a0d60bae97e5ffc..4e63d129132662bf7370fa3a7029b063476fd7b8 100644 (file)
--- a/xfce/app/xfce4-mixer/Makefile
+++ b/xfce/app/xfce4-mixer/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfce4-mixer
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=bb4c4b46873a576797c74e642da5c0ad
+PKG_MD5SUM:=ee7956a73efe43da4b27ad9cd1f4d20b
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -24,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfce4-mixer
@@ -31,7 +33,7 @@ define Package/xfce4-mixer
   CATEGORY:=Xorg
   SUBMENU:=app
   TITLE:=xfce4-mixer
-  DEPENDS:=+libxfce4util +libxfcegui4 +libxfce4panel +gst-plugins-base \
+  DEPENDS:=+libxfce4util +libxfcegui4 +xfce4-panel +gst-plugins-base \
   +xfce4-panel
 endef
 

diff --git a/xfce/app/xfce4-panel/Makefile b/xfce/app/xfce4-panel/Makefile
index 164bea71d467328cb42d0515ff78a97aae9885b8..a254cd64ee1ed823cf4800d712132b394703360b 100644 (file)
--- a/xfce/app/xfce4-panel/Makefile
+++ b/xfce/app/xfce4-panel/Makefile
@@ -9,22 +9,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfce4-panel
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src
-PKG_MD5SUM:=96c4cccf520aa789b267b14b491359ab
+PKG_MD5SUM:=b4c7cce05cc858d11c9dcd4c2f8dbfdb
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-
 TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib/
 
 define Package/libxfce4-panel

diff --git a/xfce/app/xfce4-session/Makefile b/xfce/app/xfce4-session/Makefile
index 6900f52ef7efb203677739af18095a93031cda33..76f263dd86d70b68eb6751922ce25acfa5465676 100644 (file)
--- a/xfce/app/xfce4-session/Makefile
+++ b/xfce/app/xfce4-session/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfce4-session
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=7d3b5f1400cc053ef01ad61e209d5828
+PKG_MD5SUM:=79a08c3696196ef31fc8185658316706
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -24,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfce4-session
@@ -31,7 +33,7 @@ define Package/xfce4-session
   CATEGORY:=Xorg
   SUBMENU:=app
   TITLE:=xfce4-session
-  DEPENDS:=+libxfce4util +libxfcegui4 +libwnck +dbus +libdbusgconf +libxfconf \
+  DEPENDS:=+libxfce4util +libxfcegui4 +libwnck +dbus +libdbus +libxfconf \
   +libglade +iceauth +libX11 +libSM +xfconf +thunar +xfce4-panel \
   +xfce4-settings +xfdesktop +xfce-utils +xfwm4
 endef

diff --git a/xfce/app/xfce4-settings/Makefile b/xfce/app/xfce4-settings/Makefile
index 11dfb8194509f96d66b1671457f947f078e40ef7..c2956f2419a6d86cfdf518f0f73c6f7eebe98d74 100644 (file)
--- a/xfce/app/xfce4-settings/Makefile
+++ b/xfce/app/xfce4-settings/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfce4-settings
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=3873c76afcb8f1d174381825fc0467cf
+PKG_MD5SUM:=ac538c4ab32e3a91f4567141adc3c898
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -25,6 +26,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfce4-settings

diff --git a/xfce/app/xfce4-settings/patches/010-fix-xfsettingsd-segfault.patch b/xfce/app/xfce4-settings/patches/010-fix-xfsettingsd-segfault.patch
deleted file mode 100644 (file)
index ead7118..0000000
--- a/xfce/app/xfce4-settings/patches/010-fix-xfsettingsd-segfault.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/xfsettingsd/registry.c b/xfsettingsd/registry.c
-index e868685..d2da4a1 100644
---- a/xfsettingsd/registry.c
-+++ b/xfsettingsd/registry.c
-@@ -302,13 +302,15 @@ xsettings_registry_store_xrdb(XSettingsRegistry *registry)
-     if (G_LIKELY (filename))
-     {
-         /* create file contents */
-+        const gchar *xft_rgba = g_value_get_string (&properties[XSETTING_ENTRY_XFT_RGBA].value);
-+        
-         string = g_string_sized_new (80);
-         g_string_append_printf (string, "Xft.antialias: %d\n"
-                                         "Xft.hinting: %d\n"
-                                         "Xft.rgba: %s\n",
-                                         g_value_get_int (&properties[XSETTING_ENTRY_XFT_ANTIALIAS].value),
-                                         g_value_get_int (&properties[XSETTING_ENTRY_XFT_HINTING].value),
--                                        g_value_get_string (&properties[XSETTING_ENTRY_XFT_RGBA].value));
-+                                        xft_rgba ? xft_rgba : "");
-         
-         if (g_value_get_int (&properties[XSETTING_ENTRY_XFT_HINTING].value))
-             g_string_append_printf (string, "Xft.hintstyle: %s\n", g_value_get_string (&properties[XSETTING_ENTRY_XFT_HINTSTYLE].value));
-@@ -355,10 +357,12 @@ xsettings_registry_store_xrdb(XSettingsRegistry *registry)
-     if (G_LIKELY (filename))
-     {
-         /* build file contents */
-+        const gchar *cursor_theme_name = g_value_get_string (&properties[XSETTING_ENTRY_GTK_CURSORTHEMENAME].value);
-+        
-         contents = g_strdup_printf ("Xcursor.theme: %s\n"
-                                     "Xcursor.theme_core: true\n"
-                                     "Xcursor.size: %d\n",
--                                    g_value_get_string (&properties[XSETTING_ENTRY_GTK_CURSORTHEMENAME].value),
-+                                    cursor_theme_name ? cursor_theme_name : "",
-                                     g_value_get_int (&properties[XSETTING_ENTRY_GTK_CURSORTHEMESIZE].value));
-         
-         /* write the contents to the file */

diff --git a/xfce/app/xfconf/Makefile b/xfce/app/xfconf/Makefile
index 5853995694e3fb05790316e0aa081ffd68d984f8..4b4351c207d85509e8f74f5443f6cd438e36d6df 100644 (file)
--- a/xfce/app/xfconf/Makefile
+++ b/xfce/app/xfconf/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfconf
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=d426da2c79f9741aeea7a55ce967ffa3
+PKG_MD5SUM:=38595f78379eb1f456e97b393fdafd20
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -24,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/libxfconf
@@ -31,7 +33,7 @@ define Package/libxfconf
   CATEGORY:=Xorg
   SUBMENU:=libraries
   TITLE:=libxfconf
-  DEPENDS:=+libxfce4util +dbus +libdbus-glib +gtk2
+  DEPENDS:=+libxfce4util +dbus +libdbus-glib +gtk2 +dbus-launch-x
 endef
 
 define Package/xfconf

diff --git a/xfce/app/xfdesktop/Makefile b/xfce/app/xfdesktop/Makefile
index 861f1aa33f5179c67ee964470814b862467c9cb8..1beb38e5c4461d0df3068b03d45585086287e49c 100644 (file)
--- a/xfce/app/xfdesktop/Makefile
+++ b/xfce/app/xfdesktop/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfdesktop
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=
+PKG_MD5SUM:=508b18f9d4ef27833517bba3bd6e2fbf
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -24,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfdesktop
@@ -31,7 +33,7 @@ define Package/xfdesktop
   CATEGORY:=Xorg
   SUBMENU:=app
   TITLE:=xfdesktop
-  DEPENDS:=+libxfce4util +libxfcegui4 +libxfconf +libwnck +libglade +thunar
+  DEPENDS:=+libxfce4util +libxfcegui4 +libxfce4menu +libxfconf +libwnck +libglade +thunar
 endef
 
 define Package/xfdesktop/install

diff --git a/xfce/app/xfmedia/Makefile b/xfce/app/xfmedia/Makefile
index b041024187ca437d0945578f21f0339675801e55..575d3d874c5c0015a51965adcc49b5d023e5b8e2 100644 (file)
--- a/xfce/app/xfmedia/Makefile
+++ b/xfce/app/xfmedia/Makefile
@@ -15,6 +15,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://spuriousinterrupt.org/files/xfmedia/
 PKG_MD5SUM:=6eb8bd1f67201f829e0f45e733c02bd5
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -25,6 +26,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfmedia

diff --git a/xfce/app/xfprint/Makefile b/xfce/app/xfprint/Makefile
index 38c9c43174c4bd3496cd6c784f6fb67c9e04d29c..ee7ac0720b4518ba29e6f4d3fe1d452d17ca9718 100644 (file)
--- a/xfce/app/xfprint/Makefile
+++ b/xfce/app/xfprint/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfprint
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=2d3b658167bfbe10ec3258d7c3d995d2
+PKG_MD5SUM:=cf2e0de43367da6a0ef7eeef04876281
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -24,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfprint

diff --git a/xfce/data/gtk-xfce-engine/Makefile b/xfce/data/gtk-xfce-engine/Makefile
index 265804bec018b3a04ba4099b6d4f1b37cafcc2b5..635c745fcdd1d417544594fc48a562f078b6ed04 100644 (file)
--- a/xfce/data/gtk-xfce-engine/Makefile
+++ b/xfce/data/gtk-xfce-engine/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gtk-xfce-engine
-PKG_VERSION:=2.5.92
+PKG_VERSION:=2.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-4.5.92/src/
-PKG_MD5SUM:=
+PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-4.6.0/src/
+PKG_MD5SUM:=e836705d2933d0a77c6628285e10d982
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -24,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib \
 
 define Package/gtk-xfce-engine

diff --git a/xfce/data/xfwm4-themes/Makefile b/xfce/data/xfwm4-themes/Makefile
index b36b6302dc4cf4eba04675467ba3892ccb40d645..b2ad279cc21a4fef48f0e2fe94cfbfae9a45d537 100644 (file)
--- a/xfce/data/xfwm4-themes/Makefile
+++ b/xfce/data/xfwm4-themes/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfwm4-themes
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=
+PKG_MD5SUM:=4dc5cb29cbd40e3b9dece12a85e20854
+
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/xfce/libs/libexo/Makefile b/xfce/libs/libexo/Makefile
index 95d53970a4d465d61b6621dc99ce4e1c01f979f3..5de7f9b1fe57f4861651612358ccda20f4e7f6cd 100644 (file)
--- a/xfce/libs/libexo/Makefile
+++ b/xfce/libs/libexo/Makefile
@@ -8,14 +8,14 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=libexo
-PKG_VERSION:=0.3.93
+PKG_NAME:=exo
+PKG_VERSION:=0.3.100
 PKG_RELEASE:=1
 
-PKG_SOURCE:=exo-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-4.5.93/src/
-PKG_MD5SUM:=
-PKG_BUILD_DIR:=$(BUILD_DIR)/exo-$(PKG_VERSION)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-4.6.0/src/
+PKG_MD5SUM:=ebded97ff55f43cd0fe6b16242992ecf
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -25,6 +25,7 @@ TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib/
 
 define Package/libexo

diff --git a/xfce/libs/libxfce4menu/Makefile b/xfce/libs/libxfce4menu/Makefile
index b217a92813333e00e7922f09328cb6b70198b298..c389041d2ca37ef974cebdce5ef850756e804b12 100644 (file)
--- a/xfce/libs/libxfce4menu/Makefile
+++ b/xfce/libs/libxfce4menu/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxfce4menu
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=54b75f848566f179fcfd463af03281ff
+PKG_MD5SUM:=ff7f75ffa33debd3495b1156a55828a8
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 

diff --git a/xfce/libs/libxfce4util/Makefile b/xfce/libs/libxfce4util/Makefile
index 0f04504288cb1f81cf1a5c2100db2d727c85d143..8598fe71f03d5776b7eb64ba3d367564c0282eeb 100644 (file)
--- a/xfce/libs/libxfce4util/Makefile
+++ b/xfce/libs/libxfce4util/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxfce4util
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=c0a7ae70609ba5df8d42c82c3d8cdb07
+PKG_MD5SUM:=2b0b7cdb4516704940eedf11edc94d5e
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 

diff --git a/xfce/libs/libxfcegui4/Makefile b/xfce/libs/libxfcegui4/Makefile
index aff6d4ec4a5246a2f6eaec0e58602b4755c1300a..7f8bfe5e7dda82e4d344a79eceb7d1fd328e3f9f 100644 (file)
--- a/xfce/libs/libxfcegui4/Makefile
+++ b/xfce/libs/libxfcegui4/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxfcegui4
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=e8c760abcd08df81abe4a2f94ced26aa
+PKG_MD5SUM:=8627ae4fad26289f55f0afbebe238bf5
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 

diff --git a/xfce/wm/xfwm4/Makefile b/xfce/wm/xfwm4/Makefile
index 2a3cad558737512411c4fb1adc02c7f9f9efb1db..22465888e771521364b38a763caa8505d6aad302 100644 (file)
--- a/xfce/wm/xfwm4/Makefile
+++ b/xfce/wm/xfwm4/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfwm4
-PKG_VERSION:=4.5.93
+PKG_VERSION:=4.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tx-us.xfce.org/archive/xfce-$(PKG_VERSION)/src/
-PKG_MD5SUM:=5655230f7323cda513cf3cc26b8bea78
+PKG_MD5SUM:=83cd2f82f2fabfe4ab28a9780fbf309e
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
@@ -25,6 +26,7 @@ TARGET_CFLAGS+= \
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath=/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/xfwm4