Switched to boost::signals2
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/pingus/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile 12 Jul 2019 20:46:22 -0000 1.22
+++ Makefile 10 Oct 2020 09:39:47 -0000
@@ -3,7 +3,7 @@
COMMENT= free Lemmings-like game
DISTNAME= pingus-0.7.6
-REVISION= 5
+REVISION= 6
CATEGORIES= games x11
EXTRACT_SUFX= .tar.bz2
@@ -15,16 +15,16 @@ MASTER_SITES= ${MASTER_SITE_GOOGLECODE:=
PERMIT_PACKAGE= Yes
WANTLIB += GL SDL X11 Xi c iconv m png pthread z
-WANTLIB += SDL_mixer>=3 SDL_image>=2 boost_signals ${COMPILER_LIBCXX}
+WANTLIB += SDL_mixer>=3 SDL_image>=2 ${COMPILER_LIBCXX}
MODULES= devel/scons
COMPILER = base-clang ports-gcc
+BUILD_DEPENDS= devel/boost
LIB_DEPENDS= converters/libiconv \
devel/sdl-mixer \
- devel/sdl-image \
- devel/boost
+ devel/sdl-image
NO_TEST= Yes
Index: patches/patch-SConscript
===================================================================
RCS file: /cvs/ports/games/pingus/patches/patch-SConscript,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-SConscript
--- patches/patch-SConscript 22 Oct 2018 21:18:50 -0000 1.2
+++ patches/patch-SConscript 10 Oct 2020 09:39:47 -0000
@@ -1,4 +1,7 @@
$OpenBSD: patch-SConscript,v 1.2 2018/10/22 21:18:50 naddy Exp $
+
+Switched to boost::signals2
+
Index: SConscript
--- SConscript.orig
+++ SConscript
@@ -10,7 +13,7 @@ Index: SConscript
self.opts.Add('LINKFLAGS', 'Linker Compiler flags', [])
self.opts.Add(BoolVariable('with_opengl', 'Build with OpenGL
support', True))
-@@ -182,7 +181,7 @@ class Project:
+@@ -182,14 +181,13 @@ class Project:
else:
self.reports += " * XInput support: yes\n"
self.conf.env.Append(CPPDEFINES = [('HAVE_XINPUT', 1)])
@@ -19,3 +22,12 @@ Index: SConscript
self.conf.env.Append(optional_sources =
['src/engine/input/xinput/xinput_driver.cpp',
'src/engine/input/xinput/xinput_device.cpp'])
+ def configure_boost(self):
+- if not self.conf.CheckLibWithHeader('boost_signals',
'boost/signals.hpp', 'c++'):
+- if not self.conf.CheckLibWithHeader('boost_signals-mt',
'boost/signals.hpp', 'c++'):
+- self.fatal_error += " * library 'boost_signals' not found\n"
++ if not self.conf.CheckHeader('boost/signals2.hpp', '<>', 'c++'):
++ self.fatal_error += " * library 'boost_signals2' not found\n"
+
+ def configure_png(self):
+ if self.conf.CheckMyProgram('pkg-config'):
Index: patches/patch-src_editor_button_hpp
===================================================================
RCS file: patches/patch-src_editor_button_hpp
diff -N patches/patch-src_editor_button_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_editor_button_hpp 10 Oct 2020 09:39:47 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/editor/button.hpp
+--- src/editor/button.hpp.orig
++++ src/editor/button.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_BUTTON_HPP
+ #define HEADER_PINGUS_EDITOR_BUTTON_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -48,7 +48,7 @@ class Button : public GUI::RectComponent (public)
+ void enable() { enabled = true; }
+ void disable() { enabled = false; }
+
+- boost::signal<void()> on_click;
++ boost::signals2::signal<void()> on_click;
+
+ private:
+ Button (const Button&);
Index: patches/patch-src_editor_checkbox_hpp
===================================================================
RCS file: patches/patch-src_editor_checkbox_hpp
diff -N patches/patch-src_editor_checkbox_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_editor_checkbox_hpp 10 Oct 2020 09:39:47 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/editor/checkbox.hpp
+--- src/editor/checkbox.hpp.orig
++++ src/editor/checkbox.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_CHECKBOX_HPP
+ #define HEADER_PINGUS_EDITOR_CHECKBOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -40,7 +40,7 @@ class Checkbox : public GUI::RectComponent (public)
+ bool is_checked() const { return checked; }
+ void on_primary_button_press(int x, int y);
+
+- boost::signal<void (bool)> on_change;
++ boost::signals2::signal<void (bool)> on_change;
+
+ private:
+ Checkbox (const Checkbox&);
Index: patches/patch-src_editor_combobox_hpp
===================================================================
RCS file: patches/patch-src_editor_combobox_hpp
diff -N patches/patch-src_editor_combobox_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_editor_combobox_hpp 10 Oct 2020 09:39:47 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/editor/combobox.hpp
+--- src/editor/combobox.hpp.orig
++++ src/editor/combobox.hpp
+@@ -18,7 +18,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_COMBOBOX_HPP
+ #define HEADER_PINGUS_EDITOR_COMBOBOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/display/sprite.hpp"
+ #include "engine/gui/rect_component.hpp"
+@@ -88,7 +88,7 @@ class Combobox : public GUI::RectComponent (public)
+
+ void update_layout() {}
+
+- boost::signal<void (const ComboItem&)> on_select;
++ boost::signals2::signal<void (const ComboItem&)> on_select;
+
+ private:
+ Combobox();
Index: patches/patch-src_editor_file_list_hpp
===================================================================
RCS file: patches/patch-src_editor_file_list_hpp
diff -N patches/patch-src_editor_file_list_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_editor_file_list_hpp 10 Oct 2020 09:39:47 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/editor/file_list.hpp
+--- src/editor/file_list.hpp.orig
++++ src/editor/file_list.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_FILE_LIST_HPP
+ #define HEADER_PINGUS_EDITOR_FILE_LIST_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/display/sprite.hpp"
+ #include "engine/gui/rect_component.hpp"
+@@ -61,7 +61,7 @@ class FileList : public GUI::RectComponent (public)
+ bool has_more_next_pages();
+ bool has_more_prev_pages();
+
+- boost::signal<void (const System::DirectoryEntry&)> on_click;
++ boost::signals2::signal<void (const System::DirectoryEntry&)> on_click;
+
+ private:
+ int items_per_page();
Index: patches/patch-src_editor_inputbox_hpp
===================================================================
RCS file: patches/patch-src_editor_inputbox_hpp
diff -N patches/patch-src_editor_inputbox_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_editor_inputbox_hpp 10 Oct 2020 09:39:47 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/editor/inputbox.hpp
+--- src/editor/inputbox.hpp.orig
++++ src/editor/inputbox.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_INPUTBOX_HPP
+ #define HEADER_PINGUS_EDITOR_INPUTBOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -40,8 +40,8 @@ class Inputbox : public GUI::RectComponent (public)
+
+ void update_layout() {}
+
+- boost::signal<void (const std::string&)> on_change;
+- boost::signal<void (const std::string&)> on_enter;
++ boost::signals2::signal<void (const std::string&)> on_change;
++ boost::signals2::signal<void (const std::string&)> on_enter;
+
+ private:
+ Inputbox (const Inputbox&);
Index: patches/patch-src_editor_message_box_hpp
===================================================================
RCS file: patches/patch-src_editor_message_box_hpp
diff -N patches/patch-src_editor_message_box_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_editor_message_box_hpp 10 Oct 2020 09:39:47 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/editor/message_box.hpp
+--- src/editor/message_box.hpp.orig
++++ src/editor/message_box.hpp
+@@ -45,7 +45,7 @@ class MessageBox : public GUI::GroupComponent (public)
+ void on_cancel_button();
+
+ public:
+- boost::signal<void()> on_ok;
++ boost::signals2::signal<void()> on_ok;
+
+ private:
+ MessageBox(const MessageBox&);
Index: patches/patch-src_editor_object_selector_cpp
===================================================================
RCS file: patches/patch-src_editor_object_selector_cpp
diff -N patches/patch-src_editor_object_selector_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_editor_object_selector_cpp 10 Oct 2020 09:39:47
-0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/editor/object_selector.cpp
+--- src/editor/object_selector.cpp.orig
++++ src/editor/object_selector.cpp
+@@ -16,7 +16,7 @@
+
+ #include "editor/object_selector.hpp"
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "editor/generic_level_obj.hpp"
+ #include "editor/gui_style.hpp"
+@@ -47,7 +47,7 @@ class ObjectSelectorButton : public GUI::RectComponent
+ std::string tooltip;
+
+ public:
+- boost::signal<void()> on_click;
++ boost::signals2::signal<void()> on_click;
+
+ public:
+ ObjectSelectorButton(ObjectSelectorList* object_list_,
Index: patches/patch-src_editor_viewport_hpp
===================================================================
RCS file: patches/patch-src_editor_viewport_hpp
diff -N patches/patch-src_editor_viewport_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_editor_viewport_hpp 10 Oct 2020 09:39:47 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/editor/viewport.hpp
+--- src/editor/viewport.hpp.orig
++++ src/editor/viewport.hpp
+@@ -18,7 +18,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_VIEWPORT_HPP
+ #define HEADER_PINGUS_EDITOR_VIEWPORT_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+ #include <set>
+
+ #include "editor/selection.hpp"
+@@ -148,7 +148,7 @@ class Viewport : public GUI::RectComponent (public)
+
+ void clear_selection();
+
+- boost::signal<void (const Selection&)> selection_changed;
++ boost::signals2::signal<void (const Selection&)> selection_changed;
+ private:
+ Viewport();
+ Viewport (const Viewport&);
Index: patches/patch-src_pingus_components_check_box_hpp
===================================================================
RCS file: patches/patch-src_pingus_components_check_box_hpp
diff -N patches/patch-src_pingus_components_check_box_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_pingus_components_check_box_hpp 10 Oct 2020 09:39:47
-0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/pingus/components/check_box.hpp
+--- src/pingus/components/check_box.hpp.orig
++++ src/pingus/components/check_box.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP
+ #define HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/display/sprite.hpp"
+ #include "engine/gui/rect_component.hpp"
+@@ -39,7 +39,7 @@ class CheckBox : public GUI::RectComponent (public)
+
+ void set_state(bool v, bool send_signal);
+
+- boost::signal<void (bool)> on_change;
++ boost::signals2::signal<void (bool)> on_change;
+
+ private:
+ CheckBox (const CheckBox&);
Index: patches/patch-src_pingus_components_choice_box_hpp
===================================================================
RCS file: patches/patch-src_pingus_components_choice_box_hpp
diff -N patches/patch-src_pingus_components_choice_box_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_pingus_components_choice_box_hpp 10 Oct 2020 09:39:47
-0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/pingus/components/choice_box.hpp
+--- src/pingus/components/choice_box.hpp.orig
++++ src/pingus/components/choice_box.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
+ #define HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -36,7 +36,7 @@ class ChoiceBox : public GUI::RectComponent (public)
+ void add_choice(const std::string& str);
+ void set_current_choice(int choice);
+
+- boost::signal<void (std::string)> on_change;
++ boost::signals2::signal<void (std::string)> on_change;
+
+ private:
+ ChoiceBox (const ChoiceBox&);
Index: patches/patch-src_pingus_components_slider_box_hpp
===================================================================
RCS file: patches/patch-src_pingus_components_slider_box_hpp
diff -N patches/patch-src_pingus_components_slider_box_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_pingus_components_slider_box_hpp 10 Oct 2020 09:39:47
-0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/pingus/components/slider_box.hpp
+--- src/pingus/components/slider_box.hpp.orig
++++ src/pingus/components/slider_box.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
+ #define HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -39,7 +39,7 @@ class SliderBox : public GUI::RectComponent (public)
+
+ void set_value(int v);
+
+- boost::signal<void (int)> on_change;
++ boost::signals2::signal<void (int)> on_change;
+
+ private:
+ SliderBox (const SliderBox&);
Index: patches/patch-src_pingus_config_manager_hpp
===================================================================
RCS file: patches/patch-src_pingus_config_manager_hpp
diff -N patches/patch-src_pingus_config_manager_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_pingus_config_manager_hpp 10 Oct 2020 09:39:47 -0000
@@ -0,0 +1,85 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/pingus/config_manager.hpp
+--- src/pingus/config_manager.hpp.orig
++++ src/pingus/config_manager.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
+ #define HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "math/size.hpp"
+ #include "pingus/options.hpp"
+@@ -39,55 +39,55 @@ class ConfigManager (public)
+
+ void set_master_volume(int);
+ int get_master_volume() const;
+- boost::signal<void(int)> on_master_volume_change;
++ boost::signals2::signal<void(int)> on_master_volume_change;
+
+ void set_sound_volume(int);
+ int get_sound_volume() const;
+- boost::signal<void(int)> on_sound_volume_change;
++ boost::signals2::signal<void(int)> on_sound_volume_change;
+
+ void set_music_volume(int);
+ int get_music_volume() const;
+- boost::signal<void(int)> on_music_volume_change;
++ boost::signals2::signal<void(int)> on_music_volume_change;
+
+ void set_fullscreen_resolution(const Size& size);
+ Size get_fullscreen_resolution() const;
+- boost::signal<void(Size)> on_fullscreen_resolution_change;
++ boost::signals2::signal<void(Size)> on_fullscreen_resolution_change;
+
+ void set_fullscreen(bool);
+ bool get_fullscreen() const;
+- boost::signal<void(bool)> on_fullscreen_change;
++ boost::signals2::signal<void(bool)> on_fullscreen_change;
+
+ void set_renderer(FramebufferType type);
+ FramebufferType get_renderer() const;
+- boost::signal<void(FramebufferType)> on_renderer_change;
++ boost::signals2::signal<void(FramebufferType)> on_renderer_change;
+
+ void set_resizable(bool);
+ bool get_resizable() const;
+- boost::signal<void(bool)> on_resizable_change;
++ boost::signals2::signal<void(bool)> on_resizable_change;
+
+ void set_mouse_grab(bool);
+ bool get_mouse_grab() const;
+- boost::signal<void(bool)> on_mouse_grab_change;
++ boost::signals2::signal<void(bool)> on_mouse_grab_change;
+
+ void set_print_fps(bool);
+ bool get_print_fps() const;
+- boost::signal<void(bool)> on_print_fps_change;
++ boost::signals2::signal<void(bool)> on_print_fps_change;
+
+ void set_language(const tinygettext::Language&);
+ tinygettext::Language get_language() const;
+- boost::signal<void(const tinygettext::Language&)> on_language_change;
++ boost::signals2::signal<void(const tinygettext::Language&)>
on_language_change;
+
+ void set_software_cursor(bool);
+ bool get_software_cursor() const;
+- boost::signal<void(bool)> on_software_cursor_change;
++ boost::signals2::signal<void(bool)> on_software_cursor_change;
+
+ void set_auto_scrolling(bool);
+ bool get_auto_scrolling() const;
+- boost::signal<void(bool)> on_auto_scrolling_change;
++ boost::signals2::signal<void(bool)> on_auto_scrolling_change;
+
+ void set_drag_drop_scrolling(bool);
+ bool get_drag_drop_scrolling() const;
+- boost::signal<void(bool)> on_drag_drop_scrolling_change;
++ boost::signals2::signal<void(bool)> on_drag_drop_scrolling_change;
+
+ private:
+ ConfigManager (const ConfigManager&);
Index: patches/patch-src_pingus_screens_option_menu_hpp
===================================================================
RCS file: patches/patch-src_pingus_screens_option_menu_hpp
diff -N patches/patch-src_pingus_screens_option_menu_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_pingus_screens_option_menu_hpp 10 Oct 2020 09:39:47
-0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Switched to boost::signals2
+
+Index: src/pingus/screens/option_menu.hpp
+--- src/pingus/screens/option_menu.hpp.orig
++++ src/pingus/screens/option_menu.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
+ #define HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <map>
+ #include <vector>
+
+@@ -66,7 +66,7 @@ class OptionMenu : public GUIScreen (private)
+ //Label* defaults_label;
+ //CheckBox* defaults_box;
+
+- typedef std::vector<boost::signals::connection> Connections;
++ typedef std::vector<boost::signals2::connection> Connections;
+ Connections connections;
+
+ tinygettext::Language m_language;
