summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen2009-03-21 15:05:17 +0000
committerLars-Peter Clausen2009-03-21 15:05:17 +0000
commiteaf93c81cccb5e7822bf0dd7f3093b7c9174c7eb (patch)
tree91a3b00974da23a8c3efe3c0c4ec20fc3e6745f9
parent787106ebc13d43b8c608a60e095c8864552ef829 (diff)
downloadfeeds-eaf93c81cccb5e7822bf0dd7f3093b7c9174c7eb.tar.gz
Update xfce packages to 4.6.0
SVN-Revision: 14959
-rw-r--r--xfce/app/orage/Makefile7
-rw-r--r--xfce/app/thunar/Makefile10
-rw-r--r--xfce/app/xarchiver/Makefile2
-rw-r--r--xfce/app/xfburn/Makefile2
-rw-r--r--xfce/app/xfce-mousepad/Makefile8
-rw-r--r--xfce/app/xfce-terminal/Makefile24
-rw-r--r--xfce/app/xfce-utils/Makefile9
-rw-r--r--xfce/app/xfce4-appfinder/Makefile6
-rw-r--r--xfce/app/xfce4-mixer/Makefile8
-rw-r--r--xfce/app/xfce4-panel/Makefile7
-rw-r--r--xfce/app/xfce4-session/Makefile8
-rw-r--r--xfce/app/xfce4-settings/Makefile6
-rw-r--r--xfce/app/xfce4-settings/patches/010-fix-xfsettingsd-segfault.patch35
-rw-r--r--xfce/app/xfconf/Makefile8
-rw-r--r--xfce/app/xfdesktop/Makefile8
-rw-r--r--xfce/app/xfmedia/Makefile2
-rw-r--r--xfce/app/xfprint/Makefile6
-rw-r--r--xfce/data/gtk-xfce-engine/Makefile8
-rw-r--r--xfce/data/xfwm4-themes/Makefile5
-rw-r--r--xfce/libs/libexo/Makefile13
-rw-r--r--xfce/libs/libxfce4menu/Makefile5
-rw-r--r--xfce/libs/libxfce4util/Makefile5
-rw-r--r--xfce/libs/libxfcegui4/Makefile5
-rw-r--r--xfce/wm/xfwm4/Makefile6
24 files changed, 106 insertions, 97 deletions
diff --git a/xfce/app/orage/Makefile b/xfce/app/orage/Makefile
index b44b999..cc2178e 100644
--- 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 e6f3dd1..231525d 100644
--- 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 976ab41..d9e8617 100644
--- 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 1701765..eded687 100644
--- 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 a7f806b..36028cb 100644
--- 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 2996be4..6472b1d 100644
--- 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 155d65b..5c85fd9 100644
--- 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 c1537a3..31327d9 100644
--- 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 43505e6..4e63d12 100644
--- 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 164bea7..a254cd6 100644
--- 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 6900f52..76f263d 100644
--- 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 11dfb81..c2956f2 100644
--- 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
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 5853995..4b4351c 100644
--- 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 861f1aa..1beb38e 100644
--- 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 b041024..575d3d8 100644
--- 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 38c9c43..ee7ac07 100644
--- 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 265804b..635c745 100644
--- 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 b36b630..b2ad279 100644
--- 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 95d5397..5de7f9b 100644
--- 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 b217a92..c389041 100644
--- 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 0f04504..8598fe7 100644
--- 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 aff6d4e..7f8bfe5 100644
--- 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 2a3cad5..2246588 100644
--- 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