diff options
author | 2010-04-03 05:45:49 +0000 | |
---|---|---|
committer | 2010-04-03 05:45:49 +0000 | |
commit | 3eed974c2e7a01a0b86b1a7f198461e8d0143908 (patch) | |
tree | 6c57afc2384d6bdcf453f771c10a847676cbb6c4 /x11-wm/emerald | |
parent | Replaced compiz ~ deps with >= deps to support the new compiz-0.8.6 release a... (diff) | |
download | historical-3eed974c2e7a01a0b86b1a7f198461e8d0143908.tar.gz historical-3eed974c2e7a01a0b86b1a7f198461e8d0143908.tar.bz2 historical-3eed974c2e7a01a0b86b1a7f198461e8d0143908.zip |
Replaced compiz ~ deps with >= deps to support the new compiz-0.8.6 release and to avoid future dep issues.
Did a revbump to avoid issues with installed packages.
Added a patch to enable emerald to build with gtk+-2.20. Fixes bug 308791 - thanks to Leif Walsh <adlaiff6@gmail.com>.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'x11-wm/emerald')
-rw-r--r-- | x11-wm/emerald/ChangeLog | 14 | ||||
-rw-r--r-- | x11-wm/emerald/Manifest | 4 | ||||
-rw-r--r-- | x11-wm/emerald/emerald-0.8.4-r1.ebuild | 42 | ||||
-rw-r--r-- | x11-wm/emerald/files/emerald-0.8.4-gtk+-2.20-build.patch | 33 |
4 files changed, 90 insertions, 3 deletions
diff --git a/x11-wm/emerald/ChangeLog b/x11-wm/emerald/ChangeLog index 634ededfbb60..34db43454387 100644 --- a/x11-wm/emerald/ChangeLog +++ b/x11-wm/emerald/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for x11-wm/emerald -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.29 2009/12/20 15:48:25 mrpouet Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.30 2010/04/03 05:45:49 jmbsvicetto Exp $ + +*emerald-0.8.4-r1 (03 Apr 2010) + + 03 Apr 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> + +emerald-0.8.4-r1.ebuild, +files/emerald-0.8.4-gtk+-2.20-build.patch: + Replaced compiz ~ deps with >= deps to support the new compiz-0.8.6 + release and to avoid future dep issues. + Did a revbump to avoid issues with installed packages. + Added a patch to enable emerald to build with gtk+-2.20. Fixes bug 308791 + - thanks to Leif Walsh <adlaiff6@gmail.com>. 20 Dec 2009; Romain Perier <mrpouet@gentoo.org> -emerald-0.5.2.ebuild, -emerald-0.8.2.ebuild, -files/emerald-ru.po.patch: diff --git a/x11-wm/emerald/Manifest b/x11-wm/emerald/Manifest index d151e5970776..6b80357d2038 100644 --- a/x11-wm/emerald/Manifest +++ b/x11-wm/emerald/Manifest @@ -1,4 +1,6 @@ +AUX emerald-0.8.4-gtk+-2.20-build.patch 1194 RMD160 f87d90db0341b77937b1c32521752bf0420974f8 SHA1 849f7aadb60dc702260e9900330cd5bc2a5a3242 SHA256 c196b2720ffa2996992e02b62d02f67c0f7f9dd7301fc6ceb26a1b1c81d5bcec DIST emerald-0.8.4.tar.bz2 525316 RMD160 de04228414419141c3df0e7f32a062cc6dfabcda SHA1 408bef6ba7822bd933448f16dc43bbd3d801d9c9 SHA256 7ed5009a739219c61c26176f738ba5264e93557f353fdf9fc480c73fe8b05e26 +EBUILD emerald-0.8.4-r1.ebuild 920 RMD160 833da8531c574d8a8f8ca096c56666262a1311e9 SHA1 a88a1aafc4c3a70a9263c84b145b9a790d577a5a SHA256 688b032440655d9f16396da245f296244aeea45638159ce54e3e2e3fb43cb997 EBUILD emerald-0.8.4.ebuild 853 RMD160 bdfd0dd37cb47afee946d081b988d94804105e3f SHA1 58cf310fc9d422f41ac742b150eb696d9c71f8f8 SHA256 fb66f806e20d5857154dd16305c484b7ee616007b84efb194546a3ac74f2b8ac -MISC ChangeLog 4354 RMD160 f3acecbdb6dc113186108a1c278a830bfcb515d3 SHA1 a6c4ec3913e2e2bde0c00de560f40fef10157d7d SHA256 25eaf89d132f0599b348c75ae75918e7d36d4f400174858ecabb15d8cc32a84e +MISC ChangeLog 4823 RMD160 51eb777dd34f80d6204aed2c12b9031bfc6b0fe0 SHA1 7cd887225fc68646d6af2ab601ea2eb2a13a6f2b SHA256 2f85cf2441585b3b49fb388f56aa6ac06b2b0500e39cf6d6901f89cc52ff9ac8 MISC metadata.xml 294 RMD160 4e679fcbec940438f4c6918c047a4703a9edf7f7 SHA1 a10877882be8eb3e6b2cde8df9aad51f39ecd4a4 SHA256 3f2e1d5e049bf839f1dce07e7680ebf64c7e7713c0dadd799c9b7e49b701a98e diff --git a/x11-wm/emerald/emerald-0.8.4-r1.ebuild b/x11-wm/emerald/emerald-0.8.4-r1.ebuild new file mode 100644 index 000000000000..2e67636f8421 --- /dev/null +++ b/x11-wm/emerald/emerald-0.8.4-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.8.4-r1.ebuild,v 1.1 2010/04/03 05:45:49 jmbsvicetto Exp $ + +EAPI="2" + +inherit eutils + +THEMES_RELEASE=0.5.2 + +DESCRIPTION="Emerald Window Decorator" +HOMEPAGE="http://www.compiz.org/" +SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +PDEPEND="~x11-themes/emerald-themes-${THEMES_RELEASE}" + +RDEPEND=" + >=x11-libs/gtk+-2.8.0 + >=x11-libs/libwnck-2.14.2 + >=x11-wm/compiz-${PV} +" + +DEPEND="${RDEPEND} + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.19 + >=sys-devel/gettext-0.15 +" + +PATCHES=( "${FILESDIR}-${P}-gtk+-2.20-build.patch" ) + +src_configure() { + econf --disable-mime-update || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} diff --git a/x11-wm/emerald/files/emerald-0.8.4-gtk+-2.20-build.patch b/x11-wm/emerald/files/emerald-0.8.4-gtk+-2.20-build.patch new file mode 100644 index 000000000000..3dc7bf4488ad --- /dev/null +++ b/x11-wm/emerald/files/emerald-0.8.4-gtk+-2.20-build.patch @@ -0,0 +1,33 @@ +diff -urN emerald-0.8.4/libengine/themer.c emerald-0.8.4.new/libengine/themer.c +--- emerald-0.8.4/libengine/themer.c 2009-10-13 20:56:23.000000000 -0400 ++++ emerald-0.8.4.new/libengine/themer.c 2010-03-10 01:20:03.046827674 -0500 +@@ -461,7 +461,7 @@ + } + gdouble get_float(SettingItem * item) + { +- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { ++ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { + return gtk_spin_button_get_value((GtkSpinButton *)item->widget); + } + else { +@@ -647,7 +647,7 @@ + } + void set_float(SettingItem * item, gdouble f) + { +- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { ++ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { + gtk_spin_button_set_value((GtkSpinButton *)item->widget, f); + } + else { +--- emerald-0.8.4/src/main.c.old 2010-03-29 19:49:30.420710030 -0700 ++++ emerald-0.8.4/src/main.c 2010-03-29 19:52:33.654024944 -0700 +@@ -3757,7 +3757,7 @@ + + static void hide_tooltip(void) + { +- if (GTK_WIDGET_VISIBLE(tip_window)) ++ if (gtk_widget_get_visible(tip_window)) + g_get_current_time(&tooltip_last_popdown); + + gtk_widget_hide(tip_window); + |