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

Bug#990929: unblock: slic3r/1.3.0+dfsg1-5



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package slic3r

  * [d1f6f28] Link against boost-nowide.
    Thanks to Bernhard Übelacker <bernhardu@mailbox.org> (Closes: #985473)
(change by Chow Loong Jin)

Small change that is nasty for users and took some debugging.
diff -Nru slic3r-1.3.0+dfsg1/debian/changelog slic3r-1.3.0+dfsg1/debian/changelog
--- slic3r-1.3.0+dfsg1/debian/changelog	2021-03-22 18:53:36.000000000 +0200
+++ slic3r-1.3.0+dfsg1/debian/changelog	2021-04-25 20:46:44.000000000 +0300
@@ -1,3 +1,10 @@
+slic3r (1.3.0+dfsg1-5) unstable; urgency=medium
+
+  * [d1f6f28] Link against boost-nowide.
+    Thanks to Bernhard Übelacker <bernhardu@mailbox.org> (Closes: #985473)
+
+ -- Chow Loong Jin <hyperair@debian.org>  Mon, 26 Apr 2021 01:46:44 +0800
+
 slic3r (1.3.0+dfsg1-4) unstable; urgency=medium
 
   * [19f56c2] Reexport patches with gbp-pq
diff -Nru slic3r-1.3.0+dfsg1/debian/patches/Link-against-boost-nowide-library.patch slic3r-1.3.0+dfsg1/debian/patches/Link-against-boost-nowide-library.patch
--- slic3r-1.3.0+dfsg1/debian/patches/Link-against-boost-nowide-library.patch	1970-01-01 02:00:00.000000000 +0200
+++ slic3r-1.3.0+dfsg1/debian/patches/Link-against-boost-nowide-library.patch	2021-04-25 20:46:44.000000000 +0300
@@ -0,0 +1,39 @@
+From: Chow Loong Jin <hyperair@debian.org>
+Date: Mon, 26 Apr 2021 01:40:38 +0800
+Subject: Link against boost-nowide library
+
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=985473#20
+Bug-Debian: https://bugs.debian.org/985473
+Forwarded: not-needed
+Applied-Upstream: commit:89018b6e02e9d3fda30602cb4cf48f7750ace7b5
+---
+ src/CMakeLists.txt | 2 +-
+ xs/Build.PL        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index fb34b5a..7566058 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -22,7 +22,7 @@ ENDIF(CMAKE_HOST_APPLE)
+ set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_STATIC_RUNTIME ON)
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+-find_package(Boost COMPONENTS system thread filesystem)
++find_package(Boost COMPONENTS system thread filesystem nowide)
+ 
+ set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/)
+ 
+diff --git a/xs/Build.PL b/xs/Build.PL
+index c13ce20..4f5d3d7 100644
+--- a/xs/Build.PL
++++ b/xs/Build.PL
+@@ -142,7 +142,7 @@ if (defined $ENV{BOOST_LIBRARYPATH}) {
+ }
+ # In order to generate the -l switches we need to know how Boost libraries are named
+ my $have_boost = 0;
+-my @boost_libraries = qw(system thread filesystem);  # we need these
++my @boost_libraries = qw(system thread filesystem nowide);  # we need these
+ # check without explicit lib path (works on Linux)
+ if (! $mswin) {
+     $have_boost = 1
diff -Nru slic3r-1.3.0+dfsg1/debian/patches/series slic3r-1.3.0+dfsg1/debian/patches/series
--- slic3r-1.3.0+dfsg1/debian/patches/series	2021-03-22 18:53:36.000000000 +0200
+++ slic3r-1.3.0+dfsg1/debian/patches/series	2021-04-25 20:46:44.000000000 +0300
@@ -6,3 +6,4 @@
 0006-Fix-FTBFS-with-Boost-1.71.patch
 fix_boost_174.patch
 Fix-CVE-2020-28591.patch
+Link-against-boost-nowide-library.patch

Reply to: