summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2005-11-14 21:36:44 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2005-11-14 21:36:44 +0000
commitfb07a3c2d71156fce3a7864ec63d5819483a4166 (patch)
tree2b0f98dcc489fc1ddbda2d6db88dd613f16ca7f7 /dev-java/gnu-classpath/files
parentAdded to ~ppc. See bug #112450. (diff)
downloadgentoo-2-fb07a3c2d71156fce3a7864ec63d5819483a4166.tar.gz
gentoo-2-fb07a3c2d71156fce3a7864ec63d5819483a4166.tar.bz2
gentoo-2-fb07a3c2d71156fce3a7864ec63d5819483a4166.zip
Modified the patch so that it does not fail with stable patch. Fixes bug #112544.
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'dev-java/gnu-classpath/files')
-rw-r--r--dev-java/gnu-classpath/files/0.19-dssi.patch66
1 files changed, 33 insertions, 33 deletions
diff --git a/dev-java/gnu-classpath/files/0.19-dssi.patch b/dev-java/gnu-classpath/files/0.19-dssi.patch
index be7eaf01a589..7f8bf06d3ca9 100644
--- a/dev-java/gnu-classpath/files/0.19-dssi.patch
+++ b/dev-java/gnu-classpath/files/0.19-dssi.patch
@@ -1,33 +1,33 @@
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/classpath/classpath/configure.ac,v
-retrieving revision 1.118
-diff -u -r1.118 configure.ac
---- configure.ac 7 Nov 2005 14:25:54 -0000 1.118
-+++ configure.ac 10 Nov 2005 10:50:23 -0000
-@@ -118,7 +118,7 @@
- dnl -----------------------------------------------------------
- dnl DSSI code (enabled by default)
- dnl -----------------------------------------------------------
--AC_ARG_ENABLE([alsa],
-+AC_ARG_ENABLE([dssi],
- [AS_HELP_STRING(--disable-dssi,compile DSSI providers (enable by --enable-dssi) [default=yes])],
- [case "${enableval}" in
- yes) COMPILE_DSSI=yes ;;
-Index: native/jni/midi-dssi/Makefile.am
-===================================================================
-RCS file: /cvsroot/classpath/classpath/native/jni/midi-dssi/Makefile.am,v
-retrieving revision 1.2
-diff -u -r1.2 Makefile.am
---- native/jni/midi-dssi/Makefile.am 23 Oct 2005 16:59:09 -0000 1.2
-+++ native/jni/midi-dssi/Makefile.am 10 Nov 2005 10:50:23 -0000
-@@ -1,7 +1,8 @@
- nativelib_LTLIBRARIES = libgjsmdssi.la
-
- libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \
--gnu_javax_sound_midi_dssi_DSSISynthesizer.c
-+ gnu_javax_sound_midi_dssi_DSSISynthesizer.c \
-+ dssi_data.h
-
- libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack
-
+Index: configure.ac
+===================================================================
+RCS file: /cvsroot/classpath/classpath/configure.ac,v
+retrieving revision 1.118
+diff -u -r1.118 configure.ac
+--- configure.ac 7 Nov 2005 14:25:54 -0000 1.118
++++ configure.ac 10 Nov 2005 10:50:23 -0000
+@@ -118,7 +118,7 @@
+ dnl -----------------------------------------------------------
+ dnl DSSI code (enabled by default)
+ dnl -----------------------------------------------------------
+-AC_ARG_ENABLE([alsa],
++AC_ARG_ENABLE([dssi],
+ [AS_HELP_STRING(--disable-dssi,compile DSSI providers (enable by --enable-dssi) [default=yes])],
+ [case "${enableval}" in
+ yes) COMPILE_DSSI=yes ;;
+Index: native/jni/midi-dssi/Makefile.am
+===================================================================
+RCS file: /cvsroot/classpath/classpath/native/jni/midi-dssi/Makefile.am,v
+retrieving revision 1.2
+diff -u -r1.2 Makefile.am
+--- native/jni/midi-dssi/Makefile.am 23 Oct 2005 16:59:09 -0000 1.2
++++ native/jni/midi-dssi/Makefile.am 10 Nov 2005 10:50:23 -0000
+@@ -1,7 +1,8 @@
+ nativelib_LTLIBRARIES = libgjsmdssi.la
+
+ libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \
+-gnu_javax_sound_midi_dssi_DSSISynthesizer.c
++ gnu_javax_sound_midi_dssi_DSSISynthesizer.c \
++ dssi_data.h
+
+ libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack
+