diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-06-29 04:42:36 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-06-29 04:42:36 +0800 |
| commit | 427cd70e0a4fa36571d6530abc72f11ae46d0515 (patch) | |
| tree | 8561dc06e3accccf969f641dac5a68be867927fc | |
| parent | f74789f135400a3ac9b906d9ebebc5cecf78e603 (diff) | |
| download | marcuscom-ports-427cd70e0a4fa36571d6530abc72f11ae46d0515.tar marcuscom-ports-427cd70e0a4fa36571d6530abc72f11ae46d0515.tar.gz marcuscom-ports-427cd70e0a4fa36571d6530abc72f11ae46d0515.tar.bz2 marcuscom-ports-427cd70e0a4fa36571d6530abc72f11ae46d0515.tar.lz marcuscom-ports-427cd70e0a4fa36571d6530abc72f11ae46d0515.tar.xz marcuscom-ports-427cd70e0a4fa36571d6530abc72f11ae46d0515.tar.zst marcuscom-ports-427cd70e0a4fa36571d6530abc72f11ae46d0515.zip | |
Fix the build with GCC 3.4, no longer required GCC 4.x. Runtime is untest.
Submitted by: Benoît Dejean
Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=446102
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9093 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | sysutils/gnome-system-monitor/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/gnome-system-monitor/files/patch-fix_with_gcc34 | 25 |
2 files changed, 26 insertions, 2 deletions
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 8039b41c1..c932f1158 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.101 2007/06/10 18:42:17 marcus Exp $ +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.102 2007/06/27 18:34:47 marcus Exp $ # PORTNAME= gnome-system-monitor @@ -26,7 +26,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc USE_BZIP2= yes USE_GETTEXT= yes USE_XLIB= yes -USE_GCC= 4.0+ INSTALLS_OMF= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils diff --git a/sysutils/gnome-system-monitor/files/patch-fix_with_gcc34 b/sysutils/gnome-system-monitor/files/patch-fix_with_gcc34 new file mode 100644 index 000000000..17e0c12ee --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-fix_with_gcc34 @@ -0,0 +1,25 @@ +Index: src/defaulttable.h +=================================================================== +--- src/defaulttable.h (révision 2062) ++++ src/defaulttable.h (copie de travail) +@@ -2,18 +2,17 @@ + #define _PROCMAN_DEFAULTTABLE_H_ + + #include <string> +-#include <tr1/memory> + #include "regex.h" + + /* This file contains prettynames and icons for well-known applications, that by default has no .desktop entry */ + + struct PrettyTableItem + { +- std::tr1::shared_ptr<pcrecpp::RE> command; ++ pcrecpp::RE* command; + std::string icon; + }; + +-#define ITEM(CMD, ICON) { std::tr1::shared_ptr<pcrecpp::RE>(new pcrecpp::RE((CMD))), (ICON) } ++#define ITEM(CMD, ICON) { new pcrecpp::RE((CMD)), (ICON) } + + /* The current table is only a test */ + static const PrettyTableItem default_table[] = { |