Bug#853349: codeblocks: Patch for the build-failure

[Andreas Moog]

On Sat, Sep 30, 2017 at 09:21:43PM +0200, David Paleino wrote:

> Please go ahead, I currently don't have time :(

Ok, thanks for the reply. I filed a request for sponsorship as #877376.

Cheers,
  Andreas
-- 
PGP-encrypted mails preferred
PGP Fingerprint: 74CD D9FE 5BCB FE0D 13EE 8EEA 61F3 4426 74DE 6624


signature.asc
Description: PGP signature

Bug#853349: codeblocks: Patch for the build-failure

[David Paleino]

Please go ahead, I currently don't have time :(

David
(sorry for topquoting, replying from my mobile)

Il 30 Set 2017 20:51, "Andreas Moog"  ha scritto:

> Control: tags 853349 + patch
>
> Dear maintainer,
>
> this particular error is fixed already in upstream's SVN repo:
>
> https://sourceforge.net/p/codeblocks/code/11006/
>
> I've attached a minimal nmu for which I will seek sponsoring. Please tell
> me if
> I shouldn't upload this!
>
> Thanks!
>
> Regards,
>   Andreas
>
> --
> PGP-encrypted mails preferred
> PGP Fingerprint: 74CD D9FE 5BCB FE0D 13EE 8EEA 61F3 4426 74DE 6624
>

Bug#853349: codeblocks: Patch for the build-failure

[Andreas Moog]

Control: tags 853349 + patch

Dear maintainer,

this particular error is fixed already in upstream's SVN repo:

https://sourceforge.net/p/codeblocks/code/11006/

I've attached a minimal nmu for which I will seek sponsoring. Please tell me if 
I shouldn't upload this!

Thanks!

Regards,
  Andreas

-- 
PGP-encrypted mails preferred
PGP Fingerprint: 74CD D9FE 5BCB FE0D 13EE 8EEA 61F3 4426 74DE 6624
diff -Nru codeblocks-16.01+dfsg/debian/changelog codeblocks-16.01+dfsg/debian/changelog
--- codeblocks-16.01+dfsg/debian/changelog	2016-06-15 09:26:34.0 +0200
+++ codeblocks-16.01+dfsg/debian/changelog	2017-09-30 20:21:54.0 +0200
@@ -1,3 +1,10 @@
+codeblocks (16.01+dfsg-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply patch from upstream svn to fix FTBFS with GCC 7.1 (Closes: #853349)
+
+ -- Andreas Moog   Sat, 30 Sep 2017 20:21:54 +0200
+
 codeblocks (16.01+dfsg-2) unstable; urgency=medium
 
   * Drop debian/patches/05-fix-boost-system-1.60.patch; obsolete.
diff -Nru codeblocks-16.01+dfsg/debian/patches/06-fix-ftbfs-gcc71.patch codeblocks-16.01+dfsg/debian/patches/06-fix-ftbfs-gcc71.patch
--- codeblocks-16.01+dfsg/debian/patches/06-fix-ftbfs-gcc71.patch	1970-01-01 01:00:00.0 +0100
+++ codeblocks-16.01+dfsg/debian/patches/06-fix-ftbfs-gcc71.patch	2017-09-30 20:21:54.0 +0200
@@ -0,0 +1,19 @@
+Description: Fix compilation with GCC 7.1.0
+Bug-Debian: https://bugs.debian.org/853349
+Origin: upstream, https://sourceforge.net/p/codeblocks/code/11006/
+Last-Update: 2017-09-30
+
+--- codeblocks-16.01+dfsg.orig/src/include/scripting/sqplus/sqplus.h
 codeblocks-16.01+dfsg/src/include/scripting/sqplus/sqplus.h
+@@ -154,10 +154,10 @@
+ return safeStringCopy(s,_s.s,MaxLength);
+   }
+   bool operator == (const ScriptStringVar & _s) {
+-return _strcmp(s,_s.s) == 0;
++return strcmp(s,_s.s) == 0;
+   }
+   bool compareCaseInsensitive(const ScriptStringVar & _s) {
+-return _stricmp(s,_s.s) == 0;
++return strcasecmp(s,_s.s) == 0;
+   }
+ };
diff -Nru codeblocks-16.01+dfsg/debian/patches/series codeblocks-16.01+dfsg/debian/patches/series
--- codeblocks-16.01+dfsg/debian/patches/series	2016-06-15 09:25:21.0 +0200
+++ codeblocks-16.01+dfsg/debian/patches/series	2017-09-30 20:21:54.0 +0200
@@ -3,3 +3,4 @@
 03-remove-fPIC-from-pkg-info.patch
 04-reproducible_build.patch
 05-remove-rsa-md5-impl.patch
+06-fix-ftbfs-gcc71.patch


signature.asc
Description: PGP signature