summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Shakaryan <omp@gentoo.org>2006-10-16 05:09:26 +0000
committerDavid Shakaryan <omp@gentoo.org>2006-10-16 05:09:26 +0000
commit54f95fb8e4bff379d769cf88d6ad74ca6cd24dae (patch)
tree4ea2aaf95ab3e88e135b1c0070af17455b8f62b7
parentRemove patches for removed ebuilds. (diff)
downloadhistorical-54f95fb8e4bff379d769cf88d6ad74ca6cd24dae.tar.gz
historical-54f95fb8e4bff379d769cf88d6ad74ca6cd24dae.tar.bz2
historical-54f95fb8e4bff379d769cf88d6ad74ca6cd24dae.zip
Remove patches for removed ebuilds.
Package-Manager: portage-2.1.2_pre3-r2
-rw-r--r--x11-wm/openbox/Manifest28
-rw-r--r--x11-wm/openbox/files/openbox-20060509-asneeded.patch10
-rw-r--r--x11-wm/openbox/files/openbox-20060509-gtkcolors.patch222
-rw-r--r--x11-wm/openbox/files/openbox-20060509-hideMenuHeader.patch64
-rw-r--r--x11-wm/openbox/files/openbox-20060509-pipedsplitgradient.patch256
5 files changed, 6 insertions, 574 deletions
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 3f0664c62d68..9a97af7d5f06 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,19 +1,3 @@
-AUX openbox-20060509-asneeded.patch 325 RMD160 78461369eb39f22289ae2c8339c31f1a5cc95e96 SHA1 b3223bf7ad9fc04fdb915714a372d79260b44736 SHA256 8d04d9ed3a827e9b58616cff4e4333e02c48a0306028c94d6b0b2244daf6f349
-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
-SHA256 758e776c6301e003c14d8efedf81311d1b408abfb47370bcb26d613bb420bd82 files/openbox-20060509-hideMenuHeader.patch 2455
-AUX openbox-20060509-pipedsplitgradient.patch 8034 RMD160 d2fa4e97f4dfe421d9f1a240f1cbad92ccb6022d SHA1 fcc76b1e6e9851f78f1141ed21a4a9295957a39b SHA256 16c52a8917fee7aaa6fcbf29360d0bc60bcdd56975cbd62fe6cbe737b573f2fc
-MD5 8dc2f39ce11fe90f958ea83c186999ab files/openbox-20060509-pipedsplitgradient.patch 8034
-RMD160 d2fa4e97f4dfe421d9f1a240f1cbad92ccb6022d files/openbox-20060509-pipedsplitgradient.patch 8034
-SHA256 16c52a8917fee7aaa6fcbf29360d0bc60bcdd56975cbd62fe6cbe737b573f2fc files/openbox-20060509-pipedsplitgradient.patch 8034
AUX openbox-3.2-makefile.patch 413 RMD160 827d2d6bae6bd6583a3ee5350e9b715eb555de4c SHA1 7fd443482ff10487a0bb8d0840b36604209b03cb SHA256 8cef7c7543e7b95302df9179d50d0ce79c34107b9f91053bb7e64e3bf3219c7a
MD5 9cf0208bdd9705c3aa2ec4a2be62c138 files/openbox-3.2-makefile.patch 413
RMD160 827d2d6bae6bd6583a3ee5350e9b715eb555de4c files/openbox-3.2-makefile.patch 413
@@ -31,8 +15,8 @@ MD5 87a0450483a263221557f426bd7b0d60 files/openbox.desktop 192
RMD160 af9f75aea5e8ed978ce0283be559e396101e994b files/openbox.desktop 192
SHA256 5b4e837b3d4bf068a568c6fbc49489be560eb83bca0bdd15b8395cc0622a8320 files/openbox.desktop 192
DIST ob-themes-usability.tar.bz2 19204 RMD160 0d5307746ba743647fe912eb8a364ca61c68b61a SHA1 20aebf45a6b341b9147df8d8922dfd00f72c1e14 SHA256 36ce83c2d10abcc503dbaa6c89c0ce9a8793e5760d281973a38a41577421f5c5
-DIST openbox-3.2.tar.gz 561115 RMD160 bd1045dc8c57a66ac2e6d6a0fb967ea65a02936d SHA256 1b21ae976ca84217aa34ee72c4dda81df5eff57bade5e0fd9f1910c92e56b647
-DIST openbox-3.3-rc2.tar.gz 585486 RMD160 d12f6bda7145975754626e4c421baaa2ea25d07f SHA256 066c4add6cc16bbc1c30f3dcb84c16cfd6453c06d7fe1de3d04e279236d35692
+DIST openbox-3.2.tar.gz 561115 RMD160 bd1045dc8c57a66ac2e6d6a0fb967ea65a02936d SHA1 2cc97b38d1fd5e40ba2631fcd1b2a0bc5dcc2813 SHA256 1b21ae976ca84217aa34ee72c4dda81df5eff57bade5e0fd9f1910c92e56b647
+DIST openbox-3.3-rc2.tar.gz 585486 RMD160 d12f6bda7145975754626e4c421baaa2ea25d07f SHA1 6d41005bb5709b1f5d948277f30c9b5077514734 SHA256 066c4add6cc16bbc1c30f3dcb84c16cfd6453c06d7fe1de3d04e279236d35692
DIST openbox-3.3.1.tar.gz 603402 RMD160 b796d807c17661cff506b641f121056aa146c8d9 SHA1 0524cbf2a396459d206915e6b1b688443cded89b SHA256 a70b7bc8c28427dff350aa17882d6916b678fd12d1119e4c3ad4b86f3371f033
EBUILD openbox-3.2-r2.ebuild 1760 RMD160 33378f91badab193c130ac845b60094747840174 SHA1 246bf8079d26ca5fb65f19def89abdc6e6da8d94 SHA256 43673a0a6dfbdb04932e63aae102f7687e25ac9693308481c4e78f9540781765
MD5 2cf75469ea1824d96fee25e9b82605ec openbox-3.2-r2.ebuild 1760
@@ -46,10 +30,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 19843 RMD160 1f472929b5a2e2802f8eb716e78b6c02539c45bd SHA1 766f90c47aa55a75e350d47f749a71119b2f0733 SHA256 543e0059829e58d02bf411bd07f71427cbc6d5474b61b965747ca16c4fbc075f
-MD5 f6321520e2817f8555f35184bdd0edfc ChangeLog 19843
-RMD160 1f472929b5a2e2802f8eb716e78b6c02539c45bd ChangeLog 19843
-SHA256 543e0059829e58d02bf411bd07f71427cbc6d5474b61b965747ca16c4fbc075f ChangeLog 19843
+MISC ChangeLog 20110 RMD160 d3b7e5781dc1c14a8ae04fb99f0869d584c2fea9 SHA1 a18f635b833c4b0dd9655a4ca64f2aceb6ddd7ec SHA256 cfd298230063147535f19b5441c1b1bb13416136a8b0fab5c23576c58c8663c7
+MD5 5ff2132b75ec21eaf0ec2120928523a8 ChangeLog 20110
+RMD160 d3b7e5781dc1c14a8ae04fb99f0869d584c2fea9 ChangeLog 20110
+SHA256 cfd298230063147535f19b5441c1b1bb13416136a8b0fab5c23576c58c8663c7 ChangeLog 20110
MISC metadata.xml 162 RMD160 703446c6272f12116290b48cf1edb105392e19d5 SHA1 57738825f99b27d6f85e18693ccf1167206f79e9 SHA256 98f3695fbdfbde0e5c6c81ebc87af8db70d4a62eadaea2125cfa50956860266d
MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
RMD160 703446c6272f12116290b48cf1edb105392e19d5 metadata.xml 162
diff --git a/x11-wm/openbox/files/openbox-20060509-asneeded.patch b/x11-wm/openbox/files/openbox-20060509-asneeded.patch
deleted file mode 100644
index 7dc9a6f531eb..000000000000
--- a/x11-wm/openbox/files/openbox-20060509-asneeded.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.am.orig 2006-05-09 19:25:48.200980560 -0500
-+++ Makefile.am 2006-05-09 19:26:12.776244552 -0500
-@@ -58,6 +58,7 @@
- render_libobrender_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- render_libobrender_la_LIBADD = \
-+ parser/libobparser.la \
- $(X_LIBS) \
- $(XFT_LIBS) \
- $(PANGO_LIBS) \
diff --git a/x11-wm/openbox/files/openbox-20060509-gtkcolors.patch b/x11-wm/openbox/files/openbox-20060509-gtkcolors.patch
deleted file mode 100644
index 3835ad2e4b05..000000000000
--- a/x11-wm/openbox/files/openbox-20060509-gtkcolors.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-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/files/openbox-20060509-hideMenuHeader.patch b/x11-wm/openbox/files/openbox-20060509-hideMenuHeader.patch
deleted file mode 100644
index cd09d7e15777..000000000000
--- a/x11-wm/openbox/files/openbox-20060509-hideMenuHeader.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: openbox/config.c
-===================================================================
-RCS file: /cvs/cvsroot/openbox/openbox/config.c,v
-retrieving revision 1.92
-diff -u -p -r1.92 config.c
---- openbox/config.c 25 Sep 2005 14:45:24 -0000 1.92
-+++ openbox/config.c 16 Apr 2006 18:29:18 -0000
-@@ -36,6 +36,7 @@ ObPlacePolicy config_place_policy;
- gchar *config_theme;
- gboolean config_theme_keepborder;
- gboolean config_theme_hidedisabled;
-+gboolean config_theme_hidemenuheader;
-
- gchar *config_title_layout;
-
-@@ -260,6 +261,8 @@ static void parse_theme(ObParseInst *i,
- config_theme_keepborder = parse_bool(doc, n);
- if ((n = parse_find_node("hideDisabled", node)))
- config_theme_hidedisabled = parse_bool(doc, n);
-+ if ((n = parse_find_node("hideMenuHeader", node)))
-+ config_theme_hidemenuheader = parse_bool(doc, n);
- }
-
- static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-@@ -563,6 +566,7 @@ void config_startup(ObParseInst *i)
- config_title_layout = g_strdup("NLIMC");
- config_theme_keepborder = TRUE;
- config_theme_hidedisabled = FALSE;
-+ config_theme_hidemenuheader = FALSE;
-
- parse_register(i, "theme", parse_theme, NULL);
-
-Index: openbox/config.h
-===================================================================
-RCS file: /cvs/cvsroot/openbox/openbox/config.h,v
-retrieving revision 1.57
-diff -u -p -r1.57 config.h
---- openbox/config.h 25 Sep 2005 14:45:24 -0000 1.57
-+++ openbox/config.h 16 Apr 2006 18:29:18 -0000
-@@ -88,6 +88,8 @@ extern gchar *config_theme;
- extern gboolean config_theme_keepborder;
- /* Hide window frame buttons that the window doesn't allow */
- extern gboolean config_theme_hidedisabled;
-+/* Hide the menu header? */
-+extern gboolean config_theme_hidemenuheader;
- /* Titlebar button layout */
- extern gchar *config_title_layout;
-
-Index: openbox/menuframe.c
-===================================================================
-RCS file: /cvs/cvsroot/openbox/openbox/menuframe.c,v
-retrieving revision 1.52
-diff -u -p -r1.52 menuframe.c
---- openbox/menuframe.c 14 Sep 2005 17:40:47 -0000 1.52
-+++ openbox/menuframe.c 16 Apr 2006 18:29:18 -0000
-@@ -61,7 +61,7 @@ ObMenuFrame* menu_frame_new(ObMenu *menu
- self->type = Window_Menu;
- self->menu = menu;
- self->selected = NULL;
-- self->show_title = TRUE;
-+ self->show_title = !config_theme_hidemenuheader;
- self->client = client;
-
- attr.event_mask = FRAME_EVENTMASK;
diff --git a/x11-wm/openbox/files/openbox-20060509-pipedsplitgradient.patch b/x11-wm/openbox/files/openbox-20060509-pipedsplitgradient.patch
deleted file mode 100644
index f3de4dd3bd34..000000000000
--- a/x11-wm/openbox/files/openbox-20060509-pipedsplitgradient.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-Index: openbox/openbox.c
-===================================================================
-RCS file: /cvs/cvsroot/openbox/openbox/openbox.c,v
-retrieving revision 1.130
-diff -p -u -r1.130 openbox.c
---- openbox/openbox.c 1 Apr 2005 13:04:55 -0000 1.130
-+++ openbox/openbox.c 19 Feb 2006 22:21:25 -0000
-@@ -163,7 +163,7 @@ gint main(gint argc, gchar **argv)
- cursors[OB_CURSOR_BUSY] =
- XCreateFontCursor(ob_display, XC_watch);
- cursors[OB_CURSOR_MOVE] =
-- XCreateFontCursor(ob_display, XC_fleur);
-+ XCreateFontCursor(ob_display, XC_cross);
- cursors[OB_CURSOR_NORTH] =
- XCreateFontCursor(ob_display, XC_top_side);
- cursors[OB_CURSOR_NORTHEAST] =
-Index: render/gradient.c
-===================================================================
-RCS file: /cvs/cvsroot/openbox/render/gradient.c,v
-retrieving revision 1.45
-diff -p -u -r1.45 gradient.c
---- render/gradient.c 15 Oct 2003 03:59:35 -0000 1.45
-+++ render/gradient.c 19 Feb 2006 22:21:26 -0000
-@@ -24,6 +24,7 @@
-
- static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised);
- static void gradient_solid(RrAppearance *l, gint w, gint h);
-+static void gradient_split(RrAppearance *a, gint w, gint h);
- static void gradient_vertical(RrSurface *sf, gint w, gint h);
- static void gradient_horizontal(RrSurface *sf, gint w, gint h);
- static void gradient_diagonal(RrSurface *sf, gint w, gint h);
-@@ -41,6 +42,9 @@ void RrRender(RrAppearance *a, gint w, g
- case RR_SURFACE_SOLID:
- gradient_solid(a, w, h);
- break;
-+ case RR_SURFACE_SPLIT:
-+ gradient_split(a, w, h);
-+ break;
- case RR_SURFACE_VERTICAL:
- gradient_vertical(&a->surface, w, h);
- break;
-@@ -60,7 +64,7 @@ void RrRender(RrAppearance *a, gint w, g
- g_assert_not_reached(); /* unhandled gradient */
- return;
- }
--
-+
- if (a->surface.interlaced) {
- gint i;
- RrPixel32 *p;
-@@ -76,7 +80,7 @@ void RrRender(RrAppearance *a, gint w, g
- for (x = 0; x < w; ++x, ++p)
- *p = current;
- }
--
-+
- if (a->surface.relief == RR_RELIEF_FLAT && a->surface.border) {
- r = a->surface.border_color->r;
- g = a->surface.border_color->g;
-@@ -132,11 +136,11 @@ static void highlight(RrPixel32 *x, RrPi
- down = x;
- }
- r = (*up >> RrDefaultRedOffset) & 0xFF;
-- r += r >> 1;
-+ r += r >> 2;
- g = (*up >> RrDefaultGreenOffset) & 0xFF;
-- g += g >> 1;
-+ g += g >> 2;
- b = (*up >> RrDefaultBlueOffset) & 0xFF;
-- b += b >> 1;
-+ b += b >> 2;
- if (r > 0xFF) r = 0xFF;
- if (g > 0xFF) g = 0xFF;
- if (b > 0xFF) b = 0xFF;
-@@ -144,12 +148,15 @@ static void highlight(RrPixel32 *x, RrPi
- + (b << RrDefaultBlueOffset);
-
- r = (*down >> RrDefaultRedOffset) & 0xFF;
-- r = (r >> 1) + (r >> 2);
-+ r = (r >> 1) + (r >> 2) * 1.6;
- g = (*down >> RrDefaultGreenOffset) & 0xFF;
-- g = (g >> 1) + (g >> 2);
-+ g = (g >> 1) + (g >> 2) * 1.6;
- b = (*down >> RrDefaultBlueOffset) & 0xFF;
-- b = (b >> 1) + (b >> 2);
-- *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset)
-+ b = (b >> 1) + (b >> 2) * 1.6;
-+ if (r > 0xFF) r = 0xFF;
-+ if (g > 0xFF) g = 0xFF;
-+ if (b > 0xFF) b = 0xFF;
-+ *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset)
- + (b << RrDefaultBlueOffset);
- }
-
-@@ -159,11 +166,11 @@ static void create_bevel_colors(RrAppear
-
- /* light color */
- r = l->surface.primary->r;
-- r += r >> 1;
-+ r += r >> 2;
- g = l->surface.primary->g;
-- g += g >> 1;
-+ g += g >> 2;
- b = l->surface.primary->b;
-- b += b >> 1;
-+ b += b >> 2;
- if (r > 0xFF) r = 0xFF;
- if (g > 0xFF) g = 0xFF;
- if (b > 0xFF) b = 0xFF;
-@@ -172,11 +179,11 @@ static void create_bevel_colors(RrAppear
-
- /* dark color */
- r = l->surface.primary->r;
-- r = (r >> 1) + (r >> 2);
-+ r = (r >> 1) + (r >> 2) * 1.6;
- g = l->surface.primary->g;
-- g = (g >> 1) + (g >> 2);
-+ g = (g >> 1) + (g >> 2) * 1.6;
- b = l->surface.primary->b;
-- b = (b >> 1) + (b >> 2);
-+ b = (b >> 1) + (b >> 2) * 1.6;
- g_assert(!l->surface.bevel_dark);
- l->surface.bevel_dark = RrColorNew(l->inst, r, g, b);
- }
-@@ -198,7 +205,7 @@ static void gradient_solid(RrAppearance
-
- XFillRectangle(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->primary),
- 0, 0, w, h);
--
-+
- if (sp->interlaced) {
- for (i = 0; i < h; i += 2)
- XDrawLine(RrDisplay(l->inst), l->pixmap,
-@@ -359,6 +366,77 @@ static void gradient_solid(RrAppearance
- } \
- }
-
-+static void gradient_split(RrAppearance *a, gint w, gint h)
-+{
-+ gint x, y1, y3, r, g, b;
-+ RrSurface *sf = &a->surface;
-+ RrPixel32 *data = sf->pixel_data;
-+ RrPixel32 current;
-+ RrColor *primary_light, *secondary_light;
-+
-+/*
-+ maybe this is a better way, or maybe not!
-+ r = sf->primary->r;
-+ r = (r >> 1) + (r >> 2) + (r >> 3) ;
-+ g = sf->primary->g;
-+ g = (g >> 1) + (g >> 2) + (g >> 3);
-+ b = sf->primary->b;
-+ b = (b >> 1) + (b >> 2) + (b >> 3);
-+ primary_dark = RrColorNew(a->inst, r, g, b);
-+*/
-+
-+
-+ r = sf->primary->r;
-+ r += r >> 2;
-+ g = sf->primary->g;
-+ g += g >> 2;
-+ b = sf->primary->b;
-+ b += b >> 2;
-+ if (r > 0xFF) r = 0xFF;
-+ if (g > 0xFF) g = 0xFF;
-+ if (b > 0xFF) b = 0xFF;
-+ primary_light = RrColorNew(a->inst, r, g, b);
-+
-+
-+ r = sf->secondary->r;
-+ r += r >> 4;
-+ g = sf->secondary->g;
-+ g += g >> 4;
-+ b = sf->secondary->b;
-+ b += b >> 4;
-+ if (r > 0xFF) r = 0xFF;
-+ if (g > 0xFF) g = 0xFF;
-+ if (b > 0xFF) b = 0xFF;
-+ secondary_light = RrColorNew(a->inst, r, g, b);
-+
-+ VARS(y1);
-+ SETUP(y1, primary_light, sf->primary, (h / 2) -1);
-+
-+ VARS(y3);
-+ SETUP(y3, sf->secondary, secondary_light, (h / 2) -1);
-+
-+ for (y1 = h - 1; y1 > (h / 2) -1; --y1) { /* 0 -> h-1 */
-+ current = COLOR(y1);
-+ for (x = w - 1; x >= 0; --x) /* 0 -> w */
-+ *(data++) = current;
-+
-+ NEXT(y1);
-+ }
-+
-+
-+ for (y3 = (h / 2) - 1; y3 > 0; --y3) {
-+ current = COLOR(y3);
-+ for (x = w - 1; x >= 0; --x)
-+ *(data++) = current;
-+
-+ NEXT(y3);
-+ }
-+
-+ current = COLOR(y3);
-+ for (x = w - 1; x >= 0; --x) /* 0 -> w */
-+ *(data++) = current;
-+}
-+
- static void gradient_horizontal(RrSurface *sf, gint w, gint h)
- {
- gint x, y;
-@@ -567,4 +645,3 @@ static void gradient_pyramid(RrSurface *
- *(end-x) = current;
- *(end-(inw-x)) = current;
- }
--
-Index: render/render.h
-===================================================================
-RCS file: /cvs/cvsroot/openbox/render/render.h,v
-retrieving revision 1.57
-diff -p -u -r1.57 render.h
---- render/render.h 15 Jul 2005 14:39:31 -0000 1.57
-+++ render/render.h 19 Feb 2006 22:21:26 -0000
-@@ -61,6 +61,7 @@ typedef enum {
- RR_SURFACE_NONE,
- RR_SURFACE_PARENTREL,
- RR_SURFACE_SOLID,
-+ RR_SURFACE_SPLIT,
- RR_SURFACE_HORIZONTAL,
- RR_SURFACE_VERTICAL,
- RR_SURFACE_DIAGONAL,
-Index: render/theme.c
-===================================================================
-RCS file: /cvs/cvsroot/openbox/render/theme.c,v
-retrieving revision 1.76
-diff -p -u -r1.76 theme.c
---- render/theme.c 14 Jul 2005 20:41:24 -0000 1.76
-+++ render/theme.c 19 Feb 2006 22:21:28 -0000
-@@ -904,7 +904,7 @@ RrTheme* RrThemeNew(const RrInstance *in
- theme->padding * 2;
- }
- theme->button_size = theme->label_height - 2;
-- theme->grip_width = theme->title_height * 1.5;
-+ theme->grip_width = 25;
-
- return theme;
- }
-@@ -1200,6 +1200,8 @@ static void parse_appearance(gchar *tex,
- *grad = RR_SURFACE_HORIZONTAL;
- else if (strstr(tex, "vertical") != NULL)
- *grad = RR_SURFACE_VERTICAL;
-+ else if (strstr(tex, "split") != NULL)
-+ *grad = RR_SURFACE_SPLIT;
- else
- *grad = RR_SURFACE_DIAGONAL;
- } else {