From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S5bVT-0000V5-S8 for garchives@archives.gentoo.org; Thu, 08 Mar 2012 11:27:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71AF1E06F4; Thu, 8 Mar 2012 11:27:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 338D3E06F4 for ; Thu, 8 Mar 2012 11:27:31 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 74CE81B401D for ; Thu, 8 Mar 2012 11:27:30 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2212) id AD6B42004C; Thu, 8 Mar 2012 11:27:28 +0000 (UTC) From: "Andrey Grozin (grozin)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, grozin@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sci-visualization/gle/files: gle-4.2.4-qt-4.8.patch gle-4.2.3b-parallel.patch gle-4.2.3b-overflows.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: gle-4.2.4-qt-4.8.patch gle-4.2.3b-parallel.patch gle-4.2.3b-overflows.patch X-VCS-Directories: sci-visualization/gle/files X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin Content-Type: text/plain; charset=utf8 Message-Id: <20120308112728.AD6B42004C@flycatcher.gentoo.org> Date: Thu, 8 Mar 2012 11:27:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: abc971e5-9079-45ad-935f-d3d8fecbce3e X-Archives-Hash: d7d721f8e5d5554d55e27fcbc62d40b4 grozin 12/03/08 11:27:28 Added: gle-4.2.4-qt-4.8.patch Removed: gle-4.2.3b-parallel.patch gle-4.2.3b-overflows.patch Log: Fixed compilation with qt-4.8, removed old =20 (Portage version: 2.2.0_alpha90/cvs/Linux i686) Revision Changes Path 1.1 sci-visualization/gle/files/gle-4.2.4-qt-4.8.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/= gle/files/gle-4.2.4-qt-4.8.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/= gle/files/gle-4.2.4-qt-4.8.patch?rev=3D1.1&content-type=3Dtext/plain Index: gle-4.2.4-qt-4.8.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Description: Backport upstream patch to build against qt4.8 Author: Jan Struyf Origin: upstream, http://glx.git.sourceforge.net/git/gitweb.cgi?p=3Dglx/g= le;a=3Dpatch;h=3Db0cf21c1d6fbad25da849f658feb82b433091977 Bug-Ubuntu: https://launchpad.net/bugs/935114 Index: gle-graphics/configure.ac =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gle-graphics.orig/configure.ac 2012-02-24 19:39:59.000000000 +0100 +++ gle-graphics/configure.ac 2012-02-24 19:39:59.000000000 +0100 @@ -73,8 +73,10 @@ HAVE_CYGWIN=3D0 HAVE_MINGW=3D0 HAVE_LIBZ=3D0 +HAVE_LIBGLU_H=3D0 QT_CONFIG=3D"CONFIG +=3D release" QT_RPATH=3D +QT_LIBGLU_LIB=3D =20 HAVE_STATIC_LIBPNG=3D0 HAVE_STATIC_LIBTIFF=3D0 @@ -574,6 +576,14 @@ HAVE_QT=3D1 QMAKE_VERS=3D`$QMAKE_PROG -v | tail -n 1` fi + =20 + AC_CHECK_HEADERS(GL/glu.h, + [AC_DEFINE(HAVE_LIBGLU_H)], + []) + =20 + AC_CHECK_LIB(GLU,gluLookAt, + [QT_LIBGLU_LIB=3D-lGLU], + []) fi =20 if test "x$HAVE_RPATH" !=3D "x0"; then @@ -805,6 +815,7 @@ AC_SUBST(MAKE_AUTOPACKAGE) AC_SUBST(QT_CONFIG) AC_SUBST(QT_RPATH) +AC_SUBST(QT_LIBGLU_LIB) AC_SUBST(HAVE_EXTRA_FONTS) =20 AC_CONFIG_FILES([Makefile src/gle/Makefile src/gle/bitmap/Makefile src/g= le/letzfitz/Makefile src/gle/surface/Makefile src/gle/tokens/Makefile src= /fbuild/Makefile src/makefmt/Makefile src/manip/Makefile src/TeX/Makefile= src/gui/MakefileAC src/gui/qgle.pro src/doc/gle.1 platform/autoconf/gle-= graphics.pc platform/autopackage/gle4.apspec]) Index: gle-graphics/src/config.h.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gle-graphics.orig/src/config.h.in 2012-02-24 19:39:59.000000000 +0100 +++ gle-graphics/src/config.h.in 2012-02-24 19:39:59.000000000 +0100 @@ -72,6 +72,7 @@ #undef HAVE_STDINT_H #undef HAVE_INTTYPES_H #undef HAVE_SYS_PARAM_H +#undef HAVE_LIBGLU_H =20 #undef HAVE_NCURSES_H #undef HAVE_CURSES_H Index: gle-graphics/src/gui/3dviewer.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gle-graphics.orig/src/gui/3dviewer.cpp 2012-02-24 19:39:59.000000000 = +0100 +++ gle-graphics/src/gui/3dviewer.cpp 2012-02-24 19:39:59.000000000 +0100 @@ -23,9 +23,15 @@ #include "../gle/cutils.h" #include "../gle/gle-block.h" #include "../gle/surface/gsurface.h" +#include "../config.h" =20 #include =20 +#ifdef HAVE_LIBGLU_H + #include +#endif + + QGLE3DWidget::QGLE3DWidget(QWidget *parent, GLEInterface* iface) : QGLWidget(parent) { Index: gle-graphics/src/gui/qgle.pro.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gle-graphics.orig/src/gui/qgle.pro.in 2012-02-24 18:48:09.857237000 += 0100 +++ gle-graphics/src/gui/qgle.pro.in 2012-02-24 19:54:34.345962872 +0100 @@ -176,7 +176,7 @@ =20 # add the "lib" directory to the search path of the linker unix { - LIBS +=3D @QT_RPATH@ + LIBS +=3D @QT_RPATH@ @QT_LIBGLU_LIB@ } =20 # vim:et