Package: qcad
Version: 2.0.5.0-1-2
Severity: normal
Tags: patch
Hi,
Attached is the diff for my qcad 2.0.5.0-1-2.1 NMU.
diff -u qcad-2.0.5.0-1/debian/changelog qcad-2.0.5.0-1/debian/changelog
--- qcad-2.0.5.0-1/debian/changelog
+++ qcad-2.0.5.0-1/debian/changelog
@@ -1,3 +1,10 @@
+qcad (2.0.5.0-1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with GCC 4.3 (Closes: #417503, #441578).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Fri, 14 Mar 2008 19:09:14 +0000
+
qcad (2.0.5.0-1-2) unstable; urgency=low
* debian/copyright: updated contents
only in patch2:
unchanged:
--- qcad-2.0.5.0-1.orig/fparser/Makefile
+++ qcad-2.0.5.0-1/fparser/Makefile
@@ -0,0 +1,114 @@
+#
+#
+# Makefile for fparser
+#
+#
+
+#
+# fparser installation directories
+#
+#LIBDIR = /usr/local/lib
+#INCDIR = /usr/local/include/fparser
+VERSION = 2.51
+
+#LIBDIR = $(HOME)/local/lib
+#INCDIR = $(HOME)/local/include/fparser
+
+PREFIX ?= /usr
+
+#LIBDIR = $(DESTDIR)/$(PREFIX)/lib
+#INCDIR = $(DESTDIR)/$(PREFIX)/include/fparser
+
+#
+#------------------------ do not edit ------------------------
+#
+SHELL = /bin/sh
+
+CC = gcc
+CXX = gcc
+CFLAGS = -I./src -g -O2 -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DLINUX=1 -DSTDC_HEADERS=1
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+FIND = find
+MAKEDEPEND = :
+AR = ar
+ARFLAGS = -rs
+
+BASE_DIR = ./src
+
+BASE_SRC = \
+ $(BASE_DIR)/fparser.cpp
+
+BASE_INS = \
+ $(BASE_DIR)/fparser.h
+
+SRC = $(BASE_SRC)
+OBJ = $(SRC:.cpp=.o)
+
+INS = $(BASE_INS)
+
+.cpp.o:
+ $(CXX) $(CFLAGS) -c $< -o $@
+
+
+all: prepare ./lib/libfparser.a
+
+prepare:
+ test -d ./include || mkdir -p ./include
+ -( cd ./include; rm -f *.h; \
+ for hf in `find ../src -name '*.h'`; do \
+ if [ "x$$OS" = "xWindows_NT" ]; then \
+ cp "$$hf" .; \
+ else \
+ ln -s "$$hf" 2> /dev/null; \
+ fi \
+ done )
+
+shared: ./lib/libfparser.so.$(VERSION)
+ @echo
+
+./lib/libfparser.a: $(OBJ)
+ test -d ./lib || mkdir ./lib
+ $(AR) $(ARFLAGS) ./lib/libfparser.a $(OBJ)
+
+./lib/libfparser.so.$(VERSION): $(OBJ)
+ test -d ./lib || mkdir ./lib
+ $(CC) -p -shared -o ./lib/libfparser.so.$(VERSION) $(OBJ) -lc -lm
+ -(cd ./lib ; ln -s libfparser.so.$(VERSION) libfparser.so)
+
+install: ./lib/libfparser.a
+ test -d $(LIBDIR) || mkdir -p $(LIBDIR)
+ test -d $(INCDIR) || mkdir -p $(INCDIR)
+ $(INSTALL_DATA) ./lib/libfparser.a $(LIBDIR)
+ #-(ln -s $(LIBDIR)/libfparser.a $(LIBDIR)/libfparser.a)
+ for IFILE in $(INS); do \
+ $(INSTALL_DATA) $$IFILE $(INCDIR); \
+ done
+
+install-shared: ./lib/libfparser.so.$(VERSION)
+ test -d $(LIBDIR) || mkdir -p $(LIBDIR)
+ test -d $(INCDIR) || mkdir -p $(INCDIR)
+ #$(INSTALL_DATA) ./lib/libfparser.so.$(VERSION) $(LIBDIR)
+ -(ln -s $(LIBDIR)/libfparser.so.$(VERSION) $(LIBDIR)/libfparser.so)
+ for IFILE in $(INS); do \
+ $(INSTALL_DATA) $$IFILE $(INCDIR); \
+ done
+
+clean:
+ -rm -f $(OBJ)
+ -rm -f ./lib/lib* Makefile.bak
+ -rm -f ./include/fparser/*.h
+ -rm -f ./include/*.h
+ -$(FIND) . -name "*~" -exec rm -f {} \;
+ -rm -f ./lib/libfparser.$(VERSION).a
+
+distclean: clean
+ -rm -f Makefile configure
+
+depend:
+ $(MAKEDEPEND) -- $(CFLAGS) -- $(SRC)
+ @echo
+ @echo "Run 'make' to build fparser library."
+ @echo
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
only in patch2:
unchanged:
--- qcad-2.0.5.0-1.orig/dxflib/src/dl_writer_ascii.cpp
+++ qcad-2.0.5.0-1/dxflib/src/dl_writer_ascii.cpp
@@ -29,6 +29,7 @@
#pragma once
#endif // _MSC_VER > 1000
+#include <cstring>
#include <stdio.h>
#include "dl_writer_ascii.h"
only in patch2:
unchanged:
--- qcad-2.0.5.0-1.orig/dxflib/test/Makefile
+++ qcad-2.0.5.0-1/dxflib/test/Makefile
@@ -0,0 +1,29 @@
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+bindir = ${exec_prefix}/bin
+
+OBJF = main.o \
+ test_creationclass.o
+EXTERN_LIBS = -L../lib -ldxf -L/usr/X11R6/lib -lX11
+INCLUDES = -I../include
+
+all: main
+
+clean:
+ @echo "Cleaning project..."
+ @find . -name '*.o' -exec rm "{}" \;
+ @if [ -f test ]; then rm -f test; fi
+
+distclean: clean
+ rm -f config.log config.cache Makefile config.status
+
+main: $(OBJF)
+ c++ -o test $(OBJF) $(EXTERN_LIBS)
+
+%.o : %.cpp
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -O3 -Wall $< -o $@
+
+doc :
+ @echo "Building documentation"
+ @doxygen doxy.cfg
only in patch2:
unchanged:
--- qcad-2.0.5.0-1.orig/dxflib/Makefile
+++ qcad-2.0.5.0-1/dxflib/Makefile
@@ -0,0 +1,143 @@
+#
+#
+# Makefile for dxflib
+#
+#
+VERSION = 2.0.4.8
+
+#
+# dxflib installation directories
+#
+LIBDIR = /usr/local/lib
+INCDIR = /usr/local/include/dxflib
+
+#PREFIX ?= /usr
+
+#LIBDIR = $(DESTDIR)$(PREFIX)/lib
+#INCDIR = $(DESTDIR)$(PREFIX)/include/dxflib
+
+
+#LIBDIR = $(HOME)/local/lib
+#INCDIR = $(HOME)/local/include/dxflib
+
+#
+#------------------------ do not edit ------------------------
+#
+SHELL = /bin/sh
+
+CC = gcc
+CXX = gcc
+CFLAGS = -I./src -g -O2 -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DLINUX=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+FIND = find
+MAKEDEPEND = :
+AR = ar
+ARFLAGS = -rs
+
+BASE_DIR = ./src
+
+BASE_SRC = \
+ $(BASE_DIR)/dl_dxf.cpp \
+ $(BASE_DIR)/dl_writer_ascii.cpp
+
+BASE_INS = \
+ $(BASE_DIR)/dl_attributes.h \
+ $(BASE_DIR)/dl_codes.h \
+ $(BASE_DIR)/dl_creationadapter.h \
+ $(BASE_DIR)/dl_creationinterface.h \
+ $(BASE_DIR)/dl_dxf.h \
+ $(BASE_DIR)/dl_entities.h \
+ $(BASE_DIR)/dl_exception.h \
+ $(BASE_DIR)/dl_extrusion.h \
+ $(BASE_DIR)/dl_writer.h \
+ $(BASE_DIR)/dl_writer_ascii.h
+
+SRC = $(BASE_SRC)
+OBJ = $(SRC:.cpp=.o)
+
+INS = $(BASE_INS)
+
+.cpp.o:
+ $(CXX) $(CFLAGS) -c $< -o $@
+
+
+all: prepare ./lib/libdxf.a
+
+prepare:
+ test -d ./include || mkdir -p ./include
+ -( cd ./include; rm -f *.h; \
+ for hf in `find ../src -name '*.h'`; do \
+ if [ "x$$OS" = "xWindows_NT" ]; then \
+ cp "$$hf" .; \
+ else \
+ ln -s "$$hf" 2> /dev/null; \
+ fi \
+ done )
+
+shared: ./lib/libdxf.so.$(VERSION)
+ @echo
+
+./lib/libdxf.a: $(OBJ)
+ test -d ./lib || mkdir ./lib
+ $(AR) $(ARFLAGS) ./lib/libdxf.a $(OBJ)
+
+./lib/libdxf.so.$(VERSION): $(OBJ)
+ test -d ./lib || mkdir ./lib
+ $(CC) -p -shared -o ./lib/libdxf.so.$(VERSION) $(OBJ) -lc -lm
+ -(cd ./lib ; ln -s libdxf.so.$(VERSION) libdxf.so)
+
+install: ./lib/libdxf.a
+ test -d $(LIBDIR) || mkdir -p $(LIBDIR)
+ test -d $(INCDIR) || mkdir -p $(INCDIR)
+ $(INSTALL_DATA) ./lib/libdxf.a $(LIBDIR)
+ #-(ln -s $(LIBDIR)/libdxf.a $(LIBDIR)/libdxf.a)
+ for IFILE in $(INS); do \
+ $(INSTALL_DATA) $$IFILE $(INCDIR); \
+ done
+
+install-shared: ./lib/libdxf.so.$(VERSION)
+ test -d $(LIBDIR) || mkdir -p $(LIBDIR)
+ test -d $(INCDIR) || mkdir -p $(INCDIR)
+ #$(INSTALL_DATA) ./lib/libdxf.so.$(VERSION) $(LIBDIR)
+ -(ln -s $(LIBDIR)/libdxf.so.$(VERSION) $(LIBDIR)/libdxf.so)
+ for IFILE in $(INS); do \
+ $(INSTALL_DATA) $$IFILE $(INCDIR); \
+ done
+
+clean:
+ -(cd ./test ; make clean)
+ -rm -f $(OBJ)
+ -rm -f ./lib/lib* Makefile.bak
+ -rm -f ./include/dxflib/*.h
+ -rm -f ./include/*.h
+ -$(FIND) . -name "*~" -exec rm -f {} \;
+ -rm -f ./lib/libdxf.a
+
+distclean: clean
+ -rm -f Makefile configure
+
+testing: ./lib/libdxf.a
+ (cd ./test ; make)
+
+docu:
+ -(doxygen ./doxygen.cfg)
+
+dist: clean docu
+ #-rm -r ./doc/classref/html/en/*
+ -rm -r ./distribution/dxflib/*
+ test -d ./distribution/dxflib || mkdir -p ./distribution/dxflib
+ mkdir -p ./distribution/dxflib/doc
+ -(cp -r ./src ./test ./distribution/dxflib/)
+ -(cp -r ./doc/classref ./distribution/dxflib/doc/)
+ -(cp * ./distribution/dxflib/)
+ -(cd ./distribution/dxflib; rm config.log config.cache reinstall*; mkdir lib include)
+ -(cd ./distribution; tar fvcz dxflib-$(VERSION).tar.gz dxflib)
+
+depend:
+ $(MAKEDEPEND) -- $(CFLAGS) -- $(SRC)
+ @echo
+ @echo "Run 'make' to build dxflib library."
+ @echo
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
only in patch2:
unchanged:
--- qcad-2.0.5.0-1.orig/qcadlib/src/information/rs_information.h
+++ qcad-2.0.5.0-1/qcadlib/src/information/rs_information.h
@@ -31,7 +31,7 @@
#include "rs_line.h"
#include "rs_arc.h"
-
+#include <cstdlib>
/**
* Class for getting information about entities. This includes
only in patch2:
unchanged:
--- qcad-2.0.5.0-1.orig/qcadactions/src/rs_actionzoompan.cpp
+++ qcad-2.0.5.0-1/qcadactions/src/rs_actionzoompan.cpp
@@ -28,6 +28,7 @@
#include "rs_snapper.h"
#include "rs_point.h"
+#include <cstdlib>
RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer& container,
RS_GraphicView& graphicView)
