Your message dated Sat, 24 Mar 2012 22:49:08 +0000
with message-id <[email protected]>
and subject line Bug#662702: fixed in libqglviewer 2.3.15-1~exp1
has caused the Debian Bug report #662702,
regarding libqglviewer: FTBFS against Qt 4.8
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
662702: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662702
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: libqglviewer
Version: 2.3.4-4
User: [email protected]
Usertags: qt48-transition

Hi,

Your package fails to build against Qt 4.8 which is currently in experimental.
The transition to unstable/testing is tracked in bug #653903.

I'm attaching a patch that contains the necessary changes.
It should be applied once Qt 4.8 enters unstable.

Build log:
> g++ -c -m64 -pipe -O2 -D_REENTRANT -Wall -W -fPIC -DQT_NO_DEBUG -DQT_XML_LIB 
> -DQT_OPENGL_LIB
-DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I/usr/share/qt4/mkspecs/linux-g++-64 -I.
-I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtOpenGL
-I/usr/include/qt4/QtXml -I/usr/include/qt4 -I/usr/X11R6/include -I.moc -I. -o 
.obj/qglviewer.o
qglviewer.cpp
> qglviewer.cpp: In member function 'virtual void QGLViewer::drawLight(GLenum, 
> float) const':
> qglviewer.cpp:768:9: error: 'GLUquadric' does not name a type
> qglviewer.cpp:800:17: error: 'quadric' was not declared in this scope
> qglviewer.cpp:800:122: error: 'gluCylinder' was not declared in this scope
> qglviewer.cpp:803:15: error: 'quadric' was not declared in this scope
> qglviewer.cpp:803:42: error: 'gluSphere' was not declared in this scope
> qglviewer.cpp: In member function 'virtual void 
> QGLViewer::beginSelection(const QPoint&)':
> qglviewer.cpp:1265:89: error: 'gluPickMatrix' was not declared in this scope
> qglviewer.cpp: In static member function 'static void 
> QGLViewer::drawArrow(float, float, int)':
> qglviewer.cpp:3379:9: error: 'GLUquadric' does not name a type
> qglviewer.cpp:3387:14: error: 'quadric' was not declared in this scope
> qglviewer.cpp:3387:94: error: 'gluCylinder' was not declared in this scope
> make[1]: *** [.obj/qglviewer.o] Error 1
> make[1]: Leaving directory `/tmp/buildd/libqglviewer-2.3.4/qglviewer-qt4'
> make: *** [build-stamp] Error 2

Regards,
Felix

diff -u libqglviewer-2.3.4/debian/changelog libqglviewer-2.3.4/debian/changelog
--- libqglviewer-2.3.4/debian/changelog
+++ libqglviewer-2.3.4/debian/changelog
@@ -1,3 +1,16 @@
+libqglviewer (2.3.4-5) unstable; urgency=low
+
+  [ Daniel T Chen ]
+  * debian/rules: Use Qt4 multiarch lib path. Fixes FTBFS.
+
+  [ Felix Geyer ]
+  * Add 04glu-include.dpatch to fix FTBFS with Qt 4.8.
+  * Add 05glu-link.dpatch to make libqglviewer-qt4 link against libGLU.
+  * Add Pre-Depends: ${misc:Pre-Depends} to libqglviewer-qt4-2.
+  * Mark libqglviewer-qt4-2 as Multi-Arch: same.
+
+ -- Felix Geyer <[email protected]>  Mon, 05 Mar 2012 22:06:25 +0100
+
 libqglviewer (2.3.4-4) unstable; urgency=high
 
   * reupload with high urgency
diff -u libqglviewer-2.3.4/debian/control libqglviewer-2.3.4/debian/control
--- libqglviewer-2.3.4/debian/control
+++ libqglviewer-2.3.4/debian/control
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Homepage: http://www.libqglviewer.com/
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7), libqt3-mt-dev, libqt4-dev, libqt4-opengl-dev, 
dpatch
+Build-Depends: debhelper (>= 8.1.3~), libqt3-mt-dev, libqt4-dev (>= 4:4.8.0~), 
libqt4-opengl-dev (>= 4:4.8.0~), dpatch
 
 Package: libqglviewer-dev-common
 Section: libdevel
@@ -83,6 +83,8 @@
 Package: libqglviewer-qt4-2
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: an OpenGL 3D viewer library based on Qt - runtime library
  libqglviewer (also known as libQGLViewer) is a free C++ library based on Qt
diff -u libqglviewer-2.3.4/debian/rules libqglviewer-2.3.4/debian/rules
--- libqglviewer-2.3.4/debian/rules
+++ libqglviewer-2.3.4/debian/rules
@@ -22,6 +22,8 @@
        INSTALL_PROGRAM += -s
 endif
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 version:=$(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^Version: 
//' -e 's/-.*$$//')
 ver2:=$(shell echo $(version) | cut -d. -f-2)
 major:=$(shell echo $(version) | cut -d. -f1)
@@ -76,13 +78,13 @@
        cd qglviewer-qt4 && $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp
        cd designerPlugin-qt4 && $(MAKE) install 
INSTALL_ROOT=$(CURDIR)/debian/tmp
 
-       mkdir -p debian/libqglviewer-qt4-2/usr/lib 
debian/libqglviewer-qt4-dev/usr/lib/qt4/plugins/designer
+       mkdir -p debian/libqglviewer-qt4-2/usr/lib/$(DEB_HOST_MULTIARCH) 
debian/libqglviewer-qt4-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins/designer
 
-       cp -d debian/tmp/usr/lib/*.so.* debian/libqglviewer-qt4-2/usr/lib
-       cp -d qglviewer-qt4/libqglviewer-qt4.a 
debian/libqglviewer-qt4-dev/usr/lib
-       cp -d debian/tmp/usr/lib/*.so debian/libqglviewer-qt4-dev/usr/lib
-       cp -d debian/tmp/usr/lib/*.prl debian/libqglviewer-qt4-dev/usr/lib
-       cp -d debian/tmp/usr/lib/qt4/plugins/designer/libqglviewerplugin.so 
debian/libqglviewer-qt4-dev/usr/lib/qt4/plugins/designer
+       cp -d debian/tmp/usr/lib/*.so.* 
debian/libqglviewer-qt4-2/usr/lib/$(DEB_HOST_MULTIARCH)
+       cp -d qglviewer-qt4/libqglviewer-qt4.a 
debian/libqglviewer-qt4-dev/usr/lib/$(DEB_HOST_MULTIARCH)
+       cp -d debian/tmp/usr/lib/*.so 
debian/libqglviewer-qt4-dev/usr/lib/$(DEB_HOST_MULTIARCH)
+       cp -d debian/tmp/usr/lib/*.prl 
debian/libqglviewer-qt4-dev/usr/lib/$(DEB_HOST_MULTIARCH)
+       cp -d 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins/designer/libqglviewerplugin.so
 debian/libqglviewer-qt4-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins/designer
 
        cp -dr debian/tmp/usr/include/QGLViewer 
debian/libqglviewer-dev-common/usr/include
 
diff -u libqglviewer-2.3.4/debian/patches/00list 
libqglviewer-2.3.4/debian/patches/00list
--- libqglviewer-2.3.4/debian/patches/00list
+++ libqglviewer-2.3.4/debian/patches/00list
@@ -3,2 +3,4 @@
 03only-headers-in-include-dir
+04glu-include
+05glu-link
 99compile-examples
only in patch2:
unchanged:
--- libqglviewer-2.3.4.orig/debian/patches/04glu-include.dpatch
+++ libqglviewer-2.3.4/debian/patches/04glu-include.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04glu-include.dpatch by Felix Geyer <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Nur libqglviewer-2.3.4.org/QGLViewer/camera.cpp 
libqglviewer-2.3.4/QGLViewer/camera.cpp
+--- libqglviewer-2.3.4.org/QGLViewer/camera.cpp
++++ libqglviewer-2.3.4/QGLViewer/camera.cpp
+@@ -24,6 +24,8 @@
+ #include "camera.h"
+ #include "qglviewer.h"
+ 
++#include <GL/glu.h>
++
+ using namespace std;
+ using namespace qglviewer;
+ 
+diff -Nur libqglviewer-2.3.4.org/QGLViewer/qglviewer.cpp 
libqglviewer-2.3.4/QGLViewer/qglviewer.cpp
+--- libqglviewer-2.3.4.org/QGLViewer/qglviewer.cpp
++++ libqglviewer-2.3.4/QGLViewer/qglviewer.cpp
+@@ -58,6 +58,8 @@
+ # define value data
+ #endif
+ 
++#include <GL/glu.h>
++
+ using namespace std;
+ using namespace qglviewer;
+ 
only in patch2:
unchanged:
--- libqglviewer-2.3.4.orig/debian/patches/05glu-link.dpatch
+++ libqglviewer-2.3.4/debian/patches/05glu-link.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05glu-link.dpatch by Felix Geyer <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Nur libqglviewer-2.3.4.org/QGLViewer/QGLViewer.pro 
libqglviewer-2.3.4/QGLViewer/QGLViewer.pro
+--- libqglviewer-2.3.4.org/QGLViewer/QGLViewer.pro
++++ libqglviewer-2.3.4/QGLViewer/QGLViewer.pro
+@@ -131,6 +131,8 @@
+     QMAKE_LIBS_OPENGL *= -lglut
+   }
+ 
++  QMAKE_LIBS_OPENGL *= -lGLU
++
+   MOC_DIR = .moc
+   OBJECTS_DIR = .obj
+ 

--- End Message ---
--- Begin Message ---
Source: libqglviewer
Source-Version: 2.3.15-1~exp1

We believe that the bug you reported is fixed in the latest version of
libqglviewer, which is due to be installed in the Debian FTP archive:

libqglviewer-dev_2.3.15-1~exp1_amd64.deb
  to main/libq/libqglviewer/libqglviewer-dev_2.3.15-1~exp1_amd64.deb
libqglviewer-qt3-dev_2.3.15-1~exp1_all.deb
  to main/libq/libqglviewer/libqglviewer-qt3-dev_2.3.15-1~exp1_all.deb
libqglviewer-qt4-2_2.3.15-1~exp1_all.deb
  to main/libq/libqglviewer/libqglviewer-qt4-2_2.3.15-1~exp1_all.deb
libqglviewer-qt4-dev_2.3.15-1~exp1_all.deb
  to main/libq/libqglviewer/libqglviewer-qt4-dev_2.3.15-1~exp1_all.deb
libqglviewer2_2.3.15-1~exp1_amd64.deb
  to main/libq/libqglviewer/libqglviewer2_2.3.15-1~exp1_amd64.deb
libqglviewer_2.3.15-1~exp1.debian.tar.gz
  to main/libq/libqglviewer/libqglviewer_2.3.15-1~exp1.debian.tar.gz
libqglviewer_2.3.15-1~exp1.dsc
  to main/libq/libqglviewer/libqglviewer_2.3.15-1~exp1.dsc
libqglviewer_2.3.15.orig.tar.gz
  to main/libq/libqglviewer/libqglviewer_2.3.15.orig.tar.gz



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Artur R. Czechowski <[email protected]> (supplier of updated libqglviewer package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Sat, 24 Mar 2012 23:20:24 +0100
Source: libqglviewer
Binary: libqglviewer-dev libqglviewer2 libqglviewer-qt4-2 libqglviewer-qt4-dev 
libqglviewer-qt3-dev
Architecture: source all amd64
Version: 2.3.15-1~exp1
Distribution: experimental
Urgency: low
Maintainer: Artur R. Czechowski <[email protected]>
Changed-By: Artur R. Czechowski <[email protected]>
Description: 
 libqglviewer-dev - OpenGL 3D viewer library based on Qt4 - development files
 libqglviewer-qt3-dev - Dummy package for smooth transition
 libqglviewer-qt4-2 - Dummy package to install libqglviewer2
 libqglviewer-qt4-dev - Dummy package to install libqglviewer-dev
 libqglviewer2 - OpenGL 3D viewer library based on Qt - runtime library
Closes: 604356 662702
Changes: 
 libqglviewer (2.3.15-1~exp1) experimental; urgency=low
 .
   * New upstream release:
     + uses CONFIG += no_keywords so that the library can be used with Boost
       (LP: #414975)
     + is compilable with Qt 4.8 (Closes: #662702)
   * Don't build Qt3 version anymore (Closes: #604356)
   * Using upstream name convention: libQGLViewer instead of libqglviewer
   * drop no longer needed patches:
     + 01qt3-qt4
     + 99compile-examples
   * Lintian cleanup:
     + fix descriptions
     + libqglviewer-qt4-2 depends on ${misc:Depends}
     + build-arch and build-indep provided in debian/rules
   * Convert to 3.0 (quilt) format
     + remove dpatch from Build-Deps and all calls from debian/rules
     + update patches in debian/patches
     + replace debian/00list with debian/series
     + remove README.source
     + rename remaining patches - remove NN prefix
   * Update Standards-Version to 3.9.3
     + sort Breaks/Replaces/Provides dependencies for transition
   * Remove all transition related stuff. The dev package is libqglviewer-dev,
     the shared library package is libqglviewer2. All needed transition symlinks
     are provided in those packages.
   * Headers moved from libqglviewer-dev-common to libqglviewer-dev
   * temporary removed libqglviewer-dev-common, it will be reintroduced later
     as a libqglviewer-doc
   * libqglviewer-qt4-2, libqglviewer-qt3-dev and libqglviewer-qt4-dev are now
     dummy transition packages
   * Remove debian/README.Multiflavour and other qt3 related artifacts from
     debian/
   * README.Debian cleanup
     + Merge all *.README.Debian into one file - the content is the same
     + Corrected upstream name in README.Debian
     + Updated URL of homepage
   * Provide upstreams GPL_EXCEPTION file, mention it in copyright one.
   * Updated description of libqglviewer-qt3-dev package
Checksums-Sha1: 
 7c746d83baf41b4f00496e3fa8f7f860b647d69e 1437 libqglviewer_2.3.15-1~exp1.dsc
 ab2e56cfbf094da3f9e56d749d7ff421c69b11a7 2780868 
libqglviewer_2.3.15.orig.tar.gz
 1f13b46701c6acd1d2d4f82a49548b851faf9863 7507 
libqglviewer_2.3.15-1~exp1.debian.tar.gz
 842ca2b28f46a8051ed7333c95eb7fce77b091c5 774 
libqglviewer-qt4-2_2.3.15-1~exp1_all.deb
 7d29c6b8a4b4f051502b086ef87a0e13a013b7dc 6068 
libqglviewer-qt4-dev_2.3.15-1~exp1_all.deb
 142c2376d9300a469eccb731148900f8c05ae940 6130 
libqglviewer-qt3-dev_2.3.15-1~exp1_all.deb
 48b408b92db29b59a766eb99c85a3133fc72b73d 405058 
libqglviewer-dev_2.3.15-1~exp1_amd64.deb
 19b2387dce1e6f0d88d91d76218712f6e1eb002d 258788 
libqglviewer2_2.3.15-1~exp1_amd64.deb
Checksums-Sha256: 
 9aef1747136374b0f9d73b4e41022f3e70db8fd163a5ba14954695a0b0ab4271 1437 
libqglviewer_2.3.15-1~exp1.dsc
 102c1f63171669720918b75b9bb8dd38b55aa1e84df977a89e95c8d4d8b219d8 2780868 
libqglviewer_2.3.15.orig.tar.gz
 fc32a8e4d701aa0189f67b1a69da1d77ae655bbb08a112d2e6b4e705eb468659 7507 
libqglviewer_2.3.15-1~exp1.debian.tar.gz
 bae22c151889d60a8295173eab318d14a8981e9dd3fc30eff704e33556abe64c 774 
libqglviewer-qt4-2_2.3.15-1~exp1_all.deb
 12cd7c65e4b804dfbf72fe51a400015ab8341039c88fddae89b1e3973a82093c 6068 
libqglviewer-qt4-dev_2.3.15-1~exp1_all.deb
 04810e16a14c105bceea0d8a1921f083e3dbec863849982140b8e4cff4d09af7 6130 
libqglviewer-qt3-dev_2.3.15-1~exp1_all.deb
 12cc5186cf64f28d1b04b35e5bd2b6def20d5f9fd851beb00b0cd9ab60f597bb 405058 
libqglviewer-dev_2.3.15-1~exp1_amd64.deb
 8750a060239657875a5cd9ca347b83d0e219d92ab4a013a0cd743c46ade36348 258788 
libqglviewer2_2.3.15-1~exp1_amd64.deb
Files: 
 102484fe89573efb8eec103c8117bba2 1437 libs optional 
libqglviewer_2.3.15-1~exp1.dsc
 f06186fc20d38a1f20c8b1378093d1e8 2780868 libs optional 
libqglviewer_2.3.15.orig.tar.gz
 b7f67a58250b80e20e71ca30a4746dae 7507 libs optional 
libqglviewer_2.3.15-1~exp1.debian.tar.gz
 6c20eb3bd3b30c904cae3936a170262c 774 oldlibs optional 
libqglviewer-qt4-2_2.3.15-1~exp1_all.deb
 5fb16d60e52431d3861103f300bee81f 6068 oldlibs optional 
libqglviewer-qt4-dev_2.3.15-1~exp1_all.deb
 fc4e1ef60b07961672f77d29ea8c7a56 6130 oldlibs optional 
libqglviewer-qt3-dev_2.3.15-1~exp1_all.deb
 f7b438d01c27e7c697c7cfa57fe1fbd1 405058 libdevel optional 
libqglviewer-dev_2.3.15-1~exp1_amd64.deb
 50282c5d14a61eea986b10eeafad96e8 258788 libs optional 
libqglviewer2_2.3.15-1~exp1_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEARECAAYFAk9uTEUACgkQlk0AXAynaGzjjgCg3V8vD/jyVgxHdzy3duRMUjBG
yiQAoJshg3SLyj0opXARGf8eTCzqWCxV
=Ot7k
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to