Hello community, here is the log from the commit of package tulip for openSUSE:Factory checked in at 2015-02-03 11:40:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tulip (Old) and /work/SRC/openSUSE:Factory/.tulip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tulip" Changes: -------- --- /work/SRC/openSUSE:Factory/tulip/tulip.changes 2015-01-20 12:34:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tulip.new/tulip.changes 2015-02-03 11:40:42.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 2 08:29:38 UTC 2015 - [email protected] + +- fix build with cmake 3.1 + add 0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch + +------------------------------------------------------------------- New: ---- 0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tulip.spec ++++++ --- /var/tmp/diff_new_pack.ukU658/_old 2015-02-03 11:40:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ukU658/_new 2015-02-03 11:40:45.000000000 +0100 @@ -39,7 +39,9 @@ Patch5: 0005-Use-system-ftgl-lib-if-available.patch # Fix FindFTGL.cmake Patch6: 0006-Find-system-ftgl.patch -Patch7: use-libbfd.patch +# PATCH-FIX-UPSTREAM +Patch7: 0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch +Patch8: use-libbfd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel @@ -201,6 +203,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build ++++++ 0001-Install-to-lib64.patch ++++++ --- /var/tmp/diff_new_pack.ukU658/_old 2015-02-03 11:40:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ukU658/_new 2015-02-03 11:40:45.000000000 +0100 @@ -1,17 +1,17 @@ -From fa04a6b0252f7b6dbc0897c2042cc46eb742f49c Mon Sep 17 00:00:00 2001 +From c01497a4d4859402e93173b07c53be3a94e995aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 09:51:21 +0100 -Subject: [PATCH 1/5] Install to lib64 +Subject: [PATCH 1/7] Install to lib64 --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 019dc9ada559..bdbba2b56502 100644 +index 5f592115aa16..7ed921bb11ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -418,7 +418,12 @@ SET(TulipPythonInclude ${PROJECT_SOURCE_DIR}/library/tulip-python/include) +@@ -414,7 +414,12 @@ SET(TulipPythonInclude ${PROJECT_SOURCE_DIR}/library/tulip-python/include) ## ======================================================== ## Install paths ## ======================================================== ++++++ 0002-Enable-tlprender.patch ++++++ --- /var/tmp/diff_new_pack.ukU658/_old 2015-02-03 11:40:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ukU658/_new 2015-02-03 11:40:45.000000000 +0100 @@ -1,7 +1,7 @@ -From 6d28369492823696fa029f21fb66764ae62152e7 Mon Sep 17 00:00:00 2001 +From 649bfde022e0e2a4b4b5cedf0c7df17048705928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 09:52:57 +0100 -Subject: [PATCH 2/5] Enable tlprender +Subject: [PATCH 2/7] Enable tlprender --- software/CMakeLists.txt | 1 + ++++++ 0003-Enable-PPC-and-PPC64.patch ++++++ --- /var/tmp/diff_new_pack.ukU658/_old 2015-02-03 11:40:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ukU658/_new 2015-02-03 11:40:45.000000000 +0100 @@ -1,14 +1,14 @@ -From 03e59382512020fa305800d5593365776358b416 Mon Sep 17 00:00:00 2001 +From bff49eb5d2a9c4a61d8d2c16be20cade7050999d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 09:56:52 +0100 -Subject: [PATCH 3/5] Enable PPC and PPC64 +Subject: [PATCH 3/7] Enable PPC and PPC64 --- - library/tulip-core/include/tulip/SystemDefinition.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + library/tulip-core/include/tulip/SystemDefinition.h | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/library/tulip-core/include/tulip/SystemDefinition.h b/library/tulip-core/include/tulip/SystemDefinition.h -index e30d2afb3ee6..7629d3baafc8 100644 +index e30d2afb3ee6..f8b73595cf8b 100644 --- a/library/tulip-core/include/tulip/SystemDefinition.h +++ b/library/tulip-core/include/tulip/SystemDefinition.h @@ -35,6 +35,10 @@ ++++++ 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch ++++++ --- /var/tmp/diff_new_pack.ukU658/_old 2015-02-03 11:40:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ukU658/_new 2015-02-03 11:40:45.000000000 +0100 @@ -1,14 +1,14 @@ -From 89b939b71193a63708cf5104814893989e6ed602 Mon Sep 17 00:00:00 2001 +From f8fbc3b6531f9d49892a85df96ae4e4314768ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 10:03:05 +0100 -Subject: [PATCH 4/5] Include string.h for libpng16 in GlTextureManager.cpp +Subject: [PATCH 4/7] Include string.h for libpng16 in GlTextureManager.cpp --- library/tulip-ogl/src/GlTextureManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/library/tulip-ogl/src/GlTextureManager.cpp b/library/tulip-ogl/src/GlTextureManager.cpp -index e301250269a6..649bf3bffd79 100644 +index 6d6610f8bddc..9120768f18d1 100644 --- a/library/tulip-ogl/src/GlTextureManager.cpp +++ b/library/tulip-ogl/src/GlTextureManager.cpp @@ -26,6 +26,7 @@ ++++++ 0005-Use-system-ftgl-lib-if-available.patch ++++++ --- /var/tmp/diff_new_pack.ukU658/_old 2015-02-03 11:40:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ukU658/_new 2015-02-03 11:40:45.000000000 +0100 @@ -1,7 +1,7 @@ -From 305a77d0995b3b5bafbcfb057c1e07efd80d5ce8 Mon Sep 17 00:00:00 2001 +From cd313b906921bfb6873b8cca498036beb78deca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 10:15:54 +0100 -Subject: [PATCH 5/5] Use system ftgl lib if available +Subject: [PATCH 5/7] Use system ftgl lib if available --- CMakeLists.txt | 10 ++++++++-- @@ -9,10 +9,10 @@ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index bdbba2b56502..c52dcc564c48 100644 +index 7ed921bb11ff..a7ff02f8a592 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -397,8 +397,14 @@ endif(QUAZIP_FOUND) +@@ -393,8 +393,14 @@ endif(QUAZIP_FOUND) SET(QxtInclude ${PROJECT_SOURCE_DIR}/thirdparty/qxt/src) SET(QxtLibrary qxt-tulip-${TulipMMVersion}) @@ -30,7 +30,7 @@ SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index f05f780c3939..349fbf6f5ede 100644 +index ea7902e328f0..b77134dfcb63 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -8,7 +8,9 @@ ADD_SUBDIRECTORY(libqhull) ++++++ 0006-Find-system-ftgl.patch ++++++ --- /var/tmp/diff_new_pack.ukU658/_old 2015-02-03 11:40:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ukU658/_new 2015-02-03 11:40:45.000000000 +0100 @@ -1,7 +1,7 @@ -From cf20689d0f513863b7fef37c812d3938baee7756 Mon Sep 17 00:00:00 2001 +From d525559ae2b5ee178cb18a98da3e55acd35a3a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 11:04:20 +0100 -Subject: [PATCH 6/6] Find system ftgl +Subject: [PATCH 6/7] Find system ftgl --- FindFTGL.cmake | 7 ++++--- ++++++ 0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch ++++++ >From 315a2f86d30e8d92b5a2abe4c6aba564663a975c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Mon, 2 Feb 2015 09:24:47 +0100 Subject: [PATCH 7/7] fix Tulip build configuration with CMake version >= 3.1.0 (sf bug #787) upstream svn commit r10536 --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7ff02f8a592..2cceba2b8846 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,11 @@ FUNCTION(ADD_LIBRARY name) IF(APPLE) SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib") ENDIF(APPLE) + # CMake >= 3.1.0 does not allow to set the INSTALL_RPATH property on INTERFACE_LIBRARY target type + GET_TARGET_PROPERTY(TARGET_TYPE ${name} TYPE) + IF(NOT "${TARGET_TYPE}" STREQUAL "INTERFACE_LIBRARY") SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_RPATH "$ORIGIN") + ENDIF(NOT "${TARGET_TYPE}" STREQUAL "INTERFACE_LIBRARY") IF(MSVC) SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}") SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_BINARY_DIR}") -- 2.1.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
