Re: [ports-gcc] Unbreak productivity/ledger

2019-08-08 Thread Stuart Henderson
ok

On 2019/08/08 19:05, Charlene Wendling wrote:
> ping.
> 
> On Sat, 27 Jul 2019 23:17:26 +0200
> Charlene Wendling wrote:
> 
> > 
> > > http://build-failures.rhaalovely.net/powerpc/2019-07-14/productivity/ledger.log
> > > http://build-failures.rhaalovely.net/sparc64/2019-07-11/productivity/ledger.log
> > 
> > There is some namespace issues when built with gcc, upstream fixed it
> > already.
> > 
> > This allows building on macppc [0], and amd64 is still fine.
> > 
> > Comments/feedback are welcome!
> > 
> > Charlène. 
> > 
> > 
> > [0] https://bin.charlenew.xyz/ledger.log
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/ledger/Makefile,v
> retrieving revision 1.26
> diff -u -p -u -p -r1.26 Makefile
> --- Makefile  12 Jul 2019 20:48:58 -  1.26
> +++ Makefile  27 Jul 2019 21:05:16 -
> @@ -5,7 +5,7 @@ COMMENT = command line double-entry acc
>  GH_TAGNAME = v3.1.1
>  GH_ACCOUNT = ledger
>  GH_PROJECT = ledger
> -REVISION =   3
> +REVISION =   4
>  
>  SHARED_LIBS +=  ledger0.0 # 3.0
>  
> Index: patches/patch-src_item_h
> ===
> RCS file: patches/patch-src_item_h
> diff -N patches/patch-src_item_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_item_h  27 Jul 2019 21:05:16 -
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +Fix the build with ports-gcc, from upstream:
> +https://github.com/ledger/ledger/commit/258cab91ab702e82d477b41bb1c6a026c848bda5
> +
> +Index: src/item.h
> +--- src/item.h.orig
>  src/item.h
> +@@ -92,7 +92,7 @@ class item_t : public supports_flags, 
> + 
> +   typedef std::pair, bool> tag_data_t;
> +   typedef std::map +-   function > string_map;
> ++   std::function > string_map;
> + 
> +   state_t  _state;
> +   optional _date;
> 



Re: [ports-gcc] Unbreak productivity/ledger

2019-08-08 Thread Charlene Wendling
ping.

On Sat, 27 Jul 2019 23:17:26 +0200
Charlene Wendling wrote:

> 
> > http://build-failures.rhaalovely.net/powerpc/2019-07-14/productivity/ledger.log
> > http://build-failures.rhaalovely.net/sparc64/2019-07-11/productivity/ledger.log
> 
> There is some namespace issues when built with gcc, upstream fixed it
> already.
> 
> This allows building on macppc [0], and amd64 is still fine.
> 
> Comments/feedback are welcome!
> 
> Charlène. 
> 
> 
> [0] https://bin.charlenew.xyz/ledger.log

Index: Makefile
===
RCS file: /cvs/ports/productivity/ledger/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile12 Jul 2019 20:48:58 -  1.26
+++ Makefile27 Jul 2019 21:05:16 -
@@ -5,7 +5,7 @@ COMMENT =   command line double-entry acc
 GH_TAGNAME =   v3.1.1
 GH_ACCOUNT =   ledger
 GH_PROJECT =   ledger
-REVISION = 3
+REVISION = 4
 
 SHARED_LIBS +=  ledger0.0 # 3.0
 
Index: patches/patch-src_item_h
===
RCS file: patches/patch-src_item_h
diff -N patches/patch-src_item_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_item_h27 Jul 2019 21:05:16 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix the build with ports-gcc, from upstream:
+https://github.com/ledger/ledger/commit/258cab91ab702e82d477b41bb1c6a026c848bda5
+
+Index: src/item.h
+--- src/item.h.orig
 src/item.h
+@@ -92,7 +92,7 @@ class item_t : public supports_flags, 
+ 
+   typedef std::pair, bool> tag_data_t;
+   typedef std::map > string_map;
++   std::function > string_map;
+ 
+   state_t  _state;
+   optional _date;



[ports-gcc] Unbreak productivity/ledger

2019-07-27 Thread Charlene Wendling


> http://build-failures.rhaalovely.net/powerpc/2019-07-14/productivity/ledger.log
> http://build-failures.rhaalovely.net/sparc64/2019-07-11/productivity/ledger.log

There is some namespace issues when built with gcc, upstream fixed it
already.

This allows building on macppc [0], and amd64 is still fine.

Comments/feedback are welcome!

Charlène. 


[0] https://bin.charlenew.xyz/ledger.log


Index: Makefile
===
RCS file: /cvs/ports/productivity/ledger/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile12 Jul 2019 20:48:58 -  1.26
+++ Makefile27 Jul 2019 21:05:16 -
@@ -5,7 +5,7 @@ COMMENT =   command line double-entry acc
 GH_TAGNAME =   v3.1.1
 GH_ACCOUNT =   ledger
 GH_PROJECT =   ledger
-REVISION = 3
+REVISION = 4
 
 SHARED_LIBS +=  ledger0.0 # 3.0
 
Index: patches/patch-src_item_h
===
RCS file: patches/patch-src_item_h
diff -N patches/patch-src_item_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_item_h27 Jul 2019 21:05:16 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix the build with ports-gcc, from upstream:
+https://github.com/ledger/ledger/commit/258cab91ab702e82d477b41bb1c6a026c848bda5
+
+Index: src/item.h
+--- src/item.h.orig
 src/item.h
+@@ -92,7 +92,7 @@ class item_t : public supports_flags, 
+ 
+   typedef std::pair, bool> tag_data_t;
+   typedef std::map > string_map;
++   std::function > string_map;
+ 
+   state_t  _state;
+   optional _date;