[arch-commits] Commit in gambas3/trunk (PKGBUILD gambas3-gcc7.patch sdl2_mixer.diff)

[Andreas Radke]

    Date: Thursday, November 9, 2017 @ 20:50:59
  Author: andyrtr
Revision: 266057

upgpkg: gambas3 3.10.0-4

poppler 0.61.0 rebuild; fix build with sdl2_mixer >=2.0.2

Added:
  gambas3/trunk/sdl2_mixer.diff
Modified:
  gambas3/trunk/PKGBUILD
Deleted:
  gambas3/trunk/gambas3-gcc7.patch

--------------------+
 PKGBUILD           |   18 ++++++++++--------
 gambas3-gcc7.patch |   11 -----------
 sdl2_mixer.diff    |   11 +++++++++++
 3 files changed, 21 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-09 20:36:31 UTC (rev 266056)
+++ PKGBUILD	2017-11-09 20:50:59 UTC (rev 266057)
@@ -16,9 +16,9 @@
          'gambas3-gb-util-web' 'gambas3-gb-util' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml'
          'gambas3-gb-web-feed' 'gambas3-gb-web-form' 'gambas3-gb-web'  'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script')
 pkgver=3.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://gambas.sourceforge.net/"
 license=('GPL2')
 groups=('gambas3')
@@ -31,11 +31,11 @@
 	 'gmime')
 options=('!emptydirs' 'libtool')
 source=("${pkgbase}-${pkgver}::https://gitlab.com/gambas/gambas/repository/v${pkgver}/archive.tar.bz2"
-        'prefer-qt5.patch' 'gambas3-gcc7.patch' '0001-adapt-to-poppler-0.58.patch')
+        'prefer-qt5.patch' '0001-adapt-to-poppler-0.58.patch' 'sdl2_mixer.diff')
 md5sums=('ca2bd77b4a6b0b5f2b36de335e2d4384'
          '71131eb16bbdf27bf6d329f089602cf7'
-         '97c31d0589c1fe0c5d35af11038f8362'
-         'f82c6633e79a07e2b6542ec1ceccfbff')
+         'f82c6633e79a07e2b6542ec1ceccfbff'
+         '57c5a2125a526a6011f68a405480a3af')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -45,9 +45,6 @@
 prepare() {
   cd ${srcdir}/gambas-v${pkgver}-*
 
-  # Fix build with GCC 7
-  #patch -p3 -i ../gambas3-gcc7.patch
-
   # Prefer Qt5 over Qt4 for the IDE (Qt4 will not work due to the QtWebkit removal)
   patch -Np1 -i ../prefer-qt5.patch
   
@@ -54,6 +51,11 @@
   # poppler 0.58 buildfix
   patch -Np1 -i ../0001-adapt-to-poppler-0.58.patch
 
+  # fix build with sdl2_mixer >= 2.0.2
+  # Flags MIX_INIT_MODPLUG was removed, and MIX_INIT_FLUIDSYNTH was
+  # renamed to MIX_INIT_MID.
+  patch -Np1 -i ../sdl2_mixer.diff
+  
   ./reconf-all
 }
 

Deleted: gambas3-gcc7.patch
===================================================================
--- gambas3-gcc7.patch	2017-11-09 20:36:31 UTC (rev 266056)
+++ gambas3-gcc7.patch	2017-11-09 20:50:59 UTC (rev 266057)
@@ -1,11 +0,0 @@
---- a/gambas/trunk/gb.db.sqlite2/src/sqlitedataset.cpp
-+++ b/gambas/trunk/gb.db.sqlite2/src/sqlitedataset.cpp
-@@ -765,7 +765,7 @@
-      	    _right = (char *)rindex(Type, ')');
-      	    _left = (char *)index(Type, '(');
- 	     if (_right){
--	 	_right = '\0';
-+	 	_right = NULL;
-                 rTypeLen = atoi(_left + 1);
- 	     }
- 	     else {

Added: sdl2_mixer.diff
===================================================================
--- sdl2_mixer.diff	                        (rev 0)
+++ sdl2_mixer.diff	2017-11-09 20:50:59 UTC (rev 266057)
@@ -0,0 +1,11 @@
+--- a/gb.sdl2/src/audio/main.c	2017-07-18 17:48:44.000000000 +0200
++++ b/gb.sdl2/src/audio/main.c.new	2017-11-09 21:33:11.442013948 +0100
+@@ -58,7 +58,7 @@
+ 	init_mixer(MIX_INIT_OGG, "OGG");
+ 	init_mixer(MIX_INIT_MOD, "MOD");
+ 	init_mixer(MIX_INIT_FLAC, "FLAC");
+-	init_mixer(MIX_INIT_FLUIDSYNTH, "FLUIDSYNTH");
++	init_mixer(MIX_INIT_MID, "MID");
+ 
+ 	if (Mix_OpenAudio(AUDIO_frequency, MIX_DEFAULT_FORMAT, 2, AUDIO_buffer_size))
+ 	{