Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors
In directory vz-cvs-3.sog:/tmp/cvs-serv1475
Modified Files:
gobby.info
Added Files:
gobby.patch
Log Message:
clang fix
https://sourceforge.net/tracker/?func=detail&atid=414256&aid=3573566&group_id=17203
--- NEW FILE: gobby.patch ---
--- gobby-0.4.94/code/util/config.hpp.orig 2012-10-01 19:01:55.000000000
-0400
+++ gobby-0.4.94/code/util/config.hpp 2012-10-01 19:09:37.000000000 -0400
@@ -34,6 +34,52 @@
namespace Gobby
{
+namespace serialize
+{
+
+/** @brief Used to convert Gdk::Color to a string.
+ */
+template<>
+class default_context_to<Gdk::Color>: public context_base_to<Gdk::Color>
+{
+public:
+ typedef Gdk::Color data_type;
+
+ virtual std::string to_string(const data_type& from) const;
+};
+
+/** @brief Used to convert a string to Gdk::Color.
+ */
+template<>
+class default_context_from<Gdk::Color>: public context_base_from<Gdk::Color>
+{
+public:
+ typedef Gdk::Color data_type;
+
+ virtual data_type from_string(const std::string& from) const;
+};
+
+template<>
+class default_context_to<Glib::ustring>: public context_base_to<Glib::ustring>
+{
+public:
+ typedef Glib::ustring data_type;
+
+ virtual std::string to_string(const data_type& from) const;
+};
+
+template<>
+class default_context_from<Glib::ustring>:
+ public context_base_from<Glib::ustring>
+{
+public:
+ typedef Glib::ustring data_type;
+
+ virtual data_type from_string(const std::string& from) const;
+};
+
+} // namespace serialize
+
class Config
{
public:
@@ -426,52 +472,6 @@
m_map[name] = new TypedValueEntry<DataType>(name, value, ctx);
}
-namespace serialize
-{
-
-/** @brief Used to convert Gdk::Color to a string.
- */
-template<>
-class default_context_to<Gdk::Color>: public context_base_to<Gdk::Color>
-{
-public:
- typedef Gdk::Color data_type;
-
- virtual std::string to_string(const data_type& from) const;
-};
-
-/** @brief Used to convert a string to Gdk::Color.
- */
-template<>
-class default_context_from<Gdk::Color>: public context_base_from<Gdk::Color>
-{
-public:
- typedef Gdk::Color data_type;
-
- virtual data_type from_string(const std::string& from) const;
-};
-
-template<>
-class default_context_to<Glib::ustring>: public context_base_to<Glib::ustring>
-{
-public:
- typedef Glib::ustring data_type;
-
- virtual std::string to_string(const data_type& from) const;
-};
-
-template<>
-class default_context_from<Glib::ustring>:
- public context_base_from<Glib::ustring>
-{
-public:
- typedef Glib::ustring data_type;
-
- virtual data_type from_string(const std::string& from) const;
-};
-
-} // namespace serialize
-
} // namespace Gobby
#endif // _GOBBY_CONFIG_HPP_
Index: gobby.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors/gobby.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gobby.info 9 Aug 2012 18:32:03 -0000 1.2
+++ gobby.info 2 Oct 2012 01:13:29 -0000 1.3
@@ -1,10 +1,8 @@
Package: gobby
Version: 0.4.94
-Revision: 1
+Revision: 2
# Dependencies:
Depends: <<
- x11,
- x11-shlibs,
atk1-shlibs (>= 1.26.0-2),
cairo-shlibs (>= 1.8.8-2),
cairomm1-shlibs (>= 1.8.0-1),
@@ -23,14 +21,17 @@
libxml2-shlibs (>= 2.6.32-1),
pango1-xft2-ft219-shlibs (>= 1.24.5-1),
pangomm1.4.1-shlibs (>= 2.14.1-1),
- rarian-compat
- <<
+ rarian-compat,
+ x11-shlibs,
+ x11
+<<
BuildDepends: <<
- x11-dev,
atk1 (>= 1.26.0-2),
cairo (>= 1.8.8-2),
cairomm1 (>= 1.8.0-1),
+ fink-package-precedence,
freetype219 (>= 2.3.8-2),
+ gettext-tools,
glib2-dev (>= 2.20.5-1),
glibmm2.4-dev (>= 2.18.1-1),
glitz,
@@ -39,6 +40,7 @@
gtk+2-dev (>= 2.16.6-1),
gtkmm2.4-gtk-dev (>= 2.16.0-2),
gtksourceview2-dev (>= 2.6.2-2),
+ intltool40,
libgettext8-dev (>= 0.14.5-2),
libinfinity-0.5.0,
libsigc++2,
@@ -47,11 +49,8 @@
pango1-xft2-ft219-dev (>= 1.24.5-1),
pangomm1.4.1 (>= 2.14.1-1),
pkgconfig (>= 0.9.0-1),
- gettext-tools,
- intltool40,
- fink-package-precedence,
- llvm-gcc
- <<
+ x11-dev
+<<
Description: Collaborative editor
License: GPL
Maintainer: Jack Fink <[email protected]>
@@ -59,16 +58,16 @@
# Unpack Phase:
Source: http://releases.0x539.de/%n/%n-%v.tar.gz
Source-MD5: 899d68ebe1af67c5a45b49328b86e23e
+PatchFile: %n.patch
+PatchFile-MD5: ff8ccf1aa64b813b0c75311ff71cb634
# Compile Phase:
GCC: 4.0
SetCXXFLAGS: -Os
-SetCXX: llvm-g++-4.2
-SetCC: llvm-gcc-4.2
ConfigureParams: --disable-scrollkeeper
CompileScript: <<
-%{default_script}
-fink-package-precedence .
+ %{default_script}
+ fink-package-precedence .
<<
# Install Phase:
@@ -104,22 +103,6 @@
into the GNOME desktop environment.
<<
DescPort: <<
-Using llvm-gcc|g++ due to the following build issues:
-
-In file included from config.cpp:19:
-../../code/util/config.hpp:455:7: error: explicit specialization of
'Gobby::serialize::default_context_to<Glib::ustring>' after instantiation
-class default_context_to<Glib::ustring>: public context_base_to<Glib::ustring>
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-../../code/util/config.hpp:72:5: note: implicit instantiation first required
here
- serialize::default_context_to<DataType>()
- ^
-...
-config.cpp:298:18: error: unknown type name 'data_type'
- to_string(const data_type& from) const
- ^
-config.cpp:298:2: error: template specialization requires 'template<>'
- to_string(const data_type& from) const
- ^
-
+Patch code/util/config.hpp to eliminate explicit specialization error on clang.
<<
Homepage: http://gobby.0x539.de/trac
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
