[base-gcc] Unbreak multimedia/synfig

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[base-gcc] Unbreak multimedia/synfig

Charlene Wendling

> http://build-failures.rhaalovely.net/powerpc/2019-12-25/multimedia/synfig.log
> http://build-failures.rhaalovely.net/sparc64/2020-01-05/multimedia/synfig.log

In fact the problem lies in devel/etl.

Upstream already fixed that [0]. With the below diff it fixes the build
of multimedia/synfig{,studio}, the only consumers, on powerpc [1].

amd64 is still fine with it.

Comments/feedback are welcome,

Charlène.


[0]
https://github.com/synfig/synfig/commit/cb05b072fe6fffb4433140c631f422bdbc036722
[1] https://bin.charlenew.xyz/etl_logs.tgz


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/etl/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 12 Jul 2019 20:44:08 -0000 1.7
+++ Makefile 11 Jan 2020 20:59:28 -0000
@@ -3,6 +3,7 @@
 COMMENT = C++ class and template library
 
 V = 1.2.1
+REVISION = 0
 DISTNAME = ETL-${V}
 PKGNAME = etl-${V}
 
Index: patches/patch-ETL__pen_h
===================================================================
RCS file: patches/patch-ETL__pen_h
diff -N patches/patch-ETL__pen_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ETL__pen_h 11 Jan 2020 20:59:28 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Unbreak consumers on !clang archs, from:
+https://github.com/synfig/synfig/commit/cb05b072fe6fffb4433140c631f422bdbc036722
+
+Index: ETL/_pen.h
+--- ETL/_pen.h.orig
++++ ETL/_pen.h
+@@ -136,7 +136,8 @@ class generic_pen (public)
+ typedef int value_type;
+ value_type x,y;
+ difference_type(value_type x, value_type y):x(x),y(y) { }
+- value_type &operator[](int i)const { return i?y:x; }
++ const value_type &operator[](int i) const { return i?y:x; }
++ value_type &operator[](int i) { return i?y:x; }
+ };
+
+ protected:

Reply | Threaded
Open this post in threaded view
|

Re: [base-gcc] Unbreak multimedia/synfig

Charlene Wendling
Ping :)

On Sat, 11 Jan 2020 22:05:46 +0100
Charlene Wendling wrote:

>
> > http://build-failures.rhaalovely.net/powerpc/2019-12-25/multimedia/synfig.log
> > http://build-failures.rhaalovely.net/sparc64/2020-01-05/multimedia/synfig.log
>
> In fact the problem lies in devel/etl.
>
> Upstream already fixed that [0]. With the below diff it fixes the
> build of multimedia/synfig{,studio}, the only consumers, on powerpc
> [1].
>
> amd64 is still fine with it.
>
> Comments/feedback are welcome,
>
> Charlène.
>
>
> [0]
> https://github.com/synfig/synfig/commit/cb05b072fe6fffb4433140c631f422bdbc036722
> [1] https://bin.charlenew.xyz/etl_logs.tgz
>


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/etl/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 12 Jul 2019 20:44:08 -0000 1.7
+++ Makefile 11 Jan 2020 20:59:28 -0000
@@ -3,6 +3,7 @@
 COMMENT = C++ class and template library
 
 V = 1.2.1
+REVISION = 0
 DISTNAME = ETL-${V}
 PKGNAME = etl-${V}
 
Index: patches/patch-ETL__pen_h
===================================================================
RCS file: patches/patch-ETL__pen_h
diff -N patches/patch-ETL__pen_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ETL__pen_h 11 Jan 2020 20:59:28 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Unbreak consumers on !clang archs, from:
+https://github.com/synfig/synfig/commit/cb05b072fe6fffb4433140c631f422bdbc036722
+
+Index: ETL/_pen.h
+--- ETL/_pen.h.orig
++++ ETL/_pen.h
+@@ -136,7 +136,8 @@ class generic_pen (public)
+ typedef int value_type;
+ value_type x,y;
+ difference_type(value_type x, value_type y):x(x),y(y) { }
+- value_type &operator[](int i)const { return i?y:x; }
++ const value_type &operator[](int i) const { return i?y:x; }
++ value_type &operator[](int i) { return i?y:x; }
+ };
+
+ protected:

