Restored metacity-setup functionality with patch in 0.7.1-r1

diff --git a/x11-misc/metacity-setup/ChangeLog b/x11-misc/metacity-setup/ChangeLog
index 2e15eb29812763cb5bae076b8af70993ecbaed74..590c5b0374468459936dbca78c9f9c6f882232c7 100644 (file)
--- a/x11-misc/metacity-setup/ChangeLog
+++ b/x11-misc/metacity-setup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/metacity-setup
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/metacity-setup/ChangeLog,v 1.5 2002/07/12 00:54:49 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/metacity-setup/ChangeLog,v 1.6 2002/10/09 10:59:57 foser Exp $
+
+*metacity-setup-0.7.1-r1 (09 Oct 2002)
+  09 Oct 2002; foser <foser@gentoo.org> metacity-setup-0.7.1-r1.ebuild :
+  Added patch to make metacity-setup functional again see bug #8822
+  Patch by Jonathan Nall <nall@themountaingoats.net>, thanks
 
 *metacity-setup-0.6.1 (12 Jul 2002)
   12 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> metacity-setup-0.6.1.ebuild :

diff --git a/x11-misc/metacity-setup/files/digest-metacity-setup-0.7.1-r1 b/x11-misc/metacity-setup/files/digest-metacity-setup-0.7.1-r1
new file mode 100644 (file)
index 0000000..2f452e7
--- /dev/null
+++ b/x11-misc/metacity-setup/files/digest-metacity-setup-0.7.1-r1
@@ -0,0 +1 @@
+MD5 e898a13ea95d38dcc1f9dba5dd03581f metacity-setup-0.7.1.tar.gz 210390

diff --git a/x11-misc/metacity-setup/files/metacity-setup-0.7.1-themedir.patch b/x11-misc/metacity-setup/files/metacity-setup-0.7.1-themedir.patch
new file mode 100644 (file)
index 0000000..2dbb513
--- /dev/null
+++ b/x11-misc/metacity-setup/files/metacity-setup-0.7.1-themedir.patch
@@ -0,0 +1,44 @@
+--- src/callbacks.c.orig       2002-10-05 12:36:03.000000000 -0500
++++ src/callbacks.c    2002-10-05 12:36:07.000000000 -0500
+@@ -226,20 +226,20 @@
+                       GDir *themeDirectory =
+                               g_dir_open (possibleThemeDirs[i], 0, NULL);
+ 
+-                      while ((filename =
+-                              g_dir_read_name (themeDirectory)) != NULL)
+-                              if (g_file_test
+-                                  (g_build_filename
+-                                   (possibleThemeDirs[i], filename, NULL),
+-                                              G_FILE_TEST_IS_DIR) &&
+-                                      (g_file_test
+-                                              (g_build_filename
+-                                                      (possibleThemeDirs[i], filename, "metacity-theme-1.xml", NULL),
+-                                              G_FILE_TEST_IS_REGULAR)))
+-                                      {
+-                                              g_ptr_array_add (themeNameHolder,
+-                                                       g_strdup (filename));
+-                                      }
++                      while ((filename = g_dir_read_name (themeDirectory)) != NULL)
++                              if (g_file_test (g_build_filename (possibleThemeDirs[i], filename, NULL), G_FILE_TEST_IS_DIR) &&
++                                      ((g_file_test (g_build_filename (possibleThemeDirs[i], filename, "metacity-theme-1.xml", NULL), G_FILE_TEST_IS_REGULAR)) 
++                                              /* new themes have metacity-theme-1.xml stored under a directory: metacity-1 */
++                                        ||(g_file_test (g_build_filename (possibleThemeDirs[i], filename, "metacity-1", NULL), G_FILE_TEST_IS_DIR)
++                                              && g_file_test (g_build_filename (possibleThemeDirs[i], filename, "metacity-1", "metacity-theme-1.xml",NULL), 
++                                                              G_FILE_TEST_IS_REGULAR)
++                                          )
++                                      )
++                              )
++                              {
++                                      g_ptr_array_add (themeNameHolder,
++                                               g_strdup (filename));
++                              }
+                       g_dir_close (themeDirectory);
+               }
+       }
+@@ -690,4 +690,4 @@
+       else 
+               metacity_version = "2.4";
+       on_treeview1_realize (treeview1_cheat, user_data);
+-}
+\ No newline at end of file
++}

diff --git a/x11-misc/metacity-setup/metacity-setup-0.7.1-r1.ebuild b/x11-misc/metacity-setup/metacity-setup-0.7.1-r1.ebuild
new file mode 100644 (file)
index 0000000..0065205
--- /dev/null
+++ b/x11-misc/metacity-setup/metacity-setup-0.7.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/metacity-setup/metacity-setup-0.7.1-r1.ebuild,v 1.1 2002/10/09 10:59:57 foser Exp $
+
+inherit gnome2
+
+DESCRIPTION="a setup program for metacity"
+HOMEPAGE="http://plastercast.tzo.com/~plastercast/Projects/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc sparc64"
+
+DEPEND="x11-wm/metacity
+       =x11-libs/gtk+-2.0*
+       =dev-libs/glib-2.0*
+       gnome-base/libgnomeui"
+RDEPEND="${DEPEND}"
+SRC_URI="http://unc.dl.sourceforge.net/sourceforge/metacity-setup/${P}.tar.gz"
+S=${WORKDIR}/${P}
+
+DOCS="AUTHORS COPYING  ChangeLog INSTALL NEWS README"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       patch -p0 < ${FILESDIR}/metacity-setup-0.7.1-themedir.patch || die
+}
+