From e3a8c8a99e77bc05266a7f389cbe508c9352ea83 Mon Sep 17 00:00:00 2001 From: Marcus Mellor Date: Tue, 14 Jul 2026 09:35:34 -0500 Subject: [PATCH 1/2] tk: Restore libtkstub8.6.a --- common/CI/config.yaml | 1 + packages/t/tk/package.yml | 5 +---- packages/t/tk/pspec_x86_64.xml | 15 ++++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/common/CI/config.yaml b/common/CI/config.yaml index f5a4375a6fe7..11942b132231 100644 --- a/common/CI/config.yaml +++ b/common/CI/config.yaml @@ -92,3 +92,4 @@ static_libs: - /usr/lib64/libmono*.a - /usr/lib64/libjxl_extras_codec.a # TODO: verify whether this is needed - /usr/lib64/libprojectM_eval.a + - /usr/lib64/libtkstub8.6.a diff --git a/packages/t/tk/package.yml b/packages/t/tk/package.yml index 11e080c7c76b..76116978ad97 100644 --- a/packages/t/tk/package.yml +++ b/packages/t/tk/package.yml @@ -1,7 +1,7 @@ # yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json name : tk version : 8.6.11.1 -release : 14 +release : 15 source : - https://sourceforge.net/projects/tcl/files/Tcl/8.6.11/tk8.6.11.1-src.tar.gz : 006cab171beeca6a968b6d617588538176f27be232a2b334a0e96173e89909be homepage : https://www.tcl.tk @@ -46,6 +46,3 @@ install : | # remove build $workdir traces libdir=%libdir% # stupid hack because the substitution of %libdir% does not work sed -e "s|$workdir/unix|$libdir|" -e "s|$workdir|/usr/include/tk${tkver}|" -i $installdir/$libdir/tkConfig.sh - - # No static libs - rm ${installdir}/usr/lib64/libtkstub8.6.a diff --git a/packages/t/tk/pspec_x86_64.xml b/packages/t/tk/pspec_x86_64.xml index 66201e604e7e..c3d0f65ebf5c 100644 --- a/packages/t/tk/pspec_x86_64.xml +++ b/packages/t/tk/pspec_x86_64.xml @@ -3,8 +3,8 @@ tk https://www.tcl.tk - David Harder - david@davidjharder.ca + Marcus Mellor + marcus@infinitymdm.dev TCL programming.library @@ -216,7 +216,7 @@ programming.devel - tk + tk /usr/include/tk8.6/tk.h @@ -231,6 +231,7 @@ /usr/include/tk8.6/tkUnixPort.h /usr/include/tk8.6/ttkDecls.h /usr/include/tk8.6/ttkTheme.h + /usr/lib64/libtkstub8.6.a /usr/lib64/pkgconfig/tk.pc @@ -626,12 +627,12 @@ - - 2026-06-18 + + 2026-07-14 8.6.11.1 Packaging update - David Harder - david@davidjharder.ca + Marcus Mellor + marcus@infinitymdm.dev \ No newline at end of file From b2364264762a6790950702d5211a978384a01e12 Mon Sep 17 00:00:00 2001 From: Marcus Mellor Date: Tue, 14 Jul 2026 09:38:25 -0500 Subject: [PATCH 2/2] magic: Update to 8.3.675 --- packages/m/magic/abi_symbols | 5 +- packages/m/magic/abi_used_libs | 2 + packages/m/magic/abi_used_symbols | 76 +++- .../files/0001-set_std_gnu17_default.patch | 6 +- packages/m/magic/files/0002-pr410.patch | 379 ------------------ packages/m/magic/files/0003-pr417.patch | 63 --- packages/m/magic/files/series | 2 - packages/m/magic/package.yml | 9 +- packages/m/magic/pspec_x86_64.xml | 34 +- 9 files changed, 113 insertions(+), 463 deletions(-) delete mode 100644 packages/m/magic/files/0002-pr410.patch delete mode 100644 packages/m/magic/files/0003-pr417.patch diff --git a/packages/m/magic/abi_symbols b/packages/m/magic/abi_symbols index 2d0d9b204961..00830332d3ad 100644 --- a/packages/m/magic/abi_symbols +++ b/packages/m/magic/abi_symbols @@ -46,6 +46,8 @@ tclmagic.so:DBPlaneLongNameTbl tclmagic.so:DBPlaneTypes tclmagic.so:DBPrintUseId tclmagic.so:DBPropGet +tclmagic.so:DBPropGetDouble +tclmagic.so:DBPropGetString tclmagic.so:DBPutLabel tclmagic.so:DBReComputeBbox tclmagic.so:DBSeeTypesAll @@ -235,14 +237,11 @@ tclmagic.so:WindReplaceCommand tclmagic.so:WindSearchWid tclmagic.so:WindSurfaceToScreen tclmagic.so:WindUpdate -tclmagic.so:callocMagic tclmagic.so:cmdParseCoord tclmagic.so:dbSetPlaneTile tclmagic.so:debugClients tclmagic.so:extDevTable -tclmagic.so:freeMagic tclmagic.so:magicinterp -tclmagic.so:mallocMagic tclmagic.so:maskToPrint tclmagic.so:niceabort tclmagic.so:windCheckOnlyWindow diff --git a/packages/m/magic/abi_used_libs b/packages/m/magic/abi_used_libs index a5ccd751bf3d..a0f712ca17ea 100644 --- a/packages/m/magic/abi_used_libs +++ b/packages/m/magic/abi_used_libs @@ -1,3 +1,5 @@ +libGL.so.1 +libGLU.so.1 libX11.so.6 libc.so.6 libcairo.so.2 diff --git a/packages/m/magic/abi_used_symbols b/packages/m/magic/abi_used_symbols index b6cedbecf40b..3d49be5dc0c3 100644 --- a/packages/m/magic/abi_used_symbols +++ b/packages/m/magic/abi_used_symbols @@ -1,3 +1,71 @@ +libGL.so.1:glBegin +libGL.so.1:glBindFramebuffer +libGL.so.1:glBindRenderbuffer +libGL.so.1:glBlendFunc +libGL.so.1:glBlitFramebuffer +libGL.so.1:glCallLists +libGL.so.1:glClear +libGL.so.1:glClearColor +libGL.so.1:glColor4f +libGL.so.1:glColor4ub +libGL.so.1:glColorMaterial +libGL.so.1:glCopyPixels +libGL.so.1:glCullFace +libGL.so.1:glDeleteFramebuffers +libGL.so.1:glDeleteRenderbuffers +libGL.so.1:glDisable +libGL.so.1:glDrawArrays +libGL.so.1:glDrawBuffer +libGL.so.1:glEnable +libGL.so.1:glEnableClientState +libGL.so.1:glEnd +libGL.so.1:glFinish +libGL.so.1:glFlush +libGL.so.1:glFramebufferRenderbuffer +libGL.so.1:glGenFramebuffers +libGL.so.1:glGenLists +libGL.so.1:glGenRenderbuffers +libGL.so.1:glLightfv +libGL.so.1:glLineStipple +libGL.so.1:glLineWidth +libGL.so.1:glListBase +libGL.so.1:glLoadIdentity +libGL.so.1:glMatrixMode +libGL.so.1:glPixelStorei +libGL.so.1:glPolygonStipple +libGL.so.1:glPopMatrix +libGL.so.1:glPushMatrix +libGL.so.1:glRasterPos2i +libGL.so.1:glReadBuffer +libGL.so.1:glReadPixels +libGL.so.1:glRenderbufferStorage +libGL.so.1:glRotated +libGL.so.1:glRotatef +libGL.so.1:glScalef +libGL.so.1:glScissor +libGL.so.1:glShadeModel +libGL.so.1:glTranslated +libGL.so.1:glTranslatef +libGL.so.1:glVertex2i +libGL.so.1:glVertex3dv +libGL.so.1:glVertex3f +libGL.so.1:glVertexPointer +libGL.so.1:glViewport +libGL.so.1:glXChooseVisual +libGL.so.1:glXCreateContext +libGL.so.1:glXCreatePbuffer +libGL.so.1:glXDestroyPbuffer +libGL.so.1:glXGetFBConfigs +libGL.so.1:glXMakeCurrent +libGL.so.1:glXUseXFont +libGLU.so.1:gluNewTess +libGLU.so.1:gluTessBeginContour +libGLU.so.1:gluTessBeginPolygon +libGLU.so.1:gluTessCallback +libGLU.so.1:gluTessEndContour +libGLU.so.1:gluTessEndPolygon +libGLU.so.1:gluTessProperty +libGLU.so.1:gluTessVertex libX11.so.6:XAllocColorCells libX11.so.6:XCheckWindowEvent libX11.so.6:XCopyArea @@ -15,6 +83,7 @@ libX11.so.6:XFree libX11.so.6:XFreeGC libX11.so.6:XFreePixmap libX11.so.6:XGetDefault +libX11.so.6:XGetGeometry libX11.so.6:XGetImage libX11.so.6:XGetVisualInfo libX11.so.6:XGetWindowAttributes @@ -80,6 +149,7 @@ libc.so.6:fprintf libc.so.6:fputc libc.so.6:fputs libc.so.6:free +libc.so.6:fseek libc.so.6:fstat libc.so.6:ftell libc.so.6:fwrite @@ -89,11 +159,11 @@ libc.so.6:getenv libc.so.6:geteuid libc.so.6:getpid libc.so.6:getpwnam +libc.so.6:getrlimit libc.so.6:gettimeofday libc.so.6:getuid libc.so.6:htonl libc.so.6:htons -libc.so.6:ioctl libc.so.6:isatty libc.so.6:kill libc.so.6:localtime @@ -128,6 +198,7 @@ libc.so.6:sbrk libc.so.6:select libc.so.6:setbuf libc.so.6:setitimer +libc.so.6:setrlimit libc.so.6:sigaction libc.so.6:sigemptyset libc.so.6:sleep @@ -154,8 +225,11 @@ libc.so.6:strstr libc.so.6:strtod libc.so.6:strtok libc.so.6:strtol +libc.so.6:strtoll libc.so.6:strtoul libc.so.6:system +libc.so.6:tcgetattr +libc.so.6:tcsetattr libc.so.6:time libc.so.6:times libc.so.6:tolower diff --git a/packages/m/magic/files/0001-set_std_gnu17_default.patch b/packages/m/magic/files/0001-set_std_gnu17_default.patch index 0af7a5a8ee07..e828bac50458 100644 --- a/packages/m/magic/files/0001-set_std_gnu17_default.patch +++ b/packages/m/magic/files/0001-set_std_gnu17_default.patch @@ -17,9 +17,9 @@ index ae0a0fc1..0f758e5e 100755 @@ -9,4 +9,4 @@ # script itself. It also sets up CFLAGS without the default optimizer # flag (-O2). - --( CFLAGS="-g"; export CFLAGS; cd scripts ; ./configure "$@" ) + +-( CFLAGS=${CFLAGS:-"-g"}; export CFLAGS; cd scripts ; ./configure "$@" ) +( CFLAGS="-g -std=gnu17"; export CFLAGS; cd scripts ; ./configure "$@" ) --- +-- 2.49.0 diff --git a/packages/m/magic/files/0002-pr410.patch b/packages/m/magic/files/0002-pr410.patch deleted file mode 100644 index 3f1d28a64e24..000000000000 --- a/packages/m/magic/files/0002-pr410.patch +++ /dev/null @@ -1,379 +0,0 @@ -From 2e0a689e820790c4da6e698574c21e024cb28cc6 Mon Sep 17 00:00:00 2001 -From: "Darryl L. Miles" -Date: Fri, 11 Jul 2025 15:54:52 +0100 -Subject: [PATCH 1/3] C23: CmdSubrs.c fixup deprecated isascii() - ---- - commands/CmdSubrs.c | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/commands/CmdSubrs.c b/commands/CmdSubrs.c -index 14de68bf..f62c5386 100644 ---- a/commands/CmdSubrs.c -+++ b/commands/CmdSubrs.c -@@ -1196,6 +1196,17 @@ cmdGetSelFunc( - return 1; /* Skip any other selected cells. */ - } - -+ -+/* The Open Group, Sep 2006, Austin/317 deprecated isascii(), -+ * Apparently it cannot be used portably in a localized application. -+ */ -+static int -+magic_isascii(int c) -+{ -+ return (c & ~0x7f) == 0; -+} -+ -+ - /* - * ---------------------------------------------------------------------------- - * -@@ -1228,7 +1239,7 @@ CmdIllegalChars( - - for (p = string; *p != 0; p++) - { -- if (!isascii(*p)) goto error; -+ if (!magic_isascii(*p)) goto error; - if (iscntrl(*p)) goto error; - for (bad = illegal; *bad != 0; bad++) - { -@@ -1237,7 +1248,7 @@ CmdIllegalChars( - continue; - - error: -- if (!isascii(*p) || iscntrl(*p)) -+ if (!magic_isascii(*p) || iscntrl(*p)) - { - TxError("%s contains illegal control character 0x%x\n", - msg, *p); - -From 10a9d619f72fd8ffc5cd0f91f39e4ade229081f8 Mon Sep 17 00:00:00 2001 -From: "Darryl L. Miles" -Date: Wed, 18 Jun 2025 14:29:37 +0100 -Subject: [PATCH 2/3] C23: use AC_HEADER_STDBOOL #include - ---- - scripts/configure.in | 3 ++ - utils/magic.h | 9 +--- - utils/magic_stdbool.h | 101 ++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 105 insertions(+), 8 deletions(-) - create mode 100644 utils/magic_stdbool.h - -diff --git a/scripts/configure.in b/scripts/configure.in -index c0be24f9..b3b33510 100644 ---- a/scripts/configure.in -+++ b/scripts/configure.in -@@ -129,6 +129,9 @@ AC_C_BIGENDIAN - dnl Check for required header files - AC_HEADER_STDC - -+dnl Check for compiler bool support -+AC_HEADER_STDBOOL -+ - dnl Need either setenv or putenv - AC_CHECK_FUNCS(setenv putenv) - -diff --git a/utils/magic.h b/utils/magic.h -index 7b4356d6..b4aa6f46 100644 ---- a/utils/magic.h -+++ b/utils/magic.h -@@ -85,14 +85,7 @@ typedef pointertype ClientData; - - /* --------------------------- Booleans ------------------------------- */ - --typedef unsigned char bool; -- --#ifndef TRUE --#define TRUE ((bool)1) --#endif --#ifndef FALSE --#define FALSE ((bool)0) --#endif -+#include "utils/magic_stdbool.h" - - /* ----------------------- Simple functions --------------------------- */ - -diff --git a/utils/magic_stdbool.h b/utils/magic_stdbool.h -new file mode 100644 -index 00000000..64af7355 ---- /dev/null -+++ b/utils/magic_stdbool.h -@@ -0,0 +1,101 @@ -+/* -+ * utils/magic_stdbool.h -+ * -+ * Copyright (C) 1985, 1990 Regents of the University of California. -+ * -+ * Permission to use, copy, modify, and distribute this -+ * software and its documentation for any purpose and without -+ * fee is hereby granted, provided that the above copyright -+ * notice appear in all copies. The University of California -+ * makes no representations about the suitability of this -+ * software for any purpose. It is provided "as is" without -+ * express or implied warranty. Export of this software outside -+ * of the United States of America may require an export license. -+ * -+ * SPDX-License-Identifier: HPND-UC-export-US -+ * -+ * -+ * This file contains code snippets that are part of the GNU autoconf 2.69 -+ * project documentation. This project is licensed under GPLv3 with a -+ * Section 7 clause outlined in autoconf-2.69/COPYING.EXCEPTION. -+ * -+ * The documentation for the autoconf project is licensed under GNU Free -+ * Documentation License Version 1.3 or any later version published by the -+ * Free Software Foundation. The snippets in here are taken entirely from the -+ * documentation so fall under GFDL-1.3-or-later terms. -+ * The documentation published by the FSF can be seen at -+ * https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/autoconf.html -+ * This section seeks to provide attribution by providing references to the source -+ * a link to the full license text and the required boilerplate text directly below: -+ * -+ * Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -+ * -+ * Permission is granted to copy, distribute and/or modify this -+ * document under the terms of the GNU Free Documentation License, -+ * Version 1.3 or any later version published by the Free Software -+ * Foundation; with no Invariant Sections, no Front-Cover texts, and -+ * no Back-Cover Texts. A copy of the license is included in the -+ * section entitled "GNU Free Documentation License." -+ * -+ * A full copy of the GNU Free Documentation License version 1.3 is available at: -+ * https://www.gnu.org/licenses/fdl-1.3.html -+ * SPDX-License-Identifier: GFDL-1.3-or-later -+ * -+ * -+ * All other lines in this file are licensed under the HPND-UC-export-US license -+ * at the top of this file inline with the main project licensing. -+ * -+ */ -+ -+#ifndef _MAGIC__UTILS__MAGIC_STDBOOL_H -+#define _MAGIC__UTILS__MAGIC_STDBOOL_H -+ -+#ifdef HAVE_MAGIC_AUTOCONF_CONFIG_H -+#include "magic/autoconf/config.h" -+#endif -+ -+/* This section is taken from autoconf-2.69 manual -+ * https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Headers.html -+ * for HAVE_STDBOOL_H -+ */ -+#ifdef HAVE_STDBOOL_H -+ # include -+ -+ #ifndef TRUE -+ #define TRUE (true) -+ #endif -+ #ifndef FALSE -+ #define FALSE (false) -+ #endif -+#else -+ # ifndef HAVE__BOOL -+ # ifdef __cplusplus -+ typedef bool _Bool; -+ # else -+ # define _Bool signed char -+ # endif -+ # endif -+ # define bool _Bool -+ # define false 0 -+ # define true 1 -+ # define __bool_true_false_are_defined 1 -+ -+/* This section is taken from magic project, see historical magic.h */ -+ /* originally magic.h used unsigned char but should be source compatible with -+ * a real bool type such as that in C23/C++ -+ */ -+ -+ /*typedef unsigned char bool;*/ -+/* commented out the original magic definition to adopt the historical C -+ * standard definition provided above. -+ */ -+ -+ #ifndef TRUE -+ #define TRUE ((bool)1) -+ #endif -+ #ifndef FALSE -+ #define FALSE ((bool)0) -+ #endif -+#endif -+ -+#endif /* _MAGIC__UTILS__MAGIC_STDBOOL_H */ - -From 8f3c9c325001c7ce1a44e501ce4940917c9c7309 Mon Sep 17 00:00:00 2001 -From: "Darryl L. Miles" -Date: Wed, 18 Jun 2025 14:31:17 +0100 -Subject: [PATCH 3/3] configure: autoconf regen (2.69) AC_HEADER_STDBOOL - ---- - scripts/configure | 148 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 148 insertions(+) - -diff --git a/scripts/configure b/scripts/configure -index 51ca793d..e6262296 100755 ---- a/scripts/configure -+++ b/scripts/configure -@@ -1961,6 +1961,60 @@ $as_echo "$ac_res" >&6; } - - } # ac_fn_c_check_header_compile - -+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -+# ------------------------------------------- -+# Tests whether TYPE exists after having included INCLUDES, setting cache -+# variable VAR accordingly. -+ac_fn_c_check_type () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=no" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof ($2)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+if (sizeof (($2))) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ eval "$3=yes" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_type -+ - # ac_fn_c_check_func LINENO FUNC VAR - # ---------------------------------- - # Tests whether FUNC exists, setting the cache variable VAR accordingly -@@ -4880,6 +4934,100 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h - fi - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } -+if ${ac_cv_header_stdbool_h+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #ifndef bool -+ "error: bool is not defined" -+ #endif -+ #ifndef false -+ "error: false is not defined" -+ #endif -+ #if false -+ "error: false is not 0" -+ #endif -+ #ifndef true -+ "error: true is not defined" -+ #endif -+ #if true != 1 -+ "error: true is not 1" -+ #endif -+ #ifndef __bool_true_false_are_defined -+ "error: __bool_true_false_are_defined is not defined" -+ #endif -+ -+ struct s { _Bool s: 1; _Bool t; } s; -+ -+ char a[true == 1 ? 1 : -1]; -+ char b[false == 0 ? 1 : -1]; -+ char c[__bool_true_false_are_defined == 1 ? 1 : -1]; -+ char d[(bool) 0.5 == true ? 1 : -1]; -+ /* See body of main program for 'e'. */ -+ char f[(_Bool) 0.0 == false ? 1 : -1]; -+ char g[true]; -+ char h[sizeof (_Bool)]; -+ char i[sizeof s.t]; -+ enum { j = false, k = true, l = false * true, m = true * 256 }; -+ /* The following fails for -+ HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ -+ _Bool n[m]; -+ char o[sizeof n == m * sizeof n[0] ? 1 : -1]; -+ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; -+ /* Catch a bug in an HP-UX C compiler. See -+ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html -+ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html -+ */ -+ _Bool q = true; -+ _Bool *pq = &q; -+ -+int -+main () -+{ -+ -+ bool e = &s; -+ *pq |= q; -+ *pq |= ! q; -+ /* Refer to every declared value, to avoid compiler optimizations. */ -+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l -+ + !m + !n + !o + !p + !q + !pq); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_stdbool_h=yes -+else -+ ac_cv_header_stdbool_h=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 -+$as_echo "$ac_cv_header_stdbool_h" >&6; } -+ ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" -+if test "x$ac_cv_type__Bool" = xyes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE__BOOL 1 -+_ACEOF -+ -+ -+fi -+ -+ -+if test $ac_cv_header_stdbool_h = yes; then -+ -+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h -+ -+fi -+ -+ - for ac_func in setenv putenv - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/packages/m/magic/files/0003-pr417.patch b/packages/m/magic/files/0003-pr417.patch deleted file mode 100644 index 73c6dbdae688..000000000000 --- a/packages/m/magic/files/0003-pr417.patch +++ /dev/null @@ -1,63 +0,0 @@ -From ca91f57e637b36cc2cad8b8def53997c7fabdb08 Mon Sep 17 00:00:00 2001 -From: "Darryl L. Miles" -Date: Tue, 15 Jul 2025 23:54:55 +0100 -Subject: [PATCH 1/2] F42: fix for etext symbol glibc 2.41+ - -The man page end(3) changed as well over time to support the new definition. ---- - utils/netlist.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/utils/netlist.c b/utils/netlist.c -index b835732f..b1556c85 100644 ---- a/utils/netlist.c -+++ b/utils/netlist.c -@@ -22,6 +22,7 @@ - static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/utils/netlist.c,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $"; - #endif /* lint */ - -+#include - #include - #include - #include "utils/magic.h" -@@ -369,6 +370,8 @@ NLNetName(net) - static char tempId[100]; - #if defined(EMSCRIPTEN) - int etext; -+#elif defined(linux) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 41) -+ extern char etext; - #elif defined(linux) && defined(__clang__) - extern char etext; - #elif defined(linux) || defined(CYGWIN) - -From 2cfe33c47998a996758ebbcd51a509095a2a3b99 Mon Sep 17 00:00:00 2001 -From: "Darryl L. Miles" -Date: Tue, 15 Jul 2025 23:56:45 +0100 -Subject: [PATCH 2/2] netlist.c: whitespace only cleanup - ---- - utils/netlist.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/netlist.c b/utils/netlist.c -index b1556c85..9b7d05de 100644 ---- a/utils/netlist.c -+++ b/utils/netlist.c -@@ -369,7 +369,7 @@ NLNetName(net) - { - static char tempId[100]; - #if defined(EMSCRIPTEN) -- int etext; -+ int etext; - #elif defined(linux) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 41) - extern char etext; - #elif defined(linux) && defined(__clang__) -@@ -377,7 +377,7 @@ NLNetName(net) - #elif defined(linux) || defined(CYGWIN) - extern int etext asm("etext"); - #elif defined(__APPLE__) -- int etext; -+ int etext; - #else - extern int etext; - #endif diff --git a/packages/m/magic/files/series b/packages/m/magic/files/series index e69a9431e2a2..799beb2653b0 100644 --- a/packages/m/magic/files/series +++ b/packages/m/magic/files/series @@ -1,3 +1 @@ 0001-set_std_gnu17_default.patch -0002-pr410.patch -0003-pr417.patch diff --git a/packages/m/magic/package.yml b/packages/m/magic/package.yml index bd8ffcfbbca8..25cfeb8b38c9 100644 --- a/packages/m/magic/package.yml +++ b/packages/m/magic/package.yml @@ -1,9 +1,9 @@ # yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json name : magic -version : 8.3.524 -release : 2 +version : 8.3.675 +release : 3 source : - - git|https://github.com/RTimothyEdwards/magic.git : 8.3.524 + - git|https://github.com/RTimothyEdwards/magic.git : 8.3.675 homepage : https://github.com/RTimothyEdwards/magic license : HPND-UC component : office.scientific @@ -12,10 +12,12 @@ description: | Magic is a venerable VLSI layout tool, written in the 1980's at Berkeley by John Ousterhout, now famous primarily for writing the scripting interpreter language Tcl. Magic is widely cited as being the easiest tool to use for circuit layout, even for people who ultimately rely on commercial tools for their product design flow. builddeps : - pkgconfig(cairo) + - pkgconfig(glu) - pkgconfig(readline) - pkgconfig(tcl) - pkgconfig(tk) - pkgconfig(zlib) + - pkgconfig(zlib-ng) rundeps : - tcl - tk @@ -26,3 +28,4 @@ build : | %make install : | %make_install + %install_license LICENSE diff --git a/packages/m/magic/pspec_x86_64.xml b/packages/m/magic/pspec_x86_64.xml index 70b34824c4a3..a81bc70da8b5 100644 --- a/packages/m/magic/pspec_x86_64.xml +++ b/packages/m/magic/pspec_x86_64.xml @@ -3,8 +3,8 @@ magic https://github.com/RTimothyEdwards/magic - Jared Cervantes - jared@jaredcervantes.com + Marcus Mellor + marcus@infinitymdm.dev HPND-UC office.scientific @@ -29,6 +29,7 @@ /usr/lib/magic/doc/html/addcommandentry.html /usr/lib/magic/doc/html/addpath.html /usr/lib/magic/doc/html/antennacheck.html + /usr/lib/magic/doc/html/archive.html /usr/lib/magic/doc/html/array.html /usr/lib/magic/doc/html/box.html /usr/lib/magic/doc/html/calma.html @@ -75,8 +76,6 @@ /usr/lib/magic/doc/html/ext2spice.html /usr/lib/magic/doc/html/extract.html /usr/lib/magic/doc/html/extresist.html - /usr/lib/magic/doc/html/exttosim.html - /usr/lib/magic/doc/html/exttospice.html /usr/lib/magic/doc/html/feedback.html /usr/lib/magic/doc/html/fill.html /usr/lib/magic/doc/html/findbox.html @@ -195,6 +194,7 @@ /usr/lib/magic/doc/html/tool.html /usr/lib/magic/doc/html/undo.html /usr/lib/magic/doc/html/unexpand.html + /usr/lib/magic/doc/html/units.html /usr/lib/magic/doc/html/unmeasure.html /usr/lib/magic/doc/html/updatedisplay.html /usr/lib/magic/doc/html/upsidedown.html @@ -270,7 +270,22 @@ /usr/lib/magic/sys/FreeSerif.pt3 /usr/lib/magic/sys/bw.glyphs /usr/lib/magic/sys/color.glyphs + /usr/lib/magic/sys/gdsquery.tech /usr/lib/magic/sys/magicps.pro + /usr/lib/magic/sys/minimum.tech + /usr/lib/magic/sys/mos.24bit.dstyle + /usr/lib/magic/sys/mos.24bit.std.cmap + /usr/lib/magic/sys/mos.7bit.dstyle + /usr/lib/magic/sys/mos.7bit.mraster.cmap + /usr/lib/magic/sys/mos.7bit.mraster_dstyle + /usr/lib/magic/sys/mos.7bit.std.cmap + /usr/lib/magic/sys/mos.OpenGL.dstyle + /usr/lib/magic/sys/mos.OpenGL.std.cmap + /usr/lib/magic/sys/nmos.tech + /usr/lib/magic/sys/scmos-sub.tech + /usr/lib/magic/sys/scmos-tm.tech + /usr/lib/magic/sys/scmos.tech + /usr/lib/magic/sys/scmosWR.tech /usr/lib/magic/sys/vfont.B.12 /usr/lib/magic/sys/vfont.I.12 /usr/lib/magic/sys/vfont.R.8 @@ -370,6 +385,7 @@ /usr/lib/magic/tutorial/tut9b.mag /usr/lib/magic/tutorial/tut9x.mag /usr/lib/magic/tutorial/tut9y.mag + /usr/share/licenses/magic/LICENSE /usr/share/man/man1/ext2sim.1.zst /usr/share/man/man1/ext2spice.1.zst /usr/share/man/man1/extcheck.1.zst @@ -386,12 +402,12 @@ - - 2025-11-08 - 8.3.524 + + 2026-07-14 + 8.3.675 Packaging update - Jared Cervantes - jared@jaredcervantes.com + Marcus Mellor + marcus@infinitymdm.dev \ No newline at end of file