FreeBSD Bugzilla – Attachment 139449 Details for
Bug 185691
net/sobby: Fix build with clang
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 2.75 KB, created by
tkato432
on 2014-01-12 18:40:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2014-01-12 18:40:00 UTC
Size:
2.75 KB
patch
obsolete
>diff -urN /usr/ports/net/sobby/Makefile net/sobby/Makefile >--- /usr/ports/net/sobby/Makefile 2013-11-06 21:53:24.000000000 +0900 >+++ net/sobby/Makefile 2014-01-13 00:00:00.000000000 +0900 >@@ -7,30 +7,23 @@ > MASTER_SITES= http://releases.0x539.de/sobby/ > > MAINTAINER= ports@FreeBSD.org >-COMMENT= A standalone obby server >+COMMENT= Standalone obby server > > LICENSE= GPLv2 >-LICENSE_FILE= ${WRKSRC}/COPYING > >-LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \ >- obby-0.4.1:${PORTSDIR}/devel/obby \ >- net6-1.3.0:${PORTSDIR}/net/net6 \ >- xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \ >- glibmm-2.4.1:${PORTSDIR}/devel/glibmm >+LIB_DEPENDS= libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \ >+ libobby-0.4.so:${PORTSDIR}/devel/obby \ >+ libnet6-1.3.so:${PORTSDIR}/net/net6 \ >+ libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 > > USES= pkgconfig >+USE_GNOME= glibmm > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --disable-zeroconf > >-MAN1= ${PORTNAME}.1 >-PLIST_FILES= bin/${PORTNAME} >- > CPPFLAGS+= -I${LOCALBASE}/include > LDFLAGS+= -L${LOCALBASE}/lib > >-NO_STAGE= yes >-do-install: >- ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin >- ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1 >+PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz > > .include <bsd.port.mk> >diff -urN /usr/ports/net/sobby/files/patch-inc__config.hpp net/sobby/files/patch-inc__config.hpp >--- /usr/ports/net/sobby/files/patch-inc__config.hpp 1970-01-01 09:00:00.000000000 +0900 >+++ net/sobby/files/patch-inc__config.hpp 2014-01-13 00:00:00.000000000 +0900 >@@ -0,0 +1,62 @@ >+--- inc/config.hpp.orig >++++ inc/config.hpp >+@@ -30,6 +30,30 @@ >+ #include <libxml++/nodes/element.h> >+ #include <libxml++/nodes/textnode.h> >+ >++namespace serialise >++{ >++ >++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 serialise >++ >+ namespace Sobby >+ { >+ >+@@ -434,28 +458,4 @@ >+ >+ } // namespace Sobby >+ >+-namespace serialise >+-{ >+- >+-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 serialise >+- >+ #endif // _SOBBY_CONFIG_HPP_
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 185691
: 139449