From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7C9151388BF for ; Thu, 14 Jan 2016 09:54:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 297D721C005; Thu, 14 Jan 2016 09:54:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B454821C005 for ; Thu, 14 Jan 2016 09:54:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE3DB3408EC for ; Thu, 14 Jan 2016 09:54:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9207CA91 for ; Thu, 14 Jan 2016 09:54:41 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1452717289.c25411aee92305495fac52acf5a0222d1d3f1405.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/wxmacmolplt/, sci-chemistry/wxmacmolplt/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild X-VCS-Directories: sci-chemistry/wxmacmolplt/ sci-chemistry/wxmacmolplt/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: c25411aee92305495fac52acf5a0222d1d3f1405 X-VCS-Branch: master Date: Thu, 14 Jan 2016 09:54:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e4a59ca6-ebf5-4039-8337-2a2bacbbc60d X-Archives-Hash: 1d0225e4b5cb602592317dc41139b4e8 commit: c25411aee92305495fac52acf5a0222d1d3f1405 Author: Reinis Danne gmail com> AuthorDate: Wed Jan 13 20:34:49 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Jan 13 20:34:49 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c25411ae sci-chemistry/wxmacmolplt: Use pkg-config to get link flags .../files/wxmacmolplt-7.6.1-pkg_config.patch | 90 ++++++++++++++++++++++ sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild | 2 + 2 files changed, 92 insertions(+) diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch new file mode 100644 index 0000000..d2d79ee --- /dev/null +++ b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch @@ -0,0 +1,90 @@ +diff --git a/configure.ac b/configure.ac +index ef3f90f..abec341 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,24 +7,24 @@ dnl AC_REVISION + AM_MAINTAINER_MODE + + AC_CANONICAL_HOST +-LIBGL= ++GLU_LIBS= + HOST= + case "${host}" in + *msvc*) + HOST=MSW +- LIBGL="-lopengl32 -lglu32" ++ GLU_LIBS="-lopengl32 -lglu32" + ;; + *darwin*) + HOST=OSX +- LIBGL="-framework OpenGL" ++ GLU_LIBS="-framework OpenGL" + ;; + *) + HOST=LINUX +- LIBGL="-lGL -lGLU" ++ PKG_CHECK_MODULES([GLU], [glu], [], [GLU_LIBS="-lGL -lGLU"]) + ;; + esac + AM_CONDITIONAL(HOST_IS_MSW, [test "x$HOST" == xMSW]) +-AC_SUBST([LIBGL]) ++AC_SUBST([GLU_LIBS]) + + # + # There isn't a reliable way to know we should use the Apple OpenGL framework +@@ -53,30 +53,37 @@ AC_ARG_WITH(ming, + using the ming library; (default=yes)]], + [], + [with_ming=yes]) +-LIBMING= ++ ++MING_LIBS= ++ + AS_IF([test "x$with_ming" != xno], + [AC_CHECK_LIB([ming], [Ming_init], +- [AC_SUBST([LIBMING], ["-lming"]) AC_DEFINE([HAVE_LIBMING])], ++ [PKG_CHECK_MODULES([MING], [libming], [], [MING_LIBS="-lming"]) ++ AC_DEFINE([HAVE_LIBMING])], + [if test "x$with_ming" != xyes ; then + AC_MSG_FAILURE([--with-ming was given, but test for ming failed]) + fi], -lpng)]) + ++AC_SUBST([MING_LIBS]) ++ + AC_ARG_WITH(glew, + [[ --with-glew Use the system provided glew library instead of + the built-in version; (default=yes if present)]], + [], + [with_glew=check]) + +-LIBGLEW= ++GLEW_LIBS= + + AS_IF([test "x$with_glew" != xno], + [AC_CHECK_LIB([GLEW], [glewInit], +- [AC_SUBST([LIBGLEW], ["-lGLEW"]) AC_DEFINE([SYSTEM_GLEW])], ++ [PKG_CHECK_MODULES([GLEW], [glew], [], [GLEW_LIBS="-lGLEW"]) ++ AC_DEFINE([SYSTEM_GLEW])], + [if test "x$with_glew" = xyes; then + AC_MSG_FAILURE([--with-glew was given, but test for glew failed]) + fi])]) + +-AM_CONDITIONAL([SYSTEM_GLEW], [test $LIBGLEW = "-lGLEW"]) ++AM_CONDITIONAL([SYSTEM_GLEW], [test "x$ac_cv_lib_GLEW_glewInit" = xyes]) ++AC_SUBST([GLEW_LIBS]) + + WXCONFIG=wx-config + AC_ARG_WITH(wx-config, +diff --git a/src/Makefile.am b/src/Makefile.am +index a666aff..0a88493 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -80,7 +80,7 @@ wxmacmolplt_SOURCES += glew.cpp glew.h glxew.h wglew.h + endif + + AM_CXXFLAGS = $(WX_CXXFLAGS) +-wxmacmolplt_LDADD = $(WX_LIBS) $(LIBMING) $(LIBGL) $(LIBGLEW) ++wxmacmolplt_LDADD = $(WX_LIBS) $(MING_LIBS) $(GLU_LIBS) $(GLEW_LIBS) + wxmacmolplt_LDFLAGS = $(WX_CXXFLAGS) + EXTRA_DIST = wxMacMolPlt.pjd xpms/arrow.xpm \ + xpms/hand.xpm xpms/rect_lasso.xpm xpms/view.xpm diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild index 028ff6f..cf7c2cd 100644 --- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild +++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild @@ -26,6 +26,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { + epatch "${FILESDIR}"/${P}-pkg_config.patch + epatch_user sed \