diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-embedded/ponyprog/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-embedded/ponyprog/files')
-rw-r--r-- | dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch | 57 | ||||
-rw-r--r-- | dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch | 45 |
2 files changed, 102 insertions, 0 deletions
diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch b/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch new file mode 100644 index 000000000000..f93da01d646c --- /dev/null +++ b/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch @@ -0,0 +1,57 @@ +http://bugs.gentoo.org/227503 + +--- a/v/includex/v/vpsdc.h ++++ b/v/includex/v/vpsdc.h +@@ -14,7 +14,9 @@ + + #include <v/vdc.h> + #include <v/vprinter.h> +-#include <fstream.h> ++#include <fstream> ++ ++using namespace std; + + class vPostScriptDC : public vDC + { +--- a/v/includex/v/vpsprntr.h ++++ b/v/includex/v/vpsprntr.h +@@ -14,7 +14,7 @@ + + #include <v/v_defs.h> + #include <v/vmodald.h> +-#include <fstream.h> ++#include <fstream> + + #define vPaperLetter 0 + #define vPaperLegal 1 +@@ -31,6 +31,8 @@ + #define vPaperQuarto 12 + #define vPaper10x14 13 + ++using namespace std; ++ + #define vPaperDefault vPaperLetter // Index to default paper + + class vPSPrinter : public vModalDialog +--- a/v/srcx/vpsprntr.cxx ++++ b/v/srcx/vpsprntr.cxx +@@ -103,7 +103,7 @@ static unsigned char prompt_bits[] = { + _height = PaperHeights[_paperType]; + _portrait = 1; + _useColor = 0; +- _pstream = 0; ++ vPSPrinter::_pstream = 0; + + ++_instances; // bump reference counter + } +--- a/rs232int.cpp ++++ b/rs232int.cpp +@@ -145,7 +145,7 @@ int RS232Interface::OpenSerial(int no) + snprintf(lockname, MAXPATH, LOCK_DIR "/LCK..ttyS%d", no); + UserDebug1(UserApp2, "RS232Interface::OpenSerial() now lock the device %s\n", lockname); + +- fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT); ++ fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT,0664); + if (fd < 0) + { + fd = open ((const char *)lockname,O_RDONLY); diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch b/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch new file mode 100644 index 000000000000..cc29d2f1060e --- /dev/null +++ b/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch @@ -0,0 +1,45 @@ +Fix parallel make and respect CC, CXX and LDFLAGS + +http://bugs.gentoo.org/282244 +http://bugs.gentoo.org/317767 + +--- Makefile ++++ Makefile +@@ -331,8 +331,8 @@ + + prps: $(PRPS) + +-$(PROG): $(OBJS) +- $(CXX) -o $@ $(OBJS) $(LDFLAGS) ++$(PROG): $(OBJS) vlib ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS) + + %.o: %.cpp + $(CXX) $(CFLAGS) -c $< -o $@ +--- v/Config.mk ++++ v/Config.mk +@@ -40,8 +40,6 @@ + #--------------------------------------------------------------------- + #CC = gcc + #CXX = g++ +-CC = gcc-3.4 +-CXX = g++-3.4 + + #--------------------------------------------------------------------- + # VPATH for dependencies on header files +@@ -302,5 +300,3 @@ + #--------------------------------------------------------------------- + # LINK/LOAD options + #--------------------------------------------------------------------- +-LDFLAGS = $(LIBDIR) $(LIBS) +- +--- v/srcx/Makefile ++++ v/srcx/Makefile +@@ -142,7 +142,6 @@ + vprogrsc.h vsliderc.h vtextinc.h vlistc.h vcomboc.h vtextc.h \ + vcolor.h vpen.h vclabelc.h vspinc.h + +- cd iconed ; $(MAKE) ARCH=$@ ; cd .. + + + #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |