diff options
Diffstat (limited to 'cad/kicad-devel/files')
-rw-r--r-- | cad/kicad-devel/files/patch-libs.FreeBSD | 74 | ||||
-rw-r--r-- | cad/kicad-devel/files/patch-makefile.gtk | 24 | ||||
-rw-r--r-- | cad/kicad-devel/files/patch-pcbnew__class_module.cpp | 11 |
3 files changed, 0 insertions, 109 deletions
diff --git a/cad/kicad-devel/files/patch-libs.FreeBSD b/cad/kicad-devel/files/patch-libs.FreeBSD deleted file mode 100644 index 58750c64523d..000000000000 --- a/cad/kicad-devel/files/patch-libs.FreeBSD +++ /dev/null @@ -1,74 +0,0 @@ ---- libs.FreeBSD.orig Tue Oct 4 10:54:26 2005 -+++ libs.FreeBSD Thu Dec 1 23:43:58 2005 -@@ -1,5 +1,5 @@ - #Configuration for build kicad --KICAD_BIN = /usr/local/kicad/FreeBSD -+KICAD_BIN = ${PREFIX}/kicad/FreeBSD - - - SRCSUFF = .cpp -@@ -13,11 +13,16 @@ - # KICAD_STATIC_LINK = 1 - - # path and version definition for wxWidgets and mesa libs --MESALIBSPATH = /usr/local/lib --WXPATH = `wx-config --prefix`/lib --PREFIX_WX_LIBS = lib`wx-config --basename` --SUFFIX_WX_LIBSTD = `wx-config --utility=` -+MESALIBSPATH = ${LOCALBASE}/lib -+WXPATH = `${WX_CONFIG} --prefix`/lib -+ifdef KICAD_STATIC_LINK -+PREFIX_WX_LIBS = lib`${WX_CONFIG} --basename` - SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a -+else -+PREFIX_WX_LIBS = `${WX_CONFIG} --basename` -+SUFFIX_WX_LIBGL = _gl-$(LIBVERSION) -+endif -+#SUFFIX_WX_LIBSTD = `${WX_CONFIG} --utility=` - - # Use static link for libstdc++.a (sometimes also libsupc++.a) - # locate libstdc++.a and copy it in kicad_dev/syslibs -@@ -29,13 +34,13 @@ - LIBSTDC = -lstdc++ - endif - --LIBVERSION=`wx-config --release` -+LIBVERSION=`${WX_CONFIG} --release` - - # use link static for wxWidgets - ifdef KICAD_STATIC_LINK - WXSYSLIB= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \ -- /usr/X11R6/lib/libXinerama.a \ -- /usr/X11R6/lib/libXxf86vm.a \ -+ ${X11BASE}/lib/libXinerama.a \ -+ ${X11BASE}/lib/libXxf86vm.a \ - -lgtk-x11-2.0 -lgdk-x11-2.0 \ - -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ - -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ -@@ -44,20 +49,20 @@ - - else - #or use "standard command" for wxWidgets --WXSYSLIB= `wx-config --libs` -+WXSYSLIB= `${WX_CONFIG} --libs` - endif - - - # attention à l'ordre des libairies --LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ -+LIBS = -L${LOCALBASE}/lib -L${X11BASE}/lib\ - $(EXTRALIBS) $(WXSYSLIB)\ -- $(WXPATH)/libwxpng-$(LIBVERSION).a\ -- $(WXPATH)/libwxjpeg-$(LIBVERSION).a\ -- $(WXPATH)/libwxzlib-$(LIBVERSION).a\ -+ -lpng\ -+ -ljpeg\ -+ -lz\ - $(LIBSTDC) - - ifdef KICAD_STATIC_LINK - LIBS3D = $(WXPATH)/$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL) $(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a - else --LIBS3D = $(WXPATH)/$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL) -lGL -lGLU -+LIBS3D = -l$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL) -lGL -lGLU - endif diff --git a/cad/kicad-devel/files/patch-makefile.gtk b/cad/kicad-devel/files/patch-makefile.gtk deleted file mode 100644 index e145c4f264ab..000000000000 --- a/cad/kicad-devel/files/patch-makefile.gtk +++ /dev/null @@ -1,24 +0,0 @@ ---- makefile.gtk.orig Thu Dec 1 20:47:21 2005 -+++ makefile.gtk Thu Dec 1 20:56:41 2005 -@@ -1,15 +1,16 @@ - KICAD_SUBDIRS = common 3d-viewer eeschema eeschema/plugins pcbnew cvpcb kicad gerbview - KICAD_SUBDIRS_BIN = eeschema eeschema/plugins pcbnew cvpcb kicad gerbview - # How to invoke make: --MAKE = make -k -f makefile.gtk --MAKE_INSTALL = make -f makefile.gtk install -+MAKE_FLAGS = -k -f -+MAKEFILE = makefile.gtk -+INSTALL_TARGET = install - ERASE = rm -f *.o - - all: -- @for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE)); done -+ @for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) $(MAKE_FLAGS) $(MAKEFILE)); done - - install: -- @for d in $(KICAD_SUBDIRS_BIN); do (cd $$d && $(MAKE_INSTALL)); done -- -+ @for d in $(KICAD_SUBDIRS_BIN); do (cd $$d && $(MAKE) $(MAKE_FLAGS) $(MAKEFILE) $(INSTALL_TARGET)); done -+ - clean: - @for d in $(KICAD_SUBDIRS); do (cd $$d && $(ERASE)); done diff --git a/cad/kicad-devel/files/patch-pcbnew__class_module.cpp b/cad/kicad-devel/files/patch-pcbnew__class_module.cpp deleted file mode 100644 index 6ba99924cdf3..000000000000 --- a/cad/kicad-devel/files/patch-pcbnew__class_module.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./pcbnew/class_module.cpp.orig Mon Dec 5 09:47:56 2005 -+++ ./pcbnew/class_module.cpp Sun Dec 25 16:55:30 2005 -@@ -1020,7 +1020,7 @@ - pos += 14;
- if ( flag ) // Affichage date de modification (utile en Module Editor)
- {
-- strcpy(Line, ctime(&m_LastEdit_Time));
-+ strcpy(Line, ctime((time_t*) &m_LastEdit_Time));
- strtok(Line," \n\r");
- strcpy( bufcar, strtok(NULL," \n\r") ); strcat(bufcar," ");
- strcat( bufcar, strtok(NULL," \n\r") ); strcat(bufcar,", ");
|