From dc68a002d9804fcf52df804f8d6ea77a67bf7497 Mon Sep 17 00:00:00 2001
From: lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 8 May 2009 19:12:05 +0000
Subject: [PATCH] Update libwnck package to 2.26.1 and move it to the Xorg
 section.

git-svn-id: svn://svn.openwrt.org/openwrt/packages@15712 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 {libs => Xorg/lib}/wnck/Makefile | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)
 rename {libs => Xorg/lib}/wnck/Makefile (66%)

diff --git a/libs/wnck/Makefile b/Xorg/lib/wnck/Makefile
similarity index 66%
rename from libs/wnck/Makefile
rename to Xorg/lib/wnck/Makefile
index 144e79d04..2033c1689 100644
--- a/libs/wnck/Makefile
+++ b/Xorg/lib/wnck/Makefile
@@ -8,24 +8,32 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwnck
-PKG_VERSION:=2.22.3
-PKG_RELEASE:=3
+PKG_VERSION:=2.26.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22/
-PKG_MD5SUM:=12cf787efa0b9d95bc53613bcc7d958e
+PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.26/
+PKG_MD5SUM:=015b5d2e65d15448fa143513fce03541
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-              -I$(STAGING_DIR)/usr/lib/libiconv/include/
-EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-               -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+TARGET_CFLAGS+= \
+	-I$(STAGING_DIR)/usr/lib/libintl/include/ \
+	-I$(STAGING_DIR)/usr/lib/libiconv/include/ \
+	$(FPIC)
+
+TARGET_LDFLAGS+= \
+	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+	-Wl,-rpath=/usr/lib
 
 define Package/libwnck
-  SECTION:=libs
-  CATEGORY:=Libraries
+  SECTION:=xorg-libs
+  CATEGORY:=Xorg
+  SUBMENU:=libraries
   TITLE:=Window Navigator Construction Kit
   URL:=http://ftp.gnome.org/
   DEPENDS:=+gtk2 +glib2 +libXext
@@ -35,13 +43,6 @@ define Package/libwnck/description
 Window Navigator Construction Kit
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/libwnck-1.0/libwnck/
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libwnck-1.0/libwnck/* $(1)/usr/include/libwnck-1.0/libwnck/
-- 
2.11.0