From: lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 8 May 2009 19:12:05 +0000 (+0000)
Subject: Update libwnck package to 2.26.1 and move it to the Xorg section.
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=dc68a002d9804fcf52df804f8d6ea77a67bf7497;p=packages.git

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
---

diff --git a/Xorg/lib/wnck/Makefile b/Xorg/lib/wnck/Makefile
new file mode 100644
index 000000000..2033c1689
--- /dev/null
+++ b/Xorg/lib/wnck/Makefile
@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libwnck
+PKG_VERSION:=2.26.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.26/
+PKG_MD5SUM:=015b5d2e65d15448fa143513fce03541
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+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:=xorg-libs
+  CATEGORY:=Xorg
+  SUBMENU:=libraries
+  TITLE:=Window Navigator Construction Kit
+  URL:=http://ftp.gnome.org/
+  DEPENDS:=+gtk2 +glib2 +libXext
+endef
+
+define Package/libwnck/description
+Window Navigator Construction Kit
+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/
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*{.so*,a,la} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libwnck/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libwnck))
diff --git a/libs/wnck/Makefile b/libs/wnck/Makefile
deleted file mode 100644
index 144e79d04..000000000
--- a/libs/wnck/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libwnck
-PKG_VERSION:=2.22.3
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22/
-PKG_MD5SUM:=12cf787efa0b9d95bc53613bcc7d958e
-PKG_FIXUP:=libtool
-
-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
-
-define Package/libwnck
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Window Navigator Construction Kit
-  URL:=http://ftp.gnome.org/
-  DEPENDS:=+gtk2 +glib2 +libXext
-endef
-
-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/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*{.so*,a,la} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libwnck/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libwnck))