Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (dbd106cb962c745e2d6464c0ee062ffb5c1891d3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (dbd106cb962c745e2d6464c0ee062ffb5c1891d3)
  • Date: Wed, 1 Oct 2008 16:55:41 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

graphics/kicad/BUILD | 6 +++++-
graphics/kicad/DEPENDS | 5 ++++-
graphics/kicad/DETAILS | 4 ++--
graphics/kicad/HISTORY | 8 ++++++++
graphics/kicad/INSTALL | 3 ++-
graphics/kicad/PRE_BUILD | 3 +++
graphics/kicad/kicad.patch | 17 +++++++++++++++++
7 files changed, 41 insertions(+), 5 deletions(-)

New commits:
commit dbd106cb962c745e2d6464c0ee062ffb5c1891d3
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

kicad: Updated to version 20080825. Switched to using cmake.
Added required depends. Patch to fix building error with cmake.

diff --git a/graphics/kicad/BUILD b/graphics/kicad/BUILD
index 03bf8ac..c04853d 100755
--- a/graphics/kicad/BUILD
+++ b/graphics/kicad/BUILD
@@ -1 +1,5 @@
-make -f makefile.gtk
+cd $SOURCE_DIRECTORY &&
+mkdir -p build/release &&
+cd build/release &&
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr -DCMAKE_BUILD=Release ../../
&&
+make
diff --git a/graphics/kicad/DEPENDS b/graphics/kicad/DEPENDS
index 3ccfa52..d4f4159 100755
--- a/graphics/kicad/DEPENDS
+++ b/graphics/kicad/DEPENDS
@@ -1 +1,4 @@
-depends wxgtk
+depends wxgtk &&
+depends boost &&
+depends zlib &&
+suggest_depends kicad-library "" "" "provides example modules"
diff --git a/graphics/kicad/DETAILS b/graphics/kicad/DETAILS
index 8e6adf0..214bd00 100755
--- a/graphics/kicad/DETAILS
+++ b/graphics/kicad/DETAILS
@@ -1,8 +1,8 @@
SPELL=kicad
- VERSION=20071122-r468
+ VERSION=20080825
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:255d5cb41e65e0e46b931404cd7999c24483f085fa16180125bbc4529c70ee341eaa31974618d1973522a69253d3ee05b80a837bba0c5599e59600d77bad2cd1
+
SOURCE_HASH=sha512:7512ab3087f6424d33933b6798c1bce21d49561a649199c4588d2354b7ff68bceb9e563b3b76681c2289784a93f005840a08c05c1c234b854f73cd5a2ffd6985
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
WEB_SITE="http://kicad.sourceforge.net";
LICENSE[0]=GPL
diff --git a/graphics/kicad/HISTORY b/graphics/kicad/HISTORY
index b8f8462..1996771 100644
--- a/graphics/kicad/HISTORY
+++ b/graphics/kicad/HISTORY
@@ -1,3 +1,11 @@
+2008-10-01 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 20080825
+ * BUILD: Uses cmake
+ * INSTALL: Uses cmake
+ * DEPENDS: depends zlip, cmake. suggest_depends kicad-library
+ * PRE_BUILD: Added for patch
+ * kicad.patch: Won't build due to uneeded svn error. Removed.
+
2008-02-11 linuxfan <demaillists AT comcast.net>
* DETAILS: Delint description.
* DETAILS: Delint description again.
diff --git a/graphics/kicad/INSTALL b/graphics/kicad/INSTALL
index 5379324..7c89606 100755
--- a/graphics/kicad/INSTALL
+++ b/graphics/kicad/INSTALL
@@ -1 +1,2 @@
-make -f makefile.gtk install
+cd $SOURCE_DIRECTORY/build/release &&
+make install
diff --git a/graphics/kicad/PRE_BUILD b/graphics/kicad/PRE_BUILD
new file mode 100755
index 0000000..5e81d3c
--- /dev/null
+++ b/graphics/kicad/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/kicad.patch
diff --git a/graphics/kicad/kicad.patch b/graphics/kicad/kicad.patch
new file mode 100644
index 0000000..1b0fec8
--- /dev/null
+++ b/graphics/kicad/kicad.patch
@@ -0,0 +1,17 @@
+--- CMakeLists.txt.orig 2008-10-01 15:21:46.000000000 -0500
++++ CMakeLists.txt 2008-10-01 15:19:26.000000000 -0500
+@@ -113,10 +113,10 @@
+
+ # Automagically create version header file.
+ # does not work with mingw for me (jpc)
+-if(UNIX)
+- include(CreateSVNVersionHeader)
+- create_svn_version_header()
+-endif(UNIX)
++#if(UNIX)
++# include(CreateSVNVersionHeader)
++# create_svn_version_header()
++#endif(UNIX)
+
+ if(EXISTS ${CMAKE_SOURCE_DIR}/include/config.h)
+ # This file may exist (created by an alternate process to the svn test
above),



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (dbd106cb962c745e2d6464c0ee062ffb5c1891d3), George Sherwood, 10/01/2008

Archive powered by MHonArc 2.6.24.

Top of Page