diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-04-25 15:52:59 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-04-25 15:52:59 +0000 |
| commit | b4bac654207a3e7c448f4d6ff0af5f9cb5440882 (patch) | |
| tree | f9e7c4a2cbbe521f13593e30b3f137d4802398e9 /sci-chemistry/rasmol | |
| parent | Mask systemd (diff) | |
| download | gentoo-2-b4bac654207a3e7c448f4d6ff0af5f9cb5440882.tar.gz gentoo-2-b4bac654207a3e7c448f4d6ff0af5f9cb5440882.tar.bz2 gentoo-2-b4bac654207a3e7c448f4d6ff0af5f9cb5440882.zip | |
sci-chemistry/rasmol: Add fix for >glib-2.32
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/rasmol')
| -rw-r--r-- | sci-chemistry/rasmol/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch | 31 | ||||
| -rw-r--r-- | sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild | 6 |
3 files changed, 40 insertions, 3 deletions
diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog index f6a9165c935a..7b78968cb86e 100644 --- a/sci-chemistry/rasmol/ChangeLog +++ b/sci-chemistry/rasmol/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/rasmol # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.32 2012/03/08 08:09:43 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.33 2012/04/25 15:52:59 jlec Exp $ + + 25 Apr 2012; Justin Lecher <jlec@gentoo.org> rasmol-2.7.5.2.ebuild, + +files/rasmol-2.7.5.2-glib.h.patch: + Add fix for >glib-2.32 08 Mar 2012; Justin Lecher <jlec@gentoo.org> -rasmol-2.7.2.1.1-r1.ebuild, -rasmol-2.7.5-r1.ebuild: diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch new file mode 100644 index 000000000000..69c19dae5e8d --- /dev/null +++ b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch @@ -0,0 +1,31 @@ + src/egg-macros.h | 3 ++- + src/eggfileformatchooser.c | 2 ++ + 2 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/src/egg-macros.h b/src/egg-macros.h +index 9a7caad..1a6bce0 100644 +--- a/src/egg-macros.h ++++ b/src/egg-macros.h +@@ -9,7 +9,8 @@ + #ifndef _EGG_MACROS_H_ + #define _EGG_MACROS_H_ + +-#include <glib/gmacros.h> ++#include <glib.h> ++#include <glib/gprintf.h> + + G_BEGIN_DECLS + +diff --git a/src/eggfileformatchooser.c b/src/eggfileformatchooser.c +index 32ce2ab..febfc2e 100644 +--- a/src/eggfileformatchooser.c ++++ b/src/eggfileformatchooser.c +@@ -19,6 +19,8 @@ + #include "eggfileformatchooser.h" + #include "egg-macros.h" + ++#include <glib.h> ++#include <glib/gprintf.h> + #include <glib/gi18n.h> + #include <gtk/gtk.h> + #include <string.h> diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild index 19dbf4750afa..97b1fd31068c 100644 --- a/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild +++ b/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild,v 1.2 2011/12/15 08:33:05 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild,v 1.3 2012/04/25 15:52:59 jlec Exp $ EAPI=4 @@ -43,6 +43,8 @@ S="${WORKDIR}/RasMol-${PV}" src_prepare() { cd src + epatch "${FILESDIR}"/${P}-glib.h.patch + if use amd64 || use amd64-linux; then mv rasmol.h rasmol_amd64_save.h && \ echo "#define _LONGLONG"|cat - rasmol_amd64_save.h > rasmol.h |