Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/bbmail/files: bbmail-0.9.3-gcc4.4.patch
Date: Thu, 30 Jul 2009 16:25:09
Message-Id: E1MWYRH-0001F8-10@stork.gentoo.org
1 ssuominen 09/07/30 16:25:07
2
3 Added: bbmail-0.9.3-gcc4.4.patch
4 Log:
5 Fix building with GCC 4.4 and -Wl,--as-needed.
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 x11-misc/bbmail/files/bbmail-0.9.3-gcc4.4.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/bbmail/files/bbmail-0.9.3-gcc4.4.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/bbmail/files/bbmail-0.9.3-gcc4.4.patch?rev=1.1&content-type=text/plain
13
14 Index: bbmail-0.9.3-gcc4.4.patch
15 ===================================================================
16 diff -ur bbmail-0.9.3.orig/configure.ac bbmail-0.9.3/configure.ac
17 --- bbmail-0.9.3.orig/configure.ac 2007-12-03 23:04:11.000000000 +0200
18 +++ bbmail-0.9.3/configure.ac 2009-07-30 19:24:12.000000000 +0300
19 @@ -9,13 +9,11 @@
20 AC_DEFUN(AC_SET_DEBUG,
21 [
22 test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
23 - test "$LDFLAGS" = "" && LDFLAGS=""
24 ])
25
26 AC_DEFUN(AC_SET_NODEBUG,
27 [
28 - test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
29 - test "$LDFLAGS" = "" && LDFLAGS="-s"
30 + test "$CXXFLAGS" = "" && CXXFLAGS="-Wall"
31 ])
32
33
34 @@ -46,9 +44,9 @@
35
36 CFLAGS="$CFLAGS $X_CFLAGS"
37 CXXFLAGS="$CXXFLAGS $X_CFLAGS"
38 -LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
39 +LIBS="$X_LIBS $X_PRE_LIBS"
40 dnl Checks for X libraries.
41 -AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
42 +AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
43 AC_MSG_ERROR(XOpenDisplay not found in -lX11))
44
45 dnl Checks for Xextension
46 diff -ur bbmail-0.9.3.orig/src/bbmail.cpp bbmail-0.9.3/src/bbmail.cpp
47 --- bbmail-0.9.3.orig/src/bbmail.cpp 2007-12-03 23:08:26.000000000 +0200
48 +++ bbmail-0.9.3/src/bbmail.cpp 2009-07-30 19:20:10.000000000 +0300
49 @@ -19,6 +19,8 @@
50 // (See the included file COPYING / GPL-2.0)
51 //
52
53 +#include <cstdio>
54 +
55 #include "bbmail.h"
56 #include "config.h"
57 #include <string>
58 diff -ur bbmail-0.9.3.orig/src/mailboxmenu.cpp bbmail-0.9.3/src/mailboxmenu.cpp
59 --- bbmail-0.9.3.orig/src/mailboxmenu.cpp 2005-02-01 00:03:37.000000000 +0200
60 +++ bbmail-0.9.3/src/mailboxmenu.cpp 2009-07-30 19:20:39.000000000 +0300
61 @@ -19,6 +19,9 @@
62 // (See the included file COPYING / GPL-2.0)
63 //
64 //
65 +
66 +#include <cstdio>
67 +
68 #include "mailboxmenu.h"
69
70 MailboxMenu::MailboxMenu(ToolWindow *toolwindow) :
71 diff -ur bbmail-0.9.3.orig/src/main.cpp bbmail-0.9.3/src/main.cpp
72 --- bbmail-0.9.3.orig/src/main.cpp 2006-01-20 23:28:08.000000000 +0200
73 +++ bbmail-0.9.3/src/main.cpp 2009-07-30 19:19:49.000000000 +0300
74 @@ -19,6 +19,8 @@
75 // (See the included file COPYING / GPL-2.0)
76 //
77
78 +#include <cstdio>
79 +
80 #include "bbmail.h"
81 #include "main.h"
82 #include "config.h"
83 diff -ur bbmail-0.9.3.orig/src/Makefile.am bbmail-0.9.3/src/Makefile.am
84 --- bbmail-0.9.3.orig/src/Makefile.am 2005-09-06 23:57:42.000000000 +0300
85 +++ bbmail-0.9.3/src/Makefile.am 2009-07-30 19:24:39.000000000 +0300
86 @@ -10,5 +10,4 @@
87 spoollist.cpp spoollist.h \
88 mailboxmenu.cpp mailboxmenu.h \
89 blackboxstyle.h
90 -bbmail_LDADD = @X_LIBS@
91 -
92 +bbmail_LDADD = @LIBS@
93 diff -ur bbmail-0.9.3.orig/src/resource.cpp bbmail-0.9.3/src/resource.cpp
94 --- bbmail-0.9.3.orig/src/resource.cpp 2007-08-28 19:47:19.000000000 +0300
95 +++ bbmail-0.9.3/src/resource.cpp 2009-07-30 19:20:00.000000000 +0300
96 @@ -19,6 +19,8 @@
97 // (See the included file COPYING / GPL-2.0)
98 //
99
100 +#include <cstdio>
101 +
102 #include "bbmail.h"
103 #include "resource.h"
104 #include "blackboxstyle.h"