diff options
author | Marinus Schraal <foser@gentoo.org> | 2004-03-28 16:43:13 +0000 |
---|---|---|
committer | Marinus Schraal <foser@gentoo.org> | 2004-03-28 16:43:13 +0000 |
commit | 7c2a248fb858874f190f10271269d81cc225db55 (patch) | |
tree | 7f2817f9779705a9e1c9116150a3f2e4662b5d62 /app-text | |
parent | Initial version, closes #45914. (diff) | |
download | historical-7c2a248fb858874f190f10271269d81cc225db55.tar.gz historical-7c2a248fb858874f190f10271269d81cc225db55.tar.bz2 historical-7c2a248fb858874f190f10271269d81cc225db55.zip |
fix gtk+-2.4 build
Diffstat (limited to 'app-text')
-rw-r--r-- | app-text/ggv/ChangeLog | 5 | ||||
-rw-r--r-- | app-text/ggv/Manifest | 15 | ||||
-rw-r--r-- | app-text/ggv/files/digest-ggv-2.0.1 | 1 | ||||
-rw-r--r-- | app-text/ggv/files/digest-ggv-2.4.0.1 | 1 | ||||
-rw-r--r-- | app-text/ggv/files/ggv-2.4-fix_gtk+-2.4_build.patch | 24 | ||||
-rw-r--r-- | app-text/ggv/ggv-2.0.1.ebuild | 24 | ||||
-rw-r--r-- | app-text/ggv/ggv-2.4.0.1.ebuild | 24 | ||||
-rw-r--r-- | app-text/ggv/ggv-2.4.0.2.ebuild | 12 | ||||
-rw-r--r-- | app-text/ggv/ggv-2.4.1.ebuild | 12 |
9 files changed, 56 insertions, 62 deletions
diff --git a/app-text/ggv/ChangeLog b/app-text/ggv/ChangeLog index 9117730504f8..877dcedce71f 100644 --- a/app-text/ggv/ChangeLog +++ b/app-text/ggv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/ggv # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ChangeLog,v 1.56 2004/03/22 11:34:27 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ChangeLog,v 1.57 2004/03/28 16:43:13 foser Exp $ + + 28 Mar 2004; foser <foser@gentoo.org> ggv-2.4*.ebuild : + Fix build with gtk+-2.4 (#45794) 22 Mar 2004; foser <foser@gentoo.org> ggv-2.6.0.ebuild : Fix ghostscript dep to virtual (#45350) diff --git a/app-text/ggv/Manifest b/app-text/ggv/Manifest index 1881d8ef0bd1..d5558280ea92 100644 --- a/app-text/ggv/Manifest +++ b/app-text/ggv/Manifest @@ -1,14 +1,11 @@ -MD5 1f9bfab57aade6b6e83537260f762bca ChangeLog 7006 MD5 29485590d6033d8cc9ad5e3cb0d88010 ggv-1.1.94.ebuild 1629 -MD5 f20abfdd041b7578de0617accf27d617 ggv-2.0.1.ebuild 646 -MD5 6d0a9e13992cbaf0bc10803ed4f038f6 ggv-2.4.0.1.ebuild 649 -MD5 c62954dd127b8bb867c857270d5df7fe ggv-2.4.1.ebuild 688 -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 7fd04730850f52c1faa8259d51c6ec25 ggv-2.4.0.2.ebuild 683 +MD5 8b8c5f5c0891444f9bc905f1cd4cc66c ggv-2.4.0.2.ebuild 808 MD5 3be18565a55ad8fe7d0bd6fb886b5882 ggv-2.6.0.ebuild 688 +MD5 49de6c401fed97661a0ca12398ab841d ChangeLog 7100 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 b5183925ea1610c7978d7bec98a1bceb ggv-2.4.1.ebuild 819 MD5 9839595041edeb9a62751cae70d30ea1 files/digest-ggv-1.1.94 62 -MD5 68688e676f5d0f61aeb97e413dfdb041 files/digest-ggv-2.4.1 63 -MD5 d7512f10aeb8f218994e94d0b50ef42a files/digest-ggv-2.0.1 62 -MD5 ab26db64779abda7431d8d0c8c1045af files/digest-ggv-2.4.0.1 65 MD5 d9763f700891e3270ce421ce320427b0 files/digest-ggv-2.4.0.2 65 +MD5 68688e676f5d0f61aeb97e413dfdb041 files/digest-ggv-2.4.1 63 MD5 d14e7cb9a428e2a46f909b7d1da5cfab files/digest-ggv-2.6.0 63 +MD5 515619d60d10dc4e10d15e9b93af4541 files/ggv-2.4-fix_gtk+-2.4_build.patch 951 diff --git a/app-text/ggv/files/digest-ggv-2.0.1 b/app-text/ggv/files/digest-ggv-2.0.1 deleted file mode 100644 index 8fa4a3274122..000000000000 --- a/app-text/ggv/files/digest-ggv-2.0.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 29aefe42e3f81f9ba65b8e3befb958bd ggv-2.0.1.tar.bz2 905601 diff --git a/app-text/ggv/files/digest-ggv-2.4.0.1 b/app-text/ggv/files/digest-ggv-2.4.0.1 deleted file mode 100644 index cfb55a89a181..000000000000 --- a/app-text/ggv/files/digest-ggv-2.4.0.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 749b7c7f16807dcf924db2475b87f34e ggv-2.4.0.1.tar.bz2 1121842 diff --git a/app-text/ggv/files/ggv-2.4-fix_gtk+-2.4_build.patch b/app-text/ggv/files/ggv-2.4-fix_gtk+-2.4_build.patch new file mode 100644 index 000000000000..e9ff10e0ad11 --- /dev/null +++ b/app-text/ggv/files/ggv-2.4-fix_gtk+-2.4_build.patch @@ -0,0 +1,24 @@ +diff -uNr ggv-2.4.1/configure ggv-2.4.1.patched/configure +--- ggv-2.4.1/configure 2004-02-04 21:34:30.000000000 +0100 ++++ ggv-2.4.1.patched/configure 2004-03-28 18:25:01.405058360 +0200 +@@ -21944,7 +21944,7 @@ + BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`" + + +-GGV_EXTRA_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED" ++GGV_EXTRA_CFLAGS= + + + +diff -uNr ggv-2.4.1/configure.in ggv-2.4.1.patched/configure.in +--- ggv-2.4.1/configure.in 2004-02-04 21:33:57.000000000 +0100 ++++ ggv-2.4.1.patched/configure.in 2004-03-28 18:25:18.287491840 +0200 +@@ -148,7 +148,7 @@ + BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`" + AC_SUBST(BONOBO_ACT_IDLDIR) + +-GGV_EXTRA_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED" ++GGV_EXTRA_CFLAGS= + + AC_SUBST(GGV_EXTRA_CFLAGS) + AC_SUBST(CFLAGS) diff --git a/app-text/ggv/ggv-2.0.1.ebuild b/app-text/ggv/ggv-2.0.1.ebuild deleted file mode 100644 index d1c7249d0b7a..000000000000 --- a/app-text/ggv/ggv-2.0.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ggv-2.0.1.ebuild,v 1.10 2003/12/09 17:34:10 lanius Exp $ - -inherit gnome2 - -DESCRIPTION="The GNOME PostScript document viewer" -HOMEPAGE="http://www.gnome.org/" - -IUSE="" -SLOT="0" -LICENSE="GPL-2 FDL-1.1" -KEYWORDS="x86 ppc alpha ~sparc hppa amd64" - -RDEPEND=">=gnome-base/libgnomeui-2 - >=gnome-base/ORBit2-2.4.1 - virtual/ghostscript - >=dev-libs/popt-1.6" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0 - dev-util/intltool" - -DOCS="AUTHORS ChangeLog COPYING* MAINTAINERS TODO NEWS README" diff --git a/app-text/ggv/ggv-2.4.0.1.ebuild b/app-text/ggv/ggv-2.4.0.1.ebuild deleted file mode 100644 index e2a5ac35a8a8..000000000000 --- a/app-text/ggv/ggv-2.4.0.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ggv-2.4.0.1.ebuild,v 1.7 2003/12/09 17:34:10 lanius Exp $ - -inherit gnome2 - -DESCRIPTION="The GNOME PostScript document viewer" -HOMEPAGE="http://www.gnome.org/" - -IUSE="" -SLOT="0" -LICENSE="GPL-2 FDL-1.1" -KEYWORDS="x86 ppc ~alpha sparc ~hppa amd64" - -RDEPEND=">=gnome-base/libgnomeui-2 - >=gnome-base/ORBit2-2.4.1 - virtual/ghostscript - dev-libs/popt" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0 - >=dev-util/intltool-0.21" - -DOCS="AUTHORS ChangeLog COPYING* MAINTAINERS TODO NEWS README" diff --git a/app-text/ggv/ggv-2.4.0.2.ebuild b/app-text/ggv/ggv-2.4.0.2.ebuild index 63f363915624..49b622f1595b 100644 --- a/app-text/ggv/ggv-2.4.0.2.ebuild +++ b/app-text/ggv/ggv-2.4.0.2.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/app-text/ggv/ggv-2.4.0.2.ebuild,v 1.8 2004/01/14 03:25:59 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ggv-2.4.0.2.ebuild,v 1.9 2004/03/28 16:43:13 foser Exp $ inherit gnome2 @@ -23,3 +23,13 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.21" DOCS="AUTHORS ChangeLog COPYING* INSTALL MAINTAINERS TODO README" + +src_unpack() { + + unpack ${A} + cd ${S} + + # fix build with gtk+-2.4 + epatch ${FILESDIR}/${PN}-2.4-fix_gtk+-2.4_build.patch + +} diff --git a/app-text/ggv/ggv-2.4.1.ebuild b/app-text/ggv/ggv-2.4.1.ebuild index a0ea9f6a9dbb..1489a46690f6 100644 --- a/app-text/ggv/ggv-2.4.1.ebuild +++ b/app-text/ggv/ggv-2.4.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/app-text/ggv/ggv-2.4.1.ebuild,v 1.6 2004/03/16 02:42:36 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/ggv/ggv-2.4.1.ebuild,v 1.7 2004/03/28 16:43:13 foser Exp $ inherit gnome2 @@ -23,3 +23,13 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.21" DOCS="AUTHORS ChangeLog COPYING* INSTALL MAINTAINERS TODO README" + +src_unpack() { + + unpack ${A} + cd ${S} + + # fix build with gtk+-2.4 #45794 + epatch ${FILESDIR}/${PN}-2.4-fix_gtk+-2.4_build.patch + +} |