[SCM] supercollider-sc3-plugins/master: Remove newline at end of file, explain gcc5/6 patch.

hanno-guest at users.alioth.debian.org hanno-guest at users.alioth.debian.org
Fri Sep 2 10:13:57 UTC 2016


The following commit has been merged in the master branch:
commit 1def33e202ccfd79423239ea708d83c0ceb2d1c3
Author: Hanno Zulla <hanno.zulla at epublica.de>
Date:   Fri Sep 2 12:13:25 2016 +0200

    Remove newline at end of file, explain gcc5/6 patch.

diff --git a/debian/patches/03-gcc6.patch b/debian/patches/03-gcc6.patch
index 8511577..98bcb25 100644
--- a/debian/patches/03-gcc6.patch
+++ b/debian/patches/03-gcc6.patch
@@ -1,15 +1,17 @@
 Description: Fix GCC6 compilation issue
  This fixes an issue when compiling the source with gcc6.
  Patch taken from upstream at
- <https://github.com/supercollider/sc3-plugins/pull/112>
+ <https://github.com/supercollider/sc3-plugins/pull/112>.
+ gcc5 complains about conflicting or mismatched types with
+ this patch, therefore it is used for gcc6 and up.
 Forwarded: yes
 Author: Hanno Zulla <kontakt at hanno.de>
 Last-Update: 2016-09-02
 
 Index: supercollider-sc3-plugins/source/DWGUGens/dwglib/DWG.hpp
 ===================================================================
---- supercollider-sc3-plugins.orig/source/DWGUGens/dwglib/DWG.hpp	2016-09-02 10:02:22.975627092 +0200
-+++ supercollider-sc3-plugins/source/DWGUGens/dwglib/DWG.hpp	2016-09-02 10:04:23.586778283 +0200
+--- supercollider-sc3-plugins.orig/source/DWGUGens/dwglib/DWG.hpp	2016-09-02 11:52:04.955443992 +0200
++++ supercollider-sc3-plugins/source/DWGUGens/dwglib/DWG.hpp	2016-09-02 12:02:17.035441999 +0200
 @@ -1268,8 +1268,11 @@
          if(a1 < 1e-18)
              loss = 0.0;
@@ -23,10 +25,3 @@ Index: supercollider-sc3-plugins/source/DWGUGens/dwglib/DWG.hpp
      }
      void go(){
          Rline.push(inR);
-@@ -1278,4 +1281,4 @@
-         outL = loss*Lline.delay(del);
-     }
- };
--#endif
-\ No newline at end of file
-+#endif

-- 
supercollider-sc3-plugins packaging



More information about the pkg-multimedia-commits mailing list