2 Commits

Author SHA256 Message Date
c10e0dabba Accepting request 1148179 from science
OBS-URL: https://build.opensuse.org/request/show/1148179
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qwtplot3d?expand=0&rev=3
2024-02-21 16:56:48 +00:00
eeadb77549 Accepting request 699673 from science
- Update to version 0.2.7+git20190410.a6d0890d
  Switch to a git snapshot. This version supports Qt5 which is
  required to build scidavis 1.25.
- Drop glu_include.patch
- Drop qwtplot3d-gcc43.patch
- Add build_a_shared_lib.patch to build shared library.

OBS-URL: https://build.opensuse.org/request/show/699673
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qwtplot3d?expand=0&rev=2
2019-05-02 17:18:16 +00:00
7 changed files with 55 additions and 27 deletions

15
_service Normal file
View File

@@ -0,0 +1,15 @@
<services>
<service mode="disabled" name="tar_scm">
<param name="changesgenerate">enable</param>
<param name="versionformat">0.2.7+git%cd.%h</param>
<param name="url">https://github.com/copasi/copasi-dependencies</param>
<param name="subdir">src/qwtplot3d-qt4</param>
<param name="scm">git</param>
<param name="filename">qwtplot3d</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service mode="disabled" name="set_version"/>
</services>

6
_servicedata Normal file
View File

@@ -0,0 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/copasi/copasi-dependencies</param>
<param name="changesrevision">527adc603a454aefbfd87ecb998f56ed3b6359ab</param>
</service>
</servicedata>

31
build_a_shared_lib.patch Normal file
View File

@@ -0,0 +1,31 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 312690d..334bf30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,16 +171,22 @@ endif()
set(SOURCES ${SOURCES} ${MOC_FILES})
-add_library(qwtplot3d STATIC ${SOURCES} ${HEADERS})
-QT_BIND_TO_TARGET(qwtplot3d)
+add_library(qwtplot3d-qt5 SHARED ${SOURCES} ${HEADERS})
+QT_BIND_TO_TARGET(qwtplot3d-qt5)
+
+target_link_libraries(qwtplot3d-qt5 GL GLU)
if (ZLIB_FOUND)
-target_link_libraries(qwtplot3d ${ZLIB_LIBRARIES})
+target_link_libraries(qwtplot3d-qt5 ${ZLIB_LIBRARIES})
endif(ZLIB_FOUND)
+set_target_properties(qwtplot3d-qt5 PROPERTIES
+ VERSION 0.2.7
+ SOVERSION 0
+)
install(FILES ${HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-INSTALL(TARGETS qwtplot3d
+INSTALL(TARGETS qwtplot3d-qt5
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")

View File

@@ -1,14 +0,0 @@
--- include/qwt3d_openglhelper.h 2005-07-19 17:40:28.000000000 +0200
+++ include/qwt3d_openglhelper.h.qt480 2012-03-26 19:42:02.000000000 +0200
@@ -4,8 +4,11 @@
#include "qglobal.h"
#if QT_VERSION < 0x040000
#include <qgl.h>
+#elif QT_VERSION < 0x040800
+#include <QtOpenGL/qgl.h>
#else
#include <QtOpenGL/qgl.h>
+#include <GL/glu.h>
#endif
namespace Qwt3D

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:783c3efa62a69ecbf6d2a395e4f274882bcaa6b5d2020b04eec9494d2e3bab42
size 171192

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a02416c73860486879e7ba73dd4231c8abc78af284b96272c812e35fa32c8334
size 158156

View File

@@ -1,10 +0,0 @@
diff -Nur qwtplot3d-orig/src/qwt3d_function.cpp qwtplot3d/src/qwt3d_function.cpp
--- qwtplot3d-orig/src/qwt3d_function.cpp 2010-02-07 13:47:48.807034954 +0100
+++ qwtplot3d/src/qwt3d_function.cpp 2010-02-07 13:52:58.035284843 +0100
@@ -1,5 +1,6 @@
#include "qwt3d_surfaceplot.h"
#include "qwt3d_function.h"
+#include <stdio.h>
using namespace Qwt3D;