This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch stretch in repository osgearth.
commit 104cc729e0c352f888624d3c3c128e4d31228b13 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon May 25 17:53:32 2015 +0200 Add patch to fix "undefined reference to symbol 'XInitThreads'" FTBFS. Conflicts: debian/changelog --- debian/changelog | 1 + debian/patches/series | 1 + ...ndefined-reference-to-symbol-XInitThreads.patch | 56 ++++++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/debian/changelog b/debian/changelog index f4c25e6..dba4f4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ osgearth (2.5.0+dfsg-3) UNRELEASED; urgency=medium * Update my email to use @debian.org address. * Update branch in gbp.conf and Vcs-Git URL. + * Add patch to fix "undefined reference to symbol 'XInitThreads'" FTBFS. -- Bas Couwenberg <sebas...@debian.org> Mon, 25 May 2015 17:55:21 +0200 diff --git a/debian/patches/series b/debian/patches/series index 4247e83..f82696a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ soversion.patch fallback-getCurrentThreadId.patch kfreebsd-getCurrentThreadId.patch cmake-FindMiniZip.patch +undefined-reference-to-symbol-XInitThreads.patch diff --git a/debian/patches/undefined-reference-to-symbol-XInitThreads.patch b/debian/patches/undefined-reference-to-symbol-XInitThreads.patch new file mode 100644 index 0000000..3b4f2b0 --- /dev/null +++ b/debian/patches/undefined-reference-to-symbol-XInitThreads.patch @@ -0,0 +1,56 @@ +Description: Link X11 to fix FTBFS. + /usr/bin/ld: CMakeFiles/application_osgearth_package_qt.dir/package_qt.cpp.o: undefined reference to symbol 'XInitThreads' + //usr/lib/x86_64-linux-gnu/libX11.so.6: error adding symbols: DSO missing from command line +Author: Sandro Mani <manisan...@gmail.com> +Origin: https://kojipkgs.fedoraproject.org//packages/osgearth/2.6/4.fc22/src/osgearth-2.6-4.fc22.src.rpm + +--- a/src/applications/osgearth_demo/CMakeLists.txt ++++ b/src/applications/osgearth_demo/CMakeLists.txt +@@ -22,6 +22,7 @@ SET(TARGET_ADDED_LIBRARIES + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTOPENGL_LIBRARY} ++ X11 + ) + + #### end var setup ### +--- a/src/applications/osgearth_package_qt/CMakeLists.txt ++++ b/src/applications/osgearth_package_qt/CMakeLists.txt +@@ -50,6 +50,7 @@ SET(TARGET_ADDED_LIBRARIES + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTOPENGL_LIBRARY} ++ X11 + ) + + #### end var setup ### +--- a/src/applications/osgearth_qt/CMakeLists.txt ++++ b/src/applications/osgearth_qt/CMakeLists.txt +@@ -31,6 +31,7 @@ SET(TARGET_ADDED_LIBRARIES + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTOPENGL_LIBRARY} ++ X11 + ) + + #### end var setup ### +--- a/src/applications/osgearth_qt_simple/CMakeLists.txt ++++ b/src/applications/osgearth_qt_simple/CMakeLists.txt +@@ -22,6 +22,7 @@ SET(TARGET_ADDED_LIBRARIES + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTOPENGL_LIBRARY} ++ X11 + ) + + #### end var setup ### +--- a/src/applications/osgearth_qt_windows/CMakeLists.txt ++++ b/src/applications/osgearth_qt_windows/CMakeLists.txt +@@ -22,6 +22,7 @@ SET(TARGET_ADDED_LIBRARIES + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${QT_QTOPENGL_LIBRARY} ++ X11 + ) + + #### end var setup ### -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osgearth.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel