From 6583459fb2be7233169856dd4491c7fe56d72256 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 25 Jan 2007 20:47:19 +0000
Subject: [PATCH] Use stable version 2.16.3, as 2.17.x misplaces topbar icons
 and whatnot. download and install the Clearlooks theme

---
 package/metacity/metacity.mk | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index 0cf83e8901..e618873a33 100644
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -4,18 +4,28 @@
 #
 #############################################################
 
-METACITY_VER:=2.17.3
+# Seems to be broken -- topbar icons and such are misplaced etc
+#METACITY_VER:=2.17.5
+
+METACITY_VER:=2.16.3
 METACITY_SOURCE:=metacity-$(METACITY_VER).tar.bz2
-METACITY_SITE:=http://ftp.gnome.org/pub/gnome/sources/metacity/2.17
+METACITY_SITE:=http://ftp.gnome.org/pub/gnome/sources/metacity/2.16
 METACITY_DIR:=$(BUILD_DIR)/metacity-$(METACITY_VER)
 METACITY_CAT:=$(BZCAT)
 
+METACITY_SOURCE2:=MCity-Clearlooks2.tar.gz
+METACITY_CAT2:=$(ZCAT)
+METACITY_SITE2:=http://art.gnome.org/download/themes/metacity/1190
+
 $(DL_DIR)/$(METACITY_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(METACITY_SITE)/$(METACITY_SOURCE)
 
-metacity-source: $(DL_DIR)/$(METACITY_SOURCE)
+$(DL_DIR)/$(METACITY_SOURCE2):
+	 $(WGET) -P $(DL_DIR) $(METACITY_SITE2)/$(METACITY_SOURCE2)
 
-$(METACITY_DIR)/.unpacked: $(DL_DIR)/$(METACITY_SOURCE)
+metacity-source: $(DL_DIR)/$(METACITY_SOURCE) $(DL_DIR)/$(METACITY_SOURCE2)
+
+$(METACITY_DIR)/.unpacked: $(DL_DIR)/$(METACITY_SOURCE) $(DL_DIR)/$(METACITY_SOURCE2)
 	$(METACITY_CAT) $(DL_DIR)/$(METACITY_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(METACITY_DIR) package/metacity/ \*.patch*
 	(cd $(METACITY_DIR); libtoolize --force;)
@@ -121,7 +131,11 @@ $(TARGET_DIR)/lib/*metacity*.so: $(STAGING_DIR)/lib/*metacity*.so
 	mkdir -p $(TARGET_DIR)/usr/share/metacity/icons
 	cp -dpf $(STAGING_DIR)/usr/share/metacity/icons/* $(TARGET_DIR)/usr/share/metacity/icons/
 	mkdir -p $(TARGET_DIR)/usr/share/themes
-	cp -a $(STAGING_DIR)/usr/share/themes/* $(TARGET_DIR)/usr/share/themes/
+	$(METACITY_CAT2) $(DL_DIR)/$(METACITY_SOURCE2) | \
+		tar -C $(STAGING_DIR)/usr/share/themes $(TAR_OPTIONS) -
+	cp -a $(STAGING_DIR)/usr/share/themes/Clearlooks \
+		$(TARGET_DIR)/usr/share/themes/
+	(cd $(TARGET_DIR)/usr/share/themes; rm -rf Atlanta; ln -s Clearlooks Atlanta)
 	cp -a package/metacity/Xsession $(TARGET_DIR)/etc/X11/
 
 metacity: uclibc zlib xorg libgtk2 $(TARGET_DIR)/lib/*metacity*.so