diff options
author | Mark Loeser <halcy0n@gentoo.org> | 2006-05-02 00:49:39 +0000 |
---|---|---|
committer | Mark Loeser <halcy0n@gentoo.org> | 2006-05-02 00:49:39 +0000 |
commit | 1d12f8c920ce2debb67d6249323c5fd32f09b052 (patch) | |
tree | 68bcf3d6a607ec400128f0db1853028a2aa32920 /x11-misc/fbdesk/files | |
parent | Preserve LIBGL_DRIVERS_PATH (diff) | |
download | gentoo-2-1d12f8c920ce2debb67d6249323c5fd32f09b052.tar.gz gentoo-2-1d12f8c920ce2debb67d6249323c5fd32f09b052.tar.bz2 gentoo-2-1d12f8c920ce2debb67d6249323c5fd32f09b052.zip |
Add patch to fix compilation with gcc-4.1 by Robert Führicht <the_master_of_disaster AT gmx DOT at>; bug #130825
(Portage version: 2.1_pre10)
Diffstat (limited to 'x11-misc/fbdesk/files')
-rw-r--r-- | x11-misc/fbdesk/files/digest-fbdesk-1.2.1 | 2 | ||||
-rw-r--r-- | x11-misc/fbdesk/files/fbdesk-1.2.1-gcc41.patch | 29 |
2 files changed, 31 insertions, 0 deletions
diff --git a/x11-misc/fbdesk/files/digest-fbdesk-1.2.1 b/x11-misc/fbdesk/files/digest-fbdesk-1.2.1 index 29af04e6b60d..8ff051103f1f 100644 --- a/x11-misc/fbdesk/files/digest-fbdesk-1.2.1 +++ b/x11-misc/fbdesk/files/digest-fbdesk-1.2.1 @@ -1 +1,3 @@ MD5 382a32a6e26b3f3d3a647fa4bdc81b7a fbdesk-1.2.1.tar.gz 388679 +RMD160 a3ae892c5c733351b1525e874875c09078ac5aa7 fbdesk-1.2.1.tar.gz 388679 +SHA256 64366e367c0bd8c29fc9a96eb095c15b4f839d2c83819e744d809127d6be5016 fbdesk-1.2.1.tar.gz 388679 diff --git a/x11-misc/fbdesk/files/fbdesk-1.2.1-gcc41.patch b/x11-misc/fbdesk/files/fbdesk-1.2.1-gcc41.patch new file mode 100644 index 000000000000..917b8687dc18 --- /dev/null +++ b/x11-misc/fbdesk/files/fbdesk-1.2.1-gcc41.patch @@ -0,0 +1,29 @@ +--- src/FbDesk.cc.org 2006-04-22 14:29:20.000000000 +0200 ++++ src/FbDesk.cc 2006-04-22 14:37:45.000000000 +0200 +@@ -43,6 +43,8 @@ + using namespace std; + using namespace FbTk; + ++namespace FbTk { ++ + template <> + void Resource<int>::setFromString(const char *str) { + sscanf(str, "%d", &*(*this)); +@@ -65,8 +67,6 @@ + return (*this)->c_str(); + } + +- +- + template <> + std::string Resource<FbDesk::Icon::TextPlacement>::getString() { + switch (*(*this)) { +@@ -97,6 +97,8 @@ + *(*this) = FbDesk::Icon::TEXTPLACE_BOTTOM; + } + ++} ++ + namespace FbDesk { + + FbDesk::FbDesk(const char *config_filename): |