summaryrefslogtreecommitdiff
path: root/cad/kicad-devel/files
diff options
context:
space:
mode:
Diffstat (limited to 'cad/kicad-devel/files')
-rw-r--r--cad/kicad-devel/files/patch-3d-viewer_makefile.include9
-rw-r--r--cad/kicad-devel/files/patch-cvpcb_makefile.include12
-rw-r--r--cad/kicad-devel/files/patch-gerbview_makefile.include11
-rw-r--r--cad/kicad-devel/files/patch-libs.FreeBSD117
-rw-r--r--cad/kicad-devel/files/patch-pcbnew__class_module.cpp11
-rw-r--r--cad/kicad-devel/files/patch-pcbnew_makefile.gtk20
-rw-r--r--cad/kicad-devel/files/patch-pcbnew_makefile.include11
7 files changed, 0 insertions, 191 deletions
diff --git a/cad/kicad-devel/files/patch-3d-viewer_makefile.include b/cad/kicad-devel/files/patch-3d-viewer_makefile.include
deleted file mode 100644
index 4e3c2def1346..000000000000
--- a/cad/kicad-devel/files/patch-3d-viewer_makefile.include
+++ /dev/null
@@ -1,9 +0,0 @@
---- 3d-viewer/makefile.include.orig 2007-12-29 20:15:58.000000000 +0100
-+++ 3d-viewer/makefile.include 2008-09-20 18:47:08.000000000 +0200
-@@ -1,5 +1,5 @@
- EXTRALIBS =
--EXTRACPPFLAGS= -I./ -I../include -I../common -I../polygon -I../pcbnew
-+EXTRACPPFLAGS= -I./ -I../include -I../common -I../polygon -I../pcbnew -I${LOCALBASE}/include
-
- CPPFLAGS += $(EXTRACPPFLAGS)
-
diff --git a/cad/kicad-devel/files/patch-cvpcb_makefile.include b/cad/kicad-devel/files/patch-cvpcb_makefile.include
deleted file mode 100644
index 428587135cce..000000000000
--- a/cad/kicad-devel/files/patch-cvpcb_makefile.include
+++ /dev/null
@@ -1,12 +0,0 @@
---- cvpcb/makefile.include.orig 2008-08-01 20:41:51.000000000 +0200
-+++ cvpcb/makefile.include 2008-09-20 18:51:04.000000000 +0200
-@@ -3,7 +3,8 @@
-
- EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing\
- -I./ -I../cvpcb -I../include -Ibitmaps\
-- -I../pcbnew -I../3d-viewer -I ../polygon
-+ -I../pcbnew -I../3d-viewer -I ../polygon\
-+ -I${LOCALBASE}/include
-
- EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a\
- ../polygon/lib_polygon.a\
diff --git a/cad/kicad-devel/files/patch-gerbview_makefile.include b/cad/kicad-devel/files/patch-gerbview_makefile.include
deleted file mode 100644
index 20c7e12ba9c4..000000000000
--- a/cad/kicad-devel/files/patch-gerbview_makefile.include
+++ /dev/null
@@ -1,11 +0,0 @@
---- gerbview/makefile.include.orig 2008-06-02 13:23:50.000000000 +0200
-+++ gerbview/makefile.include 2008-09-20 18:58:29.000000000 +0200
-@@ -4,7 +4,7 @@
- EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing\
- -I./ -I../gerbview -I../include\
- -I../share -I../pcbnew -I../3d-viewer\
-- -I../polygon
-+ -I../polygon -I${LOCALBASE}/include
-
-
- #COMMON = pcbnew.h struct.h
diff --git a/cad/kicad-devel/files/patch-libs.FreeBSD b/cad/kicad-devel/files/patch-libs.FreeBSD
deleted file mode 100644
index 9cc864c95e67..000000000000
--- a/cad/kicad-devel/files/patch-libs.FreeBSD
+++ /dev/null
@@ -1,117 +0,0 @@
---- libs.FreeBSD.orig 2008-09-21 21:25:03.000000000 +0200
-+++ libs.FreeBSD 2008-09-21 23:12:06.000000000 +0200
-@@ -18,7 +18,7 @@
- # STD_INSTALL = 2 is used only to make static link (only useful when kicad run on an other
- # linux distribution than the distributions used to compil kicad.
-
--STD_INSTALL = 0
-+STD_INSTALL = 1
-
- #*******************************************
- #*******************************************
-@@ -34,17 +34,16 @@
- endif
-
- ifeq ($(STD_INSTALL), 1) # Used to build linux distribs
--PREFIX = /usr # (can also be /usr/local)
- KICAD_BIN = $(PREFIX)/bin # Install main binaries here
- KICAD_PLUGINS = $(KICAD_BIN) # Install other binaries here
- KICAD_DOCS=$(PREFIX)/share/doc/kicad # Install doc files here
--KICAD_DATA=$(PREFIX)/share/kicad # Install libraries and others files here
-+# Install libraries and others files here
-+KICAD_DATA = $(PREFIX)/share/kicad
-
- else # Install ALL files in /usr/local/kicad
- # when STD_INSTALL = 0 or STD_INSTALL = 2
- # STD_INSTALL = 0 is used to build kicad intalled in /usr/local
- # STD_INSTALL = 2 is used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local
--PREFIX = /usr/local/kicad
- KICAD_BIN = $(PREFIX)/bin
- KICAD_PLUGINS = $(KICAD_BIN)/plugins
- KICAD_DOCS=$(PREFIX)/help
-@@ -57,7 +56,7 @@
- KICAD_TEMPLATE=$(KICAD_DATA)/template
-
- # define compil and link
--LD = g++
-+LD = $(CXX)
-
- SRCSUFF = .cpp
- OBJSUFF = .o
-@@ -71,12 +70,12 @@
- # common CPPFLAGS to all components, further CPPFLAGS customization in
- # directory specific makefile.gtk files.
- ifeq ($(DEBUG), 1)
--WXXFLAGS := $(shell wx-config --debug --cxxflags)
--CPPFLAGS = -Wall -g3 -ggdb3 ${WXXFLAGS} -fno-strict-aliasing -DDEBUG -D_UNICODE
--LDFLAGS = -g3 -ggdb3 #-v
-+WXXFLAGS := `${WX_CONFIG} --debug --cxxflags`
-+CPPFLAGS = -Wall -g ${WXXFLAGS} -fno-strict-aliasing -DDEBUG -D_UNICODE
-+LDFLAGS = -g #-v
- else
--WXXFLAGS := $(shell wx-config --cxxflags)
--CPPFLAGS = -Wall -O2 ${WXXFLAGS} -fno-strict-aliasing -D_UNICODE
-+WXXFLAGS := `${WX_CONFIG} --cxxflags`
-+CPPFLAGS+= -Wall ${WXXFLAGS} -fno-strict-aliasing -D_UNICODE
- LDFLAGS = -s #-v
- endif
-
-@@ -88,28 +87,28 @@
-
- ifdef KICAD_PYTHON
- PYTHON_VERSION=2.5
--PYLIBS= -L/usr/lib
--PYLIBS+= -L /usr/include/python
-+PYLIBS= -L${LOCALBASE}/lib
-+PYLIBS+= -L${LOCALBASE}/lib/python$(PYTHON_VERSION)
- PYLIBS+= -lpython$(PYTHON_VERSION)
- PYLIBS+= -lboost_python-mt
--EXTRACPPFLAGS+=-I /usr/include/python$(PYTHON_VERSION) -DKICAD_PYTHON -fno-strict-aliasing
-+EXTRACPPFLAGS+=-I ${LOCALBASE}/python$(PYTHON_VERSION) -DKICAD_PYTHON -fno-strict-aliasing
- endif
-
- # mesa (free opengl library) libs
--MESALIBSPATH = /usr/local/lib
-+MESALIBSPATH = ${LOCALBASE}/lib
-
- #for static link: add wx gl lib
--LIBVERSION=`wx-config --release`
--WXPATH = `wx-config --prefix`/lib
--PREFIX_WX_LIBS = lib`wx-config --basename`
-+LIBVERSION=`${WX_CONFIG} --release`
-+WXPATH = `${WX_CONFIG} --prefix`/lib
-+PREFIX_WX_LIBS = lib`${WX_CONFIG} --basename`
- SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a
-
- ifeq ($(DEBUG), 1)
- # debug wxWidgets
--WXSYSLIB= `wx-config --debug --libs std`
-+WXSYSLIB= `${WX_CONFIG} --debug --libs std`
- else
- # or use "standard command" for wxWidgets
--WXSYSLIB= `wx-config --libs std`
-+WXSYSLIB= `${WX_CONFIG} --libs std`
- endif
-
- # use link static
-@@ -119,16 +118,16 @@
-
- else
- ifeq ($(DEBUG), 1)
--WXSYSLIB_WITH_GL= `wx-config --debug --libs std,gl`
-+WXSYSLIB_WITH_GL= `${WX_CONFIG} --debug --libs std,gl`
- else
--WXSYSLIB_WITH_GL= `wx-config --libs std,gl`
-+WXSYSLIB_WITH_GL= `${WX_CONFIG} --libs std,gl`
- endif
- endif
-
-
- # attention a l'ordre des libairies
--LIBS = -L/usr/local/lib -L/usr/X11R6/lib\
-+LIBS = -L${LOCALBASE}/lib \
- $(EXTRALIBS) $(WXSYSLIB) $(PYLIBS)
-
--LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\
-+LIBS_WITH_GL = -L${LOCALBASE}/lib \
- $(EXTRALIBS) $(WXSYSLIB_WITH_GL) $(PYLIBS)
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 ff0cbbf80cb3..000000000000
--- a/cad/kicad-devel/files/patch-pcbnew__class_module.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./pcbnew/class_module.cpp.orig 2008-08-09 11:05:42.000000000 +0200
-+++ ./pcbnew/class_module.cpp 2008-09-20 22:18:34.000000000 +0200
-@@ -1060,7 +1060,7 @@
- pos += 6;
- 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, ", " );
diff --git a/cad/kicad-devel/files/patch-pcbnew_makefile.gtk b/cad/kicad-devel/files/patch-pcbnew_makefile.gtk
deleted file mode 100644
index 591d07964a87..000000000000
--- a/cad/kicad-devel/files/patch-pcbnew_makefile.gtk
+++ /dev/null
@@ -1,20 +0,0 @@
---- pcbnew/makefile.gtk.orig 2008-07-25 16:37:53.000000000 +0200
-+++ pcbnew/makefile.gtk 2008-11-30 16:40:13.000000000 +0100
-@@ -19,14 +19,14 @@
- -include *.d
-
- CPPFLAGS += $(EXTRACPPFLAGS)
--EDACPPFLAGS = $(CPPFLAGS) $(BOOST_LIB)
-+EDACPPFLAGS = $(CPPFLAGS) -I $(BOOST_LIB)
-
-
- $(TARGET): $(OBJECTS) makefile.gtk makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.linux
- $(LD) $(LDFLAGS) $(OBJECTS) $(LIBVIEWER3D) $(LIBS_WITH_GL)\
- -o $(TARGET)
--
--
-+
-+
- install: $(TARGET)
- mkdir -p $(KICAD_BIN)
- cp $(TARGET) $(KICAD_BIN)
diff --git a/cad/kicad-devel/files/patch-pcbnew_makefile.include b/cad/kicad-devel/files/patch-pcbnew_makefile.include
deleted file mode 100644
index 0570ec677804..000000000000
--- a/cad/kicad-devel/files/patch-pcbnew_makefile.include
+++ /dev/null
@@ -1,11 +0,0 @@
---- pcbnew/makefile.include.orig 2008-07-12 10:25:35.000000000 +0200
-+++ pcbnew/makefile.include 2008-09-20 22:20:40.000000000 +0200
-@@ -4,7 +4,7 @@
- ../polygon/kbool/src/libkbool.a
-
- EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share\
-- -I../pcbnew -I../3d-viewer -I../polygon -I/opt/local/include
-+ -I../pcbnew -I../3d-viewer -I../polygon -I${LOCALBASE}/include
-
- #COMMON = pcbnew.h struct.h class_pad.h class_module.h class_text_mod.h \
- # class_edge_mod.h class_equipot.h
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 22:39:12 +0000