From 2322d38d14f63ba67d33c1f8bfd1a5e3404bd301 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Wed, 30 Dec 2020 13:53:05 -0700 Subject: [PATCH 01/26] Updating to ucblogo 6.2 --- ucblogo.desktop | 8 ------ ucblogo.spec | 65 +++++++++++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 35 deletions(-) delete mode 100644 ucblogo.desktop diff --git a/ucblogo.desktop b/ucblogo.desktop deleted file mode 100644 index 5d0ed1f..0000000 --- a/ucblogo.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=UCBLogo -GenericName=Logo Programming Language -Exec=logo-wx -Icon=ucblogo -Terminal=false -Type=Application -Categories=Education diff --git a/ucblogo.spec b/ucblogo.spec index 54e8831..3075e19 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,11 +1,10 @@ Name: ucblogo -Version: 6.1 -Release: 3%{?dist} +Version: 6.2 +Release: 1%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ -Source: https://github.com/jrincayc/ucblogo-code/archive/version_%{version}.tar.gz -Source1: %{name}.desktop +Source: https://github.com/jrincayc/ucblogo-code/releases/download/version_%{version}/ucblogo-%{version}.tar.gz URL: https://people.eecs.berkeley.edu/~bh/logo.html BuildRequires: gcc BuildRequires: gcc-c++ @@ -45,47 +44,48 @@ BuildArch: noarch This package includes HTML and PDF documentation for ucblogo and the Program Logic Manual (plm) +%package x11 +Summary: X11 version for ucblogo +Requires: %{name} = %{version}-%{release} + +%description x11 +This package contains the x11 binary for ucblogo. + %prep -%setup -q -n ucblogo-code-version_%{version} +%setup -q # correct directories /usr/lib -> /usr/share and /usr/local -> /usr sed -i 's|/local/lib/logo|/share/logo|g' *.c README.md sed -i 's|/lib/logo|/share/logo|g' *.c makefile* -sed -i "s|/usr/local/bin/logo|%{_bindir}/logo|g" docs/usermanual.texi +sed -i "s|/usr/local/bin/logo|%{_bindir}/logo|g" docs/ucblogo.texi sed -i "s|/usr/local/bin/logo|%{_bindir}/logo|g" README.md sed -i "s|/usr/local/info|%{_datadir}/info|g" README.md -find -name 'CVS' | xargs rm -rf -find -name '.svn' | xargs rm -rf - %build -# build WX version -%configure --with-wx-config=/usr/bin/wx-config-3.0 -make %{_smp_mflags} logo -mv logo logo-wx # build traditional version +%configure --x-includes=%{_includedir} --x-libraries=%{_libdir} --enable-x11 --with-wx-config=no +%make_build ucblogo +mv ucblogo ucblogo-x11 +# build wx version make clean -%configure --x-includes=%{_includedir} --x-libraries=%{_libdir} --with-x --with-wx-config=no -make %{_smp_mflags} -# build docs -make make-docs +%configure --with-wx-config=/usr/bin/wx-config-3.0 +%make_build +# build html docs +make html %install -#Note: makefile does not support DESTDIR -%makeinstall +%make_install -install -m0755 logo-wx ${RPM_BUILD_ROOT}%{_bindir} +install -m0755 ucblogo-x11 ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/info -mv -f ${RPM_BUILD_ROOT}%{_prefix}/info/* ${RPM_BUILD_ROOT}%{_datadir}/info -rm -fr ${RPM_BUILD_ROOT}%{_prefix}/info -rm -fr ${RPM_BUILD_ROOT}%{_datadir}/logo/docs -desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps install -p -m 644 ucblogo.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps +install -p -m 644 plm $RPM_BUILD_ROOT%{_datadir}/doc/ucblogo rm -f ${RPM_BUILD_ROOT}%{_bindir}/install-logo-mode @@ -100,17 +100,28 @@ fi %files %doc README.md changes.txt %license LICENSE -%{_bindir}/* -%{_datadir}/logo +%{_bindir}/ucblogo %{_infodir}/* %{_mandir}/man1/logo* %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/256x256/apps/%{name}.png +%{_datadir}/ucblogo/csls/* +%{_datadir}/ucblogo/helpfiles/* +%{_datadir}/ucblogo/logolib/* +%{_datadir}/pixmaps/ucblogo.xpm %files doc -%doc docs/html docs/usermanual.pdf plm +%{_datadir}/doc/ucblogo/ucblogo.pdf +%{_datadir}/doc/ucblogo/ucblogo.html +%{_datadir}/doc/ucblogo/plm + +%files x11 +%{_bindir}/ucblogo-x11 %changelog +* Wed Dec 30 2020 Joshua Cogliati - 6.2-1 +- Updating to 6.2 release and splitting x11 binary to separate package + * Wed Jul 29 2020 Fedora Release Engineering - 6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5290fffbcfd4fe28adf29950723b37c05cad7598 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Wed, 30 Dec 2020 14:34:36 -0700 Subject: [PATCH 02/26] Adding new source file. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 22f25c1..7a79d0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ ucblogo-6.0.tar.gz logo-mode.tar.gz /version_6.1.tar.gz +/ucblogo-6.2.tar.gz diff --git a/sources b/sources index e583681..325cd99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (version_6.1.tar.gz) = 449fde8f5e200aa4ba712fe5af67e814c820f1b3beffb35f19244f34864c3fc0f73db8f1e25dfb11919081cee01319a6df2592644270e2fdd4137fd2f907ee82 +SHA512 (ucblogo-6.2.tar.gz) = 1368d78439863a91195bbd66cf7622833e52501de779e827d4383a7c37f7fb47858ac00b78435fced0b0802f9195069348a8370663f9d94edce0a0edaa993fa6 From 28418f567e5765e3042ac19a541627602495cdb3 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Thu, 31 Dec 2020 09:52:53 -0700 Subject: [PATCH 03/26] Updating to 6.2.1 (fixes manpage) --- .gitignore | 1 + sources | 2 +- ucblogo.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7a79d0b..0371816 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ucblogo-6.0.tar.gz logo-mode.tar.gz /version_6.1.tar.gz /ucblogo-6.2.tar.gz +/ucblogo-6.2.1.tar.gz diff --git a/sources b/sources index 325cd99..2a78465 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ucblogo-6.2.tar.gz) = 1368d78439863a91195bbd66cf7622833e52501de779e827d4383a7c37f7fb47858ac00b78435fced0b0802f9195069348a8370663f9d94edce0a0edaa993fa6 +SHA512 (ucblogo-6.2.1.tar.gz) = f6c42f5f97984717a39498f1fd050ba84371aee57fb234dc3b9101eab33f9013f3aaa7a8bcc9c4efef3603e4a11b2990b322837c0f0ce633e5070ba7b4b903fb diff --git a/ucblogo.spec b/ucblogo.spec index 3075e19..ac58bd7 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,5 +1,5 @@ Name: ucblogo -Version: 6.2 +Version: 6.2.1 Release: 1%{?dist} Summary: An interpreter for the Logo programming language @@ -88,6 +88,7 @@ install -p -m 644 ucblogo.png \ install -p -m 644 plm $RPM_BUILD_ROOT%{_datadir}/doc/ucblogo rm -f ${RPM_BUILD_ROOT}%{_bindir}/install-logo-mode +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %post /sbin/install-info %{_infodir}/ucblogo.info --entry="* UCBLogo: (ucblogo). Berkeley Logo User Manual." --section="Programming Languages" %{_infodir}/dir 2>/dev/null || : @@ -101,8 +102,8 @@ fi %doc README.md changes.txt %license LICENSE %{_bindir}/ucblogo -%{_infodir}/* -%{_mandir}/man1/logo* +%{_infodir}/*.info* +%{_mandir}/man1/ucblogo* %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/256x256/apps/%{name}.png %{_datadir}/ucblogo/csls/* @@ -119,6 +120,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Thu Dec 31 2020 Joshua Cogliati - 6.2.1-1 +- Updating to 6.2.1 release + * Wed Dec 30 2020 Joshua Cogliati - 6.2-1 - Updating to 6.2 release and splitting x11 binary to separate package From 93a6dbae0fbada4f4823d0ff2153854fd66fe798 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:16:50 +0000 Subject: [PATCH 04/26] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ucblogo.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ucblogo.spec b/ucblogo.spec index ac58bd7..e1c4ff1 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -6,6 +6,7 @@ Summary: An interpreter for the Logo programming language License: GPLv3+ Source: https://github.com/jrincayc/ucblogo-code/releases/download/version_%{version}/ucblogo-%{version}.tar.gz URL: https://people.eecs.berkeley.edu/~bh/logo.html +BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: texinfo From bca517797563d40a4c94e1237bed01b7a330a5b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:32:26 +0000 Subject: [PATCH 05/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index e1c4ff1..07941dd 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ @@ -121,6 +121,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 6.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Dec 31 2020 Joshua Cogliati - 6.2.1-1 - Updating to 6.2.1 release From 64789c7aaf229fabb3d65223e91cb915475441cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:53:41 +0000 Subject: [PATCH 06/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index 07941dd..f4895f2 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ @@ -121,6 +121,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 6.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 6.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 629c44e4dc4eb84ec63a8806134652fac2685c1f Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Wed, 29 Dec 2021 10:20:31 -0700 Subject: [PATCH 07/26] Updating to 6.2.2 --- .gitignore | 1 + sources | 2 +- ucblogo.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0371816..b389126 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ logo-mode.tar.gz /version_6.1.tar.gz /ucblogo-6.2.tar.gz /ucblogo-6.2.1.tar.gz +/ucblogo-6.2.2.tar.gz diff --git a/sources b/sources index 2a78465..b5fc1ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ucblogo-6.2.1.tar.gz) = f6c42f5f97984717a39498f1fd050ba84371aee57fb234dc3b9101eab33f9013f3aaa7a8bcc9c4efef3603e4a11b2990b322837c0f0ce633e5070ba7b4b903fb +SHA512 (ucblogo-6.2.2.tar.gz) = 8168f422454a72a4bb0383e80751cfb1dc149ab90276278b1c68f878e756fd5166b327d5f7b02d409c894cbe41b0707ba9049f53b7e7898301e0a86705b6e242 diff --git a/ucblogo.spec b/ucblogo.spec index f4895f2..df8f348 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo -Version: 6.2.1 -Release: 3%{?dist} +Version: 6.2.2 +Release: 1%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ @@ -121,6 +121,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Wed Dec 29 2021 Joshua Cogliati - 6.2.2-1 +- Updating to 6.2.2 release + * Fri Jul 23 2021 Fedora Release Engineering - 6.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d066dcd0025cc0ec0a36f43a297fe330c81caf1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:22:43 +0000 Subject: [PATCH 08/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index df8f348..29a0b8f 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ @@ -121,6 +121,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Dec 29 2021 Joshua Cogliati - 6.2.2-1 - Updating to 6.2.2 release From a3f50be302383c561f8fc834d6abfde3e3e33237 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:14:15 +0000 Subject: [PATCH 09/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index 29a0b8f..b8d19eb 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ @@ -121,6 +121,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 6.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 6.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ce9e1556bf76c1c49a24be6e55d08d807ed4ab81 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 4 Aug 2022 14:22:27 -0400 Subject: [PATCH 10/26] Rebuild with wxWidgets 3.2 --- ucblogo.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ucblogo.spec b/ucblogo.spec index b8d19eb..6b1bfb2 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ @@ -20,7 +20,7 @@ BuildRequires: libXt-devel BuildRequires: libSM-devel BuildRequires: libICE-devel BuildRequires: ncurses-devel -BuildRequires: wxGTK3-devel +BuildRequires: wxGTK-devel BuildRequires: ghostscript-tools-dvipdf BuildRequires: desktop-file-utils Requires(post): /sbin/install-info @@ -71,7 +71,7 @@ sed -i "s|/usr/local/info|%{_datadir}/info|g" README.md mv ucblogo ucblogo-x11 # build wx version make clean -%configure --with-wx-config=/usr/bin/wx-config-3.0 +%configure --with-wx-config=/usr/bin/wx-config-3.2 %make_build # build html docs make html @@ -121,6 +121,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Thu Aug 04 2022 Scott Talbert - 6.2.2-4 +- Rebuild with wxWidgets 3.2 + * Sat Jul 23 2022 Fedora Release Engineering - 6.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c9429a549fdf0f051fea6f3eb7118f6d2ec18f82 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Tue, 17 Jan 2023 18:00:18 -0700 Subject: [PATCH 11/26] Updating to version 6.2.3 --- .gitignore | 1 + sources | 2 +- ucblogo.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b389126..cc4255a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ logo-mode.tar.gz /ucblogo-6.2.tar.gz /ucblogo-6.2.1.tar.gz /ucblogo-6.2.2.tar.gz +/ucblogo-6.2.3.tar.gz diff --git a/sources b/sources index b5fc1ad..fc6b0b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ucblogo-6.2.2.tar.gz) = 8168f422454a72a4bb0383e80751cfb1dc149ab90276278b1c68f878e756fd5166b327d5f7b02d409c894cbe41b0707ba9049f53b7e7898301e0a86705b6e242 +SHA512 (ucblogo-6.2.3.tar.gz) = ba3ef87dafb936969191765282532a1c09f8e69bd0c4474bed3d689528169a4e32fb2baabe7b2298f1bd5c4ff61ae4bb7bb6786900c0cda270e42ba1ab594a53 diff --git a/ucblogo.spec b/ucblogo.spec index 6b1bfb2..b7b1fe6 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo -Version: 6.2.2 -Release: 4%{?dist} +Version: 6.2.3 +Release: 1%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ @@ -121,6 +121,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Tue Jan 17 2023 Joshua Cogliati - 6.2.3-1 +- Updating to 6.2.3 release + * Thu Aug 04 2022 Scott Talbert - 6.2.2-4 - Rebuild with wxWidgets 3.2 From a00afac23771ba31aeabb21f235860403d483b6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:39:03 +0000 Subject: [PATCH 12/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index b7b1fe6..30bf73b 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ @@ -121,6 +121,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 6.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 17 2023 Joshua Cogliati - 6.2.3-1 - Updating to 6.2.3 release From dc47d79b012178c08778fa044850901d4a4526fe Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 7 Feb 2023 14:52:16 +0100 Subject: [PATCH 13/26] Fix some C99 compatibility issues Related to: --- ucblogo-c99.patch | 40 ++++++++++++++++++++++++++++++++++++++++ ucblogo.spec | 8 ++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 ucblogo-c99.patch diff --git a/ucblogo-c99.patch b/ucblogo-c99.patch new file mode 100644 index 0000000..da67764 --- /dev/null +++ b/ucblogo-c99.patch @@ -0,0 +1,40 @@ +Implicit funciton declarations were removed from C99, and future +compilers may not support them by default because they are a type +safety hazard. + +Submitted upstream: + +diff --git a/wrksp.c b/wrksp.c +index b2d77edf90085dd3..13aadeec4e2c0c99 100644 +--- a/wrksp.c ++++ b/wrksp.c +@@ -23,6 +23,7 @@ + #endif + + #include ++#include + #ifdef WIN32 + #include + #endif +diff --git a/xgraphics.h b/xgraphics.h +index 30ac0e92e1cc7d1a..64b01fea140d7394 100644 +--- a/xgraphics.h ++++ b/xgraphics.h +@@ -129,6 +129,9 @@ typedef struct { + GC pm; + } pen_info; + ++void save_pen(pen_info *p); ++void restore_pen(pen_info *p); ++ + extern pen_info xgr_pen; + + #define p_info_x(p) (p.xpos) +@@ -152,6 +155,7 @@ extern pen_info xgr_pen; + #define pen_down pen_mode=draw_gc + + #define button get_button() ++int get_button(void); + #define mouse_x get_mouse_x() + #define mouse_y get_mouse_y() + diff --git a/ucblogo.spec b/ucblogo.spec index 30bf73b..5b71454 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,10 +1,11 @@ Name: ucblogo Version: 6.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ Source: https://github.com/jrincayc/ucblogo-code/releases/download/version_%{version}/ucblogo-%{version}.tar.gz +Patch0: ucblogo-c99.patch URL: https://people.eecs.berkeley.edu/~bh/logo.html BuildRequires: make BuildRequires: gcc @@ -53,7 +54,7 @@ Requires: %{name} = %{version}-%{release} This package contains the x11 binary for ucblogo. %prep -%setup -q +%autosetup -p1 # correct directories /usr/lib -> /usr/share and /usr/local -> /usr @@ -121,6 +122,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Tue Feb 07 2023 Florian Weimer - 6.2.3-3 +- Fix some C99 compatibility issues + * Sat Jan 21 2023 Fedora Release Engineering - 6.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d64e4ad7a6dde9e2d132af18c2c701affd2feaba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 16:57:45 +0000 Subject: [PATCH 14/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index 5b71454..87126ad 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ @@ -122,6 +122,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 6.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Feb 07 2023 Florian Weimer - 6.2.3-3 - Fix some C99 compatibility issues From 5cceaf29a22076edd21e21e5a0308252042a4844 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 22 Jan 2024 10:01:28 +0100 Subject: [PATCH 15/26] Backport upstream patches for GCC 14 compatibility --- ucb-logo-c99-2.patch | 18 ++++++++ ucb-logo-c99-3.patch | 98 ++++++++++++++++++++++++++++++++++++++++++++ ucblogo.spec | 7 +++- 3 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 ucb-logo-c99-2.patch create mode 100644 ucb-logo-c99-3.patch diff --git a/ucb-logo-c99-2.patch b/ucb-logo-c99-2.patch new file mode 100644 index 0000000..5b3e431 --- /dev/null +++ b/ucb-logo-c99-2.patch @@ -0,0 +1,18 @@ +commit 30b1223b4979a18132d599792c995264c299ba4e +Author: Joshua J. Cogliati +Date: Wed Jan 10 20:06:12 2024 -0700 + + Define SIG_TAKES_ARG in unix. + +diff --git a/logo.h b/logo.h +index 314173ffc988b32c..024c6be23a25adad 100644 +--- a/logo.h ++++ b/logo.h +@@ -69,6 +69,7 @@ + #ifndef unix + #define unix + #endif ++#define SIG_TAKES_ARG + #include "config.h" + #ifndef X_DISPLAY_MISSING + #define x_window diff --git a/ucb-logo-c99-3.patch b/ucb-logo-c99-3.patch new file mode 100644 index 0000000..4fee56d --- /dev/null +++ b/ucb-logo-c99-3.patch @@ -0,0 +1,98 @@ +commit d300824c6eaf5f98faded7c51ea799b32be7a50b +Author: Joshua J. Cogliati +Date: Fri Jan 12 10:05:45 2024 -0700 + + Fixing incorrect return and wrong type warnings. + +diff --git a/term.c b/term.c +index 48ddc425765fe8b5..17c697bd27a72e31 100644 +--- a/term.c ++++ b/term.c +@@ -95,8 +95,8 @@ extern char **environ, *tgoto(), *tgetstr(); + + char *termcap_ptr; + +-int termcap_putter(char ch) { +- *termcap_ptr++ = ch; ++int termcap_putter(int ch) { ++ *termcap_ptr++ = (char)ch; + return 0; + } + +diff --git a/xgraphics.c b/xgraphics.c +index 5d1c8d483f7e7c23..afc750a9efbc9574 100644 +--- a/xgraphics.c ++++ b/xgraphics.c +@@ -268,7 +268,7 @@ void placate_x() + XConfigureEvent *xce; + XMotionEvent *xme; + XButtonEvent *xbe; +- checkX; ++ checkX(); + + while(XCheckWindowEvent(dpy, win, EVENT_MASK, (XEvent *)&event)) + +@@ -310,14 +310,14 @@ void check_X11_stop() { + + if (--count == 0) { + count = 300; +- checkX; ++ checkX(); + placate_x(); + } + } + + int get_button() + { +- checkX; ++ checkX(0); + + placate_x(); + +@@ -326,7 +326,7 @@ int get_button() + + int get_mouse_x() + { +- checkX; ++ checkX(-1); + + placate_x(); + +@@ -336,7 +336,7 @@ int get_mouse_x() + + int get_mouse_y() + { +- checkX; ++ checkX(-1); + + placate_x(); + +diff --git a/xgraphics.h b/xgraphics.h +index 64b01fea140d7394..8d4aeae3be78f8ae 100644 +--- a/xgraphics.h ++++ b/xgraphics.h +@@ -22,15 +22,21 @@ void logofill(void); + + #define GR_SIZE 60000 + +-#define checkX { \ ++#define checkX(ret) { \ ++ if (have_x < 0) real_window_init(); \ ++ if (!have_x) { \ ++ err_logo(BAD_GRAPH_INIT,NIL); \ ++ return ret; \ ++ } \ ++} ++#define checkXnoreturn { \ + if (have_x < 0) real_window_init(); \ + if (!have_x) { \ + err_logo(BAD_GRAPH_INIT,NIL); \ +- return; \ + } \ + } + +-#define prepare_to_draw {checkX; placate_x();} ++#define prepare_to_draw {checkXnoreturn; placate_x();} + #define done_drawing XFlush(dpy) + extern void placate_x(); + diff --git a/ucblogo.spec b/ucblogo.spec index 87126ad..dc6e572 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,11 +1,13 @@ Name: ucblogo Version: 6.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ Source: https://github.com/jrincayc/ucblogo-code/releases/download/version_%{version}/ucblogo-%{version}.tar.gz Patch0: ucblogo-c99.patch +Patch1: ucb-logo-c99-2.patch +Patch2: ucb-logo-c99-3.patch URL: https://people.eecs.berkeley.edu/~bh/logo.html BuildRequires: make BuildRequires: gcc @@ -122,6 +124,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Mon Jan 22 2024 Florian Weimer - 6.2.3-5 +- Backport upstream patches for GCC 14 compatibility + * Sat Jul 22 2023 Fedora Release Engineering - 6.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 1079ae2a17807e7afbce55fc92d527a98009bfb6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 06:56:59 +0000 Subject: [PATCH 16/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index dc6e572..995b538 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ @@ -124,6 +124,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 6.2.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Florian Weimer - 6.2.3-5 - Backport upstream patches for GCC 14 compatibility From e8ce8be9df965234770e1a320bb64d4674a33abb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:06:23 +0000 Subject: [PATCH 17/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index 995b538..b2ad4a6 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ @@ -124,6 +124,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 6.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 6.2.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From dafa815ca951468bc3eb6bbe7d1e6161255f491a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 13:27:15 +0200 Subject: [PATCH 18/26] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- ucblogo.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ucblogo.spec b/ucblogo.spec index b2ad4a6..cbc5895 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,9 +1,10 @@ Name: ucblogo Version: 6.2.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An interpreter for the Logo programming language -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later Source: https://github.com/jrincayc/ucblogo-code/releases/download/version_%{version}/ucblogo-%{version}.tar.gz Patch0: ucblogo-c99.patch Patch1: ucb-logo-c99-2.patch @@ -124,6 +125,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Thu Jul 25 2024 Miroslav Suchý - 6.2.3-8 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 6.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1ae79242c36bcb2c6306491e4761ead9eb6d77ea Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Sat, 30 Nov 2024 20:12:32 +0300 Subject: [PATCH 19/26] Update to 6.2.4 --- .gitignore | 1 + compile-flags.patch | 21 +++++++++ sources | 2 +- ucb-logo-c99-1.patch | 18 +++++++ ucb-logo-c99-2.patch | 110 +++++++++++++++++++++++++++++++++++++------ ucb-logo-c99-3.patch | 98 -------------------------------------- ucblogo-c99.patch | 40 ---------------- ucblogo.spec | 33 +++++++------ 8 files changed, 152 insertions(+), 171 deletions(-) create mode 100644 compile-flags.patch create mode 100644 ucb-logo-c99-1.patch delete mode 100644 ucb-logo-c99-3.patch delete mode 100644 ucblogo-c99.patch diff --git a/.gitignore b/.gitignore index cc4255a..91d3338 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ logo-mode.tar.gz /ucblogo-6.2.1.tar.gz /ucblogo-6.2.2.tar.gz /ucblogo-6.2.3.tar.gz +/ucblogo-6.2.4.tar.gz diff --git a/compile-flags.patch b/compile-flags.patch new file mode 100644 index 0000000..6d53b0e --- /dev/null +++ b/compile-flags.patch @@ -0,0 +1,21 @@ +diff -ruN ucblogo-code-version_6.2.4/configure.ac ucblogo-code-version_6.2.4-mod/configure.ac +--- ucblogo-code-version_6.2.4/configure.ac 2023-03-28 04:05:59.000000000 +0300 ++++ ucblogo-code-version_6.2.4-mod/configure.ac 2024-11-30 18:24:29.793856326 +0300 +@@ -72,17 +72,6 @@ + AC_MSG_RESULT([$enable_docs]) + AM_CONDITIONAL([DOCS], [test x${enable_docs} = xyes]) + +-dnl Enable Compiler Warnings +-AX_CFLAGS_WARN_ALL +-dnl Disable a warning with many false positives; perhaps rethink later +-AX_CHECK_COMPILE_FLAG([-Wno-write-strings], +-[CFLAGS="$CFLAGS -Wno-write-strings" +-CXXFLAGS="$CXXFLAGS -Wno-write-strings"]) +-dnl Disable voluminous cloud of rather harmless warnings +-AX_CHECK_COMPILE_FLAG([-Wno-unused-variable], +-[CFLAGS="$CFLAGS -Wno-unused-variable" +-CXXFLAGS="$CXXFLAGS -Wno-unused-variable"]) +- + dnl Checks for libraries. + AC_SEARCH_LIBS(sqrt,[m]) + AC_SEARCH_LIBS(atan,[m]) diff --git a/sources b/sources index fc6b0b5..fd15dc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ucblogo-6.2.3.tar.gz) = ba3ef87dafb936969191765282532a1c09f8e69bd0c4474bed3d689528169a4e32fb2baabe7b2298f1bd5c4ff61ae4bb7bb6786900c0cda270e42ba1ab594a53 +SHA512 (ucblogo-6.2.4.tar.gz) = 0c962e914e6540a92b62e8fd906648f0d229247a7bb59488e9a29574300828e846815249807aadbd39d9ebe266362124c0e0e2b426d7f26088989c0f54e26d4c diff --git a/ucb-logo-c99-1.patch b/ucb-logo-c99-1.patch new file mode 100644 index 0000000..5b3e431 --- /dev/null +++ b/ucb-logo-c99-1.patch @@ -0,0 +1,18 @@ +commit 30b1223b4979a18132d599792c995264c299ba4e +Author: Joshua J. Cogliati +Date: Wed Jan 10 20:06:12 2024 -0700 + + Define SIG_TAKES_ARG in unix. + +diff --git a/logo.h b/logo.h +index 314173ffc988b32c..024c6be23a25adad 100644 +--- a/logo.h ++++ b/logo.h +@@ -69,6 +69,7 @@ + #ifndef unix + #define unix + #endif ++#define SIG_TAKES_ARG + #include "config.h" + #ifndef X_DISPLAY_MISSING + #define x_window diff --git a/ucb-logo-c99-2.patch b/ucb-logo-c99-2.patch index 5b3e431..4fee56d 100644 --- a/ucb-logo-c99-2.patch +++ b/ucb-logo-c99-2.patch @@ -1,18 +1,98 @@ -commit 30b1223b4979a18132d599792c995264c299ba4e +commit d300824c6eaf5f98faded7c51ea799b32be7a50b Author: Joshua J. Cogliati -Date: Wed Jan 10 20:06:12 2024 -0700 +Date: Fri Jan 12 10:05:45 2024 -0700 - Define SIG_TAKES_ARG in unix. + Fixing incorrect return and wrong type warnings. -diff --git a/logo.h b/logo.h -index 314173ffc988b32c..024c6be23a25adad 100644 ---- a/logo.h -+++ b/logo.h -@@ -69,6 +69,7 @@ - #ifndef unix - #define unix - #endif -+#define SIG_TAKES_ARG - #include "config.h" - #ifndef X_DISPLAY_MISSING - #define x_window +diff --git a/term.c b/term.c +index 48ddc425765fe8b5..17c697bd27a72e31 100644 +--- a/term.c ++++ b/term.c +@@ -95,8 +95,8 @@ extern char **environ, *tgoto(), *tgetstr(); + + char *termcap_ptr; + +-int termcap_putter(char ch) { +- *termcap_ptr++ = ch; ++int termcap_putter(int ch) { ++ *termcap_ptr++ = (char)ch; + return 0; + } + +diff --git a/xgraphics.c b/xgraphics.c +index 5d1c8d483f7e7c23..afc750a9efbc9574 100644 +--- a/xgraphics.c ++++ b/xgraphics.c +@@ -268,7 +268,7 @@ void placate_x() + XConfigureEvent *xce; + XMotionEvent *xme; + XButtonEvent *xbe; +- checkX; ++ checkX(); + + while(XCheckWindowEvent(dpy, win, EVENT_MASK, (XEvent *)&event)) + +@@ -310,14 +310,14 @@ void check_X11_stop() { + + if (--count == 0) { + count = 300; +- checkX; ++ checkX(); + placate_x(); + } + } + + int get_button() + { +- checkX; ++ checkX(0); + + placate_x(); + +@@ -326,7 +326,7 @@ int get_button() + + int get_mouse_x() + { +- checkX; ++ checkX(-1); + + placate_x(); + +@@ -336,7 +336,7 @@ int get_mouse_x() + + int get_mouse_y() + { +- checkX; ++ checkX(-1); + + placate_x(); + +diff --git a/xgraphics.h b/xgraphics.h +index 64b01fea140d7394..8d4aeae3be78f8ae 100644 +--- a/xgraphics.h ++++ b/xgraphics.h +@@ -22,15 +22,21 @@ void logofill(void); + + #define GR_SIZE 60000 + +-#define checkX { \ ++#define checkX(ret) { \ ++ if (have_x < 0) real_window_init(); \ ++ if (!have_x) { \ ++ err_logo(BAD_GRAPH_INIT,NIL); \ ++ return ret; \ ++ } \ ++} ++#define checkXnoreturn { \ + if (have_x < 0) real_window_init(); \ + if (!have_x) { \ + err_logo(BAD_GRAPH_INIT,NIL); \ +- return; \ + } \ + } + +-#define prepare_to_draw {checkX; placate_x();} ++#define prepare_to_draw {checkXnoreturn; placate_x();} + #define done_drawing XFlush(dpy) + extern void placate_x(); + diff --git a/ucb-logo-c99-3.patch b/ucb-logo-c99-3.patch deleted file mode 100644 index 4fee56d..0000000 --- a/ucb-logo-c99-3.patch +++ /dev/null @@ -1,98 +0,0 @@ -commit d300824c6eaf5f98faded7c51ea799b32be7a50b -Author: Joshua J. Cogliati -Date: Fri Jan 12 10:05:45 2024 -0700 - - Fixing incorrect return and wrong type warnings. - -diff --git a/term.c b/term.c -index 48ddc425765fe8b5..17c697bd27a72e31 100644 ---- a/term.c -+++ b/term.c -@@ -95,8 +95,8 @@ extern char **environ, *tgoto(), *tgetstr(); - - char *termcap_ptr; - --int termcap_putter(char ch) { -- *termcap_ptr++ = ch; -+int termcap_putter(int ch) { -+ *termcap_ptr++ = (char)ch; - return 0; - } - -diff --git a/xgraphics.c b/xgraphics.c -index 5d1c8d483f7e7c23..afc750a9efbc9574 100644 ---- a/xgraphics.c -+++ b/xgraphics.c -@@ -268,7 +268,7 @@ void placate_x() - XConfigureEvent *xce; - XMotionEvent *xme; - XButtonEvent *xbe; -- checkX; -+ checkX(); - - while(XCheckWindowEvent(dpy, win, EVENT_MASK, (XEvent *)&event)) - -@@ -310,14 +310,14 @@ void check_X11_stop() { - - if (--count == 0) { - count = 300; -- checkX; -+ checkX(); - placate_x(); - } - } - - int get_button() - { -- checkX; -+ checkX(0); - - placate_x(); - -@@ -326,7 +326,7 @@ int get_button() - - int get_mouse_x() - { -- checkX; -+ checkX(-1); - - placate_x(); - -@@ -336,7 +336,7 @@ int get_mouse_x() - - int get_mouse_y() - { -- checkX; -+ checkX(-1); - - placate_x(); - -diff --git a/xgraphics.h b/xgraphics.h -index 64b01fea140d7394..8d4aeae3be78f8ae 100644 ---- a/xgraphics.h -+++ b/xgraphics.h -@@ -22,15 +22,21 @@ void logofill(void); - - #define GR_SIZE 60000 - --#define checkX { \ -+#define checkX(ret) { \ -+ if (have_x < 0) real_window_init(); \ -+ if (!have_x) { \ -+ err_logo(BAD_GRAPH_INIT,NIL); \ -+ return ret; \ -+ } \ -+} -+#define checkXnoreturn { \ - if (have_x < 0) real_window_init(); \ - if (!have_x) { \ - err_logo(BAD_GRAPH_INIT,NIL); \ -- return; \ - } \ - } - --#define prepare_to_draw {checkX; placate_x();} -+#define prepare_to_draw {checkXnoreturn; placate_x();} - #define done_drawing XFlush(dpy) - extern void placate_x(); - diff --git a/ucblogo-c99.patch b/ucblogo-c99.patch deleted file mode 100644 index da67764..0000000 --- a/ucblogo-c99.patch +++ /dev/null @@ -1,40 +0,0 @@ -Implicit funciton declarations were removed from C99, and future -compilers may not support them by default because they are a type -safety hazard. - -Submitted upstream: - -diff --git a/wrksp.c b/wrksp.c -index b2d77edf90085dd3..13aadeec4e2c0c99 100644 ---- a/wrksp.c -+++ b/wrksp.c -@@ -23,6 +23,7 @@ - #endif - - #include -+#include - #ifdef WIN32 - #include - #endif -diff --git a/xgraphics.h b/xgraphics.h -index 30ac0e92e1cc7d1a..64b01fea140d7394 100644 ---- a/xgraphics.h -+++ b/xgraphics.h -@@ -129,6 +129,9 @@ typedef struct { - GC pm; - } pen_info; - -+void save_pen(pen_info *p); -+void restore_pen(pen_info *p); -+ - extern pen_info xgr_pen; - - #define p_info_x(p) (p.xpos) -@@ -152,6 +155,7 @@ extern pen_info xgr_pen; - #define pen_down pen_mode=draw_gc - - #define button get_button() -+int get_button(void); - #define mouse_x get_mouse_x() - #define mouse_y get_mouse_y() - diff --git a/ucblogo.spec b/ucblogo.spec index cbc5895..643b0c4 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,16 +1,18 @@ Name: ucblogo -Version: 6.2.3 -Release: 8%{?dist} +Version: 6.2.4 +Release: 1%{?dist} Summary: An interpreter for the Logo programming language -# Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later -Source: https://github.com/jrincayc/ucblogo-code/releases/download/version_%{version}/ucblogo-%{version}.tar.gz -Patch0: ucblogo-c99.patch -Patch1: ucb-logo-c99-2.patch -Patch2: ucb-logo-c99-3.patch +Source: https://github.com/jrincayc/ucblogo-code/archive/version_%{version}/ucblogo-%{version}.tar.gz +Patch1: ucb-logo-c99-1.patch +Patch2: ucb-logo-c99-2.patch +Patch3: compile-flags.patch + URL: https://people.eecs.berkeley.edu/~bh/logo.html -BuildRequires: make +BuildRequires: make +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: texinfo @@ -57,18 +59,12 @@ Requires: %{name} = %{version}-%{release} This package contains the x11 binary for ucblogo. %prep -%autosetup -p1 - - -# correct directories /usr/lib -> /usr/share and /usr/local -> /usr -sed -i 's|/local/lib/logo|/share/logo|g' *.c README.md -sed -i 's|/lib/logo|/share/logo|g' *.c makefile* -sed -i "s|/usr/local/bin/logo|%{_bindir}/logo|g" docs/ucblogo.texi -sed -i "s|/usr/local/bin/logo|%{_bindir}/logo|g" README.md -sed -i "s|/usr/local/info|%{_datadir}/info|g" README.md +%autosetup -p1 -n %{name}-code-version_%{version} %build +autoreconf -fi +autoconf # build traditional version %configure --x-includes=%{_includedir} --x-libraries=%{_libdir} --enable-x11 --with-wx-config=no %make_build ucblogo @@ -125,6 +121,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Sat Nov 30 2024 Benson Muite 6.2.4-1 +- Update to release 6.2.4 + * Thu Jul 25 2024 Miroslav Suchý - 6.2.3-8 - convert license to SPDX From dbc106081a03b6ef0d6711dcfb46d8c471f43bbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:34:46 +0000 Subject: [PATCH 20/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index cbc5895..e8eedbf 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An interpreter for the Logo programming language # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -125,6 +125,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 6.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 6.2.3-8 - convert license to SPDX From 753ee3258748f7a1233e970337b4ca0962a8dc2c Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Fri, 24 Jan 2025 17:27:40 -0700 Subject: [PATCH 21/26] Fix Bug 2341473 FTBS in rawhide --- function-pointers.patch | 217 ++++++++++++++++++++++++++++++++++++++++ ucblogo.spec | 4 +- 2 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 function-pointers.patch diff --git a/function-pointers.patch b/function-pointers.patch new file mode 100644 index 0000000..2485dec --- /dev/null +++ b/function-pointers.patch @@ -0,0 +1,217 @@ +From 6337dc88e1448ab297709cf8dfe4973a97ad05c6 Mon Sep 17 00:00:00 2001 +From: "Joshua J. Cogliati" +Date: Fri, 24 Jan 2025 14:06:48 -0700 +Subject: [PATCH 2/2] Remove unspecified () for function pointers. + +--- + coms.c | 1 - + eval.c | 2 +- + globals.h | 10 +++++----- + init.c | 2 +- + intern.c | 2 +- + logo.h | 3 ++- + logodata.c | 5 +++-- + main.c | 6 +++++- + term.c | 2 +- + wrksp.c | 6 +++--- + 10 files changed, 22 insertions(+), 17 deletions(-) + +diff --git a/coms.c b/coms.c +index 04999bd..2382ef6 100644 +--- a/coms.c ++++ b/coms.c +@@ -543,7 +543,6 @@ NODE *lshell(NODE *args) { + #endif + return(UNBOUND); + #else +- extern FILE *popen(); + char cmdbuf[300]; + FILE *strm; + NODE *head = NIL, *tail = NIL, *this; +diff --git a/eval.c b/eval.c +index 72506cb..35754a3 100644 +--- a/eval.c ++++ b/eval.c +@@ -278,7 +278,7 @@ void reset_args(NODE *old_stack) { + NODE *bf3(NODE *name) { + NODE *string = cnv_node_to_strnode(name); + return make_strnode(getstrptr(string)+3, getstrhead(string), +- getstrlen(string)-3, nodetype(string), strcpy); ++ getstrlen(string)-3, nodetype(string), strnzcpy); + } + + NODE *deep_copy(NODE *expresn) { +diff --git a/globals.h b/globals.h +index ef33ad3..a501d40 100644 +--- a/globals.h ++++ b/globals.h +@@ -50,7 +50,7 @@ extern jmp_buf iblk_buf; + + /* logodata.c */ + extern char *strnzcpy(char *, char *, int); +-extern char *word_strnzcpy(char *, NODE *, int); ++extern char *word_strnzcpy(char *, char *, int); + extern char *noparity_strnzcpy(char *, char *, int); + extern char *backslashed_strnzcpy(char *, char *, int); + extern char *mend_strnzcpy(char *, char *, int); +@@ -62,7 +62,7 @@ extern int low_strncmp(char *, char *, int); + extern int noparity_strncmp(char *, char *, int); + extern int noparitylow_strncmp(char *, char *, int); + extern NODE *make_strnode(char *, struct string_block *, int, +- NODETYPES, char *(*)()); ++ NODETYPES, char *(*)(char *, char *, int)); + extern void make_runparse(NODE *); + extern NODE *make_quote(NODE *); + extern NODE *maybe_quote(NODE *); +@@ -177,7 +177,7 @@ extern NODE *lbeforep(NODE *); + + /* intern.c */ + extern NODE *hash_table[HASH_LEN]; +-void map_oblist(void (*)()); ++void map_oblist(void (*)(NODE *)); + extern NODE *make_instance(NODE *, NODE *); + extern NODE *intern(NODE *); + +@@ -617,8 +617,8 @@ extern void wxlPrintPict(void); + extern void wxlPrintPreviewPict(void); + extern void wxlPrintText(void); + extern void wxlPrintPreviewText(void); +-extern NODE*IncreaseFont(void *); +-extern NODE*DecreaseFont(void *); ++extern NODE*IncreaseFont(NODE *); ++extern NODE*DecreaseFont(NODE *); + extern int turtlePosition_x; + extern int turtlePosition_y; + #define SCREEN_WIDTH 1 +diff --git a/init.c b/init.c +index b7ad4e7..6c5b855 100644 +--- a/init.c ++++ b/init.c +@@ -48,7 +48,7 @@ typedef struct priminfo { + short defargs; + short maxargs; + short priority; +- NODE *(*prim) (); ++ NODE *(*prim) (NODE *); + } PRIMTYPE; + + NODE *Right_Paren, *Left_Paren, *Redefp, *Caseignoredp, *Erract, *Printdepthlimit, +diff --git a/intern.c b/intern.c +index fcad726..a0dd55e 100644 +--- a/intern.c ++++ b/intern.c +@@ -27,7 +27,7 @@ + + NODE *hash_table[HASH_LEN] = {NIL}; + +-void map_oblist(void (*fcn)()) { ++void map_oblist(void (*fcn)(NODE *)) { + int i; + NODE *nd; + +diff --git a/logo.h b/logo.h +index 967ca0d..f32bb88 100644 +--- a/logo.h ++++ b/logo.h +@@ -288,6 +288,7 @@ struct string_block { + #define incstrrefcnt(sh) (((sh)->str_refcnt)++) + #define decstrrefcnt(sh) (--((sh)->str_refcnt)) + ++typedef struct logo_node NODE; + typedef struct logo_node { + NODETYPES node_type; + int my_gen; /* Nodes's Generation */ /*GC*/ +@@ -307,7 +308,7 @@ typedef struct logo_node { + FIXNUM nstring_len; + } nstring; + struct { +- struct logo_node * (*nprim_fun) (); ++ struct logo_node * (*nprim_fun) (NODE *); + short npriority; + short nmin_args; + short ndef_args; +diff --git a/logodata.c b/logodata.c +index 6f5480c..ada145e 100644 +--- a/logodata.c ++++ b/logodata.c +@@ -78,7 +78,8 @@ char *strnzcpy(char *s1, char *s2, int n) { + return(s1); + } + +-char *word_strnzcpy(char *s1, NODE *kludge, int n) { /* KLUDGE! */ ++char *word_strnzcpy(char *s1, char *kludge_char, int n) { /* KLUDGE! */ ++ NODE *kludge = (NODE *)kludge_char; + char *temp = s1; + + while (kludge != NIL) { +@@ -285,7 +286,7 @@ int noparitylow_strncmp(char *s1, char *s2, int n) { + } + + NODE *make_strnode(char *strptr, struct string_block *strhead, int len, +- NODETYPES typ, char *(*copy_routine)()) ++ NODETYPES typ, char *(*copy_routine)(char *, char *, int)) + { + NODE *strnode; + +diff --git a/main.c b/main.c +index c591960..cd63351 100644 +--- a/main.c ++++ b/main.c +@@ -196,9 +196,13 @@ void do_keyact(int ch) { + } + } + +- ++#ifdef SIG_TAKES_ARG ++void (*intfuns[])(int) = {0, logo_stop, logo_pause, mouse_down, ++ delayed_keyact}; ++#else + void (*intfuns[])() = {0, logo_stop, logo_pause, mouse_down, + delayed_keyact}; ++#endif + + void delayed_int() { + #ifdef SIG_TAKES_ARG +diff --git a/term.c b/term.c +index 76e06ed..c1f596e 100644 +--- a/term.c ++++ b/term.c +@@ -91,7 +91,7 @@ struct sgttyb tty_cooked, tty_cbreak; + + int interactive, tty_charmode; + +-extern char **environ, *tgoto(), *tgetstr(); ++extern char **environ; + + char *termcap_ptr; + +diff --git a/wrksp.c b/wrksp.c +index 031e943..1841a1c 100644 +--- a/wrksp.c ++++ b/wrksp.c +@@ -346,11 +346,11 @@ NODE *find_to(NODE *line) { + ((c = *(p-1)) == ' ' || c == '\t' || c == '\n')) + return make_strnode(p, getstrhead(line), + getstrlen(line)-(p-lp), +- nodetype(line), strcpy); ++ nodetype(line), strnzcpy); + if (c == '[') + return make_strnode(p, getstrhead(line), + strchr(p, ']')-p, +- nodetype(line), strcpy); ++ nodetype(line), strnzcpy); + } + p++; + } +@@ -1815,7 +1815,7 @@ NODE *cpdf_newname(NODE *name, NODE*titleline) { + p2 = p1+strcspn(p1, " \t"); + sprintf(buf, "%.*s%.*s%s", + (int)(p1-titlestr), titlestr, (int)getstrlen(nname), namestr, p2); +- return make_strnode(buf, NULL, strlen(buf), STRING, strcpy); ++ return make_strnode(buf, NULL, strlen(buf), STRING, strnzcpy); + } + + NODE *lcopydef(NODE *args) { +-- +2.48.1 + diff --git a/ucblogo.spec b/ucblogo.spec index ca05b5b..f588c0a 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -8,6 +8,7 @@ Source: https://github.com/jrincayc/ucblogo-code/archive/version_%{versi Patch1: ucb-logo-c99-1.patch Patch2: ucb-logo-c99-2.patch Patch3: compile-flags.patch +Patch4: function-pointers.patch URL: https://people.eecs.berkeley.edu/~bh/logo.html BuildRequires: make @@ -121,8 +122,9 @@ fi %{_bindir}/ucblogo-x11 %changelog -* Sat Nov 30 2024 Benson Muite 6.2.4-1 +* Fri Jan 24 2025 Benson Muite 6.2.4-1 - Update to release 6.2.4 +- Fix failure to build errors * Sun Jan 19 2025 Fedora Release Engineering - 6.2.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 62bd588642a4763e5b7f55b5e1f77716b179e9c5 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Fri, 14 Feb 2025 06:10:53 -0700 Subject: [PATCH 22/26] Updating to ucblogo 6.2.5 --- .gitignore | 1 + function-pointers.patch | 217 ---------------------------------------- sources | 2 +- ucb-logo-c99-1.patch | 18 ---- ucb-logo-c99-2.patch | 98 ------------------ ucblogo.spec | 12 +-- 6 files changed, 8 insertions(+), 340 deletions(-) delete mode 100644 function-pointers.patch delete mode 100644 ucb-logo-c99-1.patch delete mode 100644 ucb-logo-c99-2.patch diff --git a/.gitignore b/.gitignore index 91d3338..31544f3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ logo-mode.tar.gz /ucblogo-6.2.2.tar.gz /ucblogo-6.2.3.tar.gz /ucblogo-6.2.4.tar.gz +/ucblogo-6.2.5.tar.gz diff --git a/function-pointers.patch b/function-pointers.patch deleted file mode 100644 index 2485dec..0000000 --- a/function-pointers.patch +++ /dev/null @@ -1,217 +0,0 @@ -From 6337dc88e1448ab297709cf8dfe4973a97ad05c6 Mon Sep 17 00:00:00 2001 -From: "Joshua J. Cogliati" -Date: Fri, 24 Jan 2025 14:06:48 -0700 -Subject: [PATCH 2/2] Remove unspecified () for function pointers. - ---- - coms.c | 1 - - eval.c | 2 +- - globals.h | 10 +++++----- - init.c | 2 +- - intern.c | 2 +- - logo.h | 3 ++- - logodata.c | 5 +++-- - main.c | 6 +++++- - term.c | 2 +- - wrksp.c | 6 +++--- - 10 files changed, 22 insertions(+), 17 deletions(-) - -diff --git a/coms.c b/coms.c -index 04999bd..2382ef6 100644 ---- a/coms.c -+++ b/coms.c -@@ -543,7 +543,6 @@ NODE *lshell(NODE *args) { - #endif - return(UNBOUND); - #else -- extern FILE *popen(); - char cmdbuf[300]; - FILE *strm; - NODE *head = NIL, *tail = NIL, *this; -diff --git a/eval.c b/eval.c -index 72506cb..35754a3 100644 ---- a/eval.c -+++ b/eval.c -@@ -278,7 +278,7 @@ void reset_args(NODE *old_stack) { - NODE *bf3(NODE *name) { - NODE *string = cnv_node_to_strnode(name); - return make_strnode(getstrptr(string)+3, getstrhead(string), -- getstrlen(string)-3, nodetype(string), strcpy); -+ getstrlen(string)-3, nodetype(string), strnzcpy); - } - - NODE *deep_copy(NODE *expresn) { -diff --git a/globals.h b/globals.h -index ef33ad3..a501d40 100644 ---- a/globals.h -+++ b/globals.h -@@ -50,7 +50,7 @@ extern jmp_buf iblk_buf; - - /* logodata.c */ - extern char *strnzcpy(char *, char *, int); --extern char *word_strnzcpy(char *, NODE *, int); -+extern char *word_strnzcpy(char *, char *, int); - extern char *noparity_strnzcpy(char *, char *, int); - extern char *backslashed_strnzcpy(char *, char *, int); - extern char *mend_strnzcpy(char *, char *, int); -@@ -62,7 +62,7 @@ extern int low_strncmp(char *, char *, int); - extern int noparity_strncmp(char *, char *, int); - extern int noparitylow_strncmp(char *, char *, int); - extern NODE *make_strnode(char *, struct string_block *, int, -- NODETYPES, char *(*)()); -+ NODETYPES, char *(*)(char *, char *, int)); - extern void make_runparse(NODE *); - extern NODE *make_quote(NODE *); - extern NODE *maybe_quote(NODE *); -@@ -177,7 +177,7 @@ extern NODE *lbeforep(NODE *); - - /* intern.c */ - extern NODE *hash_table[HASH_LEN]; --void map_oblist(void (*)()); -+void map_oblist(void (*)(NODE *)); - extern NODE *make_instance(NODE *, NODE *); - extern NODE *intern(NODE *); - -@@ -617,8 +617,8 @@ extern void wxlPrintPict(void); - extern void wxlPrintPreviewPict(void); - extern void wxlPrintText(void); - extern void wxlPrintPreviewText(void); --extern NODE*IncreaseFont(void *); --extern NODE*DecreaseFont(void *); -+extern NODE*IncreaseFont(NODE *); -+extern NODE*DecreaseFont(NODE *); - extern int turtlePosition_x; - extern int turtlePosition_y; - #define SCREEN_WIDTH 1 -diff --git a/init.c b/init.c -index b7ad4e7..6c5b855 100644 ---- a/init.c -+++ b/init.c -@@ -48,7 +48,7 @@ typedef struct priminfo { - short defargs; - short maxargs; - short priority; -- NODE *(*prim) (); -+ NODE *(*prim) (NODE *); - } PRIMTYPE; - - NODE *Right_Paren, *Left_Paren, *Redefp, *Caseignoredp, *Erract, *Printdepthlimit, -diff --git a/intern.c b/intern.c -index fcad726..a0dd55e 100644 ---- a/intern.c -+++ b/intern.c -@@ -27,7 +27,7 @@ - - NODE *hash_table[HASH_LEN] = {NIL}; - --void map_oblist(void (*fcn)()) { -+void map_oblist(void (*fcn)(NODE *)) { - int i; - NODE *nd; - -diff --git a/logo.h b/logo.h -index 967ca0d..f32bb88 100644 ---- a/logo.h -+++ b/logo.h -@@ -288,6 +288,7 @@ struct string_block { - #define incstrrefcnt(sh) (((sh)->str_refcnt)++) - #define decstrrefcnt(sh) (--((sh)->str_refcnt)) - -+typedef struct logo_node NODE; - typedef struct logo_node { - NODETYPES node_type; - int my_gen; /* Nodes's Generation */ /*GC*/ -@@ -307,7 +308,7 @@ typedef struct logo_node { - FIXNUM nstring_len; - } nstring; - struct { -- struct logo_node * (*nprim_fun) (); -+ struct logo_node * (*nprim_fun) (NODE *); - short npriority; - short nmin_args; - short ndef_args; -diff --git a/logodata.c b/logodata.c -index 6f5480c..ada145e 100644 ---- a/logodata.c -+++ b/logodata.c -@@ -78,7 +78,8 @@ char *strnzcpy(char *s1, char *s2, int n) { - return(s1); - } - --char *word_strnzcpy(char *s1, NODE *kludge, int n) { /* KLUDGE! */ -+char *word_strnzcpy(char *s1, char *kludge_char, int n) { /* KLUDGE! */ -+ NODE *kludge = (NODE *)kludge_char; - char *temp = s1; - - while (kludge != NIL) { -@@ -285,7 +286,7 @@ int noparitylow_strncmp(char *s1, char *s2, int n) { - } - - NODE *make_strnode(char *strptr, struct string_block *strhead, int len, -- NODETYPES typ, char *(*copy_routine)()) -+ NODETYPES typ, char *(*copy_routine)(char *, char *, int)) - { - NODE *strnode; - -diff --git a/main.c b/main.c -index c591960..cd63351 100644 ---- a/main.c -+++ b/main.c -@@ -196,9 +196,13 @@ void do_keyact(int ch) { - } - } - -- -+#ifdef SIG_TAKES_ARG -+void (*intfuns[])(int) = {0, logo_stop, logo_pause, mouse_down, -+ delayed_keyact}; -+#else - void (*intfuns[])() = {0, logo_stop, logo_pause, mouse_down, - delayed_keyact}; -+#endif - - void delayed_int() { - #ifdef SIG_TAKES_ARG -diff --git a/term.c b/term.c -index 76e06ed..c1f596e 100644 ---- a/term.c -+++ b/term.c -@@ -91,7 +91,7 @@ struct sgttyb tty_cooked, tty_cbreak; - - int interactive, tty_charmode; - --extern char **environ, *tgoto(), *tgetstr(); -+extern char **environ; - - char *termcap_ptr; - -diff --git a/wrksp.c b/wrksp.c -index 031e943..1841a1c 100644 ---- a/wrksp.c -+++ b/wrksp.c -@@ -346,11 +346,11 @@ NODE *find_to(NODE *line) { - ((c = *(p-1)) == ' ' || c == '\t' || c == '\n')) - return make_strnode(p, getstrhead(line), - getstrlen(line)-(p-lp), -- nodetype(line), strcpy); -+ nodetype(line), strnzcpy); - if (c == '[') - return make_strnode(p, getstrhead(line), - strchr(p, ']')-p, -- nodetype(line), strcpy); -+ nodetype(line), strnzcpy); - } - p++; - } -@@ -1815,7 +1815,7 @@ NODE *cpdf_newname(NODE *name, NODE*titleline) { - p2 = p1+strcspn(p1, " \t"); - sprintf(buf, "%.*s%.*s%s", - (int)(p1-titlestr), titlestr, (int)getstrlen(nname), namestr, p2); -- return make_strnode(buf, NULL, strlen(buf), STRING, strcpy); -+ return make_strnode(buf, NULL, strlen(buf), STRING, strnzcpy); - } - - NODE *lcopydef(NODE *args) { --- -2.48.1 - diff --git a/sources b/sources index fd15dc8..3eb6b8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ucblogo-6.2.4.tar.gz) = 0c962e914e6540a92b62e8fd906648f0d229247a7bb59488e9a29574300828e846815249807aadbd39d9ebe266362124c0e0e2b426d7f26088989c0f54e26d4c +SHA512 (ucblogo-6.2.5.tar.gz) = 4b77faeeed696b08488ae34f2f4d774f58a701f9b31473b35fdb228d45e9f6e9e253662c1d552320759efb4b6054030de1c869902fe3b71a98b6dedba807d230 diff --git a/ucb-logo-c99-1.patch b/ucb-logo-c99-1.patch deleted file mode 100644 index 5b3e431..0000000 --- a/ucb-logo-c99-1.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 30b1223b4979a18132d599792c995264c299ba4e -Author: Joshua J. Cogliati -Date: Wed Jan 10 20:06:12 2024 -0700 - - Define SIG_TAKES_ARG in unix. - -diff --git a/logo.h b/logo.h -index 314173ffc988b32c..024c6be23a25adad 100644 ---- a/logo.h -+++ b/logo.h -@@ -69,6 +69,7 @@ - #ifndef unix - #define unix - #endif -+#define SIG_TAKES_ARG - #include "config.h" - #ifndef X_DISPLAY_MISSING - #define x_window diff --git a/ucb-logo-c99-2.patch b/ucb-logo-c99-2.patch deleted file mode 100644 index 4fee56d..0000000 --- a/ucb-logo-c99-2.patch +++ /dev/null @@ -1,98 +0,0 @@ -commit d300824c6eaf5f98faded7c51ea799b32be7a50b -Author: Joshua J. Cogliati -Date: Fri Jan 12 10:05:45 2024 -0700 - - Fixing incorrect return and wrong type warnings. - -diff --git a/term.c b/term.c -index 48ddc425765fe8b5..17c697bd27a72e31 100644 ---- a/term.c -+++ b/term.c -@@ -95,8 +95,8 @@ extern char **environ, *tgoto(), *tgetstr(); - - char *termcap_ptr; - --int termcap_putter(char ch) { -- *termcap_ptr++ = ch; -+int termcap_putter(int ch) { -+ *termcap_ptr++ = (char)ch; - return 0; - } - -diff --git a/xgraphics.c b/xgraphics.c -index 5d1c8d483f7e7c23..afc750a9efbc9574 100644 ---- a/xgraphics.c -+++ b/xgraphics.c -@@ -268,7 +268,7 @@ void placate_x() - XConfigureEvent *xce; - XMotionEvent *xme; - XButtonEvent *xbe; -- checkX; -+ checkX(); - - while(XCheckWindowEvent(dpy, win, EVENT_MASK, (XEvent *)&event)) - -@@ -310,14 +310,14 @@ void check_X11_stop() { - - if (--count == 0) { - count = 300; -- checkX; -+ checkX(); - placate_x(); - } - } - - int get_button() - { -- checkX; -+ checkX(0); - - placate_x(); - -@@ -326,7 +326,7 @@ int get_button() - - int get_mouse_x() - { -- checkX; -+ checkX(-1); - - placate_x(); - -@@ -336,7 +336,7 @@ int get_mouse_x() - - int get_mouse_y() - { -- checkX; -+ checkX(-1); - - placate_x(); - -diff --git a/xgraphics.h b/xgraphics.h -index 64b01fea140d7394..8d4aeae3be78f8ae 100644 ---- a/xgraphics.h -+++ b/xgraphics.h -@@ -22,15 +22,21 @@ void logofill(void); - - #define GR_SIZE 60000 - --#define checkX { \ -+#define checkX(ret) { \ -+ if (have_x < 0) real_window_init(); \ -+ if (!have_x) { \ -+ err_logo(BAD_GRAPH_INIT,NIL); \ -+ return ret; \ -+ } \ -+} -+#define checkXnoreturn { \ - if (have_x < 0) real_window_init(); \ - if (!have_x) { \ - err_logo(BAD_GRAPH_INIT,NIL); \ -- return; \ - } \ - } - --#define prepare_to_draw {checkX; placate_x();} -+#define prepare_to_draw {checkXnoreturn; placate_x();} - #define done_drawing XFlush(dpy) - extern void placate_x(); - diff --git a/ucblogo.spec b/ucblogo.spec index f588c0a..ac7fbf7 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,14 +1,11 @@ Name: ucblogo -Version: 6.2.4 +Version: 6.2.5 Release: 1%{?dist} Summary: An interpreter for the Logo programming language License: GPL-3.0-or-later Source: https://github.com/jrincayc/ucblogo-code/archive/version_%{version}/ucblogo-%{version}.tar.gz -Patch1: ucb-logo-c99-1.patch -Patch2: ucb-logo-c99-2.patch -Patch3: compile-flags.patch -Patch4: function-pointers.patch +Patch1: compile-flags.patch URL: https://people.eecs.berkeley.edu/~bh/logo.html BuildRequires: make @@ -60,7 +57,7 @@ Requires: %{name} = %{version}-%{release} This package contains the x11 binary for ucblogo. %prep -%autosetup -p1 -n %{name}-code-version_%{version} +%autosetup -p1 -n %{name}-%{version} %build @@ -122,6 +119,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Thu Feb 13 2025 Joshua Cogliati - 6.2.5-1 +- Update to release 6.2.5 + * Fri Jan 24 2025 Benson Muite 6.2.4-1 - Update to release 6.2.4 - Fix failure to build errors From 2ecba35e5e798bac3e28e3141e2c4568d9a7ec5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:41:46 +0000 Subject: [PATCH 23/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index ac7fbf7..8b36fef 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interpreter for the Logo programming language License: GPL-3.0-or-later @@ -119,6 +119,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 6.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Feb 13 2025 Joshua Cogliati - 6.2.5-1 - Update to release 6.2.5 From 96133ce90ee9147887e3734a216ad96447a907e7 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Mon, 25 Aug 2025 21:17:08 -0600 Subject: [PATCH 24/26] Fix failure to build errors --- termios.patch | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ ucblogo.spec | 6 +++- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 termios.patch diff --git a/termios.patch b/termios.patch new file mode 100644 index 0000000..beefc8c --- /dev/null +++ b/termios.patch @@ -0,0 +1,79 @@ +diff --git a/configure.ac b/configure.ac +index 749bf6f..e233b53 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -104,9 +104,7 @@ AM_COND_IF([X11], + [AC_SEARCH_LIBS(XOpenDisplay, [X11])]) + + dnl Checks for header files. +-AC_CHECK_HEADERS([unistd.h string.h]) +-AM_COND_IF([WX],, +- [AC_CHECK_HEADERS([sgtty.h termio.h termcap.h termlib.h curses.h])]) ++AC_CHECK_HEADERS([termios.h termio.h termcap.h termlib.h curses.h sys/ioctl.h unistd.h string.h]) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_TYPE_SIZE_T +diff --git a/term.c b/term.c +index c1f596e..e81c0b5 100644 +--- a/term.c ++++ b/term.c +@@ -33,16 +33,14 @@ + #include + #endif + +-#ifdef HAVE_TERMIO_H +-#ifdef HAVE_WX ++#ifdef HAVE_TERMIOS_H + #include +-#else ++#elif defined(HAVE_TERMIO_H) + #include + #endif +-#else +-#ifdef HAVE_SGTTY_H +-#include +-#endif ++ ++#ifdef HAVE_SYS_IOCTL_H ++#include + #endif + + #undef TRUE +@@ -81,7 +79,9 @@ char cm_arr[40]; + char so_arr[40]; + char se_arr[40]; + +-#ifdef HAVE_TERMIO_H ++#if defined(HAVE_TERMIOS_H) ++struct termios tty_cooked, tty_cbreak; ++#elif defined(HAVE_TERMIO_H) + struct termio tty_cooked, tty_cbreak; + #else + #ifdef HAVE_SGTTY_H +@@ -137,7 +137,7 @@ void term_init(void) { + #endif /* WIN32 */ + #else + if (interactive) { +-#ifdef HAVE_TERMIO_H ++#if defined(HAVE_TERMIO_H) || defined(HAVE_TERMIOS_H) + ioctl(0,TCGETA,(char *)(&tty_cooked)); + tty_cbreak = tty_cooked; + tty_cbreak.c_cc[VMIN] = '\01'; +@@ -200,7 +200,7 @@ void term_init(void) { + void charmode_on() { + #ifdef unix + if ((readstream == stdin) && interactive && !tty_charmode) { +-#ifdef HAVE_TERMIO_H ++#if defined(HAVE_TERMIO_H) || defined(HAVE_TERMIOS_H) + ioctl(0,TCSETA,(char *)(&tty_cbreak)); + #else /* !HAVE_TERMIO_H */ + ioctl(0,TIOCSETP,(char *)(&tty_cbreak)); +@@ -216,7 +216,7 @@ void charmode_on() { + void charmode_off() { + #ifdef unix + if (tty_charmode) { +-#ifdef HAVE_TERMIO_H ++#if defined(HAVE_TERMIO_H) || defined(HAVE_TERMIOS_H) + ioctl(0,TCSETA,(char *)(&tty_cooked)); + #else /* !HAVE_TERMIO_H */ + ioctl(0,TIOCSETP,(char *)(&tty_cooked)); diff --git a/ucblogo.spec b/ucblogo.spec index 8b36fef..47cbfa8 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,11 +1,12 @@ Name: ucblogo Version: 6.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An interpreter for the Logo programming language License: GPL-3.0-or-later Source: https://github.com/jrincayc/ucblogo-code/archive/version_%{version}/ucblogo-%{version}.tar.gz Patch1: compile-flags.patch +Patch2: termios.patch URL: https://people.eecs.berkeley.edu/~bh/logo.html BuildRequires: make @@ -119,6 +120,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Mon Aug 25 2025 Joshua Cogliati - 6.2.5-3 +- Fix failure to build errors + * Fri Jul 25 2025 Fedora Release Engineering - 6.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ee8bbe0f43630835d27e619a6868c097e8e90b5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:31:44 +0000 Subject: [PATCH 25/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index 47cbfa8..ed10700 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An interpreter for the Logo programming language License: GPL-3.0-or-later @@ -120,6 +120,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 6.2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Mon Aug 25 2025 Joshua Cogliati - 6.2.5-3 - Fix failure to build errors From e86a80403b910557d7046e4c124942482e759e2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:05:21 +0000 Subject: [PATCH 26/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- ucblogo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucblogo.spec b/ucblogo.spec index ed10700..4136697 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,6 +1,6 @@ Name: ucblogo Version: 6.2.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An interpreter for the Logo programming language License: GPL-3.0-or-later @@ -120,6 +120,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 6.2.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 6.2.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild