diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2004-04-26 17:14:33 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2004-04-26 17:14:33 +0000 |
| commit | 8914e75cd3c9113d5c363e8ea62dfc59653b8903 (patch) | |
| tree | 47bf8fa2a9830e6a6e45e2830c7fe74941ec3cb6 /gnome-base | |
| parent | Added ~alpha. (Manifest recommit) (diff) | |
| download | gentoo-2-8914e75cd3c9113d5c363e8ea62dfc59653b8903.tar.gz gentoo-2-8914e75cd3c9113d5c363e8ea62dfc59653b8903.tar.bz2 gentoo-2-8914e75cd3c9113d5c363e8ea62dfc59653b8903.zip | |
minor fixes
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gnome-panel/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/gnome-panel/files/gnome-panel-2.6.1-parallel_install.patch | 42 | ||||
| -rw-r--r-- | gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild | 6 |
3 files changed, 50 insertions, 4 deletions
diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog index 89298497745b..809f9d8981b7 100644 --- a/gnome-base/gnome-panel/ChangeLog +++ b/gnome-base/gnome-panel/ChangeLog @@ -1,9 +1,13 @@ # ChangeLog for gnome-base/gnome-panel # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.81 2004/04/21 13:53:19 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.82 2004/04/26 17:14:33 foser Exp $ *gnome-panel-2.6.1 (21 Apr 2004) + 26 Apr 2004; foser <foser@gentoo.org> gnome-panel-2.6.1.ebuild : + Fix gconf dep + Update parallel build patch (provided by j. <merkaba@quantumfish.com>) #48583 + 21 Apr 2004; foser <foser@gentoo.org> gnome-panel-2.6.1.ebuild : New release diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.6.1-parallel_install.patch b/gnome-base/gnome-panel/files/gnome-panel-2.6.1-parallel_install.patch new file mode 100644 index 000000000000..9fe5142b644f --- /dev/null +++ b/gnome-base/gnome-panel/files/gnome-panel-2.6.1-parallel_install.patch @@ -0,0 +1,42 @@ +diff -ru gnome-panel-2.6.1/gnome-panel/Makefile.am gnome-panel-2.6.1-new/gnome-panel/Makefile.am +--- gnome-panel-2.6.1/gnome-panel/Makefile.am 2004-04-19 10:16:02.000000000 -0500 ++++ gnome-panel-2.6.1-new/gnome-panel/Makefile.am 2004-04-22 14:30:37.002004640 -0500 +@@ -43,7 +43,7 @@ + GNOME_Panel-stubs.c \ + GNOME_Panel-skels.c \ + GNOME_Panel-common.c \ +- GNOME_Panel.h \ ++ $(top_builddir)/gnome-panel/GNOME_Panel.h \ + $(NULL) + + $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) +@@ -254,7 +254,7 @@ + panel_enum_headers = \ + $(top_srcdir)/gnome-panel/panel-enums.h \ + $(top_srcdir)/gnome-panel/panel-types.h \ +- GNOME_Panel.h ++ $(top_builddir)/gnome-panel/GNOME_Panel.h + + panel-marshal.h: panel-marshal.list $(GLIB_GENMARSHAL) + $(GLIB_GENMARSHAL) $< --header --prefix=panel_marshal > $@ +diff -ru gnome-panel-2.6.1/gnome-panel/Makefile.in gnome-panel-2.6.1-new/gnome-panel/Makefile.in +--- gnome-panel-2.6.1/gnome-panel/Makefile.in 2004-04-19 10:25:25.000000000 -0500 ++++ gnome-panel-2.6.1-new/gnome-panel/Makefile.in 2004-04-22 14:30:52.054716280 -0500 +@@ -273,7 +273,7 @@ + GNOME_Panel-stubs.c \ + GNOME_Panel-skels.c \ + GNOME_Panel-common.c \ +- GNOME_Panel.h \ ++ $(top_builddir)/gnome-panel/GNOME_Panel.h \ + $(NULL) + + +@@ -497,7 +497,7 @@ + panel_enum_headers = \ + $(top_srcdir)/gnome-panel/panel-enums.h \ + $(top_srcdir)/gnome-panel/panel-types.h \ +- GNOME_Panel.h ++ $(top_builddir)/gnome-panel/GNOME_Panel.h + + + uidir = $(datadir)/gnome-2.0/ui diff --git a/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild index 0812fe0c6e00..eb0ba25ebb46 100644 --- a/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild +++ b/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild,v 1.1 2004/04/21 13:53:19 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild,v 1.2 2004/04/26 17:14:33 foser Exp $ inherit gnome2 eutils @@ -21,7 +21,7 @@ RDEPEND=">=x11-libs/gtk+-2.3.2 >=gnome-base/libglade-2.3 >=gnome-base/libgnome-2.1.1 >=gnome-base/libgnomeui-2.5.4 - >=gnome-base/gconf-2.3.3 + >=gnome-base/gconf-2.6.1 media-libs/libpng !gnome-extra/system-tray-applet" @@ -40,7 +40,7 @@ src_unpack() { cd ${S} # should fix parallel install #45315 - epatch ${FILESDIR}/${PN}-2.6-parallel_install.patch + epatch ${FILESDIR}/${PN}-2.6.1-parallel_install.patch } |