minicomputer: fix broken scons `print` command - remove "Linux" from description

2 files changed, 84 insertions, 6 deletions

diff --git a/pcr/minicomputer/PKGBUILD b/pcr/minicomputer/PKGBUILD
index f344e0852..42b9c75ab 100644
--- a/pcr/minicomputer/PKGBUILD
+++ b/pcr/minicomputer/PKGBUILD
@@ -2,12 +2,14 @@
 # Contributor: farid abdelnour <farid at archlinux-br.org>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
 
 pkgname=minicomputer
 pkgver=1.41
-pkgrel=3
-pkgdesc="A standalone Linux softwaresynthesizer for creating experimental electronic sounds."
-arch=('i686' 'x86_64')
+pkgrel=4
+pkgdesc="Software synthesizer for creating experimental electronic sounds"
+arch=('i686' 'x86_64') # no arm - requires SSE
 url="http://minicomputer.sourceforge.net"
 license=('GPL3')
 depends=('fltk' 'jack' 'liblo')
@@ -15,18 +17,24 @@ makedepends=('scons')
 install="$pkgname.install"
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/MinicomputerV$pkgver.tar.gz"
         "$pkgname.desktop")
+source+=(print.patch)
 md5sums=('d2524f5fee7475159292e29a5bcd73d2'
          '3cc74321d55870b1684767255c74c2f8')
+md5sums+=('ed8548394b3dcf1823c047fd7e9fcf9e')
+
 
 prepare() {
   # installpresets.sh fix
   sed -i "s|factory|/usr/share/$pkgname/&|g" installpresets.sh
 
   # DSO linking fix
-  sed -i "35aenv.Append(LINKFLAGS = ['-lm'])" -i SConstruct
+  sed -i "35aenv.Append(LIBS = ['m'])" -i SConstruct
 
   # missing includes
   sed -i '30a#include <unistd.h>' editor/Memory.h
+
+  # fix 'print' commands in scons file
+  patch -Np1 < print.patch
 }
 
 build() {
@@ -58,5 +66,3 @@ package() {
   install -Dm755 installpresets.sh \
     "$pkgdir/usr/share/$pkgname/installpresets.sh"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/minicomputer/scons-print.patch b/pcr/minicomputer/scons-print.patch
new file mode 100644
index 000000000..037f17c43
--- /dev/null
+++ b/pcr/minicomputer/scons-print.patch
@@ -0,0 +1,72 @@
+diff --git a/SConstruct b/SConstruct
+index 13195ec..cf10e72 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1,6 +1,6 @@
+-print" "
+-print"Minicomputer-------------- "
+-print"-                     1/2:configuring"
++print(' ')
++print('Minicomputer-------------- ')
++print('-                     1/2:configuring')
+ 
+ if ARGUMENTS.get('64bit', 0):
+ 	env = Environment(CCFLAGS = '-m64')
+@@ -35,44 +35,44 @@ conf = Configure(env)
+ 
+ env.Append(LINKFLAGS = ['-lm'])
+ if not conf.CheckLibWithHeader('jack', 'jack/jack.h','c'):
+-	print 'Did not find jack, exiting!'
++	print('Did not find jack, exiting!')
+ 	Exit(1)
+ if not conf.CheckLibWithHeader('lo', 'lo/lo.h','c'):
+-	print 'Did not find liblo for OSC, exiting!'
++	print('Did not find liblo for OSC, exiting!')
+ 	Exit(1)
+ if not conf.CheckLibWithHeader('asound', 'alsa/asoundlib.h','c'):
+-	print 'Did not find alsa, exiting!'
++	print('Did not find alsa, exiting!')
+ 	Exit(1)
+ if not conf.CheckLibWithHeader('pthread', 'pthread.h','c'):
+-	print 'Did not find pthread library, exiting!'
++	print('Did not find pthread library, exiting!')
+ 	Exit(1)
+ env = conf.Finish()
+ 
+-print"-                    checking dependencies for the editor:"
++print('-                    checking dependencies for the editor:')
+ 
+ guiconf = Configure(guienv)
+ if not guiconf.CheckLibWithHeader('lo', 'lo/lo.h','c'):
+-	print 'Did not find liblo for OSC, exiting!'
++	print('Did not find liblo for OSC, exiting!')
+ 	Exit(1)
+ if not guiconf.CheckLibWithHeader('fltk', 'FL/Fl.H','c++'):
+-	print 'Did not find FLTK for the gui, exiting!'
++	print('Did not find FLTK for the gui, exiting!')
+ 	Exit(1)
+ if not guiconf.CheckLibWithHeader('asound', 'alsa/asoundlib.h','c'):
+-	print 'Did not find alsa, exiting!'
++	print('Did not find alsa, exiting!')
+ 	Exit(1)
+ if not guiconf.CheckLibWithHeader('pthread', 'pthread.h','c'):
+-	print 'Did not find pthread library, exiting!'
++	print('Did not find pthread library, exiting!')
+ 	Exit(1)
+ guienv = guiconf.Finish()
+ guienv.Append(CPPFLAGS = ['-O3','-Wall','-fmessage-length=0'])
+ 
+-print"-                     2/2:compiling"
+-print"-                     building the engine:"
++print('-                     2/2:compiling')
++print('-                     building the engine:')
+ 
+ env.Program('minicomputerCPU','cpu/main.c');
+ 
+-print""
+-print"-                     building the editor:"
++print('')
++print('-                     building the editor:')
+ 
+ guienv.Program('minicomputer',['editor/main.cpp','editor/Memory.cpp','editor/syntheditor.cxx']);
+