summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarol Wojtaszek <sekretarz@gentoo.org>2004-09-09 17:36:55 +0000
committerKarol Wojtaszek <sekretarz@gentoo.org>2004-09-09 17:36:55 +0000
commit7dbbe13bcb5576516db32669c64119ba1c5f3d45 (patch)
tree353944ec5b021ca1d91afee6ec4bf880f2114890 /x11-misc/fbdesk
parentStable on hppa. (diff)
downloadhistorical-7dbbe13bcb5576516db32669c64119ba1c5f3d45.tar.gz
historical-7dbbe13bcb5576516db32669c64119ba1c5f3d45.tar.bz2
historical-7dbbe13bcb5576516db32669c64119ba1c5f3d45.zip
Fixed gcc-34 compile issues. Bug #53910
Diffstat (limited to 'x11-misc/fbdesk')
-rw-r--r--x11-misc/fbdesk/ChangeLog6
-rw-r--r--x11-misc/fbdesk/Manifest5
-rw-r--r--x11-misc/fbdesk/fbdesk-1.1.5.ebuild10
-rw-r--r--x11-misc/fbdesk/files/fbdesk-1.1.5-gcc34.patch83
4 files changed, 100 insertions, 4 deletions
diff --git a/x11-misc/fbdesk/ChangeLog b/x11-misc/fbdesk/ChangeLog
index a2bd607db13d..9f26b00392a6 100644
--- a/x11-misc/fbdesk/ChangeLog
+++ b/x11-misc/fbdesk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/fbdesk
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.9 2004/06/24 22:17:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.10 2004/09/09 17:36:55 sekretarz Exp $
+
+ 09 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+ +files/fbdesk-1.1.5-gcc34.patch, fbdesk-1.1.5.ebuild:
+ Fixed gcc-34 compile issues. Bug #53910
14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> fbdesk-1.1.5.ebuild:
Added IUSE=
diff --git a/x11-misc/fbdesk/Manifest b/x11-misc/fbdesk/Manifest
index 8fe3f02b3332..2591edcee9b6 100644
--- a/x11-misc/fbdesk/Manifest
+++ b/x11-misc/fbdesk/Manifest
@@ -1,4 +1,5 @@
-MD5 5d19a78b1456b5684f20c22a216041e8 fbdesk-1.1.5.ebuild 643
-MD5 6cbe185ebb5bf24de9f632402f83d742 ChangeLog 1063
+MD5 a2b6871d3e39263ba05eebf5c0d06031 fbdesk-1.1.5.ebuild 741
+MD5 2c92ede06cee0a20c2be70c7a399505c ChangeLog 1218
MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
MD5 39b789020c286f3f1239d3fb96d00aa0 files/digest-fbdesk-1.1.5 64
+MD5 6c03b221f71103953d36a49670e85246 files/fbdesk-1.1.5-gcc34.patch 2462
diff --git a/x11-misc/fbdesk/fbdesk-1.1.5.ebuild b/x11-misc/fbdesk/fbdesk-1.1.5.ebuild
index acfa78755ba3..b858b98c3930 100644
--- a/x11-misc/fbdesk/fbdesk-1.1.5.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.1.5.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.1.5.ebuild,v 1.7 2004/06/24 22:17:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.1.5.ebuild,v 1.8 2004/09/09 17:36:55 sekretarz Exp $
+
+inherit eutils gcc
DESCRIPTION="fluxbox-util application that creates and manage icons on your Fluxbox desktop"
HOMEPAGE="http://www.fluxbox.org/fbdesk/"
@@ -13,6 +15,12 @@ KEYWORDS="x86 ppc ~sparc ~ia64"
DEPEND="media-libs/libpng
virtual/x11"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
src_compile() {
econf || die
emake || die
diff --git a/x11-misc/fbdesk/files/fbdesk-1.1.5-gcc34.patch b/x11-misc/fbdesk/files/fbdesk-1.1.5-gcc34.patch
new file mode 100644
index 000000000000..b2b6e314859a
--- /dev/null
+++ b/x11-misc/fbdesk/files/fbdesk-1.1.5-gcc34.patch
@@ -0,0 +1,83 @@
+diff -Naur fbdesk-1.1.5.orig/src/Resource.hh fbdesk-1.1.5/src/Resource.hh
+--- fbdesk-1.1.5.orig/src/Resource.hh 2003-01-14 22:45:53.000000000 +0100
++++ fbdesk-1.1.5/src/Resource.hh 2004-07-17 11:31:57.000000000 +0200
+@@ -56,40 +56,8 @@
+ std::string m_altname; ///< alternative name
+ };
+
+-class ResourceManager;
+-
+-/**
+- Real resource class
+-*/
+ template <typename T>
+-class Resource:public Resource_base
+-{
+-public:
+- Resource(ResourceManager &rm, T val,
+- const std::string &name, const std::string &altname):
+- Resource_base(name, altname),
+- m_value(val), m_defaultval(val),
+- m_rm(rm)
+- {
+- m_rm.addResource(*this); // add this to resource handler
+- }
+- virtual ~Resource() {
+- m_rm.removeResource(*this); // remove this from resource handler
+- }
+-
+- inline void setDefaultValue() { m_value = m_defaultval; }
+- void setFromString(const char *strval);
+- inline Resource<T>& operator = (const T& newvalue) { m_value = newvalue; return *this;}
+-
+- std::string getString();
+- inline T& operator*() { return m_value; }
+- inline const T& operator*() const { return m_value; }
+- inline T *operator->() { return &m_value; }
+- inline const T *operator->() const { return &m_value; }
+-private:
+- T m_value, m_defaultval;
+- ResourceManager &m_rm;
+-};
++class Resource;
+
+ class ResourceManager
+ {
+@@ -129,4 +97,37 @@
+ ResourceList m_resourcelist;
+ };
+
++/**
++ Real resource class
++*/
++template <typename T>
++class Resource:public Resource_base
++{
++public:
++ Resource(ResourceManager &rm, T val,
++ const std::string &name, const std::string &altname):
++ Resource_base(name, altname),
++ m_value(val), m_defaultval(val),
++ m_rm(rm)
++ {
++ m_rm.addResource(*this); // add this to resource handler
++ }
++ virtual ~Resource() {
++ m_rm.removeResource(*this); // remove this from resource handler
++ }
++
++ inline void setDefaultValue() { m_value = m_defaultval; }
++ void setFromString(const char *strval);
++ inline Resource<T>& operator = (const T& newvalue) { m_value = newvalue; return *this;}
++
++ std::string getString();
++ inline T& operator*() { return m_value; }
++ inline const T& operator*() const { return m_value; }
++ inline T *operator->() { return &m_value; }
++ inline const T *operator->() const { return &m_value; }
++private:
++ T m_value, m_defaultval;
++ ResourceManager &m_rm;
++};
++
+ #endif //_RESOURCE_HH_