From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../bbppp/files/bbppp-0.2.5-gcc3-multiline.patch | 44 ++++++++++++++++++++++ x11-misc/bbppp/files/bbppp-0.2.5-overflows.patch | 17 +++++++++ x11-misc/bbppp/files/bbppp-asneeded.patch | 38 +++++++++++++++++++ 3 files changed, 99 insertions(+) create mode 100644 x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch create mode 100644 x11-misc/bbppp/files/bbppp-0.2.5-overflows.patch create mode 100644 x11-misc/bbppp/files/bbppp-asneeded.patch (limited to 'x11-misc/bbppp/files') diff --git a/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch b/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch new file mode 100644 index 000000000000..ef2072faa9af --- /dev/null +++ b/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch @@ -0,0 +1,44 @@ +--- main.cc ++++ main.cc +@@ -24,25 +24,24 @@ + + void Usage() + { +- char* usageOptions = {"Options:\n\ +- -display X server to connect to\n\ +- -c[onfig] Alternate config file\n\ +- -n[obb] Fall back on default configuration\n\ +- -v[ersion] Display version number\n\ +- -h[elp] Display this help\n\ +- -geom[etry] Set geometry of window\n\ +- -d[ecorated] Show 'normal' decorated window\n\ +- -w[ithdrawn] Place bbtool in the Slit\n\ +- -s[hape] Don't display groundplate\n\ +- -thru[put] Display throughput rate\n\ +- -o[rient] Display window widgets horizontally or vertically\n\ +- -com[pact] Display buttons in compact style\n\ +- -notime Dont display time window\n\ +- -nosecs Show uptime in old-style hh:mm format\n\n"}; ++ char* usageOptions = {"Options:\n" ++ "-display X server to connect to\n" ++ "-c[onfig] Alternate config file\n" ++ "-n[obb] Fall back on default configuration\n" ++ "-v[ersion] Display version number\n" ++ "-h[elp] Display this help\n" ++ "-geom[etry] Set geometry of window\n" ++ "-d[ecorated] Show 'normal' decorated window\n" ++ "-w[ithdrawn] Place bbtool in the Slit\n" ++ "-s[hape] Don't display groundplate\n" ++ "-thru[put] Display throughput rate\n" ++ "-o[rient] Display window widgets horizontally or vertically\n" ++ "-com[pact] Display buttons in compact style\n" ++ "-notime Dont display time window\n" ++ "-nosecs Show uptime in old-style hh:mm format\n\n"}; + + fprintf(stdout,"\n%s version %s \n",BBTOOL,BBTOOL_VERSION); +- fprintf(stdout,"Usage:\n\ +- %s [options]\n",BBTOOL); ++ fprintf(stdout,"Usage:\n%s [options]\n",BBTOOL); + fprintf(stdout, "%s", usageOptions); + /* + fprintf(stdout,"-t[ype] <0|1|2|3> 0: diff --git a/x11-misc/bbppp/files/bbppp-0.2.5-overflows.patch b/x11-misc/bbppp/files/bbppp-0.2.5-overflows.patch new file mode 100644 index 000000000000..0c089bc92f4e --- /dev/null +++ b/x11-misc/bbppp/files/bbppp-0.2.5-overflows.patch @@ -0,0 +1,17 @@ +diff --git a/pppstat.cc b/pppstat.cc +index 71264e4..ca0f11c 100644 +--- a/pppstat.cc ++++ b/pppstat.cc +@@ -52,10 +52,10 @@ PPPStat::PPPStat(ToolWindow *toolwindow) + lastTimeMil = 0.0; + ppp_h = -1; + #ifndef ISDN +- active_interface= new char[4]; ++ active_interface= new char[5]; + strcpy(active_interface,"ppp0"); + #else +- active_interface= new char[5]; ++ active_interface= new char[6]; + strcpy(active_interface,"ippp0"); + #endif + connect_status=false; diff --git a/x11-misc/bbppp/files/bbppp-asneeded.patch b/x11-misc/bbppp/files/bbppp-asneeded.patch new file mode 100644 index 000000000000..7e8c2b8bcfd4 --- /dev/null +++ b/x11-misc/bbppp/files/bbppp-asneeded.patch @@ -0,0 +1,38 @@ +Fixing build with as-needed + +https://bugs.gentoo.org/show_bug.cgi?id=248552 + +--- configure.in ++++ configure.in +@@ -86,14 +86,9 @@ + AC_PATH_X + AC_PATH_XTRA + +-CFLAGS="$CFLAGS $X_CFLAGS" +-CXXFLAGS="$CXXFLAGS $X_CFLAGS" +-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS" + dnl Checks for X libraries. +-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11", +- AC_MSG_ERROR(XOpenDisplay not found in -lX11)) +- +-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS" ++AC_CHECK_LIB([X11], [XOpenDisplay], , ++ AC_MSG_ERROR(XOpenDisplay not found in -lX11),) + + dnl Checks for header files. + AC_HEADER_STDC +--- Makefile.am ++++ Makefile.am +@@ -1,4 +1,4 @@ +-CPPFLAGS = @CPPFLAGS@ @INTERLACE@ @ISDN@\ ++AM_CPPFLAGS = @INTERLACE@ @ISDN@\ + -DGLOBAL_BB=\"$(datadir)/bbtools/bbppp.bb\" \ + -DGLOBAL_NOBB=\"$(datadir)/bbtools/bbppp.nobb\" + +@@ -16,4 +16,5 @@ + Basewindow.cc Basewindow.hh \ + blackboxstyle.hh + EXTRA_DIST = BUGS TODO +-bbppp_LDADD = @X_LIBS@ ++bbppp_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ ++bbppp_CFLAGS = @X_PRE_CFLAGS@ @X_CFLAGS@ @X_EXTRA_CFLAGS@ -- cgit v1.2.3