Merge pull request #310356 from Sigmanificient/remove-leftover-patch

Index: beast-0.7.1/shell/Makefile.in

===================================================================

--- beast-0.7.1.orig/shell/Makefile.in

+++ beast-0.7.1/shell/Makefile.in

@@ -859,10 +859,7 @@ check-before: check-installation

 check-installation:

 	@for p in $(bin_PROGRAMS) ; do					\

 	  pp="$(DESTDIR)$(bindir)/$$p" ;				\

-	  echo "TEST: test -x \"$$pp\"" ;				\

-	  test -x "$$pp" ||						\

-	    { echo "Failed to verify installation of executable: $$pp";	\

-	      exit 1 ; }						\

+	  echo "TEST: test -x \"$$pp\" Test disabled" ;				\

 	done

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

Index: beast-0.7.1/shell/Makefile.am

===================================================================

--- beast-0.7.1.orig/shell/Makefile.am

+++ beast-0.7.1/shell/Makefile.am

@@ -859,10 +859,7 @@ check-before: check-installation

 check-installation:

 	@for p in $(bin_PROGRAMS) ; do					\

 	  pp="$(DESTDIR)$(bindir)/$$p" ;				\

-	  echo "TEST: test -x \"$$pp\"" ;				\

-	  test -x "$$pp" ||						\

-	    { echo "Failed to verify installation of executable: $$pp";	\

-	      exit 1 ; }						\

+	  echo "TEST: test -x \"$$pp\" Test disabled" ;				\

 	done

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

Index: beast-0.7.1/birnet/birnettests.h

===================================================================

--- beast-0.7.1.orig/birnet/birnettests.h

+++ beast-0.7.1/birnet/birnettests.h

@@ -27,6 +27,7 @@

 #include <glib.h>

 #include <string.h>

+#include <signal.h>

 BIRNET_EXTERN_C_BEGIN();

Index: beast-0.7.1/tools/bseloopfuncs.c

===================================================================

--- beast-0.7.1.orig/tools/bseloopfuncs.c

+++ beast-0.7.1/tools/bseloopfuncs.c

@@ -21,6 +21,7 @@

 #include <string.h>

 #include <stdio.h>

 #include <math.h>

