Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (f5e1cfd82cd32c4ec7a5b25c99f70a3d6b054ffd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (f5e1cfd82cd32c4ec7a5b25c99f70a3d6b054ffd)
  • Date: Fri, 17 Jan 2025 03:03:59 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 1
cad/xcircuit/DETAILS | 20
++++++
cad/xcircuit/HISTORY | 14 ++++
cad/xcircuit/PRE_BUILD | 4 +
cad/xcircuit/patches/0001-Declare-UDrawXAt-in-prototypes.h.patch | 31
++++++++++
science/xcircuit/DETAILS | 20
------
science/xcircuit/HISTORY | 6 -
7 files changed, 70 insertions(+), 26 deletions(-)

New commits:
commit f5e1cfd82cd32c4ec7a5b25c99f70a3d6b054ffd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xcirucit: Move to cad section

commit 510c5b6f80d163a550dc522286bfbc102ac4d8fb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xcircuit: Fix build against musl

commit d97b6baf659172a6f1e39ef44c85674a93410b8c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

WIP xcircuit 3.10.30

diff --git a/ChangeLog b/ChangeLog
index ef66705..dafca44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2025-01-17 Ismael Luceno <ismael AT sourcemage.org>
* cad/brlcad: moved from graphics section
+ * cad/xcircuit: moved from science section

2025-01-16 Ismael Luceno <ismael AT sourcemage.org>
* cad/kicad: moved from graphics section
diff --git a/cad/xcircuit/DETAILS b/cad/xcircuit/DETAILS
new file mode 100755
index 0000000..4585447
--- /dev/null
+++ b/cad/xcircuit/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=xcircuit
+ VERSION=3.10.30
+ SOURCE="${SPELL}-${VERSION}.tgz"
+ SOURCE_URL[0]=http://opencircuitdesign.com/${SPELL}/archive/${SOURCE}
+
SOURCE_HASH=sha512:52bf65fa9b5c095092f60abe32b3c88180365cc8043a8e95652ea9ab20e01c3e790989fe41171ecd1b2c60684016f6963c4851105b17a1c8a3bac8d75db84a8e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://opencircuitdesign.com/xcircuit/";
+ LICENSE[0]=GPL
+ ENTERED=20111126
+ SHORT="X11 program for drawing electrical circuit diagrams"
+cat << EOF
+XCircuit is a UNIX/X11 program for drawing publishable-quality electrical
+circuit schematic diagrams and related figures, and produce circuit
+netlists through schematic capture. XCircuit regards circuits as inherently
+hierarchical, and writes both hierarchical PostScript output and hierarchical
+SPICE netlists. Circuit components are saved in and retrieved from libraries
+which are fully editable. XCircuit does not separate artistic expression
+from circuit drawing; it maintains flexiblity in style without compromising
+the power of schematic capture.
+EOF
diff --git a/cad/xcircuit/HISTORY b/cad/xcircuit/HISTORY
new file mode 100644
index 0000000..dd9255c
--- /dev/null
+++ b/cad/xcircuit/HISTORY
@@ -0,0 +1,14 @@
+2025-01-17 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+ * patches/0001-Declare-UDrawXAt-in-prototypes.h.patch:
+ fixed implicit function declaration, causes build failure with GCC
14
+
+2025-01-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 3.10.30
+
+2012-03-04 Sven Lemke <catnip AT web.de>
+ * DETAILS: updated spell to 3.7.32
+
+2011-11-26 Sven Lemke <catnip AT web.de>
+ * DETAILS: spell created
+
diff --git a/cad/xcircuit/PRE_BUILD b/cad/xcircuit/PRE_BUILD
new file mode 100755
index 0000000..49ddb90
--- /dev/null
+++ b/cad/xcircuit/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/cad/xcircuit/patches/0001-Declare-UDrawXAt-in-prototypes.h.patch
b/cad/xcircuit/patches/0001-Declare-UDrawXAt-in-prototypes.h.patch
new file mode 100644
index 0000000..df73cff
--- /dev/null
+++ b/cad/xcircuit/patches/0001-Declare-UDrawXAt-in-prototypes.h.patch
@@ -0,0 +1,31 @@
+From 323c4c437b0eb027ac5acbd2d0c5b6d62a38befb Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer AT redhat.com>
+Date: Tue, 11 Apr 2023 09:03:09 +0200
+Subject: [PATCH] Declare UDrawXAt in prototypes.h
+
+This avoids an implicit function declaration in functions.c for
+HAVE_CAIRO. Future compilers will not accept such implicit function
+declarations by default, leading to a build failure.
+
+Origin: Red Hat
+Upstream-Status: Submitted
[https://github.com/RTimothyEdwards/XCircuit/pull/18]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ prototypes.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/prototypes.h b/prototypes.h
+index d577c85..5ec4b27 100644
+--- a/prototypes.h
++++ b/prototypes.h
+@@ -431,6 +431,7 @@ extern void UDrawSimpleLine(XPoint *, XPoint *);
+ extern void UDrawLine(XPoint *, XPoint *);
+ extern void UDrawCircle(XPoint *, u_char);
+ extern void UDrawX(labelptr);
++extern void UDrawXAt(XPoint *);
+ extern void UDrawXDown(labelptr);
+ extern int toplevelwidth(objinstptr, short *);
+ extern int toplevelheight(objinstptr, short *);
+--
+Fixed up by sm-checkpatch 0.1
+
diff --git a/science/xcircuit/DETAILS b/science/xcircuit/DETAILS
deleted file mode 100755
index deb0413..0000000
--- a/science/xcircuit/DETAILS
+++ /dev/null
@@ -1,20 +0,0 @@
- SPELL=xcircuit
- VERSION=3.7.32
- SOURCE="${SPELL}-${VERSION}.tgz"
- SOURCE_URL[0]=http://opencircuitdesign.com/${SPELL}/archive/${SOURCE}
-
SOURCE_HASH=sha512:36ae8c963ee2594769636f10da1e5ecb2790112c25285cc12b5446f84c913ee1c32c8812e5a142497673a9173d0e08489e35a1af39796ecd263ffa1207149965
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://opencircuitdesign.com/xcircuit/";
- LICENSE[0]=GPL
- ENTERED=20111126
- SHORT="X11 program for drawing electrical circuit diagrams"
-cat << EOF
-XCircuit is a UNIX/X11 program for drawing publishable-quality electrical
-circuit schematic diagrams and related figures, and produce circuit
-netlists through schematic capture. XCircuit regards circuits as inherently
-hierarchical, and writes both hierarchical PostScript output and hierarchical
-SPICE netlists. Circuit components are saved in and retrieved from libraries
-which are fully editable. XCircuit does not separate artistic expression
-from circuit drawing; it maintains flexiblity in style without compromising
-the power of schematic capture.
-EOF
diff --git a/science/xcircuit/HISTORY b/science/xcircuit/HISTORY
deleted file mode 100644
index c8c0c5a..0000000
--- a/science/xcircuit/HISTORY
+++ /dev/null
@@ -1,6 +0,0 @@
-2012-03-04 Sven Lemke <catnip AT web.de>
- * DETAILS: updated spell to 3.7.32
-
-2011-11-26 Sven Lemke <catnip AT web.de>
- * DETAILS: spell created
-


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (f5e1cfd82cd32c4ec7a5b25c99f70a3d6b054ffd), Ismael Luceno, 01/16/2025

Archive powered by MHonArc 2.6.24.

Top of Page