mirror of
https://github.com/archlinux/aur.git
synced 2026-02-08 13:12:02 +01:00
feat: v8.3.567
chore: cleanup PKGBUILD chore: remove old patch
This commit is contained in:
Torleif Skår
parent
60483086a4
commit
359eeb564d
3 changed files with 9 additions and 76 deletions
6
.SRCINFO
6
.SRCINFO
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = magic
|
||||
pkgdesc = A VLSI layout system
|
||||
pkgver = 8.3.566
|
||||
pkgver = 8.3.567
|
||||
pkgrel = 1
|
||||
url = http://opencircuitdesign.com/magic/
|
||||
arch = i686
|
||||
|
|
@ -21,9 +21,9 @@ pkgbase = magic
|
|||
optdepends = glu: Vector fonts for OpenGL renderer
|
||||
optdepends = cairo: 2D accelerated graphics, alternative to OGL
|
||||
optdepends = blt: to create a tree diagram of the cell hierarchy in a design
|
||||
source = magic-8.3.566::git+https://github.com/RTimothyEdwards/magic#tag=8.3.566
|
||||
source = magic::git+https://github.com/RTimothyEdwards/magic#tag=8.3.567
|
||||
source = 0001-fixup-magsgtty.patch
|
||||
b2sums = 81bd2017a83229ac14eb72d2345e621ed91852bb783f66a1756f9174cc441974550dca3cb15ca916d971d3a1190b73f291be9afc5cdcee0e61b446c3ccd27b8e
|
||||
b2sums = e4397f5e48a0e9bb89ba3e1060126ec9e712cc3bbeb6ed06283bb82fa2937467bbe12abab370a1c2bad4b5638e8830517f90cd0e139dec56de79b4f7efa1a5d1
|
||||
b2sums = 72d1a9742c72041204c05aca45639251ab49768c43b1829bc40e6f0857fd93c0a7e32e433a0090996e17af1fc588e26677c24487bf04d5a14a86c8f5e4a2402c
|
||||
|
||||
pkgname = magic
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
From 6195c20d3d70fbfd47d75103520ada6caf7227cd Mon Sep 17 00:00:00 2001
|
||||
From: "R. Timothy Edwards" <tim@opencircuitdesign.com>
|
||||
Date: Mon, 8 Sep 2025 09:22:14 -0400
|
||||
Subject: [PATCH] Fixed an egregious error introduced by the "save <file>.tcl"
|
||||
command handling in the previous commit, that can cause a crash whenever
|
||||
"writeall" is called while a cell's filename is still NULL. Thanks to Daniel
|
||||
Estevez for reporting the error.
|
||||
|
||||
---
|
||||
VERSION | 2 +-
|
||||
database/DBio.c | 30 ++++++++++++++++--------------
|
||||
2 files changed, 17 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/VERSION b/VERSION
|
||||
index 7c64f326..40e58fa1 100644
|
||||
--- a/VERSION
|
||||
+++ b/VERSION
|
||||
@@ -1 +1 @@
|
||||
-8.3.548
|
||||
+8.3.549
|
||||
diff --git a/database/DBio.c b/database/DBio.c
|
||||
index b17cf4c7..1c07d097 100644
|
||||
--- a/database/DBio.c
|
||||
+++ b/database/DBio.c
|
||||
@@ -4269,25 +4269,27 @@ DBCellWrite(cellDef, fileName)
|
||||
|
||||
result = FALSE;
|
||||
|
||||
- /* Feature added 9/4/2025: If the filename ends with ".tcl",
|
||||
- * then write the cell as a series of magic commands, and don't
|
||||
- * otherwise alter the cell.
|
||||
- */
|
||||
- if ((strlen(fileName) > 4) && (!strcmp(fileName + strlen(fileName) - 4, ".tcl")))
|
||||
+ if (fileName)
|
||||
{
|
||||
- if ((realf = fopen(fileName, "w")))
|
||||
+ /* Feature added 9/4/2025: If the filename ends with ".tcl",
|
||||
+ * then write the cell as a series of magic commands, and don't
|
||||
+ * otherwise alter the cell.
|
||||
+ */
|
||||
+ if ((strlen(fileName) > 4) && (!strcmp(fileName + strlen(fileName) - 4, ".tcl")))
|
||||
{
|
||||
- result = DBCellWriteCommandFile(cellDef, realf);
|
||||
- fclose(realf);
|
||||
- return result;
|
||||
+ if ((realf = fopen(fileName, "w")))
|
||||
+ {
|
||||
+ result = DBCellWriteCommandFile(cellDef, realf);
|
||||
+ fclose(realf);
|
||||
+ return result;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
-
|
||||
- /*
|
||||
- * Figure out the name of the file we will eventually write.
|
||||
- */
|
||||
- if (!fileName)
|
||||
+ else
|
||||
{
|
||||
+ /*
|
||||
+ * Figure out the name of the file we will eventually write.
|
||||
+ */
|
||||
if (cellDef->cd_file)
|
||||
fileName = cellDef->cd_file;
|
||||
else if (cellDef->cd_name)
|
||||
13
PKGBUILD
13
PKGBUILD
|
|
@ -2,7 +2,7 @@
|
|||
# Contributor: Kyle Keen <keenerd@gmail.com>
|
||||
# Contributor: Jared Casper <jaredcasper@gmail.com>
|
||||
pkgname=magic
|
||||
pkgver=8.3.566
|
||||
pkgver=8.3.567
|
||||
pkgrel=1
|
||||
pkgdesc="A VLSI layout system"
|
||||
_git_url="https://github.com/RTimothyEdwards/magic"
|
||||
|
|
@ -32,20 +32,19 @@ optdepends=(
|
|||
'blt: to create a tree diagram of the cell hierarchy in a design'
|
||||
)
|
||||
|
||||
_archive="${pkgname}-${pkgver}"
|
||||
source=(
|
||||
"${_archive}::git+${_git_url}#tag=${pkgver}"
|
||||
"${pkgname}::git+${_git_url}#tag=${pkgver}"
|
||||
"0001-fixup-magsgtty.patch"
|
||||
)
|
||||
|
||||
b2sums=('81bd2017a83229ac14eb72d2345e621ed91852bb783f66a1756f9174cc441974550dca3cb15ca916d971d3a1190b73f291be9afc5cdcee0e61b446c3ccd27b8e'
|
||||
b2sums=('e4397f5e48a0e9bb89ba3e1060126ec9e712cc3bbeb6ed06283bb82fa2937467bbe12abab370a1c2bad4b5638e8830517f90cd0e139dec56de79b4f7efa1a5d1'
|
||||
'72d1a9742c72041204c05aca45639251ab49768c43b1829bc40e6f0857fd93c0a7e32e433a0090996e17af1fc588e26677c24487bf04d5a14a86c8f5e4a2402c')
|
||||
|
||||
|
||||
options=()
|
||||
|
||||
prepare() {
|
||||
cd "${_archive}"
|
||||
cd "${pkgname}"
|
||||
|
||||
# To compile with Glibc v2.42 we need to patch magsgtty
|
||||
# See: https://github.com/RTimothyEdwards/magic/issues/434
|
||||
|
|
@ -53,7 +52,7 @@ prepare() {
|
|||
}
|
||||
|
||||
build() {
|
||||
cd "${_archive}"
|
||||
cd "${pkgname}"
|
||||
# See upstream issue: https://github.com/RTimothyEdwards/magic/issues/401
|
||||
# for more details about why we need to use C17
|
||||
export CFLAGS="${CFLAGS} -std=c17 -D_DEFAULT_SOURCE=1"
|
||||
|
|
@ -62,7 +61,7 @@ build() {
|
|||
}
|
||||
|
||||
package() {
|
||||
cd "${_archive}"
|
||||
cd "${pkgname}"
|
||||
make DESTDIR="$pkgdir" MANDIR=/usr/share/man install
|
||||
|
||||
# License
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue