| 1 |
xarthisius 10/05/30 18:29:21 |
| 2 |
|
| 3 |
Added: bbppp-0.2.5-gcc3-multiline.patch |
| 4 |
bbppp-asneeded.patch |
| 5 |
Log: |
| 6 |
Version bump. Fixing build with as-needed wrt bug 248552. Thanks Diego for report |
| 7 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: bbppp-0.2.5-gcc3-multiline.patch |
| 16 |
=================================================================== |
| 17 |
--- main.cc |
| 18 |
+++ main.cc |
| 19 |
@@ -24,25 +24,24 @@ |
| 20 |
|
| 21 |
void Usage() |
| 22 |
{ |
| 23 |
- char* usageOptions = {"Options:\n\ |
| 24 |
- -display <display name> X server to connect to\n\ |
| 25 |
- -c[onfig] <filename> Alternate config file\n\ |
| 26 |
- -n[obb] Fall back on default configuration\n\ |
| 27 |
- -v[ersion] Display version number\n\ |
| 28 |
- -h[elp] Display this help\n\ |
| 29 |
- -geom[etry] <geometry> Set geometry of window\n\ |
| 30 |
- -d[ecorated] Show 'normal' decorated window\n\ |
| 31 |
- -w[ithdrawn] Place bbtool in the Slit\n\ |
| 32 |
- -s[hape] Don't display groundplate\n\ |
| 33 |
- -thru[put] Display throughput rate\n\ |
| 34 |
- -o[rient] <v|h> Display window widgets horizontally or vertically\n\ |
| 35 |
- -com[pact] Display buttons in compact style\n\ |
| 36 |
- -notime Dont display time window\n\ |
| 37 |
- -nosecs Show uptime in old-style hh:mm format\n\n"}; |
| 38 |
+ char* usageOptions = {"Options:\n" |
| 39 |
+ "-display <display name> X server to connect to\n" |
| 40 |
+ "-c[onfig] <filename> Alternate config file\n" |
| 41 |
+ "-n[obb] Fall back on default configuration\n" |
| 42 |
+ "-v[ersion] Display version number\n" |
| 43 |
+ "-h[elp] Display this help\n" |
| 44 |
+ "-geom[etry] <geometry> Set geometry of window\n" |
| 45 |
+ "-d[ecorated] Show 'normal' decorated window\n" |
| 46 |
+ "-w[ithdrawn] Place bbtool in the Slit\n" |
| 47 |
+ "-s[hape] Don't display groundplate\n" |
| 48 |
+ "-thru[put] Display throughput rate\n" |
| 49 |
+ "-o[rient] <v|h> Display window widgets horizontally or vertically\n" |
| 50 |
+ "-com[pact] Display buttons in compact style\n" |
| 51 |
+ "-notime Dont display time window\n" |
| 52 |
+ "-nosecs Show uptime in old-style hh:mm format\n\n"}; |
| 53 |
|
| 54 |
fprintf(stdout,"\n%s version %s \n",BBTOOL,BBTOOL_VERSION); |
| 55 |
- fprintf(stdout,"Usage:\n\ |
| 56 |
- %s [options]\n",BBTOOL); |
| 57 |
+ fprintf(stdout,"Usage:\n%s [options]\n",BBTOOL); |
| 58 |
fprintf(stdout, "%s", usageOptions); |
| 59 |
/* |
| 60 |
fprintf(stdout,"-t[ype] <0|1|2|3> 0: |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
1.1 x11-misc/bbppp/files/bbppp-asneeded.patch |
| 65 |
|
| 66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bbppp/files/bbppp-asneeded.patch?rev=1.1&view=markup |
| 67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bbppp/files/bbppp-asneeded.patch?rev=1.1&content-type=text/plain |
| 68 |
|
| 69 |
Index: bbppp-asneeded.patch |
| 70 |
=================================================================== |
| 71 |
Fixing build with as-needed |
| 72 |
|
| 73 |
https://bugs.gentoo.org/show_bug.cgi?id=248552 |
| 74 |
|
| 75 |
--- configure.in |
| 76 |
+++ configure.in |
| 77 |
@@ -86,14 +86,9 @@ |
| 78 |
AC_PATH_X |
| 79 |
AC_PATH_XTRA |
| 80 |
|
| 81 |
-CFLAGS="$CFLAGS $X_CFLAGS" |
| 82 |
-CXXFLAGS="$CXXFLAGS $X_CFLAGS" |
| 83 |
-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS" |
| 84 |
dnl Checks for X libraries. |
| 85 |
-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11", |
| 86 |
- AC_MSG_ERROR(XOpenDisplay not found in -lX11)) |
| 87 |
- |
| 88 |
-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS" |
| 89 |
+AC_CHECK_LIB([X11], [XOpenDisplay], , |
| 90 |
+ AC_MSG_ERROR(XOpenDisplay not found in -lX11),) |
| 91 |
|
| 92 |
dnl Checks for header files. |
| 93 |
AC_HEADER_STDC |
| 94 |
--- Makefile.am |
| 95 |
+++ Makefile.am |
| 96 |
@@ -1,4 +1,4 @@ |
| 97 |
-CPPFLAGS = @CPPFLAGS@ @INTERLACE@ @ISDN@\ |
| 98 |
+AM_CPPFLAGS = @INTERLACE@ @ISDN@\ |
| 99 |
-DGLOBAL_BB=\"$(datadir)/bbtools/bbppp.bb\" \ |
| 100 |
-DGLOBAL_NOBB=\"$(datadir)/bbtools/bbppp.nobb\" |
| 101 |
|
| 102 |
@@ -16,4 +16,5 @@ |
| 103 |
Basewindow.cc Basewindow.hh \ |
| 104 |
blackboxstyle.hh |
| 105 |
EXTRA_DIST = BUGS TODO |
| 106 |
-bbppp_LDADD = @X_LIBS@ |
| 107 |
+bbppp_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ |
| 108 |
+bbppp_CFLAGS = @X_PRE_CFLAGS@ @X_CFLAGS@ @X_EXTRA_CFLAGS@ |
Archives