[osgearth] 08/09: Drop obsolete undefined-reference-to-symbol-XInitThreads.patch.

Bas Couwenberg sebastic at debian.org
Fri Sep 9 20:41:15 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository osgearth.

commit 45ccd68b8e8cb44a455085c5d600392b5c243db3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 9 21:19:05 2016 +0200

    Drop obsolete undefined-reference-to-symbol-XInitThreads.patch.
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  1 -
 ...ndefined-reference-to-symbol-XInitThreads.patch | 47 ----------------------
 3 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d1765c6..9e21d69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ osgearth (2.8~rc2+dfsg-1) UNRELEASED; urgency=medium
   * Drop patches applied upstream. Refresh remaining patches.
   * Update symbols for other architectures.
   * Enable protobuf support.
+  * Drop obsolete undefined-reference-to-symbol-XInitThreads.patch.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 09 Sep 2016 20:14:13 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 4584f53..0a55278 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 soversion.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
deleted file mode 100644
index 53b578c..0000000
--- a/debian/patches/undefined-reference-to-symbol-XInitThreads.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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 <manisandro at gmail.com>
-Origin: https://kojipkgs.fedoraproject.org//packages/osgearth/2.6/4.fc22/src/osgearth-2.6-4.fc22.src.rpm
-Forwarded: not-needed
-
---- a/src/applications/osgearth_demo/CMakeLists.txt
-+++ b/src/applications/osgearth_demo/CMakeLists.txt
-@@ -16,6 +16,7 @@ ELSE()
-         ${QT_QTCORE_LIBRARY}
-         ${QT_QTGUI_LIBRARY}
-         ${QT_QTOPENGL_LIBRARY}
-+        X11
-     )
- ENDIF()
- 
---- a/src/applications/osgearth_package_qt/CMakeLists.txt
-+++ b/src/applications/osgearth_package_qt/CMakeLists.txt
-@@ -60,6 +60,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
-@@ -35,6 +35,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
-@@ -30,6 +30,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



More information about the Pkg-grass-devel mailing list