Attachment 155860 Details for Bug 199614 – Patch to update graphics/tulip to 4.7.0

[patch] Patch to update graphics/tulip to 4.7.0

tulip.diff (text/plain), 13.76 KB, created by Ben Woods on 2015-04-22 15:02:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Woods

Created: 2015-04-22 15:02:05 UTC

Size: 13.76 KB

patch

obsolete

>Index: graphics/tulip/Makefile
>===================================================================
>--- graphics/tulip/Makefile	(revision 384430)
>+++ graphics/tulip/Makefile	(working copy)
>@@ -2,12 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	tulip
>-PORTVERSION=	4.6.1
>+PORTVERSION=	4.7.0
> DISTVERSIONSUFFIX=	_src
> CATEGORIES=	graphics
> MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	woodsb02@gmail.com
> COMMENT=	System dedicated to the visualization of huge graphs
> 
> LICENSE=	LGPL3
>Index: graphics/tulip/distinfo
>===================================================================
>--- graphics/tulip/distinfo	(revision 384430)
>+++ graphics/tulip/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (tulip-4.6.1_src.tar.gz) = 27ab129af9541b94bfb6f63497b4055a298a3058be58795b3bc67c2d9789a18b
>-SIZE (tulip-4.6.1_src.tar.gz) = 82574518
>+SHA256 (tulip-4.7.0_src.tar.gz) = 8ae2fe8e27e147a845eb21a3b8e9a3bb88d3d0c8d9e9c2952579399908e07874
>+SIZE (tulip-4.7.0_src.tar.gz) = 82801728
>Index: graphics/tulip/files/patch-CMakeLists.txt
>===================================================================
>--- graphics/tulip/files/patch-CMakeLists.txt	(revision 384430)
>+++ graphics/tulip/files/patch-CMakeLists.txt	(working copy)
>@@ -1,18 +1,6 @@
>---- CMakeLists.txt.orig	2014-09-28 22:18:14.000000000 +0200
>-+++ CMakeLists.txt	2014-09-30 12:39:54.000000000 +0200
>-@@ -108,7 +108,10 @@
>-   IF(APPLE)
>-     SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
>-   ENDIF(APPLE)
>--  SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_RPATH "$ORIGIN")
>-+  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}")
>-@@ -401,8 +401,8 @@
>+--- CMakeLists.txt.orig	2015-04-22 14:45:15 UTC
>++++ CMakeLists.txt
>+@@ -367,8 +367,8 @@ SET(FTGLInclude ${PROJECT_SOURCE_DIR}/th
>  SET(FTGLLibrary ftgl-tulip-${TulipMMVersion})
>  ENDIF(NOT BUILD_CORE_ONLY)
>  
>Index: graphics/tulip/files/patch-dirent
>===================================================================
>--- graphics/tulip/files/patch-dirent	(revision 384430)
>+++ graphics/tulip/files/patch-dirent	(working copy)
>@@ -1,17 +0,0 @@
>---- library/tulip-core/src/PluginLibraryLoader.cpp.orig	2014-03-25 10:10:30.000000000 +0100
>-+++ library/tulip-core/src/PluginLibraryLoader.cpp	2014-04-01 13:50:00.000000000 +0200
>-@@ -130,7 +130,14 @@
>- }
>- 
>- // accepts only file whose name matches *.so or *.dylib
>-+#ifdef __FreeBSD__
>-+#include <sys/param.h>
>-+#if (__FreeBSD_version < 900000 && __FreeBSD_version >= 800501) || (__FreeBSD_version >= 900006)
>-+int __tulip_select_libs(const struct dirent *ent) {
>-+#else
>- int __tulip_select_libs(struct dirent *ent) {
>-+#endif /* __FreeBSD_version */
>-+#endif /* __FreeBSD__ */
>- #if !defined(__APPLE__)
>-   const char *suffix = ".so";
>-   const unsigned long suffix_len = 3;
>Index: graphics/tulip/files/patch-library_tulip-core_src_PluginLibraryLoader.cpp
>===================================================================
>--- graphics/tulip/files/patch-library_tulip-core_src_PluginLibraryLoader.cpp	(revision 384430)
>+++ graphics/tulip/files/patch-library_tulip-core_src_PluginLibraryLoader.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- library/tulip-core/src/PluginLibraryLoader.cpp.orig	2014-03-25 10:10:30.000000000 +0100
>-+++ library/tulip-core/src/PluginLibraryLoader.cpp	2014-04-01 13:50:00.000000000 +0200
>-@@ -130,7 +130,14 @@
>+--- library/tulip-core/src/PluginLibraryLoader.cpp.orig	2015-04-18 20:15:27 UTC
>++++ library/tulip-core/src/PluginLibraryLoader.cpp
>+@@ -130,7 +130,14 @@ bool PluginLibraryLoader::loadPluginLibr
>  }
>  
>  // accepts only file whose name matches *.so or *.dylib
>Index: graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp
>===================================================================
>--- graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp	(revision 384430)
>+++ graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp	(working copy)
>@@ -1,11 +0,0 @@
>---- plugins/view/HistogramView/HistogramStatistics.cpp.orig	2014-04-18 12:05:56.000000000 +0200
>-+++ plugins/view/HistogramView/HistogramStatistics.cpp	2014-04-18 12:07:56.000000000 +0200
>-@@ -30,7 +30,7 @@
>- #include "HistoStatsConfigWidget.h"
>- #include "HistogramView.h"
>- 
>--#if defined(_MSC_VER) || (defined(__clang_major__) && __clang_major__ > 4)
>-+#if defined(_MSC_VER) || (defined(__clang_major__) && __clang_major__ > 4) || defined(__FreeBSD__)
>- 
>- #include <functional>
>- 
>Index: graphics/tulip/files/patch-plugins_view_HistogramView_HistogramStatistics.cpp
>===================================================================
>--- graphics/tulip/files/patch-plugins_view_HistogramView_HistogramStatistics.cpp	(revision 384430)
>+++ graphics/tulip/files/patch-plugins_view_HistogramView_HistogramStatistics.cpp	(working copy)
>@@ -1,5 +1,5 @@
>---- plugins/view/HistogramView/HistogramStatistics.cpp.orig	2014-04-18 12:05:56.000000000 +0200
>-+++ plugins/view/HistogramView/HistogramStatistics.cpp	2014-04-18 12:07:56.000000000 +0200
>+--- plugins/view/HistogramView/HistogramStatistics.cpp.orig	2015-04-18 20:15:49 UTC
>++++ plugins/view/HistogramView/HistogramStatistics.cpp
> @@ -30,7 +30,7 @@
>  #include "HistoStatsConfigWidget.h"
>  #include "HistogramView.h"
>Index: graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp
>===================================================================
>--- graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp	(revision 384430)
>+++ graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp	(working copy)
>@@ -1,11 +0,0 @@
>---- software/crash_handling/CrashHandling.cpp.orig	2014-04-18 10:33:31.000000000 +0200
>-+++ software/crash_handling/CrashHandling.cpp	2014-04-18 10:34:25.000000000 +0200
>-@@ -38,7 +38,7 @@
>- /*
>-   Linux/MacOS-specific handling
>-  */
>--#if defined(__unix__) || defined(__APPLE__)
>-+#if (defined(__unix__) || defined(__APPLE__)) && !defined(__FreeBSD__)
>- 
>- # if defined(__i386__) || defined(__amd64__)
>- 
>Index: graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp
>===================================================================
>--- graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp	(revision 384430)
>+++ graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp	(working copy)
>@@ -1,16 +0,0 @@
>---- software/crash_handling/StackWalker.cpp.orig	2014-04-22 16:44:05.000000000 +0200
>-+++ software/crash_handling/StackWalker.cpp	2014-04-22 16:46:01.000000000 +0200
>-@@ -255,8 +255,13 @@
>-       char * real_name = abi::__cxa_demangle(mangled_name, 0, 0, &status);
>- 
>-       char *end;
>-+#if defined(__FreeBSD__) && __FreeBSD_version < 9000000
>-+      int64_t runtimeAddr = static_cast<int64_t>(strtol(runtime_addr, &end, 16));
>-+      int64_t runtimeOffset = static_cast<int64_t>(strtol(runtime_offset, &end, 0));
>-+#else
>-       int64_t runtimeAddr = static_cast<int64_t>(strtoll(runtime_addr, &end, 16));
>-       int64_t runtimeOffset = static_cast<int64_t>(strtoll(runtime_offset, &end, 0));
>-+#endif
>- 
>-       if (runtimeAddr == 1 && i == (size - 1))
>-         break;
>Index: graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h
>===================================================================
>--- graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h	(revision 384430)
>+++ graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h	(working copy)
>@@ -1,11 +0,0 @@
>---- software/tulip/include/TulipPerspectiveProcessHandler.h.orig	2014-04-18 11:41:35.000000000 +0200
>-+++ software/tulip/include/TulipPerspectiveProcessHandler.h	2014-04-18 11:47:38.000000000 +0200
>-@@ -27,6 +27,8 @@
>- 
>- #include <QTcpServer>
>- 
>-+#include <ctime>
>-+
>- // Some utility class used in crash handler dialog designer form
>- 
>- class SelectionButton: public QPushButton {
>Index: graphics/tulip/files/patch-software-tulip-src_main.cpp
>===================================================================
>--- graphics/tulip/files/patch-software-tulip-src_main.cpp	(revision 384430)
>+++ graphics/tulip/files/patch-software-tulip-src_main.cpp	(working copy)
>@@ -1,12 +0,0 @@
>---- software/tulip/src/main.cpp.orig	2014-04-18 11:56:26.000000000 +0200
>-+++ software/tulip/src/main.cpp	2014-04-18 11:56:38.000000000 +0200
>-@@ -119,7 +119,9 @@
>- }
>- 
>- int main(int argc, char **argv) {
>-+#ifndef __FreeBSD__
>-   start_crash_handler();
>-+#endif
>- 
>- 
>- 
>Index: graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp
>===================================================================
>--- graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp	(revision 384430)
>+++ graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp	(working copy)
>@@ -1,12 +0,0 @@
>---- software/tulip_perspective/src/main.cpp.orig	2014-04-18 11:58:12.000000000 +0200
>-+++ software/tulip_perspective/src/main.cpp	2014-04-18 11:58:27.000000000 +0200
>-@@ -129,7 +129,9 @@
>- }
>- 
>- int main(int argc,char **argv) {
>-+#ifndef __FreeBSD__
>-   start_crash_handler();
>-+#endif
>- 
>-   QString appName("Tulip ");
>-   QString iconPath;
>Index: graphics/tulip/files/patch-software_crash__handling_CrashHandling.cpp
>===================================================================
>--- graphics/tulip/files/patch-software_crash__handling_CrashHandling.cpp	(revision 384430)
>+++ graphics/tulip/files/patch-software_crash__handling_CrashHandling.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- software/crash_handling/CrashHandling.cpp.orig	2014-04-18 10:33:31.000000000 +0200
>-+++ software/crash_handling/CrashHandling.cpp	2014-04-18 10:34:25.000000000 +0200
>-@@ -38,7 +38,7 @@
>+--- software/crash_handling/CrashHandling.cpp.orig	2015-04-18 20:15:52 UTC
>++++ software/crash_handling/CrashHandling.cpp
>+@@ -48,7 +48,7 @@ void setExtraSymbolsSearchPaths(const st
>  /*
>    Linux/MacOS-specific handling
>   */
>Index: graphics/tulip/files/patch-software_crash__handling_StackWalker.cpp
>===================================================================
>--- graphics/tulip/files/patch-software_crash__handling_StackWalker.cpp	(revision 384430)
>+++ graphics/tulip/files/patch-software_crash__handling_StackWalker.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- software/crash_handling/StackWalker.cpp.orig	2014-04-22 16:44:05.000000000 +0200
>-+++ software/crash_handling/StackWalker.cpp	2014-04-22 16:46:01.000000000 +0200
>-@@ -255,8 +255,13 @@
>+--- software/crash_handling/StackWalker.cpp.orig	2015-04-18 20:15:52 UTC
>++++ software/crash_handling/StackWalker.cpp
>+@@ -255,8 +255,13 @@ void StackWalkerGCC::printCallStack(std:
>        char * real_name = abi::__cxa_demangle(mangled_name, 0, 0, &status);
>  
>        char *end;
>Index: graphics/tulip/files/patch-software_tulip__perspective_src_main.cpp
>===================================================================
>--- graphics/tulip/files/patch-software_tulip__perspective_src_main.cpp	(revision 384430)
>+++ graphics/tulip/files/patch-software_tulip__perspective_src_main.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- software/tulip_perspective/src/main.cpp.orig	2014-04-18 11:58:12.000000000 +0200
>-+++ software/tulip_perspective/src/main.cpp	2014-04-18 11:58:27.000000000 +0200
>-@@ -129,7 +129,9 @@
>+--- software/tulip_perspective/src/main.cpp.orig	2015-04-18 20:15:52 UTC
>++++ software/tulip_perspective/src/main.cpp
>+@@ -134,7 +134,9 @@ void usage(const QString &error) {
>  }
>  
>  int main(int argc,char **argv) {
>Index: graphics/tulip/files/patch-software_tulip_include_TulipPerspectiveProcessHandler.h
>===================================================================
>--- graphics/tulip/files/patch-software_tulip_include_TulipPerspectiveProcessHandler.h	(revision 384430)
>+++ graphics/tulip/files/patch-software_tulip_include_TulipPerspectiveProcessHandler.h	(working copy)
>@@ -1,5 +1,5 @@
>---- software/tulip/include/TulipPerspectiveProcessHandler.h.orig	2014-04-18 11:41:35.000000000 +0200
>-+++ software/tulip/include/TulipPerspectiveProcessHandler.h	2014-04-18 11:47:38.000000000 +0200
>+--- software/tulip/include/TulipPerspectiveProcessHandler.h.orig	2015-04-18 20:15:52 UTC
>++++ software/tulip/include/TulipPerspectiveProcessHandler.h
> @@ -27,6 +27,8 @@
>  
>  #include <QTcpServer>
>Index: graphics/tulip/files/patch-software_tulip_src_main.cpp
>===================================================================
>--- graphics/tulip/files/patch-software_tulip_src_main.cpp	(revision 384430)
>+++ graphics/tulip/files/patch-software_tulip_src_main.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- software/tulip/src/main.cpp.orig	2014-04-18 11:56:26.000000000 +0200
>-+++ software/tulip/src/main.cpp	2014-04-18 11:56:38.000000000 +0200
>-@@ -119,7 +119,9 @@
>+--- software/tulip/src/main.cpp.orig	2015-04-22 14:45:04 UTC
>++++ software/tulip/src/main.cpp
>+@@ -124,7 +124,9 @@ void checkTulipRunning(const QString& pe
>  }
>  
>  int main(int argc, char **argv) {
>@@ -8,5 +8,5 @@
>    start_crash_handler();
> +#endif
>  
>- 
>- 
>+   QApplication tulip_agent(argc, argv);
>+   QString name("Tulip ");
>Index: graphics/tulip/files/patch-thirdparty_CMakeLists.txt
>===================================================================
>--- graphics/tulip/files/patch-thirdparty_CMakeLists.txt	(revision 384430)
>+++ graphics/tulip/files/patch-thirdparty_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- thirdparty/CMakeLists.txt.orig	2014-09-28 22:17:08.000000000 +0200
>-+++ thirdparty/CMakeLists.txt	2014-09-30 14:20:28.000000000 +0200
>-@@ -3,7 +3,7 @@
>+--- thirdparty/CMakeLists.txt.orig	2015-04-18 20:15:20 UTC
>++++ thirdparty/CMakeLists.txt
>+@@ -3,7 +3,7 @@ DISABLE_COMPILER_WARNINGS()
>  ADD_CORE_FILES(CMakeLists.txt)
>  
>  ADD_SUBDIRECTORY(gzstream)

Actions: View | Diff

Attachments on bug 199614: 155860 | 155864 | 155901 | 155902 | 155906 | 156042