update to 3.8.4
rebuilt by autoport with build requirements: libllvm-devel>=3.8.0-2mamba [release 3.8.4-1mamba;Sun May 29 2016]
This commit is contained in:
parent
0302a8c2df
commit
79da69493b
11
gambas3-3.8.4-gcc-6.1.0-2.patch
Normal file
11
gambas3-3.8.4-gcc-6.1.0-2.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- gambas3-3.8.4/main/share/gambas.h.fix 2015-12-15 13:24:50.959501153 -0500
|
||||||
|
+++ gambas3-3.8.4/main/share/gambas.h 2015-12-15 13:25:07.023387570 -0500
|
||||||
|
@@ -66,7 +66,7 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__cplusplus) && !defined(__clang__)
|
||||||
|
- #define __null ((intptr_t)0)
|
||||||
|
+/* #define __null ((intptr_t)0) */
|
||||||
|
#else
|
||||||
|
#ifdef bool
|
||||||
|
#undef bool
|
76
gambas3-3.8.4-gcc-6.1.0.patch
Normal file
76
gambas3-3.8.4-gcc-6.1.0.patch
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
--- a/gambas/trunk/main/share/gambas.h
|
||||||
|
+++ b/gambas/trunk/main/share/gambas.h
|
||||||
|
@@ -66,7 +66,8 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__cplusplus) && !defined(__clang__)
|
||||||
|
- #define __null ((intptr_t)0)
|
||||||
|
+ #undef NULL
|
||||||
|
+ #define NULL ((intptr_t)0)
|
||||||
|
#else
|
||||||
|
#ifdef bool
|
||||||
|
#undef bool
|
||||||
|
--- a/gambas/trunk/gb.sdl/src/Cmouse.cpp
|
||||||
|
+++ b/gambas/trunk/gb.sdl/src/Cmouse.cpp
|
||||||
|
@@ -35,7 +35,7 @@
|
||||||
|
CMOUSE_INFO CMOUSE_info = { 0 };
|
||||||
|
|
||||||
|
#define CHECK_VALID() \
|
||||||
|
- if (UNLIKELY(CMOUSE_info.valid == NULL)) \
|
||||||
|
+ if (UNLIKELY(!CMOUSE_info.valid)) \
|
||||||
|
{ \
|
||||||
|
GB.Error("No mouse event data"); \
|
||||||
|
return; \
|
||||||
|
--- a/gambas/trunk/gb.sdl/src/Cjoystick.cpp
|
||||||
|
+++ b/gambas/trunk/gb.sdl/src/Cjoystick.cpp
|
||||||
|
@@ -46,7 +46,7 @@
|
||||||
|
CJOY_INFO CJOY_info = { 0 };
|
||||||
|
|
||||||
|
#define CHECK_VALID() \
|
||||||
|
- if (UNLIKELY(CJOY_info.valid == NULL)) \
|
||||||
|
+ if (UNLIKELY(!CJOY_info.valid)) \
|
||||||
|
{ \
|
||||||
|
GB.Error("No joystick event data"); \
|
||||||
|
return; \
|
||||||
|
--- a/gambas/trunk/gb.qt4/src/CWidget.cpp
|
||||||
|
+++ b/gambas/trunk/gb.qt4/src/CWidget.cpp
|
||||||
|
@@ -2297,7 +2297,7 @@
|
||||||
|
{
|
||||||
|
_post_check_hovered = true;
|
||||||
|
_post_check_hovered_window = top;
|
||||||
|
- GB.Post((void (*)())post_check_hovered, NULL);
|
||||||
|
+ GB.Post((void (*)())post_check_hovered, (intptr_t)NULL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2392,7 +2392,7 @@
|
||||||
|
return;
|
||||||
|
|
||||||
|
_focus_change = TRUE;
|
||||||
|
- GB.Post((void (*)())post_focus_change, NULL);
|
||||||
|
+ GB.Post((void (*)())post_focus_change, (intptr_t)NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CWIDGET_finish_focus(void)
|
||||||
|
--- a/gambas/trunk/gb.qt4/src/CImage.cpp
|
||||||
|
+++ b/gambas/trunk/gb.qt4/src/CImage.cpp
|
||||||
|
@@ -126,7 +126,7 @@
|
||||||
|
CIMAGE *CIMAGE_create(QImage *image)
|
||||||
|
{
|
||||||
|
CIMAGE *img;
|
||||||
|
- static GB_CLASS class_id = NULL;
|
||||||
|
+ static GB_CLASS class_id = 0;
|
||||||
|
|
||||||
|
if (!class_id)
|
||||||
|
class_id = GB.FindClass("Image");
|
||||||
|
--- a/gambas/trunk/gb.gtk/src/CImage.cpp
|
||||||
|
+++ b/gambas/trunk/gb.gtk/src/CImage.cpp
|
||||||
|
@@ -79,7 +79,7 @@
|
||||||
|
CIMAGE *CIMAGE_create(gPicture *image)
|
||||||
|
{
|
||||||
|
CIMAGE *img;
|
||||||
|
- static GB_CLASS class_id = NULL;
|
||||||
|
+ static GB_CLASS class_id = 0;
|
||||||
|
|
||||||
|
if (!class_id)
|
||||||
|
class_id = GB.FindClass("Image");
|
56
gambas3.spec
56
gambas3.spec
@ -1,7 +1,7 @@
|
|||||||
%define with_v4l 1
|
%define with_v4l 1
|
||||||
|
|
||||||
Name: gambas3
|
Name: gambas3
|
||||||
Version: 3.8.0
|
Version: 3.8.4
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: A development environment based on a BASIC interpreter with object extensions
|
Summary: A development environment based on a BASIC interpreter with object extensions
|
||||||
Group: Applications/Development
|
Group: Applications/Development
|
||||||
@ -11,12 +11,15 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
|||||||
URL: http://gambas.sourceforge.net/
|
URL: http://gambas.sourceforge.net/
|
||||||
Source: http://download.sourceforge.net/sourceforge/gambas/gambas3-%{version}.tar.bz2
|
Source: http://download.sourceforge.net/sourceforge/gambas/gambas3-%{version}.tar.bz2
|
||||||
Patch0: gambas3-3.5.4-llvm-3.5.patch
|
Patch0: gambas3-3.5.4-llvm-3.5.patch
|
||||||
|
Patch1: gambas3-3.8.4-gcc-6.1.0-2.patch
|
||||||
|
Patch2: gambas3-3.8.4-gcc-6.1.0.patch
|
||||||
License: GPL
|
License: GPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
BuildRequires: libGL-devel
|
BuildRequires: libGL-devel
|
||||||
BuildRequires: libGLU-devel
|
BuildRequires: libGLU-devel
|
||||||
BuildRequires: libICE-devel
|
BuildRequires: libICE-devel
|
||||||
|
BuildRequires: libQt5WebKit-devel
|
||||||
BuildRequires: libSDL-devel
|
BuildRequires: libSDL-devel
|
||||||
BuildRequires: libSDL_mixer-devel
|
BuildRequires: libSDL_mixer-devel
|
||||||
BuildRequires: libSDL_ttf-devel
|
BuildRequires: libSDL_ttf-devel
|
||||||
@ -34,13 +37,13 @@ BuildRequires: libXrender-devel
|
|||||||
BuildRequires: libXt-devel
|
BuildRequires: libXt-devel
|
||||||
BuildRequires: libXtst-devel
|
BuildRequires: libXtst-devel
|
||||||
BuildRequires: libatk-devel
|
BuildRequires: libatk-devel
|
||||||
|
BuildRequires: libbsd-devel
|
||||||
BuildRequires: libbzip2-devel
|
BuildRequires: libbzip2-devel
|
||||||
BuildRequires: libcairo-devel
|
BuildRequires: libcairo-devel
|
||||||
BuildRequires: libcares-devel
|
BuildRequires: libcares-devel
|
||||||
BuildRequires: libcroco-devel
|
BuildRequires: libcroco-devel
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
BuildRequires: libdbus-devel
|
BuildRequires: libdbus-devel
|
||||||
BuildRequires: libdirectfb-devel
|
|
||||||
BuildRequires: libexpat-devel
|
BuildRequires: libexpat-devel
|
||||||
BuildRequires: libffi-devel
|
BuildRequires: libffi-devel
|
||||||
BuildRequires: libfontconfig-devel
|
BuildRequires: libfontconfig-devel
|
||||||
@ -61,6 +64,7 @@ BuildRequires: libgst-plugins-base-devel
|
|||||||
BuildRequires: libgst-plugins-base010-devel
|
BuildRequires: libgst-plugins-base010-devel
|
||||||
BuildRequires: libgstreamer-devel
|
BuildRequires: libgstreamer-devel
|
||||||
BuildRequires: libgstreamer010-devel
|
BuildRequires: libgstreamer010-devel
|
||||||
|
BuildRequires: libgtk-devel
|
||||||
BuildRequires: libgtk2-devel
|
BuildRequires: libgtk2-devel
|
||||||
BuildRequires: libgtkglext-devel
|
BuildRequires: libgtkglext-devel
|
||||||
BuildRequires: libharfbuzz-devel
|
BuildRequires: libharfbuzz-devel
|
||||||
@ -69,11 +73,10 @@ BuildRequires: libimlib2-devel
|
|||||||
BuildRequires: libjbig-devel
|
BuildRequires: libjbig-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: liblcms2-devel
|
BuildRequires: liblcms2-devel
|
||||||
BuildRequires: libllvm-devel
|
|
||||||
BuildRequires: libltdl-devel
|
BuildRequires: libltdl-devel
|
||||||
BuildRequires: liblzma-devel
|
BuildRequires: liblzma-devel
|
||||||
BuildRequires: libmysql5-devel
|
BuildRequires: libmysqlclient-devel
|
||||||
BuildRequires: libncurses-devel
|
BuildRequires: libncurses5
|
||||||
BuildRequires: libodbc-devel
|
BuildRequires: libodbc-devel
|
||||||
BuildRequires: libopenjpeg1-devel
|
BuildRequires: libopenjpeg1-devel
|
||||||
BuildRequires: libopenldap-devel
|
BuildRequires: libopenldap-devel
|
||||||
@ -82,23 +85,21 @@ BuildRequires: libpango-devel
|
|||||||
BuildRequires: libpangox-devel
|
BuildRequires: libpangox-devel
|
||||||
BuildRequires: libpcre-devel
|
BuildRequires: libpcre-devel
|
||||||
BuildRequires: libpng-devel
|
BuildRequires: libpng-devel
|
||||||
BuildRequires: libpng15-devel
|
|
||||||
BuildRequires: libpoppler-devel
|
BuildRequires: libpoppler-devel
|
||||||
BuildRequires: libpostgresql-devel
|
BuildRequires: libpostgresql-devel
|
||||||
BuildRequires: libqt-mobility-devel
|
BuildRequires: libqt-mobility-devel
|
||||||
BuildRequires: libqt4-devel
|
BuildRequires: libqt4-devel
|
||||||
|
BuildRequires: libqt5-devel
|
||||||
BuildRequires: librsvg-devel
|
BuildRequires: librsvg-devel
|
||||||
BuildRequires: librtmp-devel
|
BuildRequires: librtmp-devel
|
||||||
BuildRequires: libsasl-devel
|
BuildRequires: libsasl2-devel
|
||||||
BuildRequires: libselinux-devel
|
BuildRequires: libselinux-devel
|
||||||
BuildRequires: libsqlite-devel
|
BuildRequires: libsqlite-devel
|
||||||
%if "%{stage1}" != "1"
|
|
||||||
BuildRequires: libsqlite2-devel
|
BuildRequires: libsqlite2-devel
|
||||||
%endif
|
|
||||||
BuildRequires: libssh2-devel
|
BuildRequires: libssh2-devel
|
||||||
BuildRequires: libstdc++6-devel
|
BuildRequires: libstdc++6-devel
|
||||||
|
BuildRequires: libthai-devel
|
||||||
BuildRequires: libtiff-devel
|
BuildRequires: libtiff-devel
|
||||||
BuildRequires: libts-devel
|
|
||||||
BuildRequires: libuuid-devel
|
BuildRequires: libuuid-devel
|
||||||
BuildRequires: libv4l-devel
|
BuildRequires: libv4l-devel
|
||||||
BuildRequires: libxcb-devel
|
BuildRequires: libxcb-devel
|
||||||
@ -106,7 +107,9 @@ BuildRequires: libxml2-devel
|
|||||||
BuildRequires: libxslt-devel
|
BuildRequires: libxslt-devel
|
||||||
BuildRequires: libz-devel
|
BuildRequires: libz-devel
|
||||||
## AUTOBUILDREQ-END
|
## AUTOBUILDREQ-END
|
||||||
BuildRequires: libllvm-devel >= 3.5.0-2mamba
|
%ifnarch arm
|
||||||
|
BuildRequires: libllvm-devel >= 3.8.0-2mamba
|
||||||
|
%endif
|
||||||
BuildRequires: libSDL_gfx-devel >= 2.0.13
|
BuildRequires: libSDL_gfx-devel >= 2.0.13
|
||||||
BuildRequires: libsmpeg-devel >= 0.4.5
|
BuildRequires: libsmpeg-devel >= 0.4.5
|
||||||
BuildRequires: pkgconfig >= 0.9
|
BuildRequires: pkgconfig >= 0.9
|
||||||
@ -864,14 +867,17 @@ With Gambas, you can quickly design your program GUI, access MySQL or PostgreSQL
|
|||||||
This component provides the Gambas WEB component.
|
This component provides the Gambas WEB component.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q -D -T
|
||||||
#-D -T
|
:<< _EOF
|
||||||
#:<< _EOF
|
|
||||||
#%patch0 -p1
|
#%patch0 -p1
|
||||||
|
#%patch2 -p3
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#:<< _EOF
|
:<< _EOF
|
||||||
./reconf
|
./reconf
|
||||||
|
_EOF
|
||||||
|
|
||||||
%configure \
|
%configure \
|
||||||
--enable-bzlib2 \
|
--enable-bzlib2 \
|
||||||
--enable-zlib \
|
--enable-zlib \
|
||||||
@ -906,7 +912,11 @@ This component provides the Gambas WEB component.
|
|||||||
--enable-pdf \
|
--enable-pdf \
|
||||||
--disable-firebird \
|
--disable-firebird \
|
||||||
--disable-corba \
|
--disable-corba \
|
||||||
--disable-gtksvg
|
%ifarch arm
|
||||||
|
--disable-jit \
|
||||||
|
%endif
|
||||||
|
--disable-gtksvg \
|
||||||
|
CXX
|
||||||
|
|
||||||
%make
|
%make
|
||||||
|
|
||||||
@ -1014,6 +1024,8 @@ install -D -m0644 app/desktop/gambas3.svg %{buildroot}%{_datadir}/pixmaps/gambas
|
|||||||
%{_datadir}/gambas3/icons/application-x-gambas3.png
|
%{_datadir}/gambas3/icons/application-x-gambas3.png
|
||||||
%{_datadir}/gambas3/icons/application-x-gambasscript.png
|
%{_datadir}/gambas3/icons/application-x-gambasscript.png
|
||||||
%{_datadir}/gambas3/icons/application-x-gambasserverpage.png
|
%{_datadir}/gambas3/icons/application-x-gambasserverpage.png
|
||||||
|
%dir %{_datadir}/gambas3/template
|
||||||
|
%{_datadir}/gambas3/template/*
|
||||||
#%dir %{_datadir}/%{name}/examples
|
#%dir %{_datadir}/%{name}/examples
|
||||||
#%{_datadir}/%{name}/examples/*
|
#%{_datadir}/%{name}/examples/*
|
||||||
%doc ChangeLog NEWS README
|
%doc ChangeLog NEWS README
|
||||||
@ -1157,10 +1169,10 @@ install -D -m0644 app/desktop/gambas3.svg %{buildroot}%{_datadir}/pixmaps/gambas
|
|||||||
%{_datadir}/%{name}/info/gb.gui.*
|
%{_datadir}/%{name}/info/gb.gui.*
|
||||||
%{_libdir}/%{name}/gb.gui.*
|
%{_libdir}/%{name}/gb.gui.*
|
||||||
|
|
||||||
%files gb-jit
|
#%files gb-jit
|
||||||
%defattr(-,root,root)
|
#%defattr(-,root,root)
|
||||||
%{_datadir}/%{name}/info/gb.jit.*
|
#%{_datadir}/%{name}/info/gb.jit.*
|
||||||
%{_libdir}/%{name}/gb.jit.*
|
#%{_libdir}/%{name}/gb.jit.*
|
||||||
|
|
||||||
%files gb-httpd
|
%files gb-httpd
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -1360,6 +1372,10 @@ install -D -m0644 app/desktop/gambas3.svg %{buildroot}%{_datadir}/pixmaps/gambas
|
|||||||
%{_libdir}/%{name}/gb.libxml.*
|
%{_libdir}/%{name}/gb.libxml.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun May 29 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 3.8.4-1mamba
|
||||||
|
- update to 3.8.4
|
||||||
|
- rebuilt by autoport with build requirements: libllvm-devel>=3.8.0-2mamba
|
||||||
|
|
||||||
* Sun Aug 23 2015 Automatic Build System <autodist@mambasoft.it> 3.8.0-1mamba
|
* Sun Aug 23 2015 Automatic Build System <autodist@mambasoft.it> 3.8.0-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user