Control: tags 1081104 + pending

Dear maintainer,

I've prepared an NMU for slic3r (versioned as 1.3.0+dfsg1-5.1) and
uploaded it.

Chris

diff -Nru slic3r-1.3.0+dfsg1/debian/changelog slic3r-1.3.0+dfsg1/debian/changelog
--- slic3r-1.3.0+dfsg1/debian/changelog	2021-04-25 19:46:44.000000000 +0200
+++ slic3r-1.3.0+dfsg1/debian/changelog	2024-11-20 21:21:38.000000000 +0100
@@ -1,3 +1,13 @@
+slic3r (1.3.0+dfsg1-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Zixing Liu ]
+  * Apply backported patch by Jonathan Wakely <jwak...@fedoraproject.org>
+    to fix FTBFS with GCC-14. (Closes: #1081104)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Wed, 20 Nov 2024 21:21:38 +0100
+
 slic3r (1.3.0+dfsg1-5) unstable; urgency=medium
 
   * [d1f6f28] Link against boost-nowide.
diff -Nru slic3r-1.3.0+dfsg1/debian/patches/Fix-FTBFS-GCC-14.patch slic3r-1.3.0+dfsg1/debian/patches/Fix-FTBFS-GCC-14.patch
--- slic3r-1.3.0+dfsg1/debian/patches/Fix-FTBFS-GCC-14.patch	1970-01-01 01:00:00.000000000 +0100
+++ slic3r-1.3.0+dfsg1/debian/patches/Fix-FTBFS-GCC-14.patch	2024-11-20 21:21:28.000000000 +0100
@@ -0,0 +1,29 @@
+Description: Do not undefine __STRICT_ANSI__
+Author: Jonathan Wakely <jwak...@fedoraproject.org>
+Origin: backport, https://github.com/slic3r/Slic3r/pull/4974
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1081104
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/slic3r/+bug/2089187
+Last-Update: 2024-11-20
+---
+Index: slic3r/xs/Build.PL
+===================================================================
+--- slic3r.orig/xs/Build.PL
++++ slic3r/xs/Build.PL
+@@ -21,13 +21,12 @@ $ENV{LD_RUN_PATH} //= "";
+ # BOOST_ASIO_DISABLE_KQUEUE : prevents a Boost ASIO bug on OS X: https://svn.boost.org/trac/boost/ticket/5339
+ my @cflags = qw(-D_GLIBCXX_USE_C99 -DHAS_BOOL -DNOGDI -DSLIC3RXS -DBOOST_ASIO_DISABLE_KQUEUE -Dexprtk_disable_rtl_io_file -Dexprtk_disable_return_statement -Dexprtk_disable_rtl_vecops -Dexprtk_disable_string_capabilities -Dexprtk_disable_enhanced_features);
+ if ($cpp_guess->is_gcc)	{
+-	# GCC is pedantic with c++11 std, so undefine strict ansi to get M_PI back
+-	push @cflags, qw(-U__STRICT_ANSI__);
++	# GCC is pedantic with c++11 std, so use -std=gnu++11 to be able to use M_PI
++	push @cflags, qw(-std=gnu++11);
++} else {
++	push @cflags, qw(-std=c++11);
+ }
+ 
+-# std=c++11 Enforce usage of C++11 (required now). Minimum compiler supported: gcc 4.9, clang 3.3, MSVC 14.0
+-push @cflags, qw(-std=c++11);
+-
+ my @ldflags = ();
+ 
+ if ($linux && (defined $ENV{SLIC3R_STATIC} && $ENV{SLIC3R_STATIC})) {
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-04-25 19:46:44.000000000 +0200
+++ slic3r-1.3.0+dfsg1/debian/patches/series	2024-11-20 21:21:28.000000000 +0100
@@ -7,3 +7,4 @@
 fix_boost_174.patch
 Fix-CVE-2020-28591.patch
 Link-against-boost-nowide-library.patch
+Fix-FTBFS-GCC-14.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to