kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Expand creator's name in the Makefile header

Browse source 
- Fix the build on recent versions of FreeBSD (against Clang)
- Add a patch from Gentoo to unbreak GTK+ program build
- Fix potential buffer overflow (also obtained from Gentoo)
- Convert to OptionsNG, utilize new option helpers
- Drop WANT_GNOME and USE_GNOME, they are useless
- Define LICENSE (GPLv2), remove COPYING from the docs
- Make pkg-message word substitution actually work
- Generally sanitize and cleanup the Makefile

Reported by:	pointyhat-west
This commit is contained in:
Alexey Dokuchaev 2013-07-29 14:23:11 +00:00
parent 51b4207d69
commit 24a283cefb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=323888
6 changed files with 757 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
emulators/vba/Makefile
View file

@ -1,7 +1,4 @@
# New ports collection makefile for: vba
# Date Created: 02 September 2003
# Whom: <arundel@gmx.net>
#
# Created by: Alexander Best <arundel@gmx.net>
# $FreeBSD$
PORTNAME= vba
@ -12,74 +9,67 @@ MASTER_SITES= SF/${PORTNAME}/VisualBoyAdvance/${PORTVERSION}
DISTNAME= VisualBoyAdvance-src-${PORTVERSION}
MAINTAINER= arundel@h3c.de
COMMENT= Open Source Gameboy Advance emulator
COMMENT= Open source Gameboy Advance emulator
LICENSE= GPLv2
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
WANT_GNOME= yes
USE_GMAKE= yes
USES= gettext gmake
GNU_CONFIGURE= yes
USE_SDL= sdl
USES= gettext
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" LIBS="-lintl"
WRKSRC= ${WRKDIR}/VisualBoyAdvance-${PORTVERSION}
PLIST_SUB= INSTALL_GTK2="@comment "
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/VisualBoyAdvance-${PORTVERSION}
SUB_FILES= pkg-message
DATA_FILES= ${WRKSRC}/src/VisualBoyAdvance.cfg
PROG_FILES= ${WRKSRC}/src/sdl/VisualBoyAdvance
DOC_FILES= COPYING AUTHORS NEWS README ChangeLog INSTALL
PORTDOCS= AUTHORS NEWS README ChangeLog
OPTIONS_DEFINE= GTK2 PROFILING DOCS
OPTIONS_SUB= yes
GTK2_CONFIGURE_ON= --enable-gtk=2.4
PROFILING_CONFIGURE_ENABLE= profiling
.include <bsd.port.pre.mk>
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
BROKEN= Runaway cc1plus process
.endif
.ifdef(WITH_GTK2)
PLIST_SUB= INSTALL_GTK2=""
CONFIGURE_ARGS+= --enable-gtk=2.4
USE_GNOME= gnomelibs gtk20
.if ${PORT_OPTIONS:MGTK2}
LIB_DEPENDS+= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
glademm-2.4:${PORTSDIR}/devel/libglademm24
PROG_FILES+= ${WRKSRC}/src/gtk/gvba
GTK2_DATA_FILES= ${WRKSRC}/src/gtk/vba.glade
.endif
.ifndef(PROFILING)
CONFIGURE_ARGS+= --disable-profiling
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
BROKEN= Runaway cc1plus process
.endif
pre-everything::
.ifndef(PROFILING)
@${ECHO_MSG} ""
@${ECHO_MSG} "You can enable profiling by defining PROFILING."
.endif
.ifndef(WITH_GTK2)
@${ECHO_MSG} ""
@${ECHO_MSG} "You can install the GTK2 based X version by defining WITH_GTK2."
.endif
@${ECHO_MSG} ""
post-patch:
@${REINPLACE_CMD} -e '/for(int i = 0; i < 16; i++/s| i|&_|g' \
${WRKSRC}/src/sdl/debugger.cpp
@${REINPLACE_CMD} -e '/^namespace std/ { x; \
s|^|#include <sys/types.h>|; H; x; }' ${WRKSRC}/src/expr.cpp
do-install:
${INSTALL_PROGRAM} ${PROG_FILES} ${PREFIX}/bin
.ifdef(WITH_GTK2)
${INSTALL} -d ${PREFIX}/share/VisualBoyAdvance
.if ${PORT_OPTIONS:MGTK2}
@${MKDIR} ${PREFIX}/share/VisualBoyAdvance
${INSTALL_DATA} ${GTK2_DATA_FILES} ${PREFIX}/share/VisualBoyAdvance
.endif
${SED} -e 's|filter=0|filter=1|' ${DATA_FILES} > ${DATA_FILES}-default
${INSTALL_DATA} ${DATA_FILES}-default ${PREFIX}/bin
post-install:
.ifndef(NOPORTDOCS)
${INSTALL} -d ${DOCSDIR}
.for filename in ${DOC_FILES}
${INSTALL_MAN} ${WRKSRC}/${filename} ${DOCSDIR}
.endfor
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
.endif
${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.post.mk>

702
emulators/vba/files/patch-deprecatedsigc++ Normal file
View file

@ -0,0 +1,702 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 09_deprecatedsigc++.dpatch by Kjang Gwreuung-Kuq
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Inject deprecated libsigc++ code.
## DP: From http://bugs.gentoo.org/215985
## DP: From ftp://ftp.uni-erlangen.de/pub/mirrors/gentoo/distfiles/visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2
@DPATCH@
--- src/gtk/sigccompat.h.orig 2008-05-02 10:46:45.000000000 +0200
+++ src/gtk/sigccompat.h 2008-05-02 10:47:08.000000000 +0200
@@ -20,7 +20,7 @@
#ifndef __VBA_SIGCCOMPAT_H__
#define __VBA_SIGCCOMPAT_H__
-#undef LIBSIGC_DISABLE_DEPRECATED
+#define LIBSIGC_DISABLE_DEPRECATED
#include <sigc++/bind.h>
#include <sigc++/connection.h>
@@ -28,9 +28,679 @@
#include <sigc++/object.h>
#include <sigc++/functors/mem_fun.h>
-namespace SigC
+
+// From sigc++/bind.h
+namespace SigC {
+
+template <class T_bound1, class T_functor>
+inline ::sigc::bind_functor<-1, T_functor,
+ typename ::sigc::unwrap_reference<T_bound1>::type>
+bind(const T_functor& _A_functor, T_bound1 _A_b1)
+{ return ::sigc::bind_functor<-1, T_functor,
+ typename ::sigc::unwrap_reference<T_bound1>::type>
+ (_A_functor, _A_b1);
+}
+
+template <class T_bound1, class T_bound2, class T_functor>
+inline ::sigc::bind_functor<-1, T_functor,
+ typename ::sigc::unwrap_reference<T_bound1>::type,
+ typename ::sigc::unwrap_reference<T_bound2>::type>
+bind(const T_functor& _A_functor, T_bound1 _A_b1, T_bound2 _A_b2)
+{ return ::sigc::bind_functor<-1, T_functor,
+ typename ::sigc::unwrap_reference<T_bound1>::type,
+ typename ::sigc::unwrap_reference<T_bound2>::type>
+ (_A_functor, _A_b1, _A_b2);
+}
+
+template <class T_bound1, class T_bound2, class T_bound3, class T_functor>
+inline ::sigc::bind_functor<-1, T_functor,
+ typename ::sigc::unwrap_reference<T_bound1>::type,
+ typename ::sigc::unwrap_reference<T_bound2>::type,
+ typename ::sigc::unwrap_reference<T_bound3>::type>
+bind(const T_functor& _A_functor, T_bound1 _A_b1, T_bound2 _A_b2,T_bound3 _A_b3)
+{ return ::sigc::bind_functor<-1, T_functor,
+ typename ::sigc::unwrap_reference<T_bound1>::type,
+ typename ::sigc::unwrap_reference<T_bound2>::type,
+ typename ::sigc::unwrap_reference<T_bound3>::type>
+ (_A_functor, _A_b1, _A_b2, _A_b3);
+}
+
+}
+
+// From sigc++/connection.h
+namespace SigC {
+
+/** Convinience class for safe disconnection.
+ * Iterators must not be used beyond the lifetime of the list
+ * they work on. A connection object can be created from a
+ * slot list iterator and may safely be used to disconnect
+ * the referred slot at any time (disconnect()). If the slot
+ * has already been destroyed, disconnect() does nothing. empty() or
+ * operator bool() can be used to test whether the connection is
+ * still active. The connection can be blocked (block(), unblock()).
+ *
+ * This is possible because the connection object gets notified
+ * when the referred slot dies (notify()).
+ *
+ * @deprecated Use sigc::connection instead.
+ * @ingroup compat
+ */
+typedef ::sigc::connection Connection;
+
+}
+
+// From sigc++/slot.h
+namespace SigC {
+
+// SlotN
+/** Converts an arbitrary functor to a unified type which is opaque.
+ * Slot0 itself is a functor or to be more precise a closure. It contains
+ * a single, arbitrary functor (or closure) that is executed in operator()().
+ *
+ * The template arguments determine the function signature of operator()():
+ * - @e T_return The return type of operator()().
+ *
+ * To use simply assign the slot to the desired functor. If the functor
+ * is not compatible with the parameter list defined with the template
+ * arguments compiler errors are triggered. When called the slot
+ * will invoke the functor with minimal copies.
+ * block() and unblock() can be used to block the functor's invocation
+ * from operator()() temporarily.
+ *
+ * @par Example:
+ * @code
+ * #include <sigc++/slot.h>
+ * void foo(int) {}
+ * SigC::Slot1<void, long> s = SigC::slot(&foo);
+ * s(19);
+ * @endcode
+ *
+ * @deprecated Use the unnumbered template sigc::slot instead.
+ * @ingroup compat
+ */
+template <class T_return>
+class Slot0
+ : public ::sigc::slot<T_return>
+{
+public:
+ typedef ::sigc::slot<T_return> parent_type;
+
+ /// Constructs an empty slot.
+ Slot0() {}
+
+ /** Constructs a slot from an arbitrary functor.
+ * @param _A_func The desired functor the new slot should be assigned to.
+ */
+ template <class T_functor>
+ Slot0(const T_functor& _A_func)
+ : ::sigc::slot<T_return>(_A_func) {}
+
+ /** Constructs a slot, copying an existing one.
+ * @param src The existing slot to copy.
+ */
+ Slot0(const parent_type& src)
+ : parent_type(src) {}
+
+ /** Overrides this slot making a copy from another slot.
+ * @param src The slot from which to make a copy.
+ * @return @p this.
+ */
+ Slot0& operator=(const parent_type& src)
+ { parent_type::operator=(src); return *this; }
+};
+
+/** Converts an arbitrary functor to a unified type which is opaque.
+ * Slot1 itself is a functor or to be more precise a closure. It contains
+ * a single, arbitrary functor (or closure) that is executed in operator()().
+ *
+ * The template arguments determine the function signature of operator()():
+ * - @e T_return The return type of operator()().
+ * - @e T_arg1 Argument type used in the definition of operator()().
+ *
+ * To use simply assign the slot to the desired functor. If the functor
+ * is not compatible with the parameter list defined with the template
+ * arguments compiler errors are triggered. When called the slot
+ * will invoke the functor with minimal copies.
+ * block() and unblock() can be used to block the functor's invocation
+ * from operator()() temporarily.
+ *
+ * @par Example:
+ * @code
+ * #include <sigc++/slot.h>
+ * void foo(int) {}
+ * SigC::Slot1<void, long> s = SigC::slot(&foo);
+ * s(19);
+ * @endcode
+ *
+ * @deprecated Use the unnumbered template sigc::slot instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1>
+class Slot1
+ : public ::sigc::slot<T_return, T_arg1>
+{
+public:
+ typedef ::sigc::slot<T_return, T_arg1> parent_type;
+
+ /// Constructs an empty slot.
+ Slot1() {}
+
+ /** Constructs a slot from an arbitrary functor.
+ * @param _A_func The desired functor the new slot should be assigned to.
+ */
+ template <class T_functor>
+ Slot1(const T_functor& _A_func)
+ : ::sigc::slot<T_return, T_arg1>(_A_func) {}
+
+ /** Constructs a slot, copying an existing one.
+ * @param src The existing slot to copy.
+ */
+ Slot1(const parent_type& src)
+ : parent_type(src) {}
+
+ /** Overrides this slot making a copy from another slot.
+ * @param src The slot from which to make a copy.
+ * @return @p this.
+ */
+ Slot1& operator=(const parent_type& src)
+ { parent_type::operator=(src); return *this; }
+};
+
+/** Converts an arbitrary functor to a unified type which is opaque.
+ * Slot2 itself is a functor or to be more precise a closure. It contains
+ * a single, arbitrary functor (or closure) that is executed in operator()().
+ *
+ * The template arguments determine the function signature of operator()():
+ * - @e T_return The return type of operator()().
+ * - @e T_arg1 Argument type used in the definition of operator()().
+ * - @e T_arg2 Argument type used in the definition of operator()().
+ *
+ * To use simply assign the slot to the desired functor. If the functor
+ * is not compatible with the parameter list defined with the template
+ * arguments compiler errors are triggered. When called the slot
+ * will invoke the functor with minimal copies.
+ * block() and unblock() can be used to block the functor's invocation
+ * from operator()() temporarily.
+ *
+ * @par Example:
+ * @code
+ * #include <sigc++/slot.h>
+ * void foo(int) {}
+ * SigC::Slot1<void, long> s = SigC::slot(&foo);
+ * s(19);
+ * @endcode
+ *
+ * @deprecated Use the unnumbered template sigc::slot instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2>
+class Slot2
+ : public ::sigc::slot<T_return, T_arg1,T_arg2>
+{
+public:
+ typedef ::sigc::slot<T_return, T_arg1,T_arg2> parent_type;
+
+ /// Constructs an empty slot.
+ Slot2() {}
+
+ /** Constructs a slot from an arbitrary functor.
+ * @param _A_func The desired functor the new slot should be assigned to.
+ */
+ template <class T_functor>
+ Slot2(const T_functor& _A_func)
+ : ::sigc::slot<T_return, T_arg1,T_arg2>(_A_func) {}
+
+ /** Constructs a slot, copying an existing one.
+ * @param src The existing slot to copy.
+ */
+ Slot2(const parent_type& src)
+ : parent_type(src) {}
+
+ /** Overrides this slot making a copy from another slot.
+ * @param src The slot from which to make a copy.
+ * @return @p this.
+ */
+ Slot2& operator=(const parent_type& src)
+ { parent_type::operator=(src); return *this; }
+};
+
+/** Converts an arbitrary functor to a unified type which is opaque.
+ * Slot3 itself is a functor or to be more precise a closure. It contains
+ * a single, arbitrary functor (or closure) that is executed in operator()().
+ *
+ * The template arguments determine the function signature of operator()():
+ * - @e T_return The return type of operator()().
+ * - @e T_arg1 Argument type used in the definition of operator()().
+ * - @e T_arg2 Argument type used in the definition of operator()().
+ * - @e T_arg3 Argument type used in the definition of operator()().
+ *
+ * To use simply assign the slot to the desired functor. If the functor
+ * is not compatible with the parameter list defined with the template
+ * arguments compiler errors are triggered. When called the slot
+ * will invoke the functor with minimal copies.
+ * block() and unblock() can be used to block the functor's invocation
+ * from operator()() temporarily.
+ *
+ * @par Example:
+ * @code
+ * #include <sigc++/slot.h>
+ * void foo(int) {}
+ * SigC::Slot1<void, long> s = SigC::slot(&foo);
+ * s(19);
+ * @endcode
+ *
+ * @deprecated Use the unnumbered template sigc::slot instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2,class T_arg3>
+class Slot3
+ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3>
+{
+public:
+ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3> parent_type;
+
+ /// Constructs an empty slot.
+ Slot3() {}
+
+ /** Constructs a slot from an arbitrary functor.
+ * @param _A_func The desired functor the new slot should be assigned to.
+ */
+ template <class T_functor>
+ Slot3(const T_functor& _A_func)
+ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3>(_A_func) {}
+
+ /** Constructs a slot, copying an existing one.
+ * @param src The existing slot to copy.
+ */
+ Slot3(const parent_type& src)
+ : parent_type(src) {}
+
+ /** Overrides this slot making a copy from another slot.
+ * @param src The slot from which to make a copy.
+ * @return @p this.
+ */
+ Slot3& operator=(const parent_type& src)
+ { parent_type::operator=(src); return *this; }
+};
+
+/** Converts an arbitrary functor to a unified type which is opaque.
+ * Slot4 itself is a functor or to be more precise a closure. It contains
+ * a single, arbitrary functor (or closure) that is executed in operator()().
+ *
+ * The template arguments determine the function signature of operator()():
+ * - @e T_return The return type of operator()().
+ * - @e T_arg1 Argument type used in the definition of operator()().
+ * - @e T_arg2 Argument type used in the definition of operator()().
+ * - @e T_arg3 Argument type used in the definition of operator()().
+ * - @e T_arg4 Argument type used in the definition of operator()().
+ *
+ * To use simply assign the slot to the desired functor. If the functor
+ * is not compatible with the parameter list defined with the template
+ * arguments compiler errors are triggered. When called the slot
+ * will invoke the functor with minimal copies.
+ * block() and unblock() can be used to block the functor's invocation
+ * from operator()() temporarily.
+ *
+ * @par Example:
+ * @code
+ * #include <sigc++/slot.h>
+ * void foo(int) {}
+ * SigC::Slot1<void, long> s = SigC::slot(&foo);
+ * s(19);
+ * @endcode
+ *
+ * @deprecated Use the unnumbered template sigc::slot instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4>
+class Slot4
+ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4>
+{
+public:
+ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> parent_type;
+
+ /// Constructs an empty slot.
+ Slot4() {}
+
+ /** Constructs a slot from an arbitrary functor.
+ * @param _A_func The desired functor the new slot should be assigned to.
+ */
+ template <class T_functor>
+ Slot4(const T_functor& _A_func)
+ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4>(_A_func) {}
+
+ /** Constructs a slot, copying an existing one.
+ * @param src The existing slot to copy.
+ */
+ Slot4(const parent_type& src)
+ : parent_type(src) {}
+
+ /** Overrides this slot making a copy from another slot.
+ * @param src The slot from which to make a copy.
+ * @return @p this.
+ */
+ Slot4& operator=(const parent_type& src)
+ { parent_type::operator=(src); return *this; }
+};
+
+/** Converts an arbitrary functor to a unified type which is opaque.
+ * Slot5 itself is a functor or to be more precise a closure. It contains
+ * a single, arbitrary functor (or closure) that is executed in operator()().
+ *
+ * The template arguments determine the function signature of operator()():
+ * - @e T_return The return type of operator()().
+ * - @e T_arg1 Argument type used in the definition of operator()().
+ * - @e T_arg2 Argument type used in the definition of operator()().
+ * - @e T_arg3 Argument type used in the definition of operator()().
+ * - @e T_arg4 Argument type used in the definition of operator()().
+ * - @e T_arg5 Argument type used in the definition of operator()().
+ *
+ * To use simply assign the slot to the desired functor. If the functor
+ * is not compatible with the parameter list defined with the template
+ * arguments compiler errors are triggered. When called the slot
+ * will invoke the functor with minimal copies.
+ * block() and unblock() can be used to block the functor's invocation
+ * from operator()() temporarily.
+ *
+ * @par Example:
+ * @code
+ * #include <sigc++/slot.h>
+ * void foo(int) {}
+ * SigC::Slot1<void, long> s = SigC::slot(&foo);
+ * s(19);
+ * @endcode
+ *
+ * @deprecated Use the unnumbered template sigc::slot instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5>
+class Slot5
+ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>
+{
+public:
+ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> parent_type;
+
+ /// Constructs an empty slot.
+ Slot5() {}
+
+ /** Constructs a slot from an arbitrary functor.
+ * @param _A_func The desired functor the new slot should be assigned to.
+ */
+ template <class T_functor>
+ Slot5(const T_functor& _A_func)
+ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>(_A_func) {}
+
+ /** Constructs a slot, copying an existing one.
+ * @param src The existing slot to copy.
+ */
+ Slot5(const parent_type& src)
+ : parent_type(src) {}
+
+ /** Overrides this slot making a copy from another slot.
+ * @param src The slot from which to make a copy.
+ * @return @p this.
+ */
+ Slot5& operator=(const parent_type& src)
+ { parent_type::operator=(src); return *this; }
+};
+
+/** Converts an arbitrary functor to a unified type which is opaque.
+ * Slot6 itself is a functor or to be more precise a closure. It contains
+ * a single, arbitrary functor (or closure) that is executed in operator()().
+ *
+ * The template arguments determine the function signature of operator()():
+ * - @e T_return The return type of operator()().
+ * - @e T_arg1 Argument type used in the definition of operator()().
+ * - @e T_arg2 Argument type used in the definition of operator()().
+ * - @e T_arg3 Argument type used in the definition of operator()().
+ * - @e T_arg4 Argument type used in the definition of operator()().
+ * - @e T_arg5 Argument type used in the definition of operator()().
+ * - @e T_arg6 Argument type used in the definition of operator()().
+ *
+ * To use simply assign the slot to the desired functor. If the functor
+ * is not compatible with the parameter list defined with the template
+ * arguments compiler errors are triggered. When called the slot
+ * will invoke the functor with minimal copies.
+ * block() and unblock() can be used to block the functor's invocation
+ * from operator()() temporarily.
+ *
+ * @par Example:
+ * @code
+ * #include <sigc++/slot.h>
+ * void foo(int) {}
+ * SigC::Slot1<void, long> s = SigC::slot(&foo);
+ * s(19);
+ * @endcode
+ *
+ * @deprecated Use the unnumbered template sigc::slot instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6>
+class Slot6
+ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>
+{
+public:
+ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> parent_type;
+
+ /// Constructs an empty slot.
+ Slot6() {}
+
+ /** Constructs a slot from an arbitrary functor.
+ * @param _A_func The desired functor the new slot should be assigned to.
+ */
+ template <class T_functor>
+ Slot6(const T_functor& _A_func)
+ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>(_A_func) {}
+
+ /** Constructs a slot, copying an existing one.
+ * @param src The existing slot to copy.
+ */
+ Slot6(const parent_type& src)
+ : parent_type(src) {}
+
+ /** Overrides this slot making a copy from another slot.
+ * @param src The slot from which to make a copy.
+ * @return @p this.
+ */
+ Slot6& operator=(const parent_type& src)
+ { parent_type::operator=(src); return *this; }
+};
+
+/** Converts an arbitrary functor to a unified type which is opaque.
+ * Slot7 itself is a functor or to be more precise a closure. It contains
+ * a single, arbitrary functor (or closure) that is executed in operator()().
+ *
+ * The template arguments determine the function signature of operator()():
+ * - @e T_return The return type of operator()().
+ * - @e T_arg1 Argument type used in the definition of operator()().
+ * - @e T_arg2 Argument type used in the definition of operator()().
+ * - @e T_arg3 Argument type used in the definition of operator()().
+ * - @e T_arg4 Argument type used in the definition of operator()().
+ * - @e T_arg5 Argument type used in the definition of operator()().
+ * - @e T_arg6 Argument type used in the definition of operator()().
+ * - @e T_arg7 Argument type used in the definition of operator()().
+ *
+ * To use simply assign the slot to the desired functor. If the functor
+ * is not compatible with the parameter list defined with the template
+ * arguments compiler errors are triggered. When called the slot
+ * will invoke the functor with minimal copies.
+ * block() and unblock() can be used to block the functor's invocation
+ * from operator()() temporarily.
+ *
+ * @par Example:
+ * @code
+ * #include <sigc++/slot.h>
+ * void foo(int) {}
+ * SigC::Slot1<void, long> s = SigC::slot(&foo);
+ * s(19);
+ * @endcode
+ *
+ * @deprecated Use the unnumbered template sigc::slot instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7>
+class Slot7
+ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>
{
+public:
+ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> parent_type;
+
+ /// Constructs an empty slot.
+ Slot7() {}
+
+ /** Constructs a slot from an arbitrary functor.
+ * @param _A_func The desired functor the new slot should be assigned to.
+ */
+ template <class T_functor>
+ Slot7(const T_functor& _A_func)
+ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>(_A_func) {}
+
+ /** Constructs a slot, copying an existing one.
+ * @param src The existing slot to copy.
+ */
+ Slot7(const parent_type& src)
+ : parent_type(src) {}
+
+ /** Overrides this slot making a copy from another slot.
+ * @param src The slot from which to make a copy.
+ * @return @p this.
+ */
+ Slot7& operator=(const parent_type& src)
+ { parent_type::operator=(src); return *this; }
+};
+
+
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+/* gcc 3.2 reports a strange conflict between SigC::slot() and sigc::slot<>
+ * when "using namespace SigC" and later using a slot(obj,func) overload
+ * without the prefix "SigC::". Probably a compiler bug. I will investigate.
+ *
+ * This ugly hack avoids the error:
+ */
+// #define slot(...) make_slot(__VA_ARGS__) /* only works for gcc */
+#endif
+
+// slot()
+/** Creates a functor of type SigC::Slot0 that wraps an existing non-member function.
+ *
+ * @param _A_func Pointer to function that should be wrapped.
+ * @return Functor that executes _A_func on invokation.
+ *
+ * @deprecated Use sigc::ptr_fun() instead.
+ * @ingroup compat
+ */
+template <class T_return>
+inline Slot0<T_return>
+slot(T_return (*_A_func)())
+{ return Slot0<T_return>(_A_func); }
+
+/** Creates a functor of type SigC::Slot1 that wraps an existing non-member function.
+ *
+ * @param _A_func Pointer to function that should be wrapped.
+ * @return Functor that executes _A_func on invokation.
+ *
+ * @deprecated Use sigc::ptr_fun() instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1>
+inline Slot1<T_return, T_arg1>
+slot(T_return (*_A_func)(T_arg1))
+{ return Slot1<T_return, T_arg1>(_A_func); }
+
+/** Creates a functor of type SigC::Slot2 that wraps an existing non-member function.
+ *
+ * @param _A_func Pointer to function that should be wrapped.
+ * @return Functor that executes _A_func on invokation.
+ *
+ * @deprecated Use sigc::ptr_fun() instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2>
+inline Slot2<T_return, T_arg1,T_arg2>
+slot(T_return (*_A_func)(T_arg1,T_arg2))
+{ return Slot2<T_return, T_arg1,T_arg2>(_A_func); }
+
+/** Creates a functor of type SigC::Slot3 that wraps an existing non-member function.
+ *
+ * @param _A_func Pointer to function that should be wrapped.
+ * @return Functor that executes _A_func on invokation.
+ *
+ * @deprecated Use sigc::ptr_fun() instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2,class T_arg3>
+inline Slot3<T_return, T_arg1,T_arg2,T_arg3>
+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3))
+{ return Slot3<T_return, T_arg1,T_arg2,T_arg3>(_A_func); }
+
+/** Creates a functor of type SigC::Slot4 that wraps an existing non-member function.
+ *
+ * @param _A_func Pointer to function that should be wrapped.
+ * @return Functor that executes _A_func on invokation.
+ *
+ * @deprecated Use sigc::ptr_fun() instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4>
+inline Slot4<T_return, T_arg1,T_arg2,T_arg3,T_arg4>
+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4))
+{ return Slot4<T_return, T_arg1,T_arg2,T_arg3,T_arg4>(_A_func); }
+
+/** Creates a functor of type SigC::Slot5 that wraps an existing non-member function.
+ *
+ * @param _A_func Pointer to function that should be wrapped.
+ * @return Functor that executes _A_func on invokation.
+ *
+ * @deprecated Use sigc::ptr_fun() instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5>
+inline Slot5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>
+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5))
+{ return Slot5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>(_A_func); }
+
+/** Creates a functor of type SigC::Slot6 that wraps an existing non-member function.
+ *
+ * @param _A_func Pointer to function that should be wrapped.
+ * @return Functor that executes _A_func on invokation.
+ *
+ * @deprecated Use sigc::ptr_fun() instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6>
+inline Slot6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>
+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6))
+{ return Slot6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>(_A_func); }
+
+/** Creates a functor of type SigC::Slot7 that wraps an existing non-member function.
+ *
+ * @param _A_func Pointer to function that should be wrapped.
+ * @return Functor that executes _A_func on invokation.
+ *
+ * @deprecated Use sigc::ptr_fun() instead.
+ * @ingroup compat
+ */
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7>
+inline Slot7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>
+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7))
+{ return Slot7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>(_A_func); }
+
+
+
+}
+
+// From sigc++/object.h
+namespace SigC {
+
+// Object
+typedef ::sigc::trackable Object;
+
+}
+
+namespace SigC
+{
template <class T_return, class T_obj1, class T_obj2>
inline Slot0<T_return>
slot( T_obj1& _A_obj, T_return (T_obj2::*_A_func)() )

11
emulators/vba/files/patch-src-Util.cpp
View file

@ -1,6 +1,6 @@
--- src/Util.cpp.orig 2004-05-20 19:42:37.000000000 +0200
+++ src/Util.cpp 2012-05-02 20:49:07.000000000 +0200
@@ -79,7 +79,7 @@
@@ -79,7 +79,7 @@ bool utilWritePNGFile(const char *fileNa
return false;
}
@ -9,3 +9,12 @@
png_destroy_write_struct(&png_ptr,NULL);
fclose(fp);
return false;
@@ -984,7 +984,7 @@ void utilWriteData(gzFile gzFile, variab
gzFile utilGzOpen(const char *file, const char *mode)
{
- utilGzWriteFunc = (int (*)(void *,void * const, unsigned int))gzwrite;
+ utilGzWriteFunc = (int (*)(gzFile, voidp const, unsigned int))gzwrite;
utilGzReadFunc = gzread;
utilGzCloseFunc = gzclose;

9
emulators/vba/files/patch-src-sdl_debugger.cpp
View file

@ -12,3 +12,12 @@
if(size == 2)
printf("Breakpoint (on write) address %08x old:%08x new:%08x\n",
@@ -1389,7 +1389,7 @@
{
char buffer[10];
printf("Are you sure you want to quit (y/n)? ");
- fgets(buffer, 1024, stdin);
+ fgets(buffer, sizeof(buffer), stdin);
if(buffer[0] == 'y' || buffer[0] == 'Y') {
debugger = false;

0
emulators/vba/pkg-message → emulators/vba/files/pkg-message.in
View file

13
emulators/vba/pkg-plist
View file

@ -1,12 +1,5 @@
bin/VisualBoyAdvance
bin/VisualBoyAdvance.cfg-default
%%INSTALL_GTK2%%bin/gvba
%%INSTALL_GTK2%%share/VisualBoyAdvance/vba.glade
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%INSTALL_GTK2%%@dirrm share/VisualBoyAdvance
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%GTK2%%bin/gvba
%%GTK2%%share/VisualBoyAdvance/vba.glade
%%GTK2%%@dirrm share/VisualBoyAdvance