summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-05-11 15:13:50 +0000
committerJustin Lecher <jlec@gentoo.org>2015-05-11 15:13:50 +0000
commit883e1b58057394638922be5432f9743f12d44016 (patch)
tree43777c03886ac540368fbcfd0bc6eee3557fe4d6 /sci-chemistry
parentamd64 stable wrt bug #530238 (diff)
downloadgentoo-2-883e1b58057394638922be5432f9743f12d44016.tar.gz
gentoo-2-883e1b58057394638922be5432f9743f12d44016.tar.bz2
gentoo-2-883e1b58057394638922be5432f9743f12d44016.zip
Add patch to fix underlinking, thanks Tom Daff preparing the patch, bug #547400
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/avogadro/ChangeLog7
-rw-r--r--sci-chemistry/avogadro/avogadro-1.1.0.ebuild3
-rw-r--r--sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch16
3 files changed, 24 insertions, 2 deletions
diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog
index 4f65b7f1ec38..289ed1b07693 100644
--- a/sci-chemistry/avogadro/ChangeLog
+++ b/sci-chemistry/avogadro/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-chemistry/avogadro
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.50 2015/04/08 18:22:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.51 2015/05/11 15:13:50 jlec Exp $
+
+ 11 May 2015; Justin Lecher <jlec@gentoo.org>
+ +files/avogadro-1.1.0-xlibs.patch, avogadro-1.1.0.ebuild:
+ Add patch to fix underlinking, thanks Tom Daff preparing the patch, bug
+ #547400
08 Apr 2015; Michał Górny <mgorny@gentoo.org> avogadro-1.0.3-r2.ebuild,
avogadro-1.1.0.ebuild:
diff --git a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
index 66b74dec80bc..a2dc13f0c89a 100644
--- a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
+++ b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.1.0.ebuild,v 1.6 2015/04/08 18:22:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.1.0.ebuild,v 1.7 2015/05/11 15:13:50 jlec Exp $
EAPI=5
@@ -36,6 +36,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${P}-textrel.patch
+ "${FILESDIR}"/${P}-xlibs.patch
)
pkg_setup() {
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch b/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch
new file mode 100644
index 000000000000..74a5889ec8ae
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch
@@ -0,0 +1,16 @@
+ * Info: Using [gentoo] (https://bugs.gentoo.org/xmlrpc.cgi)
+ * Info: Getting attachment 403034
+ * Info: Viewing attachment: "X11.patch"
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 60ec98f..03443a7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,6 +225,7 @@ set(I18N_LANGUAGE "" CACHE STRING "Build i18n only for selected language")
+
+ find_package(Qt4 4.6.0 REQUIRED) # find and setup Qt4 for this project
+ find_package(OpenGL REQUIRED) # find and setup OpenGL
++find_package(X11 REQUIRED)
+ find_package(Linguist) # find and setup Linguist
+ if(NOT Linguist_FOUND)
+ message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations")
+