On Sat, 12 Jan 2019 22:28:38 +0100
Christian Weisgerber wrote:
> Charlene Wendling:
>
> > > http://build-failures.rhaalovely.net//powerpc/2019-01-01/x11/bbpager.log
> >
> > It fails because some headers are missing. With those patches, it
> > builds [1] and runs [2] fine on macppc, and doesn't break amd64
> > build.
> >
> > Comments/feedback are welcome!
>
> Personally, I try to follow the existing style of the source, i.e.,
> if C headers are included in their C form like
>
> #include <stdio.h>
>
> then I'll add <string.h> and not <cstring>.
>
> --
> Christian "naddy" Weisgerber
> na...@mips.inka.de
>
Hi,
Here it is. I'm unhappy as well with Baseresource.cxx, but it would
make the patch intent's less clear.
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/bbpager/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- Makefile 24 Oct 2018 14:28:12 -0000 1.27
+++ Makefile 13 Jan 2019 13:39:23 -0000
@@ -3,7 +3,7 @@
COMMENT = pager for the Blackbox window manager
DISTNAME = bbpager-0.4.7
-REVISION = 6
+REVISION = 7
CATEGORIES = x11
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=bbtools/}
Index: patches/patch-src_Baseresource_cxx
===================================================================
RCS file: patches/patch-src_Baseresource_cxx
diff -N patches/patch-src_Baseresource_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Baseresource_cxx 13 Jan 2019 13:39:23 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+Fix missing header for ports-gcc
+Index: src/Baseresource.cxx
+--- src/Baseresource.cxx.orig
++++ src/Baseresource.cxx
+@@ -22,6 +22,7 @@
+ #include <string>
+ #include "Baseresource.h"
+ #include <stdio.h>
++#include <string.h>
+ #include "Menu.hh"
+
+ BaseResource::BaseResource(bt::Application &_app, unsigned int _screen, const
std::string &blackbox_rc_filename, const std::string &filename) :
Index: patches/patch-src_main_cxx
===================================================================
RCS file: patches/patch-src_main_cxx
diff -N patches/patch-src_main_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_main_cxx 13 Jan 2019 13:39:23 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+Fix missing header for ports-gcc
+Index: src/main.cxx
+--- src/main.cxx.orig
++++ src/main.cxx
+@@ -24,6 +24,7 @@
+ #include "config.h"
+
+ #include <stdio.h>
++#include <string.h>
+ #include <string>
+ #include <iostream>
+
Index: patches/patch-src_resource_cxx
===================================================================
RCS file: patches/patch-src_resource_cxx
diff -N patches/patch-src_resource_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_resource_cxx 13 Jan 2019 13:39:23 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+Fix missing header for ports-gcc
+Index: src/resource.cxx
+--- src/resource.cxx.orig
++++ src/resource.cxx
+@@ -19,6 +19,7 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+
++#include <string.h>
+ #include "resource.h"
+ #include "blackboxstyle.h"
+
