Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22743/10.3/unstable/main/finkinfo/x11
Modified Files: vice.patch Log Message: Backport from 10.4; bug bit 10.3 users too. Index: vice.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11/vice.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vice.patch 17 Feb 2006 08:55:39 -0000 1.1 +++ vice.patch 23 May 2006 21:59:50 -0000 1.2 @@ -1,6 +1,6 @@ diff -Nurd -x'*~' vice-1.19.orig/configure vice-1.19/configure --- vice-1.19.orig/configure 2006-01-08 15:31:51.000000000 -0500 -+++ vice-1.19/configure 2006-02-17 01:04:01.000000000 -0500 ++++ vice-1.19/configure 2006-04-13 22:08:36.000000000 -0400 @@ -5647,15 +5647,15 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -19,6 +19,72 @@ fi echo "$as_me:$LINENO: result: $gt_cv_func_gettext_libintl" >&5 echo "${ECHO_T}$gt_cv_func_gettext_libintl" >&6 +diff -Nurd -x'*~' vice-1.19.orig/src/Makefile.in vice-1.19/src/Makefile.in +--- vice-1.19.orig/src/Makefile.in 2006-01-08 15:31:44.000000000 -0500 ++++ vice-1.19/src/Makefile.in 2006-04-13 18:46:20.000000000 -0400 +@@ -535,7 +535,7 @@ + video_lib = $(top_builddir)/src/video/libvideo.a + xcbm2_lib = $(top_builddir)/src/cbm2/libcbm2.a + +-common_libs = @ARCH_LIBS@ @LIBOBJS@ @READLINE@ @RESID_LIBS@ @SOUND_LIBS@ @VICE_LIBPNG@ @VICE_ZLIB@ ++common_libs = @ARCH_LIBS@ @LIBOBJS@ @READLINE@ @RESID_LIBS@ @VICE_LIBPNG@ @VICE_ZLIB@ + + driver_libs = $(sounddrv_lib) $(gfxoutputdrv_lib) $(printerdrv_lib) $(rs232drv_lib) $(monitor_lib) $(diskimage_lib) $(fsdevice_lib) $(tape_lib) $(imagecontents_lib) $(fileio_lib) $(serial_lib) $(core_lib) + +@@ -570,7 +570,7 @@ + + + x64_SOURCES = $(base_sources) $(maincpu_sources) +-x64_LDADD = $(x64_libs) @X_LIBS@ @INTLLIBS@ ++x64_LDADD = $(x64_libs) @X_LIBS@ @INTLLIBS@ @SOUND_LIBS@ + x64_DEPENDENCIES = $(x64_libs) + + # x128 +@@ -597,7 +597,7 @@ + + + x128_SOURCES = $(base_sources) +-x128_LDADD = $(x128_libs) @X_LIBS@ @INTLLIBS@ ++x128_LDADD = $(x128_libs) @X_LIBS@ @INTLLIBS@ @SOUND_LIBS@ + x128_DEPENDENCIES = $(x128_libs) + + # xvic +@@ -618,7 +618,7 @@ + + + xvic_SOURCES = $(base_sources) $(maincpu_sources) +-xvic_LDADD = $(xvic_libs) @X_LIBS@ @INTLLIBS@ ++xvic_LDADD = $(xvic_libs) @X_LIBS@ @INTLLIBS@ @SOUND_LIBS@ + xvic_DEPENDENCIES = $(xvic_libs) + + # xpet +@@ -638,7 +638,7 @@ + + + xpet_SOURCES = $(base_sources) $(maincpu_sources) +-xpet_LDADD = $(xpet_libs) @X_LIBS@ @INTLLIBS@ ++xpet_LDADD = $(xpet_libs) @X_LIBS@ @INTLLIBS@ @SOUND_LIBS@ + xpet_DEPENDENCIES = $(xpet_libs) + + # xplus4 +@@ -658,7 +658,7 @@ + + + xplus4_SOURCES = $(base_sources) +-xplus4_LDADD = $(xplus4_libs) @X_LIBS@ @INTLLIBS@ ++xplus4_LDADD = $(xplus4_libs) @X_LIBS@ @INTLLIBS@ @SOUND_LIBS@ + xplus4_DEPENDENCIES = $(xplus4_libs) + + # xcbm2 +@@ -680,7 +680,7 @@ + + + xcbm2_SOURCES = $(base_sources) +-xcbm2_LDADD = $(xcbm2_libs) @X_LIBS@ @INTLLIBS@ ++xcbm2_LDADD = $(xcbm2_libs) @X_LIBS@ @INTLLIBS@ @SOUND_LIBS@ + xcbm2_DEPENDENCIES = $(xcbm2_libs) + + # c1541 diff -Nurd -x'*~' vice-1.19.orig/src/arch/unix/archdep.h vice-1.19/src/arch/unix/archdep.h --- vice-1.19.orig/src/arch/unix/archdep.h 2005-03-28 14:10:20.000000000 -0500 +++ vice-1.19/src/arch/unix/archdep.h 2006-02-17 02:55:34.000000000 -0500 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits