| 1 |
jer 14/07/10 20:40:23 |
| 2 |
|
| 3 |
Added: cbm-0.1-gcc-4.7.patch cbm-0.1-gcc-4.3.patch |
| 4 |
cbm-0.1-headers-status-line.patch |
| 5 |
cbm-0.1-tinfo.patch |
| 6 |
Removed: cbm-gcc-4.7.patch cbm-gcc-4.3.patch |
| 7 |
Log: |
| 8 |
EAPI bump. Add Debian patch for missing headers and status line. Fix patch naming. Fix building against sys-libs/ncurses[tinfo]. |
| 9 |
|
| 10 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.1 net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch?rev=1.1&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch?rev=1.1&content-type=text/plain |
| 17 |
|
| 18 |
Index: cbm-0.1-gcc-4.7.patch |
| 19 |
=================================================================== |
| 20 |
--- a/src/cbm.cpp |
| 21 |
+++ b/src/cbm.cpp |
| 22 |
@@ -18,6 +18,7 @@ |
| 23 |
#include <sys/socket.h> |
| 24 |
#include <arpa/inet.h> |
| 25 |
#include <net/if.h> |
| 26 |
+#include <unistd.h> |
| 27 |
|
| 28 |
// Externs |
| 29 |
extern int optind, opterr, optopt; |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: cbm-0.1-gcc-4.3.patch |
| 39 |
=================================================================== |
| 40 |
--- a/src/statistics.hpp |
| 41 |
+++ b/src/statistics.hpp |
| 42 |
@@ -3,6 +3,7 @@ |
| 43 |
|
| 44 |
#include <list> |
| 45 |
#include <string> |
| 46 |
+#include <sys/time.h> |
| 47 |
|
| 48 |
namespace statistics { |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
1.1 net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch |
| 54 |
|
| 55 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch?rev=1.1&view=markup |
| 56 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch?rev=1.1&content-type=text/plain |
| 57 |
|
| 58 |
Index: cbm-0.1-headers-status-line.patch |
| 59 |
=================================================================== |
| 60 |
From bdc4f02a6d7fb1416f36aef89af4592c691576d8 Mon Sep 17 00:00:00 2001 |
| 61 |
From: Jari Aalto <jari.aalto@×××××.net> |
| 62 |
Date: Mon, 19 Sep 2011 14:27:04 +0300 |
| 63 |
Subject: [PATCH] [fix] Headers and status line don't display by Paul Martin |
| 64 |
<pm@××××××.org> |
| 65 |
Organization: Private |
| 66 |
Content-Type: text/plain; charset="utf-8" |
| 67 |
Content-Transfer-Encoding: 8bit |
| 68 |
|
| 69 |
Signed-off-by: Jari Aalto <jari.aalto@×××××.net> |
| 70 |
--- |
| 71 |
src/cbm.cpp | 9 ++++++++- |
| 72 |
src/widgets/Window.cpp | 2 +- |
| 73 |
2 files changed, 9 insertions(+), 2 deletions(-) |
| 74 |
|
| 75 |
index 74282e2..0197443 100644 |
| 76 |
--- a/src/cbm.cpp |
| 77 |
+++ b/src/cbm.cpp |
| 78 |
@@ -156,13 +156,20 @@ int main(int argc, char **argv) { |
| 79 |
interfaceTable.setColumns(4); |
| 80 |
interfaceTable.setActiveStyle(A_BOLD); |
| 81 |
interfaceTable.setActiveRow(1); |
| 82 |
+ // Position the interface table |
| 83 |
+ interfaceTable.setPosition(2, 2); |
| 84 |
+ interfaceTable.setSize(screen.getWidth() - 4, |
| 85 |
+ 8); // TODO |
| 86 |
|
| 87 |
// Create the detail table |
| 88 |
VerticalTable detailTable(screen); |
| 89 |
detailTable.setColumns(2); |
| 90 |
detailTable.setRows(2); |
| 91 |
detailTable.setActiveRow(-1); |
| 92 |
- |
| 93 |
+ // Position the detail table |
| 94 |
+ detailTable.setPosition(2, 12); // TODO |
| 95 |
+ detailTable.setSize(screen.getWidth() - 4, 10); // TODO |
| 96 |
+ |
| 97 |
// Populate the detail table |
| 98 |
detailTable.setText (0, 0, "Interface"); |
| 99 |
detailTable.setStyle(0, 0, COLOR_PAIR(COLOR_HEADING) | A_BOLD); |
| 100 |
index 322cb9b..572eef7 100644 |
| 101 |
--- a/src/widgets/Window.cpp |
| 102 |
+++ b/src/widgets/Window.cpp |
| 103 |
@@ -14,7 +14,7 @@ Window::~Window() { |
| 104 |
} |
| 105 |
|
| 106 |
void Window::setPosition(unsigned x, unsigned y) { |
| 107 |
- mvwin((WINDOW*) win_, y, x); |
| 108 |
+ mvderwin((WINDOW*) win_, y, x); |
| 109 |
} |
| 110 |
|
| 111 |
void Window::setSize(unsigned width, unsigned height) { |
| 112 |
-- |
| 113 |
1.7.5.4 |
| 114 |
|
| 115 |
|
| 116 |
|
| 117 |
|
| 118 |
1.1 net-analyzer/cbm/files/cbm-0.1-tinfo.patch |
| 119 |
|
| 120 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cbm/files/cbm-0.1-tinfo.patch?rev=1.1&view=markup |
| 121 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/cbm/files/cbm-0.1-tinfo.patch?rev=1.1&content-type=text/plain |
| 122 |
|
| 123 |
Index: cbm-0.1-tinfo.patch |
| 124 |
=================================================================== |
| 125 |
--- a/src/Makefile.am |
| 126 |
+++ b/src/Makefile.am |
| 127 |
@@ -3,4 +3,4 @@ |
| 128 |
cbm_SOURCES = cbm.cpp \ |
| 129 |
ErrnoError.hpp \ |
| 130 |
statistics.cpp statistics.hpp |
| 131 |
-cbm_LDADD = -lncurses widgets/libwidgets.la |
| 132 |
+cbm_LDADD = $(ncurses_LIBS) widgets/libwidgets.la |
| 133 |
--- a/configure.ac |
| 134 |
+++ b/configure.ac |
| 135 |
@@ -18,6 +18,8 @@ |
| 136 |
|
| 137 |
# Checks for libraries. |
| 138 |
|
| 139 |
+PKG_CHECK_MODULES(ncurses,ncurses) |
| 140 |
+ |
| 141 |
# Checks for header files. |
| 142 |
|
| 143 |
# Checks for typedefs, structures, and compiler characteristics. |
Archives