diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2010-11-10 12:55:14 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2010-11-10 12:55:14 +0000 |
| commit | c4c05dfeeaa7bcffb2b99aa0288750d7ba786cba (patch) | |
| tree | 283f8cb95b52db1068b4b112cbdddf60b78830a9 /app-office/texmacs | |
| parent | Update regex to match beginning of the word, bug #342849 thank Sok Ann Yap fo... (diff) | |
| download | gentoo-2-c4c05dfeeaa7bcffb2b99aa0288750d7ba786cba.tar.gz gentoo-2-c4c05dfeeaa7bcffb2b99aa0288750d7ba786cba.tar.bz2 gentoo-2-c4c05dfeeaa7bcffb2b99aa0288750d7ba786cba.zip | |
Added a patch to fix compilation error with USE=qt4
(Portage version: 2.2.0_alpha4/cvs/Linux i686)
Diffstat (limited to 'app-office/texmacs')
| -rw-r--r-- | app-office/texmacs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/texmacs/files/texmacs-qt.patch | 22 | ||||
| -rw-r--r-- | app-office/texmacs/texmacs-1.0.7.6.ebuild | 5 | ||||
| -rw-r--r-- | app-office/texmacs/texmacs-1.0.7.7.ebuild | 5 |
4 files changed, 35 insertions, 3 deletions
diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog index 31f111a3c4f7..0bd37176ea38 100644 --- a/app-office/texmacs/ChangeLog +++ b/app-office/texmacs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/texmacs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.85 2010/10/31 05:18:40 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.86 2010/11/10 12:55:14 grozin Exp $ + + 10 Nov 2010; Andrey Grozin <grozin@gentoo.org> texmacs-1.0.7.6.ebuild, + texmacs-1.0.7.7.ebuild, +files/texmacs-qt.patch: + Added a patch to fix compilation error with USE=qt4 31 Oct 2010; Andrey Grozin <grozin@gentoo.org> -texmacs-1.0.7.5.ebuild: Cleaning old version diff --git a/app-office/texmacs/files/texmacs-qt.patch b/app-office/texmacs/files/texmacs-qt.patch new file mode 100644 index 000000000000..ebb73553ade2 --- /dev/null +++ b/app-office/texmacs/files/texmacs-qt.patch @@ -0,0 +1,22 @@ +diff -r -U1 TeXmacs-1.0.7.7-src.orig//src/Plugins/Imlib2/imlib2.cpp TeXmacs-1.0.7.7-src//src/Plugins/Imlib2/imlib2.cpp +--- TeXmacs-1.0.7.7-src.orig//src/Plugins/Imlib2/imlib2.cpp 2010-10-23 02:38:01.000000000 +0700 ++++ TeXmacs-1.0.7.7-src//src/Plugins/Imlib2/imlib2.cpp 2010-11-11 00:00:12.000000000 +0600 +@@ -17,2 +17,6 @@ + ++#include <Imlib2.h> ++#include <stdio.h> ++#include <string.h> ++ + /****************************************************************************** +diff -r -U1 TeXmacs-1.0.7.7-src.orig//src/Plugins/Imlib2/imlib2.hpp TeXmacs-1.0.7.7-src//src/Plugins/Imlib2/imlib2.hpp +--- TeXmacs-1.0.7.7-src.orig//src/Plugins/Imlib2/imlib2.hpp 2010-10-23 02:38:01.000000000 +0700 ++++ TeXmacs-1.0.7.7-src//src/Plugins/Imlib2/imlib2.hpp 2010-11-11 00:01:11.000000000 +0600 +@@ -25,8 +25,2 @@ + +-#ifdef USE_IMLIB2 +-#include <Imlib2.h> +-#include <stdio.h> +-#include <string.h> +-#endif // USE_IMLIB2 +- + #endif // IMLIB2_H diff --git a/app-office/texmacs/texmacs-1.0.7.6.ebuild b/app-office/texmacs/texmacs-1.0.7.6.ebuild index a178af00f28a..9612cd63141e 100644 --- a/app-office/texmacs/texmacs-1.0.7.6.ebuild +++ b/app-office/texmacs/texmacs-1.0.7.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.6.ebuild,v 1.2 2010/10/31 05:15:44 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.6.ebuild,v 1.3 2010/11/10 12:55:14 grozin Exp $ EAPI=2 inherit autotools MY_P=${P/tex/TeX}-src @@ -44,6 +44,9 @@ src_prepare() { # don't strip epatch "${FILESDIR}"/${PN}-strip.patch + # CursorShape was #define'd to 0 by X11/X.h + epatch "${FILESDIR}"/${PN}-qt.patch + eautoreconf } diff --git a/app-office/texmacs/texmacs-1.0.7.7.ebuild b/app-office/texmacs/texmacs-1.0.7.7.ebuild index 5461c21bcdd8..2b3b5b0dc24e 100644 --- a/app-office/texmacs/texmacs-1.0.7.7.ebuild +++ b/app-office/texmacs/texmacs-1.0.7.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.7.ebuild,v 1.1 2010/10/31 05:15:44 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.7.ebuild,v 1.2 2010/11/10 12:55:14 grozin Exp $ EAPI=2 inherit autotools MY_P=${P/tex/TeX}-src @@ -47,6 +47,9 @@ src_prepare() { # respect LDFLAGS, bug #338459 epatch "${FILESDIR}"/${PN}-ldflags.patch + # CursorShape was #define'd to 0 by X11/X.h + epatch "${FILESDIR}"/${PN}-qt.patch + eautoreconf } |