gtk use color support

Package-Manager: portage-2.1_rc4

5 files changed, 322 insertions, 5 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 59c3baa65f16..78b00afd355d 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.108 2006/06/01 01:09:15 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.109 2006/06/04 01:03:03 anarchy Exp $
+
+*openbox-20060509-r2 (04 Jun 2006)
+
+  04 Jun 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +files/openbox-20060509-gtkcolors.patch, +openbox-20060509-r2.ebuild:
+  gtk use color support
 
 *openbox-20060509-r1 (01 Jun 2006)
 
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 19f762c38cb3..06c1e25e22c2 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,6 +2,10 @@ AUX openbox-20060509-asneeded.patch 325 RMD160 78461369eb39f22289ae2c8339c31f1a5
 MD5 402889e38296ea7b8d1f03b49a8a7549 files/openbox-20060509-asneeded.patch 325
 RMD160 78461369eb39f22289ae2c8339c31f1a5cc95e96 files/openbox-20060509-asneeded.patch 325
 SHA256 8d04d9ed3a827e9b58616cff4e4333e02c48a0306028c94d6b0b2244daf6f349 files/openbox-20060509-asneeded.patch 325
+AUX openbox-20060509-gtkcolors.patch 6951 RMD160 85fed91aa4945068a7a5c6d6c42b19b7919fdab6 SHA1 04b8ce81bb62404ac76a1d948781ea6abedeb604 SHA256 481248cce304c89312cd76d19f786e811be92195e47e7ec1476b141c6a7f8542
+MD5 18444c4261ee0228bbfb3eb293bea75d files/openbox-20060509-gtkcolors.patch 6951
+RMD160 85fed91aa4945068a7a5c6d6c42b19b7919fdab6 files/openbox-20060509-gtkcolors.patch 6951
+SHA256 481248cce304c89312cd76d19f786e811be92195e47e7ec1476b141c6a7f8542 files/openbox-20060509-gtkcolors.patch 6951
 AUX openbox-20060509-hideMenuHeader.patch 2455 RMD160 5c5abeeb9964ab0735dbffa0bc8a687585d57a11 SHA1 0b9cd352e2c1299022c30c5bc9594d6087eb63d0 SHA256 758e776c6301e003c14d8efedf81311d1b408abfb47370bcb26d613bb420bd82
 MD5 e82bfd747e4b24f433b44b72cdf91c25 files/openbox-20060509-hideMenuHeader.patch 2455
 RMD160 5c5abeeb9964ab0735dbffa0bc8a687585d57a11 files/openbox-20060509-hideMenuHeader.patch 2455
@@ -34,6 +38,10 @@ EBUILD openbox-20060509-r1.ebuild 1761 RMD160 dc7d98facacb7066379d52410113b2c651
 MD5 74e4dc8ff19f456bc38978a44fa257aa openbox-20060509-r1.ebuild 1761
 RMD160 dc7d98facacb7066379d52410113b2c65191123c openbox-20060509-r1.ebuild 1761
 SHA256 fabc6fdf5c5f9b6804a742bacd39b155b02e7183d21e3f73fc6e7f61ebad03ff openbox-20060509-r1.ebuild 1761
+EBUILD openbox-20060509-r2.ebuild 1928 RMD160 e642d6aa4282c5ba5567adbae2a3831b7acbf175 SHA1 45c0b64c334d39f7d84f14223b68850e7238411d SHA256 dfaf1a4c8c14611e46e84c6633d74291abd7c69da68a2e8442f48176daeed178
+MD5 1d45691988a6867a30cbdc2b35b39a16 openbox-20060509-r2.ebuild 1928
+RMD160 e642d6aa4282c5ba5567adbae2a3831b7acbf175 openbox-20060509-r2.ebuild 1928
+SHA256 dfaf1a4c8c14611e46e84c6633d74291abd7c69da68a2e8442f48176daeed178 openbox-20060509-r2.ebuild 1928
 EBUILD openbox-20060509.ebuild 1662 RMD160 4a0d2709333be8439cb809c0a172987cffc1e12b SHA1 0cba4ab26cd55df52e7e4f90920f9bce872133c3 SHA256 82a6226363e6cc839cdd0d6a76dfc57e919785a3220813edf89ccb0f093e0190
 MD5 6f2d301179a4dc7c2465d020dfc7f4a4 openbox-20060509.ebuild 1662
 RMD160 4a0d2709333be8439cb809c0a172987cffc1e12b openbox-20060509.ebuild 1662