+#include <signal.h>

 typedef struct {

   gdouble score;

--- beast-0.7.1.orig/bse/Makefile.am	2008-06-01 13:12:28.116708321 +0200

+++ beast-0.7.1/bse/Makefile.am	2008-06-01 13:12:40.000000000 +0200

@@ -10,7 +10,7 @@

 # need -I$(top_builddir) for <sfi/sficonfig.h>

 # need -I$(srcdir) for "bseserver.h" in .genprc.c

 # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc

-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS

+INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS

 DEFS     += $(strip \

 	$(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \

 	              $(filter $(<F), $(bse_sources) $(bse_sources))) \

--- beast-0.7.1.orig/bse/zintern/Makefile.am	2008-06-01 13:14:25.880028999 +0200

+++ beast-0.7.1/bse/zintern/Makefile.am	2008-06-01 13:14:38.000000000 +0200

@@ -4,7 +4,7 @@

 ## GNU Lesser General Public License version 2 or any later version.

 include $(top_srcdir)/Makefile.decl

-INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS

+INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS

 ZFILE_DEFS = $(strip \

 	wave-mono		$(srcdir)/wave-mono.bse		\

--- a/configure.in	2008-06-01 15:19:46.000000000 +0200

+++ b/configure.in	2008-06-01 15:27:45.000000000 +0200

@@ -159,39 +159,33 @@

 dnl # Define package requirements.

 dnl #

 dnl ## include acintltool.m4 to provide IT_PROG_INTLTOOL

-builtin(include, acintltool.m4)dnl

-AC_DEFUN([AC_I18N_REQUIREMENTS],

-[

-    ALL_LINGUAS=`cat "$srcdir/po/LINGUAS" | grep -v '^#' | xargs echo -n `

-    AC_SUBST(ALL_LINGUAS)

-    AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/po/LINGUAS'])

-

-    dnl # versioned BEAST gettext domain (po/)

-    BST_GETTEXT_DOMAIN=beast-v$BIN_VERSION    # version without -rcZ

-    AC_SUBST(BST_GETTEXT_DOMAIN)

-    AC_DEFINE_UNQUOTED(BST_GETTEXT_DOMAIN, "$BST_GETTEXT_DOMAIN", [Versioned BEAST gettext domain])

-    GETTEXT_PACKAGE=$BST_GETTEXT_DOMAIN

-    AC_SUBST(GETTEXT_PACKAGE)

-

-    dnl # locale directory for all domains

-    dnl # (AM_GLIB_DEFINE_LOCALEDIR() could do this if it would do AC_SUBST())

-    saved_prefix="$prefix"

-    saved_exec_prefix="$exec_prefix"

-    test "x$prefix" = xNONE && prefix=$ac_default_prefix

-    test "x$exec_prefix" = xNONE && exec_prefix=$prefix

-    if test "x$CATOBJEXT" = "x.mo" ; then

-      beastlocaledir=`eval echo "${libdir}/locale"`

-    else

-      beastlocaledir=`eval echo "${datadir}/locale"`

-    fi

-    exec_prefix="$saved_exec_prefix"

-    prefix="$saved_prefix"

-    AC_SUBST(beastlocaledir)

-

-    dnl # do gettext checks and prepare for intltool

-    AM_GLIB_GNU_GETTEXT

-    IT_PROG_INTLTOOL

-])

+IT_PROG_INTLTOOL([0.35.0])

+

+dnl # versioned BEAST gettext domain (po/)

+BST_GETTEXT_DOMAIN=beast-v$BIN_VERSION    # version without -rcZ

+AC_SUBST(BST_GETTEXT_DOMAIN)

+AC_DEFINE_UNQUOTED(BST_GETTEXT_DOMAIN, "$BST_GETTEXT_DOMAIN", [Versioned BEAST gettext domain])

+GETTEXT_PACKAGE=$BST_GETTEXT_DOMAIN

+AC_SUBST(GETTEXT_PACKAGE)

+

+dnl # locale directory for all domains

+dnl # (AM_GLIB_DEFINE_LOCALEDIR() could do this if it would do AC_SUBST())

+saved_prefix="$prefix"

+saved_exec_prefix="$exec_prefix"

+test "x$prefix" = xNONE && prefix=$ac_default_prefix

+test "x$exec_prefix" = xNONE && exec_prefix=$prefix

+if test "x$CATOBJEXT" = "x.mo" ; then

+  beastlocaledir=`eval echo "${libdir}/locale"`

+else

+  beastlocaledir=`eval echo "${datadir}/locale"`

+fi

+exec_prefix="$saved_exec_prefix"

+prefix="$saved_prefix"

+AC_SUBST(beastlocaledir)

+

+dnl # do gettext checks and prepare for intltool

+AM_GLIB_GNU_GETTEXT

+

 AC_DEFUN([AC_SFI_REQUIREMENTS],

 [

     dnl # check for GLib libs, libbirnet already provides gthread-2.0 and glib-2.0

@@ -570,7 +564,6 @@

 AC_BIRNET_REQUIREMENTS

 # Check requirement sets

-AC_I18N_REQUIREMENTS

 AC_SFI_REQUIREMENTS

 AC_BSE_REQUIREMENTS

 AC_BSESCM_REQUIREMENTS

--- a/po/POTFILES.in	2008-06-22 15:12:10.000000000 +0200

+++ b/po/POTFILES.in	2008-06-22 15:13:28.000000000 +0200

@@ -131,3 +131,29 @@

 plugins/davxtalstrings.c

 plugins/freeverb/bsefreeverb.c

 tools/bsewavetool.cc

+

+beast-gtk/bstgentypes.c

+birnet/birnetcpu.cc

+birnet/birnetutils.hh

+bse/bsebus.genprc.c

+bse/bsebusmodule.genidl.hh

+bse/bsecontainer.genprc.c

+bse/bsecore.genidl.hh

+bse/bseieee754.h

+bse/bseladspamodule.c

+bse/bseparasite.genprc.c

+bse/bsesong.genprc.c

+bse/bsesource.genprc.c

+bse/bsetrack.genprc.c

+plugins/artscompressor.genidl.hh

+plugins/bseamplifier.genidl.hh

+plugins/bsebalance.genidl.hh

+plugins/bsecontribsampleandhold.genidl.hh

+plugins/bsenoise.genidl.hh

+plugins/bsequantizer.genidl.hh

+plugins/bsesummation.genidl.hh

+plugins/davbassfilter.genidl.hh

+plugins/davchorus.genidl.hh

+plugins/standardguspatchenvelope.genidl.hh

+plugins/standardsaturator.genidl.hh

+tests/latency/bselatencytest.genidl.hh

diff --git a/build.xml b/build.xml

index 1ba08e0..9248b76 100644

--- a/build.xml

+++ b/build.xml

@@ -56,10 +56,16 @@

     <target name="compilejni" unless="isWindows">

         <description>JNI compilation task (builds libarecafs.so ... for unix-like operating systems only)</description>

+

         <!--Generate the JNI header-->

-        <javah destdir="${root}/jni" force="yes" classpath="${root}/lib/areca.jar">

-            <class name="com.myJava.file.metadata.posix.jni.wrapper.FileAccessWrapper"/>

-        </javah>

+	<exec executable="javah">

+		<arg value="-d"/>

+		<arg value="${root}/jni"/>

+		<arg value="-force"/>

+		<arg value="-classpath"/>

+		<arg value="${root}/lib/areca.jar"/>

+		<arg value="com.myJava.file.metadata.posix.jni.wrapper.FileAccessWrapper"/>

+	</exec>

         <!-- Compile the JNI code -->

         <exec dir="${root}/jni" executable="gcc">