diff -Nru tuxguitar-1.2/debian/changelog tuxguitar-1.2/debian/changelog --- tuxguitar-1.2/debian/changelog 2019-09-11 23:33:26.000000000 +0200 +++ tuxguitar-1.2/debian/changelog 2019-12-16 15:26:10.000000000 +0100 @@ -1,3 +1,11 @@ +tuxguitar (1.2-25) UNRELEASED; urgency=medium + + * debian/patches/git_new_libfluidsynth.patch: + - backport an upstream commit to build with the new libfluidsynth + (Closes: #946848) + + -- Sebastien Bacher <[email protected]> Mon, 16 Dec 2019 15:18:17 +0100 + tuxguitar (1.2-24) unstable; urgency=medium * Team upload. diff -Nru tuxguitar-1.2/debian/control tuxguitar-1.2/debian/control --- tuxguitar-1.2/debian/control 2019-09-11 23:03:16.000000000 +0200 +++ tuxguitar-1.2/debian/control 2019-12-16 15:20:07.000000000 +0100 @@ -1,7 +1,8 @@ Source: tuxguitar Section: sound Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> +Maintainer: Ubuntu Developers <[email protected]> +XSBC-Original-Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Philippe Coval <[email protected]>, tony mancill <[email protected]> Build-Depends: ant, diff -Nru tuxguitar-1.2/debian/patches/git_new_libfluidsynth.patch tuxguitar-1.2/debian/patches/git_new_libfluidsynth.patch --- tuxguitar-1.2/debian/patches/git_new_libfluidsynth.patch 1970-01-01 01:00:00.000000000 +0100 +++ tuxguitar-1.2/debian/patches/git_new_libfluidsynth.patch 2019-12-16 14:05:45.000000000 +0100 @@ -0,0 +1,122 @@ +Index: tuxguitar/TuxGuitar-fluidsynth/jni/GNUmakefile +=================================================================== +--- tuxguitar/TuxGuitar-fluidsynth/jni/GNUmakefile (révision 1799) ++++ tuxguitar/TuxGuitar-fluidsynth/jni/GNUmakefile (révision 1800) +@@ -1,4 +1,4 @@ +-CFLAGS?=-I$(shell gcj -print-file-name=include/) ++CFLAGS?=-I../../build-scripts/native-modules/common-include + CFLAGS+=-fPIC + LDFLAGS?= + LDLIBS?=-lfluidsynth +Index: tuxguitar/TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c +=================================================================== +--- tuxguitar/TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c (révision 1799) ++++ tuxguitar/TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c (révision 1800) +@@ -4,6 +4,9 @@ + #include <fluidsynth.h> + #include "org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h" + ++#define FLUID_VERSION_GEN(major, minor, micro) ((major << 16) | (minor << 8) | (micro)) ++#define FLUID_VERSION FLUID_VERSION_GEN(FLUIDSYNTH_VERSION_MAJOR, FLUIDSYNTH_VERSION_MINOR, FLUIDSYNTH_VERSION_MICRO) ++ + typedef struct{ + fluid_settings_t* settings; + fluid_synth_t* synth; +@@ -217,7 +220,7 @@ + double value = 0; + const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL); + +- fluid_settings_getnum(handle->settings,(char *)jkey, &value ); ++ fluid_settings_getnum(handle->settings, (char *)jkey, &value); + + (*env)->ReleaseStringUTFChars(env, key, jkey); + (*env)->CallVoidMethod( env, ref , mid , (jdouble)value ); +@@ -236,7 +239,7 @@ + int value = 0; + const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL); + +- fluid_settings_getint(handle->settings,(char *)jkey, &value ); ++ fluid_settings_getint(handle->settings, (char *)jkey, &value); + + (*env)->ReleaseStringUTFChars(env, key, jkey); + (*env)->CallVoidMethod( env, ref , mid , (jint)value ); +@@ -256,7 +259,8 @@ + char *value = NULL; + const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL); + +- fluid_settings_getstr(handle->settings,(char *)jkey, &value ); ++ fluid_settings_dupstr(handle->settings, (char *)jkey, &value); ++ + jvalue = (*env)->NewStringUTF(env, value); + + (*env)->ReleaseStringUTFChars(env, key, jkey); +@@ -273,11 +277,16 @@ + jclass cl = (*env)->GetObjectClass(env, ref); + jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(D)V"); + if (mid != 0){ ++ double value = 0; + const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL); +- double value = fluid_settings_getnum_default(handle->settings,(char *)jkey); +- ++ ++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0) ++ fluid_settings_getnum_default(handle->settings, (char *)jkey, &value); ++#else ++ value = fluid_settings_getnum_default(handle->settings, (char *)jkey); ++#endif + (*env)->ReleaseStringUTFChars(env, key, jkey); +- (*env)->CallVoidMethod( env, ref , mid , (jdouble)value ); ++ (*env)->CallVoidMethod( env, ref , mid , (jdouble) value ); + } + } + } +@@ -290,9 +299,14 @@ + jclass cl = (*env)->GetObjectClass(env, ref); + jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(I)V"); + if (mid != 0){ ++ int value = 0; + const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL); +- int value = fluid_settings_getint_default(handle->settings,(char *)jkey); + ++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0) ++ fluid_settings_getint_default(handle->settings, (char *)jkey, &value); ++#else ++ value = fluid_settings_getint_default(handle->settings, (char *)jkey); ++#endif + (*env)->ReleaseStringUTFChars(env, key, jkey); + (*env)->CallVoidMethod( env, ref , mid , (jint)value ); + } +@@ -307,8 +321,14 @@ + jclass cl = (*env)->GetObjectClass(env, ref); + jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(Ljava/lang/String;)V"); + if (mid != 0){ ++ char *value = NULL; + const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL); +- char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey); ++ ++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0) ++ fluid_settings_getstr_default(handle->settings,(char *)jkey, &value); ++#else ++ value = fluid_settings_getstr_default(handle->settings,(char *)jkey); ++#endif + jstring jvalue = (*env)->NewStringUTF(env, value); + + (*env)->ReleaseStringUTFChars(env, key, jkey); +@@ -331,7 +351,7 @@ + double maximum = 0; + const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL); + +- fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum ); ++ fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum); + + (*env)->ReleaseStringUTFChars(env, key, jkey); + (*env)->CallVoidMethod( env, minimumRef , midMin , (jdouble)minimum ); +@@ -354,7 +374,7 @@ + int maximum = 0; + const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL); + +- fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum ); ++ fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum); + + (*env)->ReleaseStringUTFChars(env, key, jkey); + (*env)->CallVoidMethod( env, minimumRef , midMin , (jint)minimum ); diff -Nru tuxguitar-1.2/debian/patches/series tuxguitar-1.2/debian/patches/series --- tuxguitar-1.2/debian/patches/series 2017-10-19 22:37:44.000000000 +0200 +++ tuxguitar-1.2/debian/patches/series 2019-12-16 14:02:51.000000000 +0100 @@ -4,3 +4,4 @@ 04-hardening-cppflags.patch 05-drop_xulrunner.patch 06-swt4.patch +git_new_libfluidsynth.patch
__ This is the maintainer address of Debian's Java team <https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use [email protected] for discussions and questions.
