From 87732ce8d42a322143d604607b5e6660719ae672 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 25 Jul 2005 20:57:37 +0000 Subject: - updated build system for Pd-0.38.4-extended-RC2 - got optional Jack linking working using "weak" linking - updated Pd version grabbing regexps and added extended version to "about pd.." dialog svn path=/trunk/; revision=3377 --- packages/darwin_app/patches/display_tweaks.patch | 4 ++-- packages/darwin_app/patches/weak_linking.patch | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 packages/darwin_app/patches/weak_linking.patch (limited to 'packages/darwin_app/patches') diff --git a/packages/darwin_app/patches/display_tweaks.patch b/packages/darwin_app/patches/display_tweaks.patch index 97232b07..59771854 100644 --- a/packages/darwin_app/patches/display_tweaks.patch +++ b/packages/darwin_app/patches/display_tweaks.patch @@ -18,7 +18,7 @@ frame .printout -text .printout.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \ -+text .printout.text -relief raised -bd 2 -font -*-courier-regular--normal--12-* \ ++text .printout.text -relief raised -bd 2 -font { courier 12 } \ -yscrollcommand ".printout.scroll set" -width 80 # .printout.text insert end "\n\n\n\n\n\n\n\n\n\n" scrollbar .printout.scroll -command ".printout.text yview" @@ -27,7 +27,7 @@ set name [format ".help%d" $doc_number] toplevel $name - text $name.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \ -+ text $name.text -relief raised -bd 2 -font -*-times-regular--normal--14-* \ ++ text $name.text -relief raised -bd 2 -font { helvetica 14 } \ -yscrollcommand "$name.scroll set" -background white scrollbar $name.scroll -command "$name.text yview" pack $name.scroll -side right -fill y diff --git a/packages/darwin_app/patches/weak_linking.patch b/packages/darwin_app/patches/weak_linking.patch new file mode 100644 index 00000000..fa0f6601 --- /dev/null +++ b/packages/darwin_app/patches/weak_linking.patch @@ -0,0 +1,22 @@ +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 25 Jul 2005 01:59:05 -0000 +@@ -85,9 +85,12 @@ + $(BIN_DIR)/pdreceive: u_pdreceive.c + $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c + ++# MACOSX_DEPLOYMENT_TARGET=10.2 is necessary on Mac OS X to support weak ++# linking of frameworks. Since its just a environment variable, it should be ++# safely ignored on other platforms. + $(PDEXEC): $(OBJ) +- cd ../obj; $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) \ +- $(LIB) ++ cd ../obj; MACOSX_DEPLOYMENT_TARGET=10.2 $(CC) $(LDFLAGS) $(DBG_CFLAGS) \ ++ -o $(PDEXEC) $(OBJ) $(LIB) + + $(BIN_DIR)/pd-gui: $(GOBJ) $(GSRC) + cd ../obj; $(CC) $(INCLUDE) -o $(BIN_DIR)/$(GUINAME) $(GOBJ) \ -- cgit v1.2.1