development/gambas3: Updated for version 3.11.3 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 18 insertions, 137 deletions

diff --git a/development/gambas3/README b/development/gambas3/README
index a6434943f5..870f7b6b84 100644
--- a/development/gambas3/README
+++ b/development/gambas3/README
@@ -7,3 +7,6 @@ make 3D OpenGL applications, make CGI web applications, and so on.
 
 alure, gtkglext, imlib2, unixODBC, sqlite2, postgresql, and qt5 are 
 optional dependencies.
+
+It can create slackware packages of your programs, but only the
+noarch version contains the program.
diff --git a/development/gambas3/gambas3.SlackBuild b/development/gambas3/gambas3.SlackBuild
index 7bcb9d319c..40710ff943 100644
--- a/development/gambas3/gambas3.SlackBuild
+++ b/development/gambas3/gambas3.SlackBuild
@@ -22,13 +22,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# update to version 3.11.3 Copyright 2018 Tim Dickson dickson.tim@googlemail.com
+
 PRGNAM=gambas3
-VERSION=${VERSION:-3.9.1}
-BUILD=${BUILD:-2}
+SRCNAM=gambas
+VERSION=${VERSION:-3.11.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SHORT_PRGNAM=${PRGNAM%$(cut -d . -f 1 <<< $VERSION)}
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -61,19 +62,12 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
+cd $SRCNAM-$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" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -88,14 +82,14 @@ make -j1 install-strip DESTDIR=$PKG XDG_UTILS=""
 mkdir -p $PKG/usr/share/icons/hicolor/{scalable/apps,48x48/apps,64x64/mimetypes}
 cp -a app/desktop/$PRGNAM.svg $PKG/usr/share/icons/hicolor/scalable/apps
 cp -a app/desktop/$PRGNAM.png $PKG/usr/share/icons/hicolor/48x48/apps
-cp -a app/mime/application-x-${SHORT_PRGNAM}{script,serverpage}.png \
+cp -a app/mime/application-x-${SRCNAM}{script,serverpage}.png \
   $PKG/usr/share/icons/hicolor/64x64/mimetypes
 cp -a main/mime/application-x-$PRGNAM.png \
   $PKG/usr/share/icons/hicolor/64x64/mimetypes
 
 mkdir -p $PKG/usr/share/{applications,mime/packages}
 cp -a app/desktop/$PRGNAM.desktop $PKG/usr/share/applications
-cp -a app/mime/application-x-${SHORT_PRGNAM}{script,serverpage}.xml \
+cp -a app/mime/application-x-${SRCNAM}{script,serverpage}.xml \
   $PKG/usr/share/mime/packages
 cp -a main/mime/application-x-$PRGNAM.xml $PKG/usr/share/mime/packages
 
diff --git a/development/gambas3/gambas3.info b/development/gambas3/gambas3.info
index c01677a858..2bb45c72c1 100644
--- a/development/gambas3/gambas3.info
+++ b/development/gambas3/gambas3.info
@@ -1,10 +1,10 @@
 PRGNAM="gambas3"
-VERSION="3.9.1"
+VERSION="3.11.3"
 HOMEPAGE="http://gambas.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/gambas/gambas3-3.9.1.tar.bz2"
-MD5SUM="68949413f2ffc523e5b88ebaf3e3944a"
+DOWNLOAD="https://gitlab.com/gambas/gambas/-/archive/3.11.3/gambas-3.11.3.tar.bz2"
+MD5SUM="5664503c06557f243f95eade5f617055"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere.com"
+MAINTAINER="Tim Dickson"
+EMAIL="dickson.tim2@googlemail.com"
diff --git a/development/gambas3/qt5-5.7.patch b/development/gambas3/qt5-5.7.patch
deleted file mode 100644
index ffdb37485d..0000000000
--- a/development/gambas3/qt5-5.7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-[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
deleted file mode 100644
index 662a3edcd5..0000000000
--- a/development/gambas3/qt5-ext-5.7.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index 01a74260e9..0000000000
--- a/development/gambas3/qt5-webkit-5.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-[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 = \