From 169ba3c4d2020518ce7338654f2a17d917f7ea62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:09:16 +0000 Subject: [PATCH 01/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index bc34bb0..7fe5489 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -8,7 +8,7 @@ Name: xcircuit Version: %{short_version}.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -108,6 +108,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.10.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 22 2018 Mamoru TASAKA - 3.10.10-1 - 3.10.10 From cd4e84d173a6e75eea354f1ae7d63f885b79586a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 12 Nov 2018 14:26:16 +0900 Subject: [PATCH 02/32] 3.10.12 --- .gitignore | 1 + sources | 2 +- xcircuit.spec | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 51906a4..cb4fb95 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /xcircuit-3.10.8.tgz /xcircuit-3.10.9.tgz /xcircuit-3.10.10.tgz +/xcircuit-3.10.12.tgz diff --git a/sources b/sources index 63afb64..5e5472b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xcircuit-3.10.10.tgz) = 821f8b317e4eac82d715f408abec965843069d643633e50e54999044933676b997c2e6b7df9a9166affca5440cbda8fe94a2098b645ae144566125da8e4bc93f +SHA512 (xcircuit-3.10.12.tgz) = b2fd580840d3533c984cd6910eb67ebccfa307dc58ac9a3f035e827f8ddfe76ad9df10023f8301e628a27556476b617c16822a0725eb8df7e7c67c337807759a diff --git a/xcircuit.spec b/xcircuit.spec index 7fe5489..03c80e0 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -6,9 +6,12 @@ %global ghostscript_devel ghostscript-devel %endif +%undefine _changelog_trimtime +%undefine __brp_mangle_shebangs + Name: xcircuit -Version: %{short_version}.10 -Release: 2%{?dist} +Version: %{short_version}.12 +Release: 1%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -61,6 +64,7 @@ autoreconf sed -i Makefile.in -e 's|LD_RUN_PATH =|LD_RUN_PATH_DIE =|' sed -i examples/xc_remote.sh -e 's|/usr/local/bin|%{_bindir}|' +chmod ugo-x lib/tcl/console.tcl %build export WISH=/usr/bin/wish @@ -108,6 +112,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Mon Nov 12 2018 Mamoru TASAKA - 3.10.12-1 +- 3.10.12 + * Sat Jul 14 2018 Fedora Release Engineering - 3.10.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 1745c34216a2a5a78bdc4402960a06d613b4d416 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 03/32] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xcircuit.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 03c80e0..0d45569 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -15,7 +15,6 @@ Release: 1%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ -Group: Applications/Engineering URL: http://opencircuitdesign.com/xcircuit Source: http://opencircuitdesign.com/xcircuit/archive/%{name}-%{version}.tgz From 704a26296dc2c4f2bb90e60681344cc973898986 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:11:27 +0000 Subject: [PATCH 04/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 0d45569..05edf51 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -111,6 +111,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 3.10.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Nov 12 2018 Mamoru TASAKA - 3.10.12-1 - 3.10.12 From 37f6fc0bb3bf9056bdc8fb03684eaea4e18f02c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:57:17 +0000 Subject: [PATCH 05/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 05edf51..65df77a 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -111,6 +111,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.10.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 3.10.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ce02bb0639316c6264d86419f540b507634a74f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:11:16 +0000 Subject: [PATCH 06/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 65df77a..770b3d6 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -111,6 +111,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.10.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 3.10.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f4d157b390ec8ec8f306a9c7f01c8f1482466ac0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 May 2020 17:39:31 +0900 Subject: [PATCH 07/32] 3.10.24 --- .gitignore | 1 + sources | 2 +- xcircuit.spec | 14 +++++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cb4fb95..3ef5bcf 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /xcircuit-3.10.9.tgz /xcircuit-3.10.10.tgz /xcircuit-3.10.12.tgz +/xcircuit-3.10.24.tgz diff --git a/sources b/sources index 5e5472b..182402c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xcircuit-3.10.12.tgz) = b2fd580840d3533c984cd6910eb67ebccfa307dc58ac9a3f035e827f8ddfe76ad9df10023f8301e628a27556476b617c16822a0725eb8df7e7c67c337807759a +SHA512 (xcircuit-3.10.24.tgz) = dd4f70cce2ce5cdc3168c3d30998534e90df043fd9532318e199406f7f9443cc9b3d404fe7fb391db5e1f9b4e8766b0a17eae1fe523050a736d7d1c1102f14c0 diff --git a/xcircuit.spec b/xcircuit.spec index 770b3d6..312d3f8 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -10,8 +10,8 @@ %undefine __brp_mangle_shebangs Name: xcircuit -Version: %{short_version}.12 -Release: 4%{?dist} +Version: %{short_version}.24 +Release: 1%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -58,6 +58,8 @@ CAD program for circuit schematic drawing and schematic capture. #439604: TCL 8.5.1 sed -i lib/tcl/tkcon.tcl \ -e "s|package require -exact|package require|" +sed -i Makefile.am \ + -e 's|/lib/|/%{_lib}/|' autoreconf @@ -76,7 +78,10 @@ export WISH=/usr/bin/wish make %{?_smp_mflags} %install -make INSTALL="install -p" DESTDIR=%{buildroot} install +make \ + INSTALL="install -p" \ + DESTDIR=%{buildroot} \ + install make install-man mandir="%{buildroot}%{_mandir}" rm -rf examples/win32 @@ -111,6 +116,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Tue May 5 2020 Mamoru TASAKA - 3.10.24-1 +- 3.10.24 + * Fri Jan 31 2020 Fedora Release Engineering - 3.10.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f59f482eea77932c28aaf0ebcc13036c1f8ac70f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 2 Jul 2020 22:42:23 +0900 Subject: [PATCH 08/32] 3.10.28 --- .gitignore | 1 + sources | 2 +- xcircuit.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3ef5bcf..2e8161c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /xcircuit-3.10.10.tgz /xcircuit-3.10.12.tgz /xcircuit-3.10.24.tgz +/xcircuit-3.10.28.tgz diff --git a/sources b/sources index 182402c..679a024 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xcircuit-3.10.24.tgz) = dd4f70cce2ce5cdc3168c3d30998534e90df043fd9532318e199406f7f9443cc9b3d404fe7fb391db5e1f9b4e8766b0a17eae1fe523050a736d7d1c1102f14c0 +SHA512 (xcircuit-3.10.28.tgz) = e2a84942fd1b0cb4ec101b08f8e4628be8c42083f16514098939e30ca73c407d67603d30d0424a12b068e1bdc05c99f6c558e467c8c484bceaf51b88ff12da06 diff --git a/xcircuit.spec b/xcircuit.spec index 312d3f8..39bde99 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -10,7 +10,7 @@ %undefine __brp_mangle_shebangs Name: xcircuit -Version: %{short_version}.24 +Version: %{short_version}.28 Release: 1%{?dist} Summary: Electronic circuit schematic drawing program @@ -116,6 +116,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Thu Jul 2 2020 Mamoru TASAKA - 3.10.28-1 +- 3.10.28 + * Tue May 5 2020 Mamoru TASAKA - 3.10.24-1 - 3.10.24 From 69e84f2370f70d4d4549691c2fc0bb8e90a812c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:31:11 +0000 Subject: [PATCH 09/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 39bde99..f14a917 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -116,6 +116,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.10.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 2 2020 Mamoru TASAKA - 3.10.28-1 - 3.10.28 From f5a1c970a36c384221c0684186e28d0366a5eeba Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 23 Sep 2020 15:51:53 +0900 Subject: [PATCH 10/32] 3.10.29 --- .gitignore | 1 + sources | 2 +- xcircuit.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2e8161c..1b5607f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /xcircuit-3.10.12.tgz /xcircuit-3.10.24.tgz /xcircuit-3.10.28.tgz +/xcircuit-3.10.29.tgz diff --git a/sources b/sources index 679a024..cc420fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xcircuit-3.10.28.tgz) = e2a84942fd1b0cb4ec101b08f8e4628be8c42083f16514098939e30ca73c407d67603d30d0424a12b068e1bdc05c99f6c558e467c8c484bceaf51b88ff12da06 +SHA512 (xcircuit-3.10.29.tgz) = d3615007ca56d7858dfcef3e7b2d8cbea3155ef7f222105a60c75d232f8a8755af715f59367eb358941b9ceed476c7b3f802fcf5b0dae40ad221bdad914bf4ff diff --git a/xcircuit.spec b/xcircuit.spec index f14a917..2c44bcf 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -10,8 +10,8 @@ %undefine __brp_mangle_shebangs Name: xcircuit -Version: %{short_version}.28 -Release: 2%{?dist} +Version: %{short_version}.29 +Release: 1%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -116,6 +116,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Wed Sep 23 2020 Mamoru TASAKA - 3.10.29-1 +- 3.10.29 + * Wed Jul 29 2020 Fedora Release Engineering - 3.10.28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a36d1fa40d44c53bd44a1aa8dd20da03654e7dab Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 29 Dec 2020 21:11:04 +0900 Subject: [PATCH 11/32] 3.10.30 --- .gitignore | 1 + sources | 2 +- xcircuit.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1b5607f..a6a5190 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /xcircuit-3.10.24.tgz /xcircuit-3.10.28.tgz /xcircuit-3.10.29.tgz +/xcircuit-3.10.30.tgz diff --git a/sources b/sources index cc420fe..5c10eb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xcircuit-3.10.29.tgz) = d3615007ca56d7858dfcef3e7b2d8cbea3155ef7f222105a60c75d232f8a8755af715f59367eb358941b9ceed476c7b3f802fcf5b0dae40ad221bdad914bf4ff +SHA512 (xcircuit-3.10.30.tgz) = 52bf65fa9b5c095092f60abe32b3c88180365cc8043a8e95652ea9ab20e01c3e790989fe41171ecd1b2c60684016f6963c4851105b17a1c8a3bac8d75db84a8e diff --git a/xcircuit.spec b/xcircuit.spec index 2c44bcf..229270e 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -10,7 +10,7 @@ %undefine __brp_mangle_shebangs Name: xcircuit -Version: %{short_version}.29 +Version: %{short_version}.30 Release: 1%{?dist} Summary: Electronic circuit schematic drawing program @@ -116,6 +116,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Tue Dec 29 2020 Mamoru TASAKA - 3.10.30-1 +- 3.10.30 + * Wed Sep 23 2020 Mamoru TASAKA - 3.10.29-1 - 3.10.29 From db882c34b5543da58ceedcb146eb44c29e944e87 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:12:11 +0000 Subject: [PATCH 12/32] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xcircuit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xcircuit.spec b/xcircuit.spec index 229270e..99a250a 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -24,6 +24,7 @@ Source2: %{name}.png Patch0: xcircuit-3.9.40-format-security.patch +BuildRequires: make BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(fontconfig) BuildRequires: %ghostscript_devel From 434b9c4852ada5afadf30dd23202238346820728 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:51:32 +0000 Subject: [PATCH 13/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 99a250a..860fd24 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -117,6 +117,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.10.30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Dec 29 2020 Mamoru TASAKA - 3.10.30-1 - 3.10.30 From 9a8a55df314c67ff51adddad98d9e30418edd4d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:21:31 +0000 Subject: [PATCH 14/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 860fd24..1453319 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -117,6 +117,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.10.30-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 3.10.30-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 051156d67ac636d42136ab7479a7d12f74b1fba8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:53:11 +0000 Subject: [PATCH 15/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 1453319..da2c9cc 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -117,6 +117,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.10.30-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 3.10.30-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2a56279b21dc7399edb75f495cb9942d3cc762df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:52:40 +0000 Subject: [PATCH 16/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index da2c9cc..fd3674d 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -117,6 +117,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.10.30-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 3.10.30-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 7549d5be1b4ae5b4c858101d93774a2745660243 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:14:14 +0000 Subject: [PATCH 17/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index fd3674d..171350c 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -117,6 +117,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.10.30-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 3.10.30-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From f8cb62060fb22d2e25b4e48e1cb3014a060bca3d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 24 Jan 2023 19:44:15 +0900 Subject: [PATCH 18/32] Rebuild for ghostscript 10 --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 171350c..e4ac689 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -117,6 +117,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Tue Jan 24 2023 Mamoru TASAKA - 3.10.30-7 +- Rebuild for ghostscript 10 + * Sat Jan 21 2023 Fedora Release Engineering - 3.10.30-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 357e9fee9f2d97085b3ca8ff109e54d584497c9a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 11 Apr 2023 09:08:09 +0200 Subject: [PATCH 19/32] Port to C99 Related to: --- xcircuit-c99.patch | 19 +++++++++++++++++++ xcircuit.spec | 7 ++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 xcircuit-c99.patch diff --git a/xcircuit-c99.patch b/xcircuit-c99.patch new file mode 100644 index 0000000..8a4b6c3 --- /dev/null +++ b/xcircuit-c99.patch @@ -0,0 +1,19 @@ +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. + +Submitted upstream: + +diff --git a/prototypes.h b/prototypes.h +index d577c854c48eddf1..5ec4b272722fd658 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 *); diff --git a/xcircuit.spec b/xcircuit.spec index e4ac689..877104b 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -23,6 +23,7 @@ Source1: %{name}.desktop Source2: %{name}.png Patch0: xcircuit-3.9.40-format-security.patch +Patch1: xcircuit-c99.patch BuildRequires: make BuildRequires: pkgconfig(cairo) @@ -55,6 +56,7 @@ CAD program for circuit schematic drawing and schematic capture. %prep %setup -q %patch0 -p1 +%patch1 -p1 #439604: TCL 8.5.1 sed -i lib/tcl/tkcon.tcl \ @@ -117,6 +119,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Tue Apr 11 2023 Florian Weimer - 3.10.30-8 +- Port to C99 + * Tue Jan 24 2023 Mamoru TASAKA - 3.10.30-7 - Rebuild for ghostscript 10 From 69d2cad2b0a9c5b1354fd60d748385181affa997 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 23 Jul 2023 00:37:49 +0900 Subject: [PATCH 20/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild --- xcircuit.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xcircuit.spec b/xcircuit.spec index 877104b..85178a6 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -55,8 +55,8 @@ CAD program for circuit schematic drawing and schematic capture. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 #439604: TCL 8.5.1 sed -i lib/tcl/tkcon.tcl \ @@ -119,6 +119,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Sat Jul 22 2023 Mamoru TASAKA - 3.10.30-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Apr 11 2023 Florian Weimer - 3.10.30-8 - Port to C99 From bb13885b5e9abf43a6f1b6c2fb0b4ef074b72f8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:24:57 +0000 Subject: [PATCH 21/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 85178a6..e0f1672 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -11,7 +11,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Electronic circuit schematic drawing program License: GPLv2+ @@ -119,6 +119,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.10.30-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Mamoru TASAKA - 3.10.30-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ad2bdb1c4c0370854cdd2f7171a7686fa2189fcf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 22 Mar 2024 16:19:23 +0900 Subject: [PATCH 22/32] remove old macro --- xcircuit.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/xcircuit.spec b/xcircuit.spec index e0f1672..15c841f 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -1,11 +1,5 @@ %global short_version 3.10 -%if 0%{?fedora} >= 28 -%global ghostscript_devel libgs-devel -%else -%global ghostscript_devel ghostscript-devel -%endif - %undefine _changelog_trimtime %undefine __brp_mangle_shebangs @@ -23,12 +17,12 @@ Source1: %{name}.desktop Source2: %{name}.png Patch0: xcircuit-3.9.40-format-security.patch -Patch1: xcircuit-c99.patch +Patch1: xcircuit-c99.patch -BuildRequires: make +BuildRequires: make BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(fontconfig) -BuildRequires: %ghostscript_devel +BuildRequires: libgs-devel BuildRequires: libXpm-devel BuildRequires: libXt-devel BuildRequires: tcl-devel From 6ff3ca6babdf645d09d49187fa91ce5d466cfc46 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 22 Mar 2024 17:36:07 +0900 Subject: [PATCH 23/32] add reference --- xcircuit.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xcircuit.spec b/xcircuit.spec index 15c841f..b6ad056 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -8,6 +8,13 @@ Version: %{short_version}.30 Release: 10%{?dist} Summary: Electronic circuit schematic drawing program +# Xw/ HPND unused +# asg/ non-free unused +# flate.c GPL-2.0-only from acroformtool +# lib/tcl/matgen.tcl GPL-2.0-or-later +# spiceparser/ GPL-2.0-or-later unused +# utf8encodings.c under review https://gitlab.com/fedora/legal/fedora-license-data/-/issues/498 +# xcircuit.c GPL-2.0-or-later License: GPLv2+ URL: http://opencircuitdesign.com/xcircuit From b43f19696a9420c3c61bf42994c786104d5f9709 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 12 Apr 2024 14:37:58 +0900 Subject: [PATCH 24/32] SPDX migration --- xcircuit.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xcircuit.spec b/xcircuit.spec index b6ad056..6da1e93 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -5,7 +5,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Electronic circuit schematic drawing program # Xw/ HPND unused @@ -13,9 +13,10 @@ Summary: Electronic circuit schematic drawing program # flate.c GPL-2.0-only from acroformtool # lib/tcl/matgen.tcl GPL-2.0-or-later # spiceparser/ GPL-2.0-or-later unused -# utf8encodings.c under review https://gitlab.com/fedora/legal/fedora-license-data/-/issues/498 +# utf8encodings.c not-a-license https://gitlab.com/fedora/legal/fedora-license-data/-/issues/498 # xcircuit.c GPL-2.0-or-later -License: GPLv2+ +# SPDX confirmed +License: GPL-2.0-or-later AND GPL-2.0-only URL: http://opencircuitdesign.com/xcircuit Source: http://opencircuitdesign.com/xcircuit/archive/%{name}-%{version}.tgz @@ -120,6 +121,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Fri Apr 12 2024 Mamoru TASAKA - 3.10.30-11 +- SPDX migration + * Sat Jan 27 2024 Fedora Release Engineering - 3.10.30-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7fcb466c21d072ca54801d890390c6a425ed44f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:48:33 +0000 Subject: [PATCH 25/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 6da1e93..1451bbe 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -5,7 +5,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Electronic circuit schematic drawing program # Xw/ HPND unused @@ -121,6 +121,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.10.30-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Apr 12 2024 Mamoru TASAKA - 3.10.30-11 - SPDX migration From 72d7e19f54c0d705d5b4793a776039f666fe0784 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 19 Jan 2025 22:12:53 +0900 Subject: [PATCH 26/32] Fix for C23, include header properly --- xcircuit-3.10.30-c23-math-include.patch | 24 ++++++++++++++++++++++++ xcircuit.spec | 19 +++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 xcircuit-3.10.30-c23-math-include.patch diff --git a/xcircuit-3.10.30-c23-math-include.patch b/xcircuit-3.10.30-c23-math-include.patch new file mode 100644 index 0000000..9750bd2 --- /dev/null +++ b/xcircuit-3.10.30-c23-math-include.patch @@ -0,0 +1,24 @@ +diff --git a/elements.c b/elements.c +index c7705f4..ac599f8 100644 +--- a/elements.c ++++ b/elements.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #ifndef XC_WIN32 + #include +@@ -54,8 +55,6 @@ extern colorindex *colorlist; + extern Pixmap dbuf; + #endif + +-extern double atan2(); +- + /*------------------------------------------------------------------------*/ + /* Declarations of global variables */ + /*------------------------------------------------------------------------*/ +diff --git a/examples/xc_remote.sh b/examples/xc_remote.sh +old mode 100755 +new mode 100644 diff --git a/xcircuit.spec b/xcircuit.spec index 1451bbe..dd74f77 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -5,7 +5,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Electronic circuit schematic drawing program # Xw/ HPND unused @@ -26,6 +26,8 @@ Source2: %{name}.png Patch0: xcircuit-3.9.40-format-security.patch Patch1: xcircuit-c99.patch +# C23 fix, include math.h instead of declare atan2 internally +Patch2: xcircuit-3.10.30-c23-math-include.patch BuildRequires: make BuildRequires: pkgconfig(cairo) @@ -57,8 +59,9 @@ CAD program for circuit schematic drawing and schematic capture. %prep %setup -q -%patch -P0 -p1 -%patch -P1 -p1 +%patch -P0 -p1 -b .format +%patch -P1 -p1 -b .c99 +%patch -P2 -p1 -b .c23 #439604: TCL 8.5.1 sed -i lib/tcl/tkcon.tcl \ @@ -80,13 +83,10 @@ export WISH=/usr/bin/wish --with-tcl=%{_libdir} \ --with-tk=%{_libdir} \ %{nil} -make %{?_smp_mflags} +%make_build %install -make \ - INSTALL="install -p" \ - DESTDIR=%{buildroot} \ - install +%make_install make install-man mandir="%{buildroot}%{_mandir}" rm -rf examples/win32 @@ -121,6 +121,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Sun Jan 19 2025 Mamoru TASAKA - 3.10.30-13 +- Fix for C23, include header properly + * Sat Jul 20 2024 Fedora Release Engineering - 3.10.30-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a293d4d21e23d17c5d1b211e6564b8656b7d921d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 31 Jan 2025 10:50:36 +0900 Subject: [PATCH 27/32] Use tk8 explicitly --- xcircuit.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xcircuit.spec b/xcircuit.spec index dd74f77..bdc23a4 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -5,7 +5,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Electronic circuit schematic drawing program # Xw/ HPND unused @@ -35,8 +35,8 @@ BuildRequires: pkgconfig(fontconfig) BuildRequires: libgs-devel BuildRequires: libXpm-devel BuildRequires: libXt-devel -BuildRequires: tcl-devel -BuildRequires: tk-devel +BuildRequires: pkgconfig(tcl) <= 8.999 +BuildRequires: pkgconfig(tk) <= 8.999 BuildRequires: zlib-devel BuildRequires: desktop-file-utils BuildRequires: ngspice @@ -121,6 +121,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Fri Jan 31 2025 Mamoru TASAKA - 3.10.30-14 +- Use tk8 explicitly + * Sun Jan 19 2025 Mamoru TASAKA - 3.10.30-13 - Fix for C23, include header properly From 5eba1480dab5b965f2e160e0590a287164bc4b5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:40:52 +0000 Subject: [PATCH 28/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index bdc23a4..fc82bde 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -5,7 +5,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Electronic circuit schematic drawing program # Xw/ HPND unused @@ -121,6 +121,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.10.30-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 31 2025 Mamoru TASAKA - 3.10.30-14 - Use tk8 explicitly From 2232d445f36cbcc81d644c221b784c2f2a3a59ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:30:33 +0000 Subject: [PATCH 29/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index fc82bde..3c28545 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -5,7 +5,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Electronic circuit schematic drawing program # Xw/ HPND unused @@ -121,6 +121,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 3.10.30-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 3.10.30-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 07ddb65e0c7aeab31cf29671a1e1c91cc2fb8ccb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:03:59 +0000 Subject: [PATCH 30/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xcircuit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcircuit.spec b/xcircuit.spec index 3c28545..ea956eb 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -5,7 +5,7 @@ Name: xcircuit Version: %{short_version}.30 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Electronic circuit schematic drawing program # Xw/ HPND unused @@ -121,6 +121,9 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.10.30-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 3.10.30-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 7aa4fe09b819d68a02e1bc54f432ba9e6405270c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 17 Aug 2026 15:21:08 +0900 Subject: [PATCH 31/32] refresh .gitignore --- .gitignore | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index a6a5190..c74ef8e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1 @@ -/xcircuit-3.7.57.tgz -/xcircuit-3.9.40.tgz -/xcircuit-3.9.48.tgz -/xcircuit-3.9.49.tgz -/xcircuit-3.9.50.tgz -/xcircuit-3.9.51.tgz -/xcircuit-3.9.54.tgz -/xcircuit-3.9.56.tgz -/xcircuit-3.9.57.tgz -/xcircuit-3.9.58.tgz -/xcircuit-3.9.59.tgz -/xcircuit-3.9.60.tgz -/xcircuit-3.9.61.tgz -/xcircuit-3.9.65.tgz -/xcircuit-3.9.66.tgz -/xcircuit-3.9.67.tgz -/xcircuit-3.9.68.tgz -/xcircuit-3.10.4.tgz -/xcircuit-3.10.8.tgz -/xcircuit-3.10.9.tgz -/xcircuit-3.10.10.tgz -/xcircuit-3.10.12.tgz -/xcircuit-3.10.24.tgz -/xcircuit-3.10.28.tgz -/xcircuit-3.10.29.tgz -/xcircuit-3.10.30.tgz +/xcircuit-*.tgz From 07cc95340070179ae7f20196e6e9a73132388cd9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 17 Aug 2026 15:22:41 +0900 Subject: [PATCH 32/32] 3.10.45 --- sources | 2 +- xcircuit-3.10.30-c23-math-include.patch | 24 ---------- xcircuit-3.9.40-format-security.patch | 58 ------------------------- xcircuit-c99.patch | 19 -------- xcircuit.spec | 22 ++++------ 5 files changed, 9 insertions(+), 116 deletions(-) delete mode 100644 xcircuit-3.10.30-c23-math-include.patch delete mode 100644 xcircuit-3.9.40-format-security.patch delete mode 100644 xcircuit-c99.patch diff --git a/sources b/sources index 5c10eb1..e2eb38b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xcircuit-3.10.30.tgz) = 52bf65fa9b5c095092f60abe32b3c88180365cc8043a8e95652ea9ab20e01c3e790989fe41171ecd1b2c60684016f6963c4851105b17a1c8a3bac8d75db84a8e +SHA512 (xcircuit-3.10.45.tgz) = c08eeba7d1a22c009cca33f68723cc24c5565f00f34ca29f043481b32cae2327a8bb1fd6cfb82bfdaf6c18973d3bbb6ada3668d74c48879166fe2a11da4bfa96 diff --git a/xcircuit-3.10.30-c23-math-include.patch b/xcircuit-3.10.30-c23-math-include.patch deleted file mode 100644 index 9750bd2..0000000 --- a/xcircuit-3.10.30-c23-math-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/elements.c b/elements.c -index c7705f4..ac599f8 100644 ---- a/elements.c -+++ b/elements.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - #ifndef XC_WIN32 - #include -@@ -54,8 +55,6 @@ extern colorindex *colorlist; - extern Pixmap dbuf; - #endif - --extern double atan2(); -- - /*------------------------------------------------------------------------*/ - /* Declarations of global variables */ - /*------------------------------------------------------------------------*/ -diff --git a/examples/xc_remote.sh b/examples/xc_remote.sh -old mode 100755 -new mode 100644 diff --git a/xcircuit-3.9.40-format-security.patch b/xcircuit-3.9.40-format-security.patch deleted file mode 100644 index 1a7b48d..0000000 --- a/xcircuit-3.9.40-format-security.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -urp -x Makefile -x 'config.*' -x '*~' xcircuit-3.9.40.old/svg.c xcircuit-3.9.40.new/svg.c ---- xcircuit-3.9.40.old/svg.c 2015-10-07 00:04:49.000000000 +0900 -+++ xcircuit-3.9.40.new/svg.c 2016-06-25 00:13:28.468986578 +0900 -@@ -1108,12 +1108,12 @@ int xctcl_svg(ClientData clientData, Tcl - - if (locobjc >= 2) { - /* If there is a non-option argument, use it for the output filename */ -- sprintf(filename, Tcl_GetString(objv[1])); -+ sprintf(filename, "%s", Tcl_GetString(objv[1])); - } - else if (xobjs.pagelist[areawin->page]->pageinst->thisobject->name == NULL) -- sprintf(filename, xobjs.pagelist[areawin->page]->filename); -+ sprintf(filename, "%s", xobjs.pagelist[areawin->page]->filename); - else -- sprintf(filename, xobjs.pagelist[areawin->page]->pageinst->thisobject->name); -+ sprintf(filename, "%s", xobjs.pagelist[areawin->page]->pageinst->thisobject->name); - - pptr = strrchr(filename, '.'); - if (pptr != NULL) -diff -urp -x Makefile -x 'config.*' -x '*~' xcircuit-3.9.40.old/tclxcircuit.c xcircuit-3.9.40.new/tclxcircuit.c ---- xcircuit-3.9.40.old/tclxcircuit.c 2015-11-14 02:27:30.000000000 +0900 -+++ xcircuit-3.9.40.new/tclxcircuit.c 2016-06-25 00:15:07.012510579 +0900 -@@ -3876,7 +3876,7 @@ int xctcl_object(ClientData clientData, - case NameIdx: - if (nidx == 1 || areawin->selects == 0) { - if (objc == 3) { -- sprintf(thisinst->thisobject->name, Tcl_GetString(objv[nidx + 2])); -+ sprintf(thisinst->thisobject->name, "%s", Tcl_GetString(objv[nidx + 2])); - checkname(thisinst->thisobject); - } - Tcl_AppendElement(interp, thisinst->thisobject->name); -@@ -7294,7 +7294,7 @@ int xctcl_page(ClientData clientData, Tc - - case LoadIdx: - TechReplaceSave(); -- sprintf(_STR2, Tcl_GetString(objv[2 + nidx])); -+ sprintf(_STR2, "%s", Tcl_GetString(objv[2 + nidx])); - for (i = 3 + nidx; i < objc; i++) { - argv = Tcl_GetString(objv[i]); - if ((*argv == '-') && !strncmp(argv, "-repl", 5)) { -@@ -7380,7 +7380,7 @@ int xctcl_page(ClientData clientData, Tc - - switch (importtype) { - case XCircuitIdx: -- sprintf(_STR2, Tcl_GetString(objv[3 + nidx])); -+ sprintf(_STR2, "%s", Tcl_GetString(objv[3 + nidx])); - for (i = 4; i < objc; i++) { - strcat(_STR2, ","); - strcat(_STR2, Tcl_GetString(objv[i + nidx])); -@@ -7397,7 +7397,7 @@ int xctcl_page(ClientData clientData, Tc - Tcl_SetObjResult(interp, objPtr); - return XcTagCallback(interp, objc, objv); - } -- sprintf(_STR2, Tcl_GetString(objv[3 + nidx])); -+ sprintf(_STR2, "%s", Tcl_GetString(objv[3 + nidx])); - if (savepage != pageno) newpage(pageno); - loadbackground(); - if (savepage != pageno) newpage(savepage); diff --git a/xcircuit-c99.patch b/xcircuit-c99.patch deleted file mode 100644 index 8a4b6c3..0000000 --- a/xcircuit-c99.patch +++ /dev/null @@ -1,19 +0,0 @@ -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. - -Submitted upstream: - -diff --git a/prototypes.h b/prototypes.h -index d577c854c48eddf1..5ec4b272722fd658 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 *); diff --git a/xcircuit.spec b/xcircuit.spec index ea956eb..eaf7417 100644 --- a/xcircuit.spec +++ b/xcircuit.spec @@ -4,8 +4,8 @@ %undefine __brp_mangle_shebangs Name: xcircuit -Version: %{short_version}.30 -Release: 17%{?dist} +Version: %{short_version}.45 +Release: 1%{?dist} Summary: Electronic circuit schematic drawing program # Xw/ HPND unused @@ -24,11 +24,6 @@ Source1: %{name}.desktop # http://opencircuitdesign.com/xcircuit/archive/xcircuit.xpm as 64x64 Source2: %{name}.png -Patch0: xcircuit-3.9.40-format-security.patch -Patch1: xcircuit-c99.patch -# C23 fix, include math.h instead of declare atan2 internally -Patch2: xcircuit-3.10.30-c23-math-include.patch - BuildRequires: make BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(fontconfig) @@ -48,7 +43,7 @@ BuildRequires: libtool # Need check Requires: coreutils Requires: gtk2 -Requires: tk +Requires: tk8 # Special FEL Gnome/KDE menu structure Requires: electronics-menu @@ -59,13 +54,8 @@ CAD program for circuit schematic drawing and schematic capture. %prep %setup -q -%patch -P0 -p1 -b .format -%patch -P1 -p1 -b .c99 -%patch -P2 -p1 -b .c23 #439604: TCL 8.5.1 -sed -i lib/tcl/tkcon.tcl \ - -e "s|package require -exact|package require|" sed -i Makefile.am \ -e 's|/lib/|/%{_lib}/|' @@ -76,7 +66,7 @@ sed -i examples/xc_remote.sh -e 's|/usr/local/bin|%{_bindir}|' chmod ugo-x lib/tcl/console.tcl %build -export WISH=/usr/bin/wish +export WISH=/usr/bin/wish8 #01/08/09 Without --enable-asg \ because it's broken %configure \ @@ -121,6 +111,10 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1.* %changelog +* Mon Aug 17 2026 Mamoru TASAKA - 3.10.45-1 +- 3.10.45 +- Still use Tcl/Tk 8: Not ready for Tk 9 + * Fri Jul 17 2026 Fedora Release Engineering - 3.10.30-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild