[coin3] 52/58: Refresh patches
Anton Gladky
gladk at moszumanska.debian.org
Tue Dec 26 23:52:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch experimental
in repository coin3.
commit bb204921ab838f04d62b5fa18f05e0b358465bdb
Author: Anton Gladky <gladk at debian.org>
Date: Wed Dec 27 00:09:01 2017 +0100
Refresh patches
---
.../0010-Remove-timestamp-in-generated-html.patch | 24 ------------
debian/patches/0020_Remove_exe-installs.patch | 31 ---------------
debian/patches/01_convert_old_patches.patch | 6 ++-
debian/patches/series | 4 +-
debian/patches/use_old_soname.patch | 44 ++++++++++++++++++++++
debian/patches/use_system_expat.patch | 42 +++++++++++++++++++++
6 files changed, 92 insertions(+), 59 deletions(-)
diff --git a/debian/patches/0010-Remove-timestamp-in-generated-html.patch b/debian/patches/0010-Remove-timestamp-in-generated-html.patch
deleted file mode 100644
index 28ab224..0000000
--- a/debian/patches/0010-Remove-timestamp-in-generated-html.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7e589c44f3fbcef75db1ba4af148229e4b993cf9 Mon Sep 17 00:00:00 2001
-From: Anton Gladky <gladk at debian.org>
-Date: Tue, 5 May 2015 22:06:43 +0200
-Subject: [PATCH] Remove timestamp in generated html.
-
----
- docs/doxygen/footer.html | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/doxygen/footer.html b/docs/doxygen/footer.html
-index c24d52e..a13a0b9 100644
---- a/docs/doxygen/footer.html
-+++ b/docs/doxygen/footer.html
-@@ -1,6 +1,6 @@
- <hr noshade>
- <p align="right">Copyright © by <a href="http://www.kongsberg.com/kogt">Kongsberg Oil & Gas Technologies</a>. All rights reserved.</p>
- <address style="align: right;"><small>
--Generated on $datetime for $projectname by <a href="http://www.doxygen.org/">Doxygen</a> $doxygenversion.</small></address>
-+Generated for $projectname by <a href="http://www.doxygen.org/">Doxygen</a> </small></address>
- </body>
- </html>
---
-2.1.4
-
diff --git a/debian/patches/0020_Remove_exe-installs.patch b/debian/patches/0020_Remove_exe-installs.patch
deleted file mode 100644
index d404daa..0000000
--- a/debian/patches/0020_Remove_exe-installs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Remove installation of exe-files
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: https://bugs.debian.org/795241
-Last-Update: 2015-08-12
-
-Index: Coin3D-coin-abc9f50968c9/Makefile.in
-===================================================================
---- Coin3D-coin-abc9f50968c9.orig/Makefile.in
-+++ Coin3D-coin-abc9f50968c9/Makefile.in
-@@ -1420,8 +1420,6 @@ EXTRA_DIST = \
- cfg/errors.txt \
- cfg/gendsp.pl.in \
- cfg/ltconfig \
-- cfg/wrapmsvc.exe \
-- cfg/csubst.exe \
- cfg/doxy4win.pl \
- docs/coin.doxygen.in \
- docs/oiki-launch.txt \
-@@ -2242,12 +2240,10 @@ doxygen-docs: built-sources
- @BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_TRUE@ # Link to SoQt.framework to allow <Inventor/Qt/xxx.h> includes.
- @BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_TRUE@ cd "$(DESTDIR)$(MAC_FRAMEWORK_PREFIX)/$(MAC_FRAMEWORK_NAME).framework/Versions/$(MAC_FRAMEWORK_VERSION)/Headers" && rm -f Qt && ln -s ../../../../SoQt.framework/Headers Qt && cd -;
- @BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_FALSE at install-data-local:
-- at BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_FALSE at install-exec-local: $(srcdir)/cfg/wrapmsvc.exe
- @BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_FALSE@ @$(NORMAL_INSTALL)
- @BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_FALSE@ @if @BUILD_WITH_MSVC@; then \
- @BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_FALSE@ echo " $(mkinstalldirs) $(DESTDIR)$(bindir)"; \
- @BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_FALSE@ $(mkinstalldirs) $(DESTDIR)$(bindir); \
-- at BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_FALSE@ p=wrapmsvc.exe; \
- @BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_FALSE@ echo " $(INSTALL_PROGRAM) $(srcdir)/cfg/$$p $(DESTDIR)$(bindir)/$$p"; \
- @BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_FALSE@ $(INSTALL_PROGRAM) $(srcdir)/cfg/$$p $(DESTDIR)$(bindir)/$$p; \
- @BUILD_LIBRARY_TRUE@@MAC_FRAMEWORK_FALSE@ else :; fi
diff --git a/debian/patches/01_convert_old_patches.patch b/debian/patches/01_convert_old_patches.patch
index ef8de49..b27b911 100644
--- a/debian/patches/01_convert_old_patches.patch
+++ b/debian/patches/01_convert_old_patches.patch
@@ -2,8 +2,10 @@ Description: convert old patches into DEP-3
Acked-By: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-03
---- a/include/Inventor/SbBasic.h
-+++ b/include/Inventor/SbBasic.h
+Index: coin/include/Inventor/SbBasic.h
+===================================================================
+--- coin.orig/include/Inventor/SbBasic.h
++++ coin/include/Inventor/SbBasic.h
@@ -33,6 +33,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\**************************************************************************/
diff --git a/debian/patches/series b/debian/patches/series
index e6f5f43..60cef72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
01_convert_old_patches.patch
-0010-Remove-timestamp-in-generated-html.patch
-0020_Remove_exe-installs.patch
+use_old_soname.patch
+use_system_expat.patch
diff --git a/debian/patches/use_old_soname.patch b/debian/patches/use_old_soname.patch
new file mode 100644
index 0000000..ffa280e
--- /dev/null
+++ b/debian/patches/use_old_soname.patch
@@ -0,0 +1,44 @@
+Description: Use old soname.
+ This is the quick and dirty solution just to check the new
+ upstream versiion in the experimental.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2017-12-26
+
+Index: coin3-4.0.0+dfsg1/CMakeLists.txt
+===================================================================
+--- coin3-4.0.0+dfsg1.orig/CMakeLists.txt
++++ coin3-4.0.0+dfsg1/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 2.8.12)
+ project(Coin)
+-set (COIN_MAJOR_VERSION 4)
++set (COIN_MAJOR_VERSION 80)
+ set (COIN_MINOR_VERSION 0)
+ set (COIN_MICRO_VERSION 0)
+ set (COIN_BETA_VERSION "a")
+Index: coin3-4.0.0+dfsg1/src/coindefs.h
+===================================================================
+--- coin3-4.0.0+dfsg1.orig/src/coindefs.h
++++ coin3-4.0.0+dfsg1/src/coindefs.h
+@@ -168,7 +168,7 @@ static void inline COIN_CONCAT(compile_o
+ this marker is used in a pure comment, so do not content yourself
+ with checking every place that fails.
+ */
+-#define POTENTIAL_ROTTING_DOCUMENTATION COMPILE_ONLY_BEFORE_NOFUNCTION(4,0,1,"This piece of documentation may potentially be outdated in the future.")
++#define POTENTIAL_ROTTING_DOCUMENTATION COMPILE_ONLY_BEFORE_NOFUNCTION(80,0,1,"This piece of documentation may potentially be outdated in the future.")
+
+ #ifdef _MSC_VER
+ #define COIN_MSVC _MSC_VER
+Index: coin3-4.0.0+dfsg1/src/CMakeLists.txt
+===================================================================
+--- coin3-4.0.0+dfsg1.orig/src/CMakeLists.txt
++++ coin3-4.0.0+dfsg1/src/CMakeLists.txt
+@@ -159,7 +159,7 @@ find_package(OpenGL)
+ target_link_libraries(Coin ${OPENGL_LIBRARIES})
+ target_include_directories(Coin INTERFACE $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>)
+
+-set_target_properties(Coin PROPERTIES VERSION ${COIN_MAJOR_VERSION}.${COIN_MINOR_VERSION}.${COIN_MICRO_VERSION})
++set_target_properties(Coin PROPERTIES VERSION ${COIN_MAJOR_VERSION}.${COIN_MINOR_VERSION}.${COIN_MICRO_VERSION} SOVERSION ${COIN_MAJOR_VERSION})
+
+ install(TARGETS Coin EXPORT Coin
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
diff --git a/debian/patches/use_system_expat.patch b/debian/patches/use_system_expat.patch
new file mode 100644
index 0000000..7a6d97c
--- /dev/null
+++ b/debian/patches/use_system_expat.patch
@@ -0,0 +1,42 @@
+Description: Use system expat instead of embedded one.
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/674096
+Last-Update: 2017-12-26
+
+--- coin3-4.0.0+dfsg1.orig/src/CMakeLists.txt
++++ coin3-4.0.0+dfsg1/src/CMakeLists.txt
+@@ -68,7 +68,6 @@ else()
+ $<TARGET_OBJECTS:engines>
+ $<TARGET_OBJECTS:errors>
+ $<TARGET_OBJECTS:events>
+- $<TARGET_OBJECTS:expat>
+ $<TARGET_OBJECTS:fields>
+ $<TARGET_OBJECTS:fonts>
+ $<TARGET_OBJECTS:foreignfiles>
+@@ -155,6 +154,7 @@ if(HAVE_LIBSIMAGE)
+ target_link_libraries(Coin simage::simage)
+ endif()
+
++target_link_libraries(Coin expat)
+ find_package(OpenGL)
+ target_link_libraries(Coin ${OPENGL_LIBRARIES})
+ target_include_directories(Coin INTERFACE $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>)
+--- coin3-4.0.0+dfsg1.orig/src/xml/CMakeLists.txt
++++ coin3-4.0.0+dfsg1/src/xml/CMakeLists.txt
+@@ -1,5 +1,3 @@
+-add_subdirectory(expat)
+-
+ # source files
+ set(COIN_XML_FILES
+ document.cpp
+--- coin3-4.0.0+dfsg1.orig/src/xml/document.cpp
++++ coin3-4.0.0+dfsg1/src/xml/document.cpp
+@@ -52,7 +52,7 @@
+ #include <Inventor/lists/SbList.h>
+ #include <Inventor/SbString.h>
+
+-#include "expat/expat.h"
++#include "expat.h"
+ #include "utils.h"
+ #include "elementp.h"
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/coin3.git
More information about the debian-science-commits
mailing list