diff options
| -rw-r--r-- | development/gambas3/gambas3.SlackBuild | 8 | ||||
| -rw-r--r-- | development/gambas3/qt5-5.7.patch | 45 | ||||
| -rw-r--r-- | development/gambas3/qt5-ext-5.7.patch | 41 | ||||
| -rw-r--r-- | development/gambas3/qt5-webkit-5.7.patch | 30 |
4 files changed, 123 insertions, 1 deletions
diff --git a/development/gambas3/gambas3.SlackBuild b/development/gambas3/gambas3.SlackBuild index 3b566653e7..7bcb9d319c 100644 --- a/development/gambas3/gambas3.SlackBuild +++ b/development/gambas3/gambas3.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=gambas3 VERSION=${VERSION:-3.9.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} SHORT_PRGNAM=${PRGNAM%$(cut -d . -f 1 <<< $VERSION)} @@ -66,6 +66,12 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . +# Fix building against qt5 >= 5.7.0 +# https://sourceforge.net/p/gambas/mailman/message/35618038/ +patch -p3 < $CWD/qt5-ext-5.7.patch +patch -p3 < $CWD/qt5-5.7.patch +patch -p3 < $CWD/qt5-webkit-5.7.patch + ./reconf-all CFLAGS="$SLKCFLAGS" \ diff --git a/development/gambas3/qt5-5.7.patch b/development/gambas3/qt5-5.7.patch new file mode 100644 index 0000000000..ffdb37485d --- /dev/null +++ b/development/gambas3/qt5-5.7.patch @@ -0,0 +1,45 @@ +[GB.QT5] +* BUG: The component now should compile correctly with C++11. +Authored by: gambas 2017-01-09 +Browse code at this revision +Parent: [r8048] +Child: [r8050] +changed /gambas/trunk/gb.qt4/src/CMenu.cpp +changed /gambas/trunk/gb.qt4/src/CWidget.cpp +changed /gambas/trunk/gb.qt5/src/Makefile.am +/gambas/trunk/gb.qt4/src/CMenu.cpp Diff Switch to side-by-side view +--- a/gambas/trunk/gb.qt4/src/CMenu.cpp ++++ b/gambas/trunk/gb.qt4/src/CMenu.cpp +@@ -59,7 +59,7 @@ + + #define HANDLE_PROXY(_ob) \ + while (EXT(_ob) && EXT(_ob)->proxy) \ +- _ob = (typeof _ob)(EXT(_ob)->proxy); ++ _ob = (__typeof__ _ob)(EXT(_ob)->proxy); + + static CMENU_EXT *alloc_ext(CMENU *_object) + { +/gambas/trunk/gb.qt4/src/CWidget.cpp Diff Switch to side-by-side view +--- a/gambas/trunk/gb.qt4/src/CWidget.cpp ++++ b/gambas/trunk/gb.qt4/src/CWidget.cpp +@@ -96,7 +96,7 @@ + + #define HANDLE_PROXY(_ob) \ + while (EXT(_ob) && EXT(_ob)->proxy) \ +- _ob = (typeof _ob)(EXT(_ob)->proxy); ++ _ob = (__typeof__ _ob)(EXT(_ob)->proxy); + + static CWIDGET_EXT *alloc_ext(CWIDGET *_object) + { +/gambas/trunk/gb.qt5/src/Makefile.am Diff Switch to side-by-side view +--- a/gambas/trunk/gb.qt5/src/Makefile.am ++++ b/gambas/trunk/gb.qt5/src/Makefile.am +@@ -8,7 +8,7 @@ + + gb_qt5_la_LIBADD = @THREAD_LIB@ @QT5_LIB@ + gb_qt5_la_LDFLAGS = -module @LD_FLAGS@ @QT5_LDFLAGS@ +-gb_qt5_la_CXXFLAGS = @THREAD_INC@ -DGB_QT_COMPONENT $(AM_CXXFLAGS) ++gb_qt5_la_CXXFLAGS = @THREAD_INC@ -DGB_QT_COMPONENT $(AM_CXXFLAGS) -std=c++11 + gb_qt5_la_CPPFLAGS = @QT5_INC@ -I$(top_srcdir)/share/ + + gb_qt5_la_SOURCES = \ diff --git a/development/gambas3/qt5-ext-5.7.patch b/development/gambas3/qt5-ext-5.7.patch new file mode 100644 index 0000000000..662a3edcd5 --- /dev/null +++ b/development/gambas3/qt5-ext-5.7.patch @@ -0,0 +1,41 @@ +Commit [r8061] Maximize History + +[GB.QT5.EXT] +* BUG: The component now should compile correctly with C++11. +Authored by: gambas 3 days ago +Browse code at this revision +Parent: [r8060] +changed /gambas/trunk/gb.qt5/configure.ac +changed /gambas/trunk/gb.qt5/src/ext/Makefile.am +/gambas/trunk/gb.qt5/configure.ac Diff Switch to side-by-side view +--- a/gambas/trunk/gb.qt5/configure.ac ++++ b/gambas/trunk/gb.qt5/configure.ac +@@ -14,11 +14,6 @@ + qt5, QT5, gb.qt5, [src], + 'Qt5Core >= 5.3.0' Qt5Gui Qt5Widgets Qt5Svg Qt5PrintSupport Qt5X11Extras x11 + ) +- +-## GB_COMPONENT_PKG_CONFIG( +-## qt5ext, QT5EXT, gb.qt5.ext, [ext], +-## 'Qt5Core >= 5.4.0' Qt5Gui Qt5Widgets +-## ) + + GB_COMPONENT_PKG_CONFIG( + qt5webkit, QT5WEBKIT, gb.qt5.webkit, [webkit], +@@ -55,6 +50,4 @@ + src/ext/Makefile \ + ) + +-## src/ext/Makefile \ +- + GB_PRINT_MESSAGES +--- a/gambas/trunk/gb.qt5/src/ext/Makefile.am ++++ b/gambas/trunk/gb.qt5/src/ext/Makefile.am +@@ -6,6 +6,7 @@ + + gb_qt5_ext_la_LIBADD = @QT5EXT_LIB@ + gb_qt5_ext_la_LDFLAGS = -module @LD_FLAGS@ @QT5EXT_LDFLAGS@ ++gb_qt5_ext_la_CXXFLAGS = @THREAD_INC@ $(AM_CXXFLAGS) -std=c++11 + gb_qt5_ext_la_CPPFLAGS = @QT5EXT_INC@ -I$(top_srcdir)/share -I$(top_srcdir)/src/share + + gb_qt5_ext_la_SOURCES = \ diff --git a/development/gambas3/qt5-webkit-5.7.patch b/development/gambas3/qt5-webkit-5.7.patch new file mode 100644 index 0000000000..01a74260e9 --- /dev/null +++ b/development/gambas3/qt5-webkit-5.7.patch @@ -0,0 +1,30 @@ +[GB.QT5.WEBKIT] +* BUG: The component now should compile correctly with C++11. +Authored by: gambas 2017-01-09 +Browse code at this revision +Parent: [r8049] +Child: [r8051] +changed /gambas/trunk/gb.qt5/src/opengl/Makefile.am +changed /gambas/trunk/gb.qt5/src/webkit/Makefile.am +/gambas/trunk/gb.qt5/src/opengl/Makefile.am Diff Switch to side-by-side view +--- a/gambas/trunk/gb.qt5/src/opengl/Makefile.am ++++ b/gambas/trunk/gb.qt5/src/opengl/Makefile.am +@@ -6,6 +6,7 @@ + + gb_qt5_opengl_la_LIBADD = @QT5OPENGL_LIB@ @QT5OPENGL_LIB@ + gb_qt5_opengl_la_LDFLAGS = -module @LD_FLAGS@ @QT5OPENGL_LDFLAGS@ ++gb_qt5_opengl_la_CXXFLAGS = @THREAD_INC@ $(AM_CXXFLAGS) -std=c++11 + gb_qt5_opengl_la_CPPFLAGS = @QT5OPENGL_INC@ + + gb_qt5_opengl_la_SOURCES = main.h main.cpp +/gambas/trunk/gb.qt5/src/webkit/Makefile.am Diff Switch to side-by-side view +--- a/gambas/trunk/gb.qt5/src/webkit/Makefile.am ++++ b/gambas/trunk/gb.qt5/src/webkit/Makefile.am +@@ -6,6 +6,7 @@ + + gb_qt5_webkit_la_LIBADD = @QT5WEBKIT_LIB@ + gb_qt5_webkit_la_LDFLAGS = -module @LD_FLAGS@ @QT5WEBKIT_LDFLAGS@ ++gb_qt5_webkit_la_CXXFLAGS = @THREAD_INC@ $(AM_CXXFLAGS) -std=c++11 + gb_qt5_webkit_la_CPPFLAGS = @QT5WEBKIT_INC@ -I$(top_srcdir)/share -I$(top_srcdir)/src/share + + gb_qt5_webkit_la_SOURCES = \ |