@@ -46,10 +54,10 @@ EBUILD openbox-3.3_rc2-r2.ebuild 1951 RMD160 a7b12a23cddbec8b339672ee036cbb596de
 MD5 e86767e871873c541be8effcf1b7e97c openbox-3.3_rc2-r2.ebuild 1951
 RMD160 a7b12a23cddbec8b339672ee036cbb596de81a2e openbox-3.3_rc2-r2.ebuild 1951
 SHA256 039448255cda5aa4ec96aeeefc079b3d32b0456c3ebcef29edf9a3f6e7229eff openbox-3.3_rc2-r2.ebuild 1951
-MISC ChangeLog 19182 RMD160 a552351a1c57fe12bfffd3043e0c8789c7e86f53 SHA1 8eb593ef2d495550079aa904c3833db5ad5bbed7 SHA256 f858497bf9812d3dbc96518ffec213b10b386ffe6eea09f96c7afe3fa3c1ed36
-MD5 582d1a5124a4e14a08cf87c43e6e51dc ChangeLog 19182
-RMD160 a552351a1c57fe12bfffd3043e0c8789c7e86f53 ChangeLog 19182
-SHA256 f858497bf9812d3dbc96518ffec213b10b386ffe6eea09f96c7afe3fa3c1ed36 ChangeLog 19182
+MISC ChangeLog 19365 RMD160 4b0c582a99bcb12ac0faaed32edeb2ad3ea0a24a SHA1 71fa3b4e43e38dda3e299f5944843fe7d821256b SHA256 1a6b47fd092d4db8850fe9015a68501eb3559af85957712ad2054f5633137e19
+MD5 bf82f97862719a216e653845f6c8c0c4 ChangeLog 19365
+RMD160 4b0c582a99bcb12ac0faaed32edeb2ad3ea0a24a ChangeLog 19365
+SHA256 1a6b47fd092d4db8850fe9015a68501eb3559af85957712ad2054f5633137e19 ChangeLog 19365
 MISC metadata.xml 252 RMD160 9910b5b4d79ad4db9860760d072e527a1e86764c SHA1 c3795d7f97f379907ee077df1cbe5a65b3579d3f SHA256 fa65533c0d00c7a422a47a3e4beba53a15a0256a2cb9002c4f47882416670a6e
 MD5 ed7e3e0736adfe198661f5f351fd9e8a metadata.xml 252
 RMD160 9910b5b4d79ad4db9860760d072e527a1e86764c metadata.xml 252
@@ -60,6 +68,9 @@ SHA256 32c25d1f04dc41796e243c6939f4d9a059b87541807a6932cf91872cc29fb8b9 files/di
 MD5 40791b4b800759dab416ca5a8a98f95c files/digest-openbox-20060509-r1 509
 RMD160 e1c1c6117bbfecb43a703393ca67ff89ea837316 files/digest-openbox-20060509-r1 509
 SHA256 32c25d1f04dc41796e243c6939f4d9a059b87541807a6932cf91872cc29fb8b9 files/digest-openbox-20060509-r1 509
+MD5 40791b4b800759dab416ca5a8a98f95c files/digest-openbox-20060509-r2 509
+RMD160 e1c1c6117bbfecb43a703393ca67ff89ea837316 files/digest-openbox-20060509-r2 509
+SHA256 32c25d1f04dc41796e243c6939f4d9a059b87541807a6932cf91872cc29fb8b9 files/digest-openbox-20060509-r2 509
 MD5 30d786a3ba34faec2401458b44bb8215 files/digest-openbox-3.2-r2 494
 RMD160 6b451782ac3681b6694ad2947b8f6fbb68dadf36 files/digest-openbox-3.2-r2 494
 SHA256 eba726a081f08d419cee76b8bd4c61395f5df36f02309a6aca8601e3bcaadadb files/digest-openbox-3.2-r2 494