Reply | Threaded
Open this post in threaded view
|

Re: [base-gcc] Unbreak multimedia/synfig

Charlene Wendling
Ping again :)

On Sat, 18 Jan 2020 13:59:08 +0100
Charlene Wendling wrote:

> Ping :)
>
> On Sat, 11 Jan 2020 22:05:46 +0100
> Charlene Wendling wrote:
>
> >
> > > http://build-failures.rhaalovely.net/powerpc/2019-12-25/multimedia/synfig.log
> > > http://build-failures.rhaalovely.net/sparc64/2020-01-05/multimedia/synfig.log
> >
> > In fact the problem lies in devel/etl.
> >
> > Upstream already fixed that [0]. With the below diff it fixes the
> > build of multimedia/synfig{,studio}, the only consumers, on powerpc
> > [1].
> >
> > amd64 is still fine with it.
> >
> > Comments/feedback are welcome,
> >
> > Charlène.
> >
> >
> > [0]
> > https://github.com/synfig/synfig/commit/cb05b072fe6fffb4433140c631f422bdbc036722
> > [1] https://bin.charlenew.xyz/etl_logs.tgz
> >

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/etl/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 12 Jul 2019 20:44:08 -0000 1.7
+++ Makefile 11 Jan 2020 20:59:28 -0000
@@ -3,6 +3,7 @@
 COMMENT = C++ class and template library
 
 V = 1.2.1
+REVISION = 0
 DISTNAME = ETL-${V}
 PKGNAME = etl-${V}
 
Index: patches/patch-ETL__pen_h
===================================================================
RCS file: patches/patch-ETL__pen_h
diff -N patches/patch-ETL__pen_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ETL__pen_h 11 Jan 2020 20:59:28 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Unbreak consumers on !clang archs, from:
+https://github.com/synfig/synfig/commit/cb05b072fe6fffb4433140c631f422bdbc036722
+
+Index: ETL/_pen.h
+--- ETL/_pen.h.orig
++++ ETL/_pen.h
+@@ -136,7 +136,8 @@ class generic_pen (public)
+ typedef int value_type;
+ value_type x,y;
+ difference_type(value_type x, value_type y):x(x),y(y) { }
+- value_type &operator[](int i)const { return i?y:x; }
++ const value_type &operator[](int i) const { return i?y:x; }
++ value_type &operator[](int i) { return i?y:x; }
+ };
+
+ protected:

Reply | Threaded
Open this post in threaded view
|

Re: [base-gcc] Unbreak multimedia/synfig

Kurt Mosiejczuk-9
On Sun, Jan 26, 2020 at 03:21:02PM +0100, Charlene Wendling wrote:
> Ping again :)

> On Sat, 18 Jan 2020 13:59:08 +0100
> Charlene Wendling wrote:

> > Ping :)
> >
> > On Sat, 11 Jan 2020 22:05:46 +0100
> > Charlene Wendling wrote:
> >
> > >
> > > > http://build-failures.rhaalovely.net/powerpc/2019-12-25/multimedia/synfig.log
> > > > http://build-failures.rhaalovely.net/sparc64/2020-01-05/multimedia/synfig.log
> > >
> > > In fact the problem lies in devel/etl.
> > >
> > > Upstream already fixed that [0]. With the below diff it fixes the
> > > build of multimedia/synfig{,studio}, the only consumers, on powerpc
> > > [1].
> > >
> > > amd64 is still fine with it.
> > >
> > > Comments/feedback are welcome,
> > >
> > > Charlène.

ok kmos

--Kurt