diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-07-12 05:37:56 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-07-12 05:37:56 +0000 |
| commit | 9757614a76994cea464c06266bdb3bf5c8beac0a (patch) | |
| tree | 5e9550e76deda0fa8def2f85dbf01acfb07e113b /app-office | |
| parent | Stable ppc64, bug #425734 (diff) | |
| download | gentoo-2-9757614a76994cea464c06266bdb3bf5c8beac0a.tar.gz gentoo-2-9757614a76994cea464c06266bdb3bf5c8beac0a.tar.bz2 gentoo-2-9757614a76994cea464c06266bdb3bf5c8beac0a.zip | |
app-office/texmakerx: Fix for gcc-4.7, #426250
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/texmakerx/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/texmakerx/files/texmakerx-2.1-gcc-4.7.patch | 17 | ||||
| -rw-r--r-- | app-office/texmakerx/metadata.xml | 6 | ||||
| -rw-r--r-- | app-office/texmakerx/texmakerx-2.1.ebuild | 7 |
4 files changed, 30 insertions, 6 deletions
diff --git a/app-office/texmakerx/ChangeLog b/app-office/texmakerx/ChangeLog index 504d34fe21ca..5437eeb4acc9 100644 --- a/app-office/texmakerx/ChangeLog +++ b/app-office/texmakerx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/texmakerx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmakerx/ChangeLog,v 1.3 2012/05/03 20:00:41 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/texmakerx/ChangeLog,v 1.4 2012/07/12 05:37:56 jlec Exp $ + + 12 Jul 2012; Justin Lecher <jlec@gentoo.org> texmakerx-2.1.ebuild, + +files/texmakerx-2.1-gcc-4.7.patch, metadata.xml: + Fix for gcc-4.7, #426250 03 May 2012; Jeff Horelick <jdhore@gentoo.org> texmakerx-2.1.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/app-office/texmakerx/files/texmakerx-2.1-gcc-4.7.patch b/app-office/texmakerx/files/texmakerx-2.1-gcc-4.7.patch new file mode 100644 index 000000000000..553435539379 --- /dev/null +++ b/app-office/texmakerx/files/texmakerx-2.1-gcc-4.7.patch @@ -0,0 +1,17 @@ + qtsingleapplication/qtlocalpeer.cpp | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp +index 57ed567..4997626 100644 +--- a/qtsingleapplication/qtlocalpeer.cpp ++++ b/qtsingleapplication/qtlocalpeer.cpp +@@ -49,6 +49,9 @@ + #include <QtCore/QCoreApplication>
+ #include <QtCore/QTime>
+
++#include <unistd.h>
++#include <sys/types.h>
++
+ #if defined(Q_OS_WIN)
+ #include <QtCore/QLibrary>
+ #include <QtCore/qt_windows.h>
diff --git a/app-office/texmakerx/metadata.xml b/app-office/texmakerx/metadata.xml index dc06c49f3397..c845479d513e 100644 --- a/app-office/texmakerx/metadata.xml +++ b/app-office/texmakerx/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer> - <email>jlec@gentoo.org</email> -</maintainer> + <maintainer> + <email>jlec@gentoo.org</email> + </maintainer> </pkgmetadata> diff --git a/app-office/texmakerx/texmakerx-2.1.ebuild b/app-office/texmakerx/texmakerx-2.1.ebuild index 8a8427ee28ea..e95e5fdbe97e 100644 --- a/app-office/texmakerx/texmakerx-2.1.ebuild +++ b/app-office/texmakerx/texmakerx-2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmakerx/texmakerx-2.1.ebuild,v 1.3 2012/05/03 20:00:41 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/texmakerx/texmakerx-2.1.ebuild,v 1.4 2012/07/12 05:37:56 jlec Exp $ EAPI=4 @@ -35,7 +35,10 @@ DEPEND="${COMMON_DEPEND} S="${WORKDIR}"/${P/-/} -PATCHES=( "${FILESDIR}/${P}-hunspell.patch" ) +PATCHES=( + "${FILESDIR}/${P}-hunspell.patch" + "${FILESDIR}/${P}-gcc-4.7.patch" + ) src_prepare() { find hunspell -delete |