diff options
| -rw-r--r-- | x11-wm/openbox/Manifest | 30 | ||||
| -rw-r--r-- | x11-wm/openbox/files/digest-openbox-3.3_rc2-r2 | 6 | ||||
| -rw-r--r-- | x11-wm/openbox/files/openbox-3.3_rc2-64bit-property.patch | 176 | ||||
| -rw-r--r-- | x11-wm/openbox/files/openbox-3.3_rc2-asneeded.patch | 12 | ||||
| -rw-r--r-- | x11-wm/openbox/openbox-3.3_rc2-r2.ebuild | 71 |
5 files changed, 7 insertions, 288 deletions
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest index 7958e787d54a..bd8ca1931b42 100644 --- a/x11-wm/openbox/Manifest +++ b/x11-wm/openbox/Manifest @@ -5,21 +5,12 @@ AUX openbox-3.2-makefile.patch 413 RMD160 827d2d6bae6bd6583a3ee5350e9b715eb555de MD5 9cf0208bdd9705c3aa2ec4a2be62c138 files/openbox-3.2-makefile.patch 413 RMD160 827d2d6bae6bd6583a3ee5350e9b715eb555de4c files/openbox-3.2-makefile.patch 413 SHA256 8cef7c7543e7b95302df9179d50d0ce79c34107b9f91053bb7e64e3bf3219c7a files/openbox-3.2-makefile.patch 413 -AUX openbox-3.3_rc2-64bit-property.patch 6458 RMD160 503e0d806c2084beb7d75c8670d8c512e4c289cc SHA1 ae4dc629df8082b4a7dfd99285df1555292adc64 SHA256 0f8833392f3ec63c84f835a28943a767e41ff44e20d3436438d10278f1b34395 -MD5 f628d964589ac827c70bca569312d813 files/openbox-3.3_rc2-64bit-property.patch 6458 -RMD160 503e0d806c2084beb7d75c8670d8c512e4c289cc files/openbox-3.3_rc2-64bit-property.patch 6458 -SHA256 0f8833392f3ec63c84f835a28943a767e41ff44e20d3436438d10278f1b34395 files/openbox-3.3_rc2-64bit-property.patch 6458 -AUX openbox-3.3_rc2-asneeded.patch 423 RMD160 d388b22842a2da7311b07c127927f2b1df68e8c9 SHA1 c00c330a2beb41af02cef8b6e894711e488ae317 SHA256 013d4da392119414ef25b1152495c39b834b952051cd940697a61233449d923e -MD5 8c4e16f0734dd4a37adc4c4dd8c5d862 files/openbox-3.3_rc2-asneeded.patch 423 -RMD160 d388b22842a2da7311b07c127927f2b1df68e8c9 files/openbox-3.3_rc2-asneeded.patch 423 -SHA256 013d4da392119414ef25b1152495c39b834b952051cd940697a61233449d923e files/openbox-3.3_rc2-asneeded.patch 423 AUX openbox.desktop 192 RMD160 af9f75aea5e8ed978ce0283be559e396101e994b SHA1 78ce3e081c9080ff4f4af63413497cc238a56be8 SHA256 5b4e837b3d4bf068a568c6fbc49489be560eb83bca0bdd15b8395cc0622a8320 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 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 @@ -29,14 +20,10 @@ EBUILD openbox-3.3.1.ebuild 1413 RMD160 97efbcf2fde00dab5319e42343db671be530dcd6 MD5 d605418c42be029f7da7a611aa89ba2d openbox-3.3.1.ebuild 1413 RMD160 97efbcf2fde00dab5319e42343db671be530dcd6 openbox-3.3.1.ebuild 1413 SHA256 20eacaa60f66a0f88d948958c50df004d3752d605030536ea12ed4bc7107b2d7 openbox-3.3.1.ebuild 1413 -EBUILD openbox-3.3_rc2-r2.ebuild 1951 RMD160 a7b12a23cddbec8b339672ee036cbb596de81a2e SHA1 fcdbad256c948496ca26d64436e15e43c2351821 SHA256 039448255cda5aa4ec96aeeefc079b3d32b0456c3ebcef29edf9a3f6e7229eff -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 20380 RMD160 15c6324bd551a8817faea6822f8be219577b4d4a SHA1 f1a7afcfd69738ab63ed4bc03f971f40f85e1c13 SHA256 9c092dd4b55a21ccd16012199e7b1424082aa140e6a701d127ed24e3702058c0 -MD5 f9743a19b0cbb1045e12a2e257b064a8 ChangeLog 20380 -RMD160 15c6324bd551a8817faea6822f8be219577b4d4a ChangeLog 20380 -SHA256 9c092dd4b55a21ccd16012199e7b1424082aa140e6a701d127ed24e3702058c0 ChangeLog 20380 +MISC ChangeLog 20563 RMD160 3524db0f505ab16929ca78e92855f79caf5a6462 SHA1 060e735ec0498d2dd1a0de91b4685bebb8a4a105 SHA256 5c775cb4a7f5f170a7e1cba76e0ea1b6cbe83827442b9b33c68580be1987bcd1 +MD5 cdc0677ce7ddaf0bb3eafd287626823b ChangeLog 20563 +RMD160 3524db0f505ab16929ca78e92855f79caf5a6462 ChangeLog 20563 +SHA256 5c775cb4a7f5f170a7e1cba76e0ea1b6cbe83827442b9b33c68580be1987bcd1 ChangeLog 20563 MISC metadata.xml 262 RMD160 ec458281a9fcc009187abba6cea56e99a9c63fe6 SHA1 a2a009bf8e56984d21bdb27d5232b19f9c8d87d5 SHA256 911f653cc05b0d1653fe55f3b3b07b94d8b3d94fd47c7342fc6c261634d93353 MD5 d2ac74d7476641e709ee917062fd85f5 metadata.xml 262 RMD160 ec458281a9fcc009187abba6cea56e99a9c63fe6 metadata.xml 262 @@ -47,13 +34,10 @@ SHA256 eba726a081f08d419cee76b8bd4c61395f5df36f02309a6aca8601e3bcaadadb files/di MD5 127edd67230d7a2222392a75829431d7 files/digest-openbox-3.3.1 241 RMD160 7f6da8a3f377022f42de08caad83df40a9103f05 files/digest-openbox-3.3.1 241 SHA256 d67149fc668496cb27418c6db31ccb5de5e93f1bece79cbf7310a8dc315e1010 files/digest-openbox-3.3.1 241 -MD5 aa497c5f2d9e4e97143d13a2e15adfb9 files/digest-openbox-3.3_rc2-r2 506 -RMD160 93e050fb5728584d84d21abcb11b3460ccb5fdcb files/digest-openbox-3.3_rc2-r2 506 -SHA256 11180050b938be73a9bd65dbbbca5f38d31db4a3571de45c51f8c597e7d7e748 files/digest-openbox-3.3_rc2-r2 506 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFd3a/AiZjviIA2XgRAqnCAKCQ2ZIkKIwk+YnLixU29dEWYvHQGgCgyKRO -IweuEWzYaeV3p7EwMO2rR8c= -=R6vu +iD8DBQFFd5QFvSApE0uP4UsRAsR4AJ9SENI+zd+fQUBeeSHQPlsIN8j3kACeOe33 +f/tdqGkBvbeK0+Ua3a7nByI= +=9V3i -----END PGP SIGNATURE----- diff --git a/x11-wm/openbox/files/digest-openbox-3.3_rc2-r2 b/x11-wm/openbox/files/digest-openbox-3.3_rc2-r2 deleted file mode 100644 index e8acfbffb7e4..000000000000 --- a/x11-wm/openbox/files/digest-openbox-3.3_rc2-r2 +++ /dev/null @@ -1,6 +0,0 @@ -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 1ff100d27cc1f47dadebb884a696dac3 openbox-3.3-rc2.tar.gz 585486 -RMD160 d12f6bda7145975754626e4c421baaa2ea25d07f openbox-3.3-rc2.tar.gz 585486 -SHA256 066c4add6cc16bbc1c30f3dcb84c16cfd6453c06d7fe1de3d04e279236d35692 openbox-3.3-rc2.tar.gz 585486 diff --git a/x11-wm/openbox/files/openbox-3.3_rc2-64bit-property.patch b/x11-wm/openbox/files/openbox-3.3_rc2-64bit-property.patch deleted file mode 100644 index 4d763ff16c28..000000000000 --- a/x11-wm/openbox/files/openbox-3.3_rc2-64bit-property.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff -ruN openbox-3.3-rc2.bak/openbox/client.c openbox-3.3-rc2/openbox/client.c ---- openbox-3.3-rc2.bak/openbox/client.c 2005-08-11 15:23:59.000000000 +0200 -+++ openbox-3.3-rc2/openbox/client.c 2005-10-07 16:34:21.000000000 +0200 -@@ -126,7 +126,7 @@ - windows = NULL; - - PROP_SETA32(RootWindow(ob_display, ob_screen), -- net_client_list, window, (guint32*)windows, size); -+ net_client_list, window, (gulong*)windows, size); - - if (windows) - g_free(windows); -@@ -1297,7 +1297,7 @@ - - static void client_change_allowed_actions(ObClient *self) - { -- guint32 actions[9]; -+ gulong actions[9]; - gint num = 0; - - /* desktop windows are kept on all desktops */ -@@ -1712,8 +1712,8 @@ - - static void client_change_state(ObClient *self) - { -- guint32 state[2]; -- guint32 netstate[11]; -+ gulong state[2]; -+ gulong netstate[11]; - guint num; - - state[0] = self->wmstate; -diff -ruN openbox-3.3-rc2.bak/openbox/frame.c openbox-3.3-rc2/openbox/frame.c ---- openbox-3.3-rc2.bak/openbox/frame.c 2005-07-14 15:44:33.000000000 +0200 -+++ openbox-3.3-rc2/openbox/frame.c 2005-10-07 16:06:50.000000000 +0200 -@@ -422,7 +422,7 @@ - } - - if (!STRUT_EQUAL(self->size, oldsize)) { -- guint32 vals[4]; -+ gulong vals[4]; - vals[0] = self->size.left; - vals[1] = self->size.right; - vals[2] = self->size.top; -Files openbox-3.3-rc2.bak/openbox/.libs/lt-openbox and openbox-3.3-rc2/openbox/.libs/lt-openbox differ -Files openbox-3.3-rc2.bak/openbox/.libs/openbox and openbox-3.3-rc2/openbox/.libs/openbox differ -diff -ruN openbox-3.3-rc2.bak/openbox/prop.c openbox-3.3-rc2/openbox/prop.c ---- openbox-3.3-rc2.bak/openbox/prop.c 2004-03-21 02:03:00.000000000 +0100 -+++ openbox-3.3-rc2/openbox/prop.c 2005-10-07 16:58:45.000000000 +0200 -@@ -206,7 +206,7 @@ - data[i] = xdata[i]; - break; - case 16: -- ((guint16*)data)[i] = ((guint16*)xdata)[i]; -+ ((gushort*)data)[i] = ((gushort*)xdata)[i]; - break; - case 32: - ((guint32*)data)[i] = ((gulong*)xdata)[i]; -@@ -245,7 +245,7 @@ - (*data)[i] = xdata[i]; - break; - case 16: -- ((guint16*)*data)[i] = ((guint16*)xdata)[i]; -+ ((gushort*)*data)[i] = ((gushort*)xdata)[i]; - break; - case 32: - ((guint32*)*data)[i] = ((gulong*)xdata)[i]; -@@ -383,13 +383,13 @@ - return FALSE; - } - --void prop_set32(Window win, Atom prop, Atom type, guint32 val) -+void prop_set32(Window win, Atom prop, Atom type, gulong val) - { - XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace, - (guchar*)&val, 1); - } - --void prop_set_array32(Window win, Atom prop, Atom type, guint32 *val, -+void prop_set_array32(Window win, Atom prop, Atom type, gulong *val, - guint num) - { - XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace, -diff -ruN openbox-3.3-rc2.bak/openbox/prop.h openbox-3.3-rc2/openbox/prop.h ---- openbox-3.3-rc2.bak/openbox/prop.h 2004-03-21 02:03:00.000000000 +0100 -+++ openbox-3.3-rc2/openbox/prop.h 2005-10-07 16:15:38.000000000 +0200 -@@ -177,8 +177,8 @@ - gboolean prop_get_strings_locale(Window win, Atom prop, gchar ***ret); - gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret); - --void prop_set32(Window win, Atom prop, Atom type, guint32 val); --void prop_set_array32(Window win, Atom prop, Atom type, guint32 *val, -+void prop_set32(Window win, Atom prop, Atom type, gulong val); -+void prop_set_array32(Window win, Atom prop, Atom type, gulong *val, - guint num); - void prop_set_string_utf8(Window win, Atom prop, gchar *val); - void prop_set_strings_utf8(Window win, Atom prop, gchar **strs); -diff -ruN openbox-3.3-rc2.bak/openbox/screen.c openbox-3.3-rc2/openbox/screen.c ---- openbox-3.3-rc2.bak/openbox/screen.c 2005-10-03 17:47:53.000000000 +0200 -+++ openbox-3.3-rc2/openbox/screen.c 2005-10-07 16:29:58.000000000 +0200 -@@ -156,7 +156,7 @@ - XSetWindowAttributes attrib; - pid_t pid; - gint i, num_support; -- guint32 *supported; -+ gulong *supported; - - /* create the netwm support window */ - attrib.override_redirect = TRUE; -@@ -206,7 +206,7 @@ - /* set the _NET_SUPPORTED_ATOMS hint */ - num_support = 51; - i = 0; -- supported = g_new(guint32, num_support); -+ supported = g_new(gulong, num_support); - supported[i++] = prop_atoms.net_current_desktop; - supported[i++] = prop_atoms.net_number_of_desktops; - supported[i++] = prop_atoms.net_desktop_geometry; -@@ -340,7 +340,7 @@ - static gint oldw = 0, oldh = 0; - gint w, h; - GList *it; -- guint32 geometry[2]; -+ gulong geometry[2]; - - w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen)); - h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen)); -@@ -368,7 +368,7 @@ - void screen_set_num_desktops(guint num) - { - guint i, old; -- guint32 *viewport; -+ gulong *viewport; - GList *it; - - g_assert(num > 0); -@@ -381,7 +381,7 @@ - net_number_of_desktops, cardinal, num); - - /* set the viewport hint */ -- viewport = g_new0(guint32, num * 2); -+ viewport = g_new0(gulong, num * 2); - PROP_SETA32(RootWindow(ob_display, ob_screen), - net_desktop_viewport, cardinal, viewport, num * 2); - g_free(viewport); -@@ -969,7 +969,7 @@ - void screen_update_areas() - { - guint i, x; -- guint32 *dims; -+ long *dims; - GList *it; - gint o; - -@@ -987,7 +987,7 @@ - area[i] = g_new0(Rect, screen_num_monitors + 1); - area[i] = NULL; - -- dims = g_new(guint32, 4 * screen_num_desktops); -+ dims = g_new(gulong, 4 * screen_num_desktops); - - for (i = 0; i < screen_num_desktops + 1; ++i) { - Strut *struts; - -diff -ruN openbox-3.3-rc2.bak/openbox/stacking.c openbox-3.3-rc2/openbox/stacking.c ---- openbox-3.3-rc2.bak/openbox/stacking.c 2005-02-08 05:33:54.000000000 +0100 -+++ openbox-3.3-rc2/openbox/stacking.c 2005-10-07 16:21:27.000000000 +0200 -@@ -49,7 +49,7 @@ - } - - PROP_SETA32(RootWindow(ob_display, ob_screen), -- net_client_list_stacking, window, (guint32*)windows, i); -+ net_client_list_stacking, window, (gulong*)windows, i); - - g_free(windows); - } diff --git a/x11-wm/openbox/files/openbox-3.3_rc2-asneeded.patch b/x11-wm/openbox/files/openbox-3.3_rc2-asneeded.patch deleted file mode 100644 index 0d85c8ca90f9..000000000000 --- a/x11-wm/openbox/files/openbox-3.3_rc2-asneeded.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: openbox-3.3-rc2/Makefile.am -=================================================================== ---- openbox-3.3-rc2.orig/Makefile.am -+++ openbox-3.3-rc2/Makefile.am -@@ -58,6 +58,7 @@ render_libobrender_la_CPPFLAGS = \ - 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/openbox-3.3_rc2-r2.ebuild b/x11-wm/openbox/openbox-3.3_rc2-r2.ebuild deleted file mode 100644 index b5ed339a9a1e..000000000000 --- a/x11-wm/openbox/openbox-3.3_rc2-r2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# 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-3.3_rc2-r2.ebuild,v 1.2 2006/04/29 22:30:34 anarchy Exp $ - -inherit eutils - -DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager." -HOMEPAGE="http://icculus.org/openbox/" -SRC_URI="http://icculus.org/openbox/releases/${P/_/-}.tar.gz - mirror://gentoo/ob-themes-usability.tar.bz2" - -LICENSE="GPL-2" -SLOT="3" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64" -IUSE="pango nls startup-notification xinerama" - -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" -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}/${P/_/-} - -src_unpack() { - unpack ${A} - epatch ${FILESDIR}/${P}-64bit-property.patch - epatch ${FILESDIR}/${P}-asneeded.patch -} - -src_compile() { - econf `use_enable nls` `use_enable pango` ${myconf} || die - emake || die -} - -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 - - # Extra styles from http://home.clara.co.uk/dpb/openbox.htm - # These are included due to the poor usability of the default themes - # for users with limited vision. These are based on Jimmac's - # Gorilla and Industrial themes for Metacity. - - insinto /usr/share/themes - #cp -pPR ${WORKDIR}/ob-themes-usability/* ${D}/usr/share/themes - doins -r ${WORKDIR}/ob-themes-usability/* -} |