[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#860346: marked as done (unblock: oce/0.17.2-2)



Your message dated Tue, 18 Apr 2017 07:20:00 +0000
with message-id <50030080-5cf0-d986-7c89-123f7f4608a8@thykier.net>
and subject line Re: Bug#860346: unblock: oce/0.17.2-2
has caused the Debian Bug report #860346,
regarding unblock: oce/0.17.2-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
860346: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860346
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@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 <gladk@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 <janus@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

--- End Message ---
--- Begin Message ---
Anton Gladky:
> tags 860346 -moreinfo
> thanks
> 
> Hi Niels,
> 
> oce_0.17.2-2 has been succesfully built on all release
> platforms [1].
> 
> [1] https://buildd.debian.org/status/package.php?p=oce
> 
> Anton
> 
> 
> [...]

Unblocked, thanks.

~Niels

--- End Message ---

Reply to: