diff options
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/swine/Makefile | 3 | ||||
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-c++11-qt5 | 54 | ||||
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-configure | 8 |
3 files changed, 64 insertions, 1 deletions
diff --git a/emulators/swine/Makefile b/emulators/swine/Makefile index 7a2f7dc33572..1526f10ec742 100644 --- a/emulators/swine/Makefile +++ b/emulators/swine/Makefile @@ -40,7 +40,8 @@ RUN_DEPENDS+= wine:emulators/wine-devel post-patch: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/version.sh @${REINPLACE_CMD} -e 's|/usr|${PREFIX}| ; \ - s|swine32.png|*|' \ + s|swine32.png|*| ; \ + s|lrelease-qt4|lrelease|' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|/usr/share/swine/images/swine32.png|swine|' \ -e 's|^Categories=.*|Categories=Wine;System;Emulator;Utility;Game;|' \ diff --git a/emulators/virtualbox-ose/files/patch-c++11-qt5 b/emulators/virtualbox-ose/files/patch-c++11-qt5 new file mode 100644 index 000000000000..c6d42bfa312f --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-c++11-qt5 @@ -0,0 +1,54 @@ +--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2017-01-17 08:26:40.000000000 +0100 ++++ src/VBox/Frontends/VirtualBox/Makefile.kmk 2017-02-10 19:08:22.842186000 +0100 +@@ -238,6 +238,7 @@ + VirtualBox_LIBS.linux += xcb + VirtualBox_LIBS.solaris += xcb + VirtualBox_LIBS.freebsd += xcb ++ VirtualBox_CXXFLAGS.freebsd += -std=c++11 + endif # VBOX_WITH_QTGUI_V5 + + ifneq ($(KBUILD_TARGET),win) +@@ -888,6 +889,7 @@ + VirtualBox_SOURCES += \ + src/VBoxFBOverlay.cpp \ + src/VBoxGLSupportInfo.cpp ++ VirtualBox_CXXFLAGS += -std=c++11 + endif + + # +@@ -1222,6 +1224,7 @@ + VBoxOGL2D_SOURCES = \ + src/VBoxGLSupportInfo.cpp + VBoxOGL2D_INCS = include ++ VBoxOGL2D_CXXFLAGS += -std=c++11 + endif + endif + +--- src/VBox/Debugger/Makefile.kmk.orig 2017-02-10 19:55:21.598089000 +0100 ++++ src/VBox/Debugger/Makefile.kmk 2017-02-10 20:12:29.292761000 +0100 +@@ -115,6 +115,7 @@ + VBoxDbgBase.cpp \ + VBoxDbgConsole.cpp \ + VBoxDbgStatsQt4.cpp ++VBoxDbg_CXXFLAGS += -std=c++11 + VBoxDbg_LIBS = \ + $(VBOX_LIB_VMM_LAZY) + VBoxDbg_LDFLAGS.darwin = \ +@@ -141,6 +142,7 @@ + tstVBoxDbg_LIBS.linux += xcb + tstVBoxDbg_LIBS.solaris += xcb + tstVBoxDbg_LIBS.freebsd += xcb ++ tstVBoxDbg_CXXFLAGS += -std=c++1 + endif # VBOX_WITH_QTGUI_V5 + tstVBoxDbg_SOURCES = testcase/tstVBoxDbg.cpp + tstVBoxDbg_LIBS = \ +--- src/VBox/HostServices/SharedOpenGL/Makefile.kmk.orig 2017-02-10 20:31:10.812441000 +0100 ++++ src/VBox/HostServices/SharedOpenGL/Makefile.kmk 2017-02-10 20:32:04.804107000 +0100 +@@ -444,6 +444,7 @@ + VBoxTestOGL_LIBS.linux += xcb + VBoxTestOGL_LIBS.solaris += xcb + VBoxTestOGL_LIBS.freebsd += xcb ++ VBoxTestOGL_CXXFLAGS += -std=c++11 + endif # VBOX_WITH_QTGUI_V5 + VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL + VBoxTestOGL_LIBS.win += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib diff --git a/emulators/virtualbox-ose/files/patch-configure b/emulators/virtualbox-ose/files/patch-configure index 82994e000506..88081f6175ac 100644 --- a/emulators/virtualbox-ose/files/patch-configure +++ b/emulators/virtualbox-ose/files/patch-configure @@ -34,6 +34,14 @@ test_execute fi } +@@ -1694,6 +1701,7 @@ + if [ $? -eq 0 ]; then + echo "(Qt5 from pkg-config)" >> $LOG + FLGQT5=`pkg-config Qt5Core --cflags` ++ FLGQT5="$FLGQT5 -std=c++11" + INCQT5=`strip_I "$FLGQT5"` + LIBDIR5=`pkg-config Qt5Core --variable=libdir` + LIBQT5=`pkg-config Qt5Core --libs` @@ -2126,8 +2133,8 @@ EOF echo "compiling the following source file:" >> $LOG cat $ODIR.tmp_src.cc >> $LOG |