diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2004-03-21 23:23:31 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2004-03-21 23:23:31 +0000 |
| commit | e5ef8ac1119cf29e540a552bf9b60b53e812d410 (patch) | |
| tree | 89ecb1271b4cbb46c8aa5f76501712a1d2258207 /gnome-base | |
| parent | Added ~sparc keyword. (Manifest recommit) (diff) | |
| download | gentoo-2-e5ef8ac1119cf29e540a552bf9b60b53e812d410.tar.gz gentoo-2-e5ef8ac1119cf29e540a552bf9b60b53e812d410.tar.bz2 gentoo-2-e5ef8ac1119cf29e540a552bf9b60b53e812d410.zip | |
fix gtk+-2.4 issues
Diffstat (limited to 'gnome-base')
4 files changed, 59 insertions, 6 deletions
diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog index 5cab8bfcb197..6f33e6e296d4 100644 --- a/gnome-base/gnome-desktop/ChangeLog +++ b/gnome-base/gnome-desktop/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-base/gnome-desktop # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.52 2004/03/20 09:52:29 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.53 2004/03/21 23:23:31 foser Exp $ + + 22 Mar 2004; foser <foser@gentoo.org> gnome-desktop-2.4.{0,1.1}.ebuild : + Fix the breakage because of gtk+-2.4 deprecated API (#45258) *gnome-desktop-2.5.92 (20 Mar 2004) diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.4-no_deprecated_about.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.4-no_deprecated_about.patch new file mode 100644 index 000000000000..321b4c3420e1 --- /dev/null +++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.4-no_deprecated_about.patch @@ -0,0 +1,44 @@ +diff -uNr gnome-desktop-2.4.1.1/gnome-about/Makefile.am gnome-desktop-2.4.1.1.patched/gnome-about/Makefile.am +--- gnome-desktop-2.4.1.1/gnome-about/Makefile.am 2003-06-06 15:00:57.000000000 +0200 ++++ gnome-desktop-2.4.1.1.patched/gnome-about/Makefile.am 2004-03-21 23:42:39.821531616 +0100 +@@ -6,12 +6,12 @@ + -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" + + # Flags to make sure we're not using any deprecated functions +-DISABLE_DEPRECATED_CFLAGS = \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGNOME_DISABLE_DEPRECATED ++#DISABLE_DEPRECATED_CFLAGS = \ ++# -DG_DISABLE_DEPRECATED \ ++# -DGDK_DISABLE_DEPRECATED \ ++# -DGTK_DISABLE_DEPRECATED \ ++# -DGDK_PIXBUF_DISABLE_DEPRECATED \ ++# -DGNOME_DISABLE_DEPRECATED + + LDADD = \ + $(GNOME_ABOUT_LIBS) +diff -uNr gnome-desktop-2.4.1.1/gnome-about/Makefile.in gnome-desktop-2.4.1.1.patched/gnome-about/Makefile.in +--- gnome-desktop-2.4.1.1/gnome-about/Makefile.in 2003-10-15 15:02:21.000000000 +0200 ++++ gnome-desktop-2.4.1.1.patched/gnome-about/Makefile.in 2004-03-21 23:53:57.296539760 +0100 +@@ -155,12 +155,12 @@ + + + # Flags to make sure we're not using any deprecated functions +-DISABLE_DEPRECATED_CFLAGS = \ +- -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGNOME_DISABLE_DEPRECATED ++#DISABLE_DEPRECATED_CFLAGS = \ ++# -DG_DISABLE_DEPRECATED \ ++# -DGDK_DISABLE_DEPRECATED \ ++# -DGTK_DISABLE_DEPRECATED \ ++# -DGDK_PIXBUF_DISABLE_DEPRECATED \ ++# -DGNOME_DISABLE_DEPRECATED + + + LDADD = \ diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.4.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.4.0.ebuild index e0de6f249def..8cb3082e06db 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-2.4.0.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-2.4.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# 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-desktop/gnome-desktop-2.4.0.ebuild,v 1.11 2004/01/30 05:49:32 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.4.0.ebuild,v 1.12 2004/03/21 23:23:31 foser Exp $ inherit gnome2 eutils @@ -38,6 +38,9 @@ src_unpack() { cd ${S} sed -i 's:GNOME.Org:Gentoo Linux:' configure.in + #45258 + epatch ${FILESDIR}/${PN}-2.4-no_deprecated_about.patch + WANT_AUTOCONF=2.5 autoconf || die WANT_AUTOMAKE=1.4 automake || die diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild index fcc0fe341f6f..fdaf8474fed1 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-2.4.1.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-desktop/gnome-desktop-2.4.1.1.ebuild,v 1.8 2004/03/14 18:18:08 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.4.1.1.ebuild,v 1.9 2004/03/21 23:23:31 foser Exp $ inherit gnome2 eutils @@ -39,8 +39,8 @@ src_unpack() { cd ${S} sed -i 's:GNOME.Org:Gentoo Linux:' configure.in - WANT_AUTOCONF=2.5 autoconf || die - WANT_AUTOMAKE=1.4 automake || die + # fix issues with gtk+-2.4 (#45258) + epatch ${FILESDIR}/${PN}-2.4-no_deprecated_about.patch # Fix bug 16853 by building gnome-about with IEEE to prevent # floating point exceptions on alpha @@ -48,4 +48,7 @@ src_unpack() { cd ${S}/gnome-about sed -i '/^CFLAGS/s/$/ -mieee/' Makefile.in + WANT_AUTOCONF=2.5 autoconf || die + WANT_AUTOMAKE=1.4 automake || die + } |