[arch-commits] Commit in timidity++/trunk (PKGBUILD timidity-tk86.patch)

[Felix Yan]

    Date: Monday, December 10, 2018 @ 18:33:09
  Author: felixonmars
Revision: 341570

upgpkg: timidity++ 2.15.0-1

Modified:
  timidity++/trunk/PKGBUILD
Deleted:
  timidity++/trunk/timidity-tk86.patch

---------------------+
 PKGBUILD            |   10 ++++------
 timidity-tk86.patch |   39 ---------------------------------------
 2 files changed, 4 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-10 18:32:41 UTC (rev 341569)
+++ PKGBUILD	2018-12-10 18:33:09 UTC (rev 341570)
@@ -1,8 +1,8 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=timidity++
-pkgver=2.14.0
-pkgrel=8
+pkgver=2.15.0
+pkgrel=1
 pkgdesc="A MIDI to WAVE converter and player"
 arch=('x86_64')
 url="http://timidity.sourceforge.net"
@@ -14,16 +14,14 @@
             'xaw3d: for using the Xaw interface')
 backup=('etc/timidity++/timidity.cfg')
 source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz
-        timidity.cfg timidity.service timidity-tk86.patch timidity-jack.patch)
-sha512sums=('d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3'
+        timidity.cfg timidity.service timidity-jack.patch)
+sha512sums=('36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f'
             '054cd39bef913314e9901171566398af6280236531ac13ece683eaeb642c52b3280116adaa6328054c94bd79b0ab88c253281e386012a2c6d67f4b85c38e4859'
             'b77e460c9803300db67d571d5298edbf4c29a469593c41640057ff8d173ed6edf8b9c2d6cd9a35f6cf1cc32d5b92be38513105f927991fd451725802abb1108b'
-            'f7c711fd7aaf924b4469f61780f8b6a282c11246e093b121597a098190ee3ab96964dcc0eb772dfe8232eb95bcfa8819e105eb0f7956b723f84a4df13e72ca98'
             '51c075da04aeedca4edecb5a7f1926ccb80637b550f8fafca6d68be466cd4353a77bbb832878941919ec354c279a6014403e995b9152a47a3817c99890a4afeb')
 
 prepare() {
   cd TiMidity++-${pkgver}
-  patch -p1 -i "${srcdir}/timidity-tk86.patch"
   patch -p1 -i "${srcdir}/timidity-jack.patch"
 }
 

Deleted: timidity-tk86.patch
===================================================================
--- timidity-tk86.patch	2018-12-10 18:32:41 UTC (rev 341569)
+++ timidity-tk86.patch	2018-12-10 18:33:09 UTC (rev 341570)
@@ -1,39 +0,0 @@
---- a/interface/tk_c.c
-+++ b/interface/tk_c.c
-@@ -65,6 +65,9 @@
- #define TKPROGPATH PKGLIBDIR "/tkmidity.tcl"
- #endif /* TKPROGPATH */
- 
-+#if (TCL_MAJOR_VERSION < 8)
-+#define Tcl_GetStringResult(interp) (interp->result)
-+#endif
- 
- static void ctl_refresh(void);
- static void ctl_total_time(int tt);
-@@ -117,7 +120,7 @@
- 
- static void start_panel(void);
- 
--#define MAX_TK_MIDI_CHANNELS	16
-+#define MAX_TK_MIDI_CHANNELS	32
- 
- typedef struct {
- 	int reset_panel;
-@@ -933,7 +936,7 @@
- }
- 
- /* evaluate Tcl script */
--static char *v_eval(char *fmt, ...)
-+static const char *v_eval(char *fmt, ...)
- {
- 	char buf[256];
- 	va_list ap;
-@@ -941,7 +944,7 @@
- 	vsnprintf(buf, sizeof(buf), fmt, ap);
- 	Tcl_Eval(my_interp, buf);
- 	va_end(ap);
--	return my_interp->result;
-+	return Tcl_GetStringResult(my_interp);
- }
- 
- static const char *v_get2(const char *v1, const char *v2)