| 1 |
jlec 15/06/28 18:25:51 |
| 2 |
|
| 3 |
Added: mathgl-2.1.3.1-x11.patch |
| 4 |
Log: |
| 5 |
Fix underlinking, bug #547486 |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mathgl-2.1.3.1-x11.patch |
| 16 |
=================================================================== |
| 17 |
CMakeLists.txt | 1 + |
| 18 |
json/CMakeLists.txt | 2 +- |
| 19 |
udav/CMakeLists.txt | 2 +- |
| 20 |
widgets/CMakeLists.txt | 4 ++-- |
| 21 |
4 files changed, 5 insertions(+), 4 deletions(-) |
| 22 |
|
| 23 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 24 |
index 3364973..0c3a645 100644 |
| 25 |
--- a/CMakeLists.txt |
| 26 |
+++ b/CMakeLists.txt |
| 27 |
@@ -316,6 +316,7 @@ endif(enable-wx) |
| 28 |
if(enable-qt) |
| 29 |
set(MGL_HAVE_QT 1) |
| 30 |
FIND_PACKAGE(Qt4 4.8 REQUIRED QtCore QtGui QtNetwork QtWebKit) |
| 31 |
+ FIND_PACKAGE(X11) |
| 32 |
if(NOT QT4_FOUND) |
| 33 |
message(SEND_ERROR "Couldn't find Qt4 library.") |
| 34 |
endif(NOT QT4_FOUND) |
| 35 |
diff --git a/json/CMakeLists.txt b/json/CMakeLists.txt |
| 36 |
index 79d4716..0a53874 100644 |
| 37 |
--- a/json/CMakeLists.txt |
| 38 |
+++ b/json/CMakeLists.txt |
| 39 |
@@ -9,6 +9,6 @@ include_directories(${MathGL_BINARY_DIR}/json) |
| 40 |
qt4_wrap_ui(json_ui_src MainWindow.ui) |
| 41 |
qt4_wrap_cpp(json_moc_src ${json_moc_hdr} ) |
| 42 |
add_executable(MglForJsTestBench ${json_src} ${json_moc_src} ${json_ui_src}) |
| 43 |
-target_link_libraries(MglForJsTestBench mgl-qt ${QT_LIBRARIES}) |
| 44 |
+target_link_libraries(MglForJsTestBench mgl-qt ${QT_LIBRARIES} ${X11_LIBRARIES}) |
| 45 |
|
| 46 |
endif(MGL_HAVE_QT) |
| 47 |
diff --git a/udav/CMakeLists.txt b/udav/CMakeLists.txt |
| 48 |
index 9a9c574..a1ff2df 100644 |
| 49 |
--- a/udav/CMakeLists.txt |
| 50 |
+++ b/udav/CMakeLists.txt |
| 51 |
@@ -27,7 +27,7 @@ qt4_add_resources(udav_rc_src ${udav_rc} ) |
| 52 |
qt4_wrap_cpp(udav_moc_src ${udav_moc_hdr} ) |
| 53 |
add_executable(udav ${udav_src} ${udav_moc_src} ${udav_rc_src}) |
| 54 |
#set_target_properties(udav PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -pthread") |
| 55 |
-target_link_libraries(udav mgl-qt ${QT_LIBRARIES}) |
| 56 |
+target_link_libraries(udav mgl-qt ${QT_LIBRARIES} ${X11_LIBRARIES}) |
| 57 |
|
| 58 |
if(MGL_HAVE_PTHREAD) |
| 59 |
target_link_libraries(udav ${CMAKE_THREAD_LIBS_INIT}) |
| 60 |
diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt |
| 61 |
index 90ea00c..f582003 100644 |
| 62 |
--- a/widgets/CMakeLists.txt |
| 63 |
+++ b/widgets/CMakeLists.txt |
| 64 |
@@ -93,7 +93,7 @@ if(MGL_HAVE_QT) |
| 65 |
set_target_properties(mgl-qt-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) |
| 66 |
set_target_properties(mgl-qt-static PROPERTIES COMPILE_FLAGS -DMGL_STATIC_DEFINE) |
| 67 |
target_link_libraries(mgl-qt mgl) |
| 68 |
- target_link_libraries(mgl-qt ${QT_LIBRARIES}) |
| 69 |
+ target_link_libraries(mgl-qt ${QT_LIBRARIES} ${X11_LIBRARIES}) |
| 70 |
|
| 71 |
if(enable-mgl2) |
| 72 |
set_target_properties(mgl-qt PROPERTIES OUTPUT_NAME "mgl2-qt") |
| 73 |
@@ -137,7 +137,7 @@ if(MGL_HAVE_QT AND MGL_HAVE_FLTK) |
| 74 |
endif(enable-mgl2) |
| 75 |
|
| 76 |
target_link_libraries(mgl-wnd mgl) |
| 77 |
- target_link_libraries(mgl-wnd ${QT_LIBRARIES}) |
| 78 |
+ target_link_libraries(mgl-wnd ${QT_LIBRARIES} ${X11_LIBRARIES}) |
| 79 |
# target_link_libraries(mgl-wnd ${wxWidgets_LIBRARIES}) |
| 80 |
target_link_libraries(mgl-wnd ${FLTK_LIBRARIES}) |
Archives