diff --git a/x11-wm/openbox/files/digest-openbox-20060509-r2 b/x11-wm/openbox/files/digest-openbox-20060509-r2
new file mode 100644
index 000000000000..f185955cb253
--- /dev/null
+++ b/x11-wm/openbox/files/digest-openbox-20060509-r2
@@ -0,0 +1,6 @@
+MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
+RMD160 0d5307746ba743647fe912eb8a364ca61c68b61a ob-themes-usability.tar.bz2 19204
+SHA256 36ce83c2d10abcc503dbaa6c89c0ce9a8793e5760d281973a38a41577421f5c5 ob-themes-usability.tar.bz2 19204
+MD5 3ff8d5dd7fdae18e5bc1b49f917af16a openbox-20060509.tar.gz 827216
+RMD160 dcd93e081ba1db144b87b0758a76a45256a543a1 openbox-20060509.tar.gz 827216
+SHA256 c097806666b63dfc312f769a3f60b30c60d73996fb44e37f484d4321fd2e7fb2 openbox-20060509.tar.gz 827216
diff --git a/x11-wm/openbox/files/openbox-20060509-gtkcolors.patch b/x11-wm/openbox/files/openbox-20060509-gtkcolors.patch
new file mode 100644
index 000000000000..3835ad2e4b05
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-20060509-gtkcolors.patch
@@ -0,0 +1,222 @@
+diff -urN openbox-tree/Makefile.am openbox/Makefile.am
+--- openbox-tree/Makefile.am	2006-06-03 19:12:50.576300928 -0500
++++ openbox/Makefile.am	2006-06-03 19:19:36.964520528 -0500
+@@ -51,6 +51,7 @@
+ 	$(X_CFLAGS) \
+ 	$(XFT_CFLAGS) \
+ 	$(GLIB_CFLAGS) \
++	$(GTK_CFLAGS) \
+ 	$(XML_CFLAGS) \
+ 	$(PANGO_CFLAGS) \
+ 	-DG_LOG_DOMAIN=\"ObRender\" \
+@@ -63,6 +64,7 @@
+ 	$(XFT_LIBS) \
+ 	$(PANGO_LIBS) \
+ 	$(GLIB_LIBS) \
++	$(GTK_LIBS) \
+ 	$(XML_LIBS) \
+ 	parser/libobparser.la
+ render_libobrender_la_SOURCES = \
+@@ -111,6 +113,7 @@
+ 	$(SM_CFLAGS) \
+ 	$(XFT_CFLAGS) \
+ 	$(GLIB_CFLAGS) \
++	$(GTK_CFLAGS) \
+ 	$(LIBSN_CFLAGS) \
+ 	$(XML_CFLAGS) \
+ 	-DLOCALEDIR=\"$(localedir)\" \
+@@ -125,6 +128,7 @@
+ 	$(VIDMODE_LIBS) \
+ 	$(XSHAPE_LIBS) \
+ 	$(GLIB_LIBS) \
++	$(GTK_LIBS) \
+ 	$(X_LIBS) \
+ 	$(LIBSN_LIBS) \
+ 	$(XML_LIBS) \
+diff -urN openbox-tree/configure.ac openbox/configure.ac
+--- openbox-tree/configure.ac	2006-06-03 19:12:50.577300776 -0500
++++ openbox/configure.ac	2006-06-03 19:14:01.146572616 -0500
+@@ -74,6 +74,29 @@
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
++AC_ARG_ENABLE(gtk,
++  AC_HELP_STRING(
++    [--disable-gtk],
++    [disable the GTK+ library [[default=no]]]
++  ),
++  [enable_gtk=$enableval],
++  [enable_gtk=yes]
++)
++
++if test "$enable_gtk" = yes; then
++PKG_CHECK_MODULES([GTK], [gtk+-2.0],
++  [
++    AC_DEFINE(USE_GTK, [1], [Use GTK])
++    AC_SUBST(GTK_CFLAGS)
++    AC_SUBST(GTK_LIBS)
++    gtk_found=yes
++  ],
++    gtk_found=no
++)
++else
++  gtk_found=no
++fi
++
+ AC_ARG_ENABLE(pango,
+   AC_HELP_STRING(
+     [--disable-pango],
+@@ -157,6 +180,7 @@
+ AC_MSG_RESULT
+ AC_MSG_RESULT([Compiling with these options:
+                Pango... $pango_found
++               GTK+... $gtk_found
+                Startup Notification... $sn_found
+                Session Management... $SM
+                ])
+diff -urN openbox-tree/openbox/openbox.c openbox/openbox/openbox.c
+--- openbox-tree/openbox/openbox.c	2006-06-03 19:12:50.833261864 -0500
++++ openbox/openbox/openbox.c	2006-06-03 19:14:01.147572464 -0500
+@@ -68,6 +68,9 @@
+ #  include <unistd.h>
+ #endif
+ #include <errno.h>
++#ifdef USE_GTK
++#   include <gtk/gtk.h>
++#endif
+ 
+ #include <X11/cursorfont.h>
+ 
+@@ -105,6 +108,10 @@
+     bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
+     textdomain(PACKAGE_NAME);
+ 
++#ifdef USE_GTK
++    gtk_init (&argv, &argv);
++#endif
++
+     g_set_prgname(argv[0]);
+ 
+     if (chdir(g_get_home_dir()) == -1)
+diff -urN openbox-tree/render/color.c openbox/render/color.c
+--- openbox-tree/render/color.c	2006-06-03 19:12:50.940245600 -0500
++++ openbox/render/color.c	2006-06-03 19:14:01.148572312 -0500
+@@ -23,8 +23,81 @@
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
++#ifdef USE_GTK
++#   include <gtk/gtk.h>
++#   include <gdk/gdk.h>
++#endif
+ #include <string.h>
+ 
++#ifdef USE_GTK
++gchar *GtkConstToColorname (gchar *colorname)
++{
++    GtkWidget *widget;
++    GdkColor *col = NULL;
++    gchar *tmp;
++
++    gtk_rc_reparse_all ();
++    widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
++    gtk_widget_ensure_style (widget);
++
++    /* FIXME: omg, this is awful */
++    /* fg */
++    if (!g_ascii_strcasecmp (colorname, "GTK_FG_NORMAL"))
++	col = &GTK_WIDGET (widget)->style->fg[GTK_STATE_NORMAL];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_FG_ACTIVE"))
++	col = &GTK_WIDGET (widget)->style->fg[GTK_STATE_ACTIVE];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_FG_PRELIGHT"))
++	col = &GTK_WIDGET (widget)->style->fg[GTK_STATE_PRELIGHT];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_FG_SELECTED"))
++	col = &GTK_WIDGET (widget)->style->fg[GTK_STATE_SELECTED];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_FG_INSENSITIVE"))
++	col = &GTK_WIDGET (widget)->style->fg[GTK_STATE_INSENSITIVE];
++    /* bg */
++    else if (!g_ascii_strcasecmp (colorname, "GTK_BG_NORMAL"))
++	col = &GTK_WIDGET (widget)->style->bg[GTK_STATE_NORMAL];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_BG_ACTIVE"))
++	col = &GTK_WIDGET (widget)->style->bg[GTK_STATE_ACTIVE];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_BG_PRELIGHT"))
++	col = &GTK_WIDGET (widget)->style->bg[GTK_STATE_PRELIGHT];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_BG_SELECTED"))
++	col = &GTK_WIDGET (widget)->style->bg[GTK_STATE_SELECTED];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_BG_INSENSITIVE"))
++	col = &GTK_WIDGET (widget)->style->bg[GTK_STATE_INSENSITIVE];
++    /* base */
++    else if (!g_ascii_strcasecmp (colorname, "GTK_BASE_NORMAL"))
++	col = &GTK_WIDGET (widget)->style->base[GTK_STATE_NORMAL];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_BASE_ACTIVE"))
++	col = &GTK_WIDGET (widget)->style->base[GTK_STATE_ACTIVE];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_BASE_PRELIGHT"))
++	col = &GTK_WIDGET (widget)->style->base[GTK_STATE_PRELIGHT];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_BASE_SELECTED"))
++	col = &GTK_WIDGET (widget)->style->base[GTK_STATE_SELECTED];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_BASE_INSENSITIVE"))
++	col = &GTK_WIDGET (widget)->style->base[GTK_STATE_INSENSITIVE];
++    /* text */
++    else if (!g_ascii_strcasecmp (colorname, "GTK_TEXT_NORMAL"))
++	col = &GTK_WIDGET (widget)->style->text[GTK_STATE_NORMAL];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_TEXT_ACTIVE"))
++	col = &GTK_WIDGET (widget)->style->text[GTK_STATE_ACTIVE];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_TEXT_PRELIGHT"))
++	col = &GTK_WIDGET (widget)->style->text[GTK_STATE_PRELIGHT];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_TEXT_SELECTED"))
++	col = &GTK_WIDGET (widget)->style->text[GTK_STATE_SELECTED];
++    else if (!g_ascii_strcasecmp (colorname, "GTK_TEXT_INSENSITIVE"))
++	col = &GTK_WIDGET (widget)->style->text[GTK_STATE_INSENSITIVE];
++
++    gtk_widget_destroy (widget);
++
++    if (col)
++	tmp = g_strdup_printf ("#%02x%02x%02x",
++		col->red >> 8, col->green >> 8, col->blue >> 8);
++    else
++	tmp = g_strdup ("#ffffff");
++
++    return (tmp);
++}
++#endif /* USE_GTK */
++
+ void RrColorAllocateGC(RrColor *in)
+ {
+     XGCValues gcv;
+@@ -39,19 +112,32 @@
+ RrColor *RrColorParse(const RrInstance *inst, gchar *colorname)
+ {
+     XColor xcol;
++    RrColor *ret;
+ 
+     g_assert(colorname != NULL);
+     /* get rgb values from colorname */
+ 
++    /* beware! voodoo following */
++#ifdef USE_GTK
++    if (!g_ascii_strncasecmp (colorname, "GTK", 3))
++	colorname = GtkConstToColorname (colorname);
++    else
++	colorname = g_strdup (colorname);
++#endif
++
+     xcol.red = 0;
+     xcol.green = 0;
+     xcol.blue = 0;
+     xcol.pixel = 0;
+-    if (!XParseColor(RrDisplay(inst), RrColormap(inst), colorname, &xcol)) {
++    if (!XParseColor(RrDisplay(inst), RrColormap(inst), colorname, &xcol))
+         g_warning("unable to parse color '%s'", colorname);
+-        return NULL;
+-    }
+-    return RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8);
++    else
++	ret= RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8);
++
++#ifdef USE_GTK
++    g_free (colorname);
++#endif
++    return ret;
+ }
+ 
+ /*#define NO_COLOR_CACHE*/
diff --git a/x11-wm/openbox/openbox-20060509-r2.ebuild b/x11-wm/openbox/openbox-20060509-r2.ebuild
new file mode 100644
index 000000000000..2fb4d0c8d628
--- /dev/null
+++ b/x11-wm/openbox/openbox-20060509-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-20060509-r2.ebuild,v 1.1 2006/06/04 01:03:03 anarchy Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager."
+HOMEPAGE="http://icculus.org/openbox/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/ob-themes-usability.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="pango nls startup-notification xinerama gtk"
+
+RDEPEND="|| ( ( x11-libs/libXrandr
+		x11-libs/libXt
+		xinerama? ( x11-libs/libXinerama )
+		)
+		virtual/x11
+	)
+	virtual/xft
+	>=dev-libs/glib-2
+	>=media-libs/fontconfig-2
+	>=dev-libs/libxml2-2.0
+	gtk? ( >=x11-libs/gtk+-2 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		xinerama? ( x11-proto/xineramaproto )
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+		)
+		virtual/x11
+	 )
+	pango? ( x11-libs/pango )
+	startup-notification? ( x11-libs/startup-notification )
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-asneeded.patch
+	epatch ${FILESDIR}/${P}-hideMenuHeader.patch
+	epatch ${FILESDIR}/${P}-pipedsplitgradient.patch
+	epatch ${FILESDIR}/${P}-gtkcolors.patch
+
+	AT_M4DIR="m4" \
+	eautoreconf || die "failed running eautoreconf"
+}
+
+src_compile() {
+	econf `use_enable nls` `use_enable pango` `use_enable startup-notification` `use_enable gtk` ${myconf} || die "failed running configure"
+	emake || die "failed running make"
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/openbox" > ${D}/etc/X11/Sessions/openbox
+	fperms a+x /etc/X11/Sessions/openbox
+
+	insinto /usr/share/xsessions
+	doins ${FILESDIR}/${PN}.desktop
+
+	make DESTDIR=${D} install || die
+	dodoc ABOUT-NLS AUTHORS CHANGELOG COMPLIANCE COPYING README
+
+	insinto /usr/share/themes
+	doins -r ${WORKDIR}/ob-themes-usability/*
+}