[3dldf] 01/01: fix RC bug #777763
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository 3dldf.
commit 33cbf2ebd6b82588e21e200c50d9831c3e7f6312
Author: Jerome Benoit <calculus@rezozer.net>
Date: Fri Jun 26 03:26:12 2015 +0200
fix RC bug #777763
---
debian/changelog | 9 +
debian/control | 4 +-
debian/copyright | 4 +-
debian/patches/series | 1 +
.../upstream-cleanup-permissive_cxx_code.patch | 300 +++++++++++++++++++++
5 files changed, 314 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 35d7274..1f2ccaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+3dldf (2.0.3+dfsg-3) unstable; urgency=medium
+
+ * RC bug fix release (Closes: #777763);
+ * Debianization:
+ - debian/copyright, refresh;
+ - debian/control, Standards Version 3.9.6.
+
+ -- Jerome Benoit <calculus@rezozer.net> Fri, 26 Jun 2015 00:36:16 +0000
+
3dldf (2.0.3+dfsg-2) unstable; urgency=medium
* Debianization:
diff --git a/debian/control b/debian/control
index 0ad9c3a..af82712 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends:
texlive-generic-recommended,
texlive-formats-extra,
texlive-fonts-extra,
-## cm-super,
+# cm-super,
ghostscript
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: https://www.gnu.org/software/3dldf/
Vcs-Git: git://anonscm.debian.org/debian-tex/3dldf.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-tex/3dldf.git
diff --git a/debian/copyright b/debian/copyright
index bdec0cc..1d442d6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,12 +13,12 @@ Comment:
Files: *
Copyright:
- 2003-2014 Laurence D. Finston <laurence.finston@gmx.de>
+ 2003-2015 Laurence D. Finston <laurence.finston@gmx.de>
License: GPL-3+
Files: debian/*
Copyright:
- 2014 Jerome Benoit <calculus@rezozer.net>
+ 2014-2015 Jerome Benoit <calculus@rezozer.net>
License: GPL-3+
License: GPL-3+
diff --git a/debian/patches/series b/debian/patches/series
index 805bcdd..8722fd6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream-cleanup-permissive_cxx_code.patch
fix-upstream-autotools.patch
fix-upstream-bison.patch
fix-upstream-log.patch
diff --git a/debian/patches/upstream-cleanup-permissive_cxx_code.patch b/debian/patches/upstream-cleanup-permissive_cxx_code.patch
new file mode 100644
index 0000000..2fd697d
--- /dev/null
+++ b/debian/patches/upstream-cleanup-permissive_cxx_code.patch
@@ -0,0 +1,300 @@
+Description: permissive code cleanup
+ Clarify C++ permissive code as detected by gcc-5; closes RC bug #777763.
+Origin: debian
+Forwarded: https://savannah.gnu.org/bugs/?44314
+Author: Jerome Benoit <calculus@rezozer.net>
+Last-Update: 2015-06-26
+
+--- a/src/pspglb.web
++++ b/src/pspglb.web
+@@ -5075,12 +5075,7 @@
+ void*
+ polyhedron_path_intersection_func(Polyhedron* p,
+ Path* q,
+- void* parameter = 0);
+-
+-template <class C>
+-int
+-show_func(C* c, string text = "", void* parameter = 0);
+-
++ void* parameter = 0);
+
+ void*
+ plane_intersection_func(void* v, void* w, void* parameter = 0);
+--- a/src/io.web
++++ b/src/io.web
+@@ -4937,22 +4937,22 @@
+ template <class C>
+ friend
+ void*
+- Scan_Parse::get_point_func(real r, C* c, void* parameter = 0);
++ Scan_Parse::get_point_func(real r, C* c, void* parameter);
+
+ template <class C>
+ friend
+ void*
+- Scan_Parse::get_center_func(C* c, void* parameter = 0);
++ Scan_Parse::get_center_func(C* c, void* parameter);
+
+ template <class C>
+ friend
+ void*
+- Scan_Parse::get_focus_func(C* c, const unsigned short s = 0, void* parameter = 0);
++ Scan_Parse::get_focus_func(C* c, const unsigned short s, void* parameter);
+
+ template <class C>
+ friend
+ void*
+- Scan_Parse::get_vertex_func(C* c, const unsigned short s = 0, void* parameter = 0);
++ Scan_Parse::get_vertex_func(C* c, const unsigned short s, void* parameter);
+
+
+ @q **** (4) Functions for |Focuses|.@>
+@@ -5009,8 +5009,8 @@
+ friend
+ string*
+ Scan_Parse::sub_binary_number_string_func(C c,
+- bool oversize_switch = false,
+- Scanner_Node scanner_node = 0);
++ bool oversize_switch,
++ Scanner_Node scanner_node);
+
+
+ @q **** (4) @>
+@@ -5035,7 +5035,7 @@
+ int
+ Scan_Parse::shape_decl_func(Scanner_Node,
+ int,
+- C* dummy = 0);
++ C*);
+
+ template <class C>
+ friend
+@@ -5164,7 +5164,7 @@
+ template <class C>
+ friend
+ void*
+-Scan_Parse::normal_func(C* c, Scanner_Node scanner_node = 0);
++Scan_Parse::normal_func(C* c, Scanner_Node scanner_node);
+
+
+ @q **** (4)@>
+@@ -5226,7 +5226,7 @@
+ Scan_Parse::vector_type_decl(Scanner_Node scanner_node,
+ int vector_type_num,
+ int array_type_num,
+- C* dummy = 0);
++ C* dummy);
+
+
+ template <class C>
+@@ -5237,7 +5237,7 @@
+ int vector_type_num,
+ int array_type_num,
+ C* object,
+- bool copy_object = true);
++ bool copy_object);
+
+ template <class C, class D>
+ friend
+@@ -5245,7 +5245,7 @@
+ Scan_Parse::vector_type_assign(Scanner_Node scanner_node,
+ Id_Map_Entry_Node entry,
+ const Pointer_Vector<D>* object_vector,
+- C* dummy = 0);
++ C* dummy);
+ friend
+ int
+ Scan_Parse::conditional(Scanner_Node scanner_node,
+@@ -5367,7 +5367,7 @@
+ template<class C>
+ friend
+ int
+- Scan_Parse::reverse_func(void* v, void* parameter, C* c = 0);
++ Scan_Parse::reverse_func(void* v, void* parameter, C* c);
+
+
+ friend
+@@ -5447,7 +5447,7 @@
+ template<class C>
+ friend
+ void*
+-standardize_func(C* c, void* v = 0);
++standardize_func(C* c, void* v);
+
+ friend
+ void*
+@@ -5610,11 +5610,11 @@
+ int increment_value,
+ const unsigned short conic_section_type,
+ C* c,
+- void* parameter = 0,
+- bool test_points = true,
+- bool rectify_points = true,
+- real tolerance = -1,
+- bool ignore_extra_points = true);
++ void* parameter,
++ bool test_points,
++ bool rectify_points,
++ real tolerance,
++ bool ignore_extra_points);
+
+ friend
+ void*
+@@ -5677,23 +5677,23 @@
+ template<class C>
+ friend
+ int
+-Scan_Parse::cull_func(void* v,
+- const unsigned short comparison = 0,
+- Scanner_Node scanner_node = 0,
+- real tolerance = -1,
+- C* c = 0);
++Scan_Parse::cull_func(void* v,
++ const unsigned short comparison,
++ Scanner_Node scanner_node,
++ real tolerance,
++ C* c);
+
+ template<class C>
+ friend
+ int
+ Scan_Parse::rectify_func(void* v,
+- Scanner_Node scanner_node = 0,
+- bool do_test = true,
+- bool do_cull = true,
+- bool do_transform = true,
+- real tolerance = -1,
+- Transform* t = 0,
+- C* c = 0);
++ Scanner_Node scanner_node,
++ bool do_test,
++ bool do_cull,
++ bool do_transform,
++ real tolerance,
++ Transform* t,
++ C* c);
+
+ @q ***** (5) |cuboid| expressions.@>
+ @*4 {\bf cuboid} expressions.
+@@ -5709,12 +5709,12 @@
+ template<class C>
+ friend
+ void*
+-Scan_Parse::in_cuboid_func(C* c, void* parameter = 0);
++Scan_Parse::in_cuboid_func(C* c, void* parameter);
+
+ template<class C>
+ friend
+ void*
+-Scan_Parse::out_cuboid_func(C* c, void* parameter = 0);
++Scan_Parse::out_cuboid_func(C* c, void* parameter);
+
+ @q ***** (5) Functions for |Polyhedra|.@>
+ @*4 Functions for {\bf Polyhedra}.
+@@ -6033,7 +6033,7 @@
+ template<class C>
+ friend
+ void*
+-Scan_Parse::is_whatever_func(C* c, void* parameter = 0);
++Scan_Parse::is_whatever_func(C* c, void* parameter);
+
+
+ friend
+@@ -6047,10 +6047,10 @@
+ template <class C, class D, class E>
+ friend
+ void*
+-Scan_Parse::intersection_points_func(C* c,
+- D* d,
+- void* parameter = 0,
+- E* e = 0);
++Scan_Parse::intersection_points_func(C* c,
++ D* d,
++ void* parameter,
++ E* e);
+ friend
+ Pointer_Vector<Bool_Point>*
+ Scan_Parse::convert(Bool_Point_Quadruple* bpq,
+@@ -6061,22 +6061,22 @@
+ template<class C, class D>
+ friend
+ void*
+-Scan_Parse::ellipse_like_intersection_func(C* c, D* d, void* parameter = 0);
++Scan_Parse::ellipse_like_intersection_func(C* c, D* d, void* parameter);
+
+ template<class C>
+ friend
+ void*
+-Scan_Parse::ellipse_like_plane_intersection_func(C* c, void* w, void* parameter = 0);
++Scan_Parse::ellipse_like_plane_intersection_func(C* c, void* w, void* parameter);
+
+ template<class C, class D>
+ friend
+ void*
+-Scan_Parse::conic_section_intersection_func(C* c, D* d, void* parameter = 0);
++Scan_Parse::conic_section_intersection_func(C* c, D* d, void* parameter);
+
+ template<class C, class D>
+ friend
+ void*
+-Scan_Parse::polygon_like_intersection_func(C* c, D* d, void* parameter = 0);
++Scan_Parse::polygon_like_intersection_func(C* c, D* d, void* parameter);
+
+
+ template<class C>
+@@ -6084,7 +6084,7 @@
+ void*
+ Scan_Parse::ellipsoid_like_plane_intersection_func(C* c,
+ Plane* p,
+- void* parameter = 0);
++ void* parameter);
+ friend
+ void*
+ Scan_Parse::sphere_line_intersection_func(Sphere* s,
+@@ -6100,12 +6100,12 @@
+ template<class C>
+ friend
+ void*
+-Scan_Parse::plane_cast_func(C* c, void* parameter = 0);
++Scan_Parse::plane_cast_func(C* c, void* parameter);
+
+ template <class C>
+ friend
+ void*
+-Scan_Parse::plane_assignment_func(void* entry, C* c, void* parameter = 0);
++Scan_Parse::plane_assignment_func(void* entry, C* c, void* parameter);
+
+ friend
+ int
+@@ -6114,7 +6114,7 @@
+ template <class C>
+ friend
+ int
+-Scan_Parse::show_func(C* c, string text = "", void* parameter = 0);
++Scan_Parse::show_func(C* c, string text, void* parameter);
+
+ friend
+ void*
+--- a/src/scanprse.web
++++ b/src/scanprse.web
+@@ -6245,7 +6245,7 @@
+ Scan_Parse::vector_type_decl(Scanner_Node scanner_node,
+ int vector_type_num,
+ int array_type_num,
+- C* dummy = 0)
++ C* dummy)
+ {
+
+
+@@ -8147,8 +8147,8 @@
+ Scan_Parse::cull_func(void* v,
+ const unsigned short comparison,
+ Scanner_Node scanner_node,
+- real tolerance = -1,
+- C* c = 0)
++ real tolerance,
++ C* c)
+ {
+
+ @q ***** (5) Preliminaries.@>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/3dldf.git
Reply to: