Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package oce
The upstream has found and fixed an annoying bug [1] in
oce. Debian and Ubuntu packages are affected. OCE_LIBRARIES
wrongly includes DRAWEX if -DOCE_DRAW=ON.
The attached patch was cherry-picked from upstream repo.
unblock oce/0.17.2-2
[1] https://github.com/tpaviot/oce/issues/660
Thanks,
Anton
diff -Nru oce-0.17.2/debian/changelog oce-0.17.2/debian/changelog
--- oce-0.17.2/debian/changelog 2016-06-16 23:05:45.000000000 +0200
+++ oce-0.17.2/debian/changelog 2017-04-14 22:35:14.000000000 +0200
@@ -1,3 +1,10 @@
+oce (0.17.2-2) unstable; urgency=medium
+
+ [ Janus Weil ]
+ * [c25582f] Prevent DRAWEXE from being added to OCE_LIBRARIES.
+
+ -- Anton Gladky <gl...@debian.org> Fri, 14 Apr 2017 22:35:14 +0200
+
oce (0.17.2-1) unstable; urgency=medium
* [776089c] Imported Upstream version 0.17.2
diff -Nru oce-0.17.2/debian/patches/do_not_add_drawexe.patch
oce-0.17.2/debian/patches/do_not_add_drawexe.patch
--- oce-0.17.2/debian/patches/do_not_add_drawexe.patch 1970-01-01
01:00:00.000000000 +0100
+++ oce-0.17.2/debian/patches/do_not_add_drawexe.patch 2017-04-14
22:33:04.000000000 +0200
@@ -0,0 +1,25 @@
+From 340781368c4d1902887fe6a5b7288cce5eb53456 Mon Sep 17 00:00:00 2001
+From: Janus Weil <ja...@gcc.gnu.org>
+Date: Sun, 12 Mar 2017 16:47:28 +0100
+Subject: [PATCH] prevent DRAWEXE from being added to OCE_LIBRARIES * see issue
+ #660
+
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 19e9705..c379b3c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -990,7 +990,9 @@ macro(process_module modulename modules_std)
+ list(APPEND modules ${ARGN})
+ endif(NOT OCE_DISABLE_X11)
+ foreach(module ${modules})
+- list(APPEND OCE_LIBRARIES ${module})
++ if(NOT module MATCHES ".*EXE")
++ list(APPEND OCE_LIBRARIES ${module})
++ endif()
+ set(TOOLKIT_MODULES "")
+ set(TOOLKIT_DEPENDS "")
+ set(TOOLKIT_INCLUDE_DIRECTORIES "")
diff -Nru oce-0.17.2/debian/patches/series oce-0.17.2/debian/patches/series
--- oce-0.17.2/debian/patches/series 2016-01-29 13:01:05.000000000 +0100
+++ oce-0.17.2/debian/patches/series 2017-04-14 22:33:49.000000000 +0200
@@ -1,2 +1,3 @@
split-export.patch
speedup-BRepMesh_test.patch
+do_not_add_drawexe.patch
