From 274f61fd37250e84a1b0eb81e214754fcef1cd05 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 10 Jan 2009 23:00:06 +0000 Subject: more patches that miller accepted svn path=/trunk/; revision=10508 --- .../better_html_url_handling_on_linux-0.40.3.patch | 27 --- .../cmd-click_manipulates_GUIs-0.41.0-test03.patch | 10 - packages/patches/disable-fat_option-0.40-1.patch | 40 ---- packages/patches/mingw_fixes-0.40-1.patch | 230 --------------------- .../remove_80_char_print_limit_0.40.3.patch | 18 -- packages/patches/strtokcpy-0.41.0-test10.patch | 59 ------ 6 files changed, 384 deletions(-) delete mode 100644 packages/patches/better_html_url_handling_on_linux-0.40.3.patch delete mode 100644 packages/patches/cmd-click_manipulates_GUIs-0.41.0-test03.patch delete mode 100644 packages/patches/disable-fat_option-0.40-1.patch delete mode 100644 packages/patches/mingw_fixes-0.40-1.patch delete mode 100644 packages/patches/remove_80_char_print_limit_0.40.3.patch delete mode 100644 packages/patches/strtokcpy-0.41.0-test10.patch (limited to 'packages') diff --git a/packages/patches/better_html_url_handling_on_linux-0.40.3.patch b/packages/patches/better_html_url_handling_on_linux-0.40.3.patch deleted file mode 100644 index e3aa8099..00000000 --- a/packages/patches/better_html_url_handling_on_linux-0.40.3.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: u_main.tk -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v -retrieving revision 1.25 -diff -u -w -r1.25 u_main.tk ---- u_main.tk 9 Oct 2006 04:36:12 -0000 1.25 -+++ u_main.tk 10 Oct 2007 05:12:38 -0000 -@@ -386,9 +386,16 @@ - global pd_nt - - if {$pd_nt == 0} { -- exec sh -c \ -- [format "firefox file:%s || mozilla file:%s " \ -- $filename $filename] & -+ foreach candidate \ -+ { gnome-open xdg-open sensible-browser iceweasel firefox mozilla \ -+ galeon konqueror netscape lynx } { -+ set browser [lindex [auto_execok $candidate] 0] -+ if {[string length $browser]} { -+ puts stderr [format "%s %s" $browser $filename] -+ exec -- sh -c [format "%s %s" $browser $filename] & -+ break -+ } -+ } - } elseif {$pd_nt == 2} { - puts stderr [format "open %s" $filename] - exec sh -c [format "open %s" $filename] diff --git a/packages/patches/cmd-click_manipulates_GUIs-0.41.0-test03.patch b/packages/patches/cmd-click_manipulates_GUIs-0.41.0-test03.patch deleted file mode 100644 index b4f296a5..00000000 --- a/packages/patches/cmd-click_manipulates_GUIs-0.41.0-test03.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- u_main.tk 2006-12-11 21:20:49.000000000 -0500 -+++ u_main.tk 2007-07-11 17:46:11.000000000 -0400 -@@ -1152,6 +1192,7 @@ - bind $name.c {pdtk_canvas_click %W %x %y %b 4} - bind $name.c {pdtk_canvas_click %W %x %y %b 5} - bind $name.c {pdtk_canvas_click %W %x %y %b 6} -+ bind $name.c {pdtk_canvas_click %W %x %y %b 6} - bind $name.c \ - {pdtk_canvas_click %W %x %y %b 7} - } else { diff --git a/packages/patches/disable-fat_option-0.40-1.patch b/packages/patches/disable-fat_option-0.40-1.patch deleted file mode 100644 index 4e8f6b51..00000000 --- a/packages/patches/disable-fat_option-0.40-1.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: configure.in -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/configure.in,v -retrieving revision 1.21.2.1 -diff -u -w -r1.21.2.1 configure.in ---- configure.in 28 Oct 2006 19:16:41 -0000 1.21.2.1 -+++ configure.in 23 Dec 2006 07:44:30 -0000 -@@ -41,6 +42,8 @@ - setuid=$enableval) - AC_ARG_ENABLE(fftw, [ --enable-fftw use FFTW package], - fftw=$enableval) -+AC_ARG_ENABLE(fat, [ --disable-fat build fat binary on Mac OS X], -+ fat=$enableval, fat="yes") - - dnl Checks for programs. - AC_PROG_CC -@@ -249,15 +263,20 @@ - -I../portmidi/pm_common -I../portmidi/pm_mac \ - -I../portmidi/porttime \ - -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO" -+dnl for Mac OS X 10.3 (i.e. < 10.4) - if test `uname -r` = 7.9.0; - then -- MORECFLAGS="-DMACOSX3 -DPA_BIG_ENDIAN -Wno-error" -- EXTERNTARGET=d_ppc -- else -+ fat="no" -+ fi -+ if test "x$fat" == "xyes"; -+ then - MORECFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk \ - -arch i386 -arch ppc -Wno-error" - EXTERNTARGET=d_fat - LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" -+ else -+ MORECFLAGS="-DMACOSX3 -Wno-error" -+ EXTERNTARGET=d_ppc - fi - SYSSRC="s_midi_pm.c s_audio_pa.c \ - s_audio_pablio.c \ diff --git a/packages/patches/mingw_fixes-0.40-1.patch b/packages/patches/mingw_fixes-0.40-1.patch deleted file mode 100644 index 8529e4bf..00000000 --- a/packages/patches/mingw_fixes-0.40-1.patch +++ /dev/null @@ -1,230 +0,0 @@ -Index: configure.in -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/configure.in,v -retrieving revision 1.15 -diff -u -w -r1.15 configure.in ---- configure.in 16 Aug 2005 04:06:28 -0000 1.15 -+++ configure.in 22 Feb 2006 05:41:08 -0000 -@@ -19,6 +19,7 @@ - AC_SUBST(GUIFLAGS) - AC_SUBST(OSNUMBER) - AC_SUBST(EXTERNTARGET) -+AC_SUBST(ASIOSRC) - - dnl other defaults - -@@ -77,7 +78,10 @@ - - dnl Checking for `pthread_create' function in -pthread - AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread", -- echo "pthreads required" || exit 1) -+ AC_CHECK_LIB(pthreadGC2, pthread_create, PDLIB="$PDLIB -lpthreadGC2", -+ AC_CHECK_LIB(pthreadGC1, pthread_create, PDLIB="$PDLIB -lpthreadGC1", -+ AC_CHECK_LIB(pthreadGC, pthread_create, PDLIB="$PDLIB -lpthreadGC", -+ echo "pthreads required"; exit 1)))) - - dnl look for tcl 8.x... do I really have to go through all this!? - -@@ -108,6 +112,11 @@ - fi - if test $foundit == "no"; - then -+ AC_CHECK_HEADER(tcl8.4/tcl.h, -+ GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.4";foundit=yes,) -+fi -+if test $foundit == "no"; -+then - AC_CHECK_HEADER(tcl8.3/tcl.h, - GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.3";foundit=yes,) - fi -@@ -119,27 +128,30 @@ - if test $foundit == "no"; - then - echo no tcl header found -- exit -1 -+ echo bolding trying without... -+# exit -1 - fi - --AC_CHECK_LIB(tcl8.7, main,, -- AC_CHECK_LIB(tcl8.6, main,, -+AC_CHECK_LIB(tcl85, main,, - AC_CHECK_LIB(tcl8.5, main,, -+ AC_CHECK_LIB(tcl84, main,, - AC_CHECK_LIB(tcl8.4, main,, - AC_CHECK_LIB(tcl8.3, main,, - AC_CHECK_LIB(tcl8.2, main,, -- AC_CHECK_LIB(tcl8.0, main,,echo no tcl library found || exit 1))))))) -+ AC_CHECK_LIB(tcl8.0, main,, -+ echo no tcl library found; exit 1))))))) - --AC_CHECK_LIB(tk8.7, main,, -- AC_CHECK_LIB(tk8.6, main,, -+AC_CHECK_LIB(tk85, main,, - AC_CHECK_LIB(tk8.5, main,, -+ AC_CHECK_LIB(tk84, main,, - AC_CHECK_LIB(tk8.4, main,, - AC_CHECK_LIB(tk8.3, main,, - AC_CHECK_LIB(tk8.2, main,, -- AC_CHECK_LIB(tk8.0, main,,echo no tk library found || exit 1))))))) -+ AC_CHECK_LIB(tk8.0, main,, -+ echo no tk library found; exit 1))))))) - - --if test `uname -s` = Linux; -+if test `uname -s` == Linux; - then - dnl Ckecking for ALSA - echo .................... alsa= $alsa -@@ -254,7 +266,7 @@ - LDFLAGS=$LDFLAGS" -lrt -ljack" - fi - --if test `uname -s` = Darwin; -+if test `uname -s` == Darwin; - then - LDFLAGS="-Wl -framework CoreAudio \ - -framework AudioUnit -framework AudioToolbox \ -@@ -324,6 +336,39 @@ - fi - fi - -+# only Windows uses ASIO, for the rest, set to blank -+ASIOSRC= -+ -+if test `uname -s` == MINGW32_NT-5.0; -+then -+ EXT=dll -+ MORECFLAGS="-DUSEAPI_PORTAUDIO -DPA19 -DMSW -DPA_NO_DS -DPD_INTERNAL \ -+ -I../portaudio/pa_common -I../portaudio/pablio \ -+ -mwindows -mms-bitfields "$MORECFLAGS -+ PDLIB=$PDLIB" -lwsock32 -lwinmm -lole32 -lstdc++" -+ -+ SYSSRC="s_audio_pa.c s_audio_pablio.c s_audio_paring.c \ -+ s_audio_mmio.c s_midi_mmio.c \ -+ ../portaudio/pa_common/pa_allocation.c \ -+ ../portaudio/pa_common/pa_converters.c \ -+ ../portaudio/pa_common/pa_cpuload.c \ -+ ../portaudio/pa_common/pa_dither.c \ -+ ../portaudio/pa_common/pa_front.c \ -+ ../portaudio/pa_common/pa_process.c \ -+ ../portaudio/pa_common/pa_skeleton.c \ -+ ../portaudio/pa_common/pa_stream.c \ -+ ../portaudio/pa_common/pa_trace.c \ -+ ../portaudio/pa_win/pa_win_util.c \ -+ ../portaudio/pa_win/pa_win_hostapis.c \ -+ ../portaudio/pa_win_wmme/pa_win_wmme.c" -+ ASIOSRC="../portaudio/pa_asio/iasiothiscallresolver.cpp \ -+ ../portaudio/pa_asio/pa_asio.cpp ../asio/asio.cpp \ -+ ../asio/asiodrivers.cpp ../asio/asiolist.cpp" -+ STRIPFLAG="--strip-unneeded" -+ GUINAME="pdtcl.dll" -+ GUIFLAGS= -+fi -+ - # support for jack, on either linux or darwin: - - if test x$jack == "xyes"; -Index: makefile.in -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/makefile.in,v -retrieving revision 1.8 -diff -u -w -r1.8 makefile.in ---- makefile.in 24 Jul 2005 19:41:14 -0000 1.8 -+++ makefile.in 22 Feb 2006 05:41:08 -0000 -@@ -30,6 +30,10 @@ - - SYSSRC += @SYSSRC@ - -+ASIOSRC = @ASIOSRC@ -+ -+ASIOOBJ = $(ASIOSRC:.cpp=.o) -+ - SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ - g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ - g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ -@@ -70,6 +74,9 @@ - $(GOBJ) : %.o : %.c - $(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c - -+$(ASIOOBJ): %.o : %.cpp -+ $(CXX) $(CFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.cpp -+ - pd: $(PDEXEC) - - gui: $(BIN_DIR)/$(GUINAME) -@@ -109,6 +116,12 @@ - @executable_path/../Frameworks/Tk.framework/Versions/8.4/Tk \ - ../bin/libPdTcl.dylib - -+# this is for Windows/MinGW (only?) -+$(BIN_DIR)/pdtcl.dll: $(GOBJ) -+ cd $(BIN_DIR); dllwrap --export-all-symbols --output-def pdtcl.def \ -+ --output-lib=pdtcl.a --dllname=$(GUINAME) $(OBJ_DIR)/t_tkcmd.o $(LIB) $(GLIB) -+ strip --strip-unneeded $(BIN_DIR)/pdtcl.dll -+ - externs: - cd ../extra/bonk~;make @EXTERNTARGET@ - cd ../extra/choice;make @EXTERNTARGET@ -Index: s_inter.c -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v -retrieving revision 1.14 -diff -u -w -r1.14 s_inter.c ---- s_inter.c 15 Oct 2005 23:14:28 -0000 1.14 -+++ s_inter.c 22 Feb 2006 05:41:08 -0000 -@@ -23,16 +23,19 @@ - #ifdef HAVE_BSTRING_H - #include - #endif --#ifdef MSW -+#ifdef _WIN32 - #include - #include - #include - #include - #include -+# ifdef _MSC_VER - typedef int pid_t; -+# endif - typedef int socklen_t; - #define EADDRINUSE WSAEADDRINUSE - #endif -+ - #include - #include - #include -Index: s_entry.c -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/s_entry.c,v -retrieving revision 1.3 -diff -u -w -r1.3 s_entry.c ---- s_entry.c 11 Nov 2004 04:58:21 -0000 1.3 -+++ s_entry.c 29 Dec 2006 03:13:08 -0000 -@@ -3,7 +3,11 @@ - - int sys_main(int argc, char **argv); - --#ifdef MSW -+/* -+ * gcc does not support the __try stuff, only MSVC. Also, MinGW allows you to -+ * use main() instead of WinMain(). -+ */ -+#ifdef _MSC_VER - #include - #include - -@@ -21,11 +25,11 @@ - } - } - --#else /* not MSW */ -+#else /* not _MSC_VER */ - int main(int argc, char **argv) - { - return (sys_main(argc, argv)); - } --#endif -+#endif /* _MSC_VER */ - - diff --git a/packages/patches/remove_80_char_print_limit_0.40.3.patch b/packages/patches/remove_80_char_print_limit_0.40.3.patch deleted file mode 100644 index b61c15bb..00000000 --- a/packages/patches/remove_80_char_print_limit_0.40.3.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: s_print.c -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/s_print.c,v -retrieving revision 1.3 -diff -u -w -r1.3 s_print.c ---- s_print.c 18 May 2005 04:28:51 -0000 1.3 -+++ s_print.c 5 Oct 2007 15:15:30 -0000 -@@ -77,8 +77,8 @@ - int i; - for (i = 0; i < argc; i++) - { -- char buf[80]; -- atom_string(argv+i, buf, 80); -+ char buf[MAXPDSTRING]; -+ atom_string(argv+i, buf, MAXPDSTRING); - poststring(buf); - } - } diff --git a/packages/patches/strtokcpy-0.41.0-test10.patch b/packages/patches/strtokcpy-0.41.0-test10.patch deleted file mode 100644 index aa167793..00000000 --- a/packages/patches/strtokcpy-0.41.0-test10.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: s_path.c -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/s_path.c,v -retrieving revision 1.11 -diff -u -u -r1.11 s_path.c ---- s_path.c 8 Sep 2006 23:45:31 -0000 1.11 -+++ s_path.c 17 Dec 2007 14:54:32 -0000 -@@ -64,21 +64,29 @@ - - /******************* Utility functions used below ******************/ - --/* copy until delimiter and return position after delimiter in string */ --/* if it was the last substring, return NULL */ -+/*! -+ * \brief copy until delimiter -+ * -+ * \arg to destination buffer -+ * \arg to_len destination buffer length -+ * \arg from source buffer -+ * \arg delim string delimiter to stop copying on -+ * -+ * \return position after delimiter in string. If it was the last -+ * substring, return NULL. -+ */ -+static const char *strtokcpy(char *to, size_t to_len, const char *from, char delim) -+{ -+ unsigned int i = 0; -+ -+ for (; i < (to_len - 1) && from[i] && from[i] != delim; i++) -+ to[i] = from[i]; -+ to[i] = '\0'; - --static const char* strtokcpy(char *to, const char *from, int delim) --{ -- int size = 0; -- -- while (from[size] != (char)delim && from[size] != '\0') -- size++; -+ if (i && from[i] != '\0') -+ return from + i + 1; - -- strncpy(to,from,size); -- to[size] = '\0'; -- if (from[size] == '\0') return NULL; -- if (size) return from+size+1; -- else return NULL; -+ return NULL; - } - - /* add a single item to a namelist. If "allowdup" is true, duplicates -@@ -126,7 +134,7 @@ - npos = s; - do - { -- npos = strtokcpy(temp, npos, SEPARATOR); -+ npos = strtokcpy(temp, sizeof(temp), npos, SEPARATOR); - if (! *temp) continue; - nl = namelist_append(nl, temp, 0); - } -- cgit v1.2.1