Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (b2db3088cf1a16a0c677987b6df684e4d89e06f4)
  • Date: Sun, 29 Dec 2024 22:48:09 +0000

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

ChangeLog |
3
gnome2-libs/gtkdatabox/DETAILS |
4
gnome2-libs/gtkdatabox/HISTORY |
4
gnome2-libs/gtkdatabox/PRE_BUILD |
4
gnome2-libs/gtkdatabox/deprecated.patch |
20 --
science/xoscope/DEPENDS |
12 +
science/xoscope/DETAILS |
17 ++
science/xoscope/HISTORY |
2
utils/atop/DETAILS |
4
utils/atop/HISTORY |
6
utils/atop/patches/0001-Fix-drawbar-mvwprintw-format-security-error.patch |
76 ----------
utils/atop/patches/0001-Fix-includes-for-standard-compliance.patch |
42 -----
12 files changed, 48 insertions(+), 146 deletions(-)

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

xoscope: new spell, digital oscilloscope

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

gtkdatabox 1.0.0

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

atop 2.11.0

diff --git a/ChangeLog b/ChangeLog
index 22d3525..0b0cb3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2024-12-29 Ismael Luceno <ismael AT sourcemage.org>
+ * science/xoscope: new spell, digital oscilloscope
+
2024-12-25 Pavel Vinogradov <public AT sourcemage.org>
* ruby-raa/ruby-3.4: new spell, Ruby 3.4 branch

diff --git a/gnome2-libs/gtkdatabox/DETAILS b/gnome2-libs/gtkdatabox/DETAILS
index 6f2fbac..b9c8d10 100755
--- a/gnome2-libs/gtkdatabox/DETAILS
+++ b/gnome2-libs/gtkdatabox/DETAILS
@@ -1,9 +1,9 @@
SPELL=gtkdatabox
- VERSION=0.9.1.1
+ VERSION=1.0.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:8e56b3fa51f44efe0929d54b273b6101696fa46fd90e96cafeb1d2fff1d6291ef440bffb0f441d5fa241b0a01fd4272234d587ffc5410aecf9f02bd762b59625
+
SOURCE_HASH=sha512:63007ab50e1e1eba185a2c05ccc1a8759aded91797688c4b4888728af3527514cc79280851981e36b01e24859fe8e0f95d660a219d456edeb50e0b847d7b9999
LICENSE[0]=LGPL
WEB_SITE=http://sourceforge.net/projects/gtkdatabox/
ENTERED=20110123
diff --git a/gnome2-libs/gtkdatabox/HISTORY b/gnome2-libs/gtkdatabox/HISTORY
index 4ac455d..0147df9 100644
--- a/gnome2-libs/gtkdatabox/HISTORY
+++ b/gnome2-libs/gtkdatabox/HISTORY
@@ -1,3 +1,7 @@
+2024-12-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.0
+ * PRE_BUILD, deprecated.patch: removed, no longer needed
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/gnome2-libs/gtkdatabox/PRE_BUILD
b/gnome2-libs/gtkdatabox/PRE_BUILD
deleted file mode 100755
index aebd0f4..0000000
--- a/gnome2-libs/gtkdatabox/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/deprecated.patch"
diff --git a/gnome2-libs/gtkdatabox/deprecated.patch
b/gnome2-libs/gtkdatabox/deprecated.patch
deleted file mode 100644
index 9ca3666..0000000
--- a/gnome2-libs/gtkdatabox/deprecated.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- examples/Makefile.in.orig 2009-05-11 04:57:46.000000000 +0400
-+++ examples/Makefile.in 2011-01-23 01:49:43.420341392 +0300
-@@ -285,7 +285,6 @@
- -DG_DISABLE_DEPRECATED\
- -DGDK_DISABLE_DEPRECATED\
- -DGDK_PIXBUF_DISABLE_DEPRECATED\
-- -DGTK_DISABLE_DEPRECATED\
- @LIBGLADE_CFLAGS@ \
- `pkg-config gtk+-2.0 --cflags`
-
---- gtk/Makefile.in.orig 2009-05-11 04:57:46.000000000 +0400
-+++ gtk/Makefile.in 2011-01-23 01:50:37.195341393 +0300
-@@ -260,7 +260,6 @@
- -DG_DISABLE_DEPRECATED\
- -DGDK_DISABLE_DEPRECATED\
- -DGDK_PIXBUF_DISABLE_DEPRECATED\
-- -DGTK_DISABLE_DEPRECATED\
- -DGTK_MULTIHEAD_SAFE=1\
- `pkg-config gtk+-2.0 --cflags`
-
diff --git a/science/xoscope/DEPENDS b/science/xoscope/DEPENDS
new file mode 100755
index 0000000..cc5fd50
--- /dev/null
+++ b/science/xoscope/DEPENDS
@@ -0,0 +1,12 @@
+. "$GRIMOIRE"/VDEPENDS &&
+vdepends << ! &&
+ alsa-lib
+ gtk+3 >= 3.4
+ gtkdatabox >= 1.0.0
+ fftw
+ perl
+!
+optional_depends comedilib \
+ "--with-comedi" \
+ "--without-comedi" \
+ "for COMEDI devices support"
diff --git a/science/xoscope/DETAILS b/science/xoscope/DETAILS
new file mode 100755
index 0000000..1062a7d
--- /dev/null
+++ b/science/xoscope/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=xoscope
+ VERSION=2.3
+ SOURCE="$SPELL-$VERSION.tar.gz"
+
SOURCE_URL[0]=http://sourceforge.net/projects/$SPELL/files/$SPELL/$VERSION/$SOURCE/download
+
SOURCE_HASH=sha512:9f1c15a240644027927e1bc39d2a0204d03b8dbe9d1d2aed974d062777562c6877d46f6e3768cf506799d902373fd26a090d94821b0f791f8f3151f7bb2e7eee
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="https://xoscope.sourceforge.net/";
+ LICENSE[0]="GPL-3.0-or-later"
+ ENTERED=20241229
+ KEYWORDS=""
+ SHORT="digital oscilloscope"
+cat << EOF
+xoscope is a digital oscilloscope using input from a sound card (via ALSA, or
+EsounD) and/or a data acquisition card (via COMEDI; supports
ProbeScope/osziFOX
+and will soon support Bitscope hardware). Includes 8 signal displays,
+variable time scale, math, memory, measurements, and file save/load.
+EOF
diff --git a/science/xoscope/HISTORY b/science/xoscope/HISTORY
new file mode 100644
index 0000000..c0aee0f
--- /dev/null
+++ b/science/xoscope/HISTORY
@@ -0,0 +1,2 @@
+2024-12-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/utils/atop/DETAILS b/utils/atop/DETAILS
index d4fa81e..a1800a3 100755
--- a/utils/atop/DETAILS
+++ b/utils/atop/DETAILS
@@ -1,7 +1,7 @@
SPELL=atop
- VERSION=2.10.0
+ VERSION=2.11.0
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:72a9307ed0cfa9c0157c81e8acbb4850ae339b50481ce2e1b828cad4b3354bfc8f56866c9c4df72ea34941359719d088f7936182d1478a6ac8f4e1bdf4bee7f4
+
SOURCE_HASH=sha512:f43881fcc9fa8bfe6837bd8228b9fc7fc7679f84e51af80ab5e9f89915e254fbf6e24c7bf78c22814d8d9db5b012d46ca75ff5abe1dfde3b51d94fa29fed077a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://www.atoptool.nl/download/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/utils/atop/HISTORY b/utils/atop/HISTORY
index bd6f989..66cff84 100644
--- a/utils/atop/HISTORY
+++ b/utils/atop/HISTORY
@@ -1,3 +1,9 @@
+2024-12-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.11.0
+ * patches/0001-Fix-drawbar-mvwprintw-format-security-error.patch,
+ patches/0001-Fix-includes-for-standard-compliance.patch:
+ removed, no longer needed
+
2024-02-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.10.0
* DEPENDS: added glib2 dependency
diff --git
a/utils/atop/patches/0001-Fix-drawbar-mvwprintw-format-security-error.patch
b/utils/atop/patches/0001-Fix-drawbar-mvwprintw-format-security-error.patch
deleted file mode 100644
index 3627f65..0000000
---
a/utils/atop/patches/0001-Fix-drawbar-mvwprintw-format-security-error.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 957ff648436fa4a6f08ad9a8c5ea856a5f33ef5b Mon Sep 17 00:00:00 2001
-From: BlackEagle <ike.devolder AT gmail.com>
-Date: Fri, 2 Jun 2023 19:49:51 +0200
-Subject: [PATCH] Fix drawbar mvwprintw format-security error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When building with `-Werror=format-security` there are some issues with
-the use of mvwprintw in drawbar.c
-
-```
-export CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
- -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
- -fstack-clash-protection -fcf-protection"
-
-make
-...
-cc -march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions
-Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security
-fstack-clash-protection -fcf-protection -O2 -I. -Wall
-Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -c -o
drawbar.o drawbar.c
-drawbar.c: In function ‘drawevent’:
-drawbar.c:2058:9: error: format not a string literal and no format arguments
[-Werror=format-security]
- 2058 | mvwprintw(w->win, line, column, text);
- | ^~~~~~~~~
-drawbar.c: In function ‘headergetch’:
-drawbar.c:2108:17: error: format not a string literal and no format
arguments [-Werror=format-security]
- 2108 | mvwprintw(headwin, 0, statcol, statusmsg);
- | ^~~~~~~~~
-drawbar.c: In function ‘getwininput’:
-drawbar.c:2331:9: error: format not a string literal and no format arguments
[-Werror=format-security]
- 2331 | mvwprintw(mywin, 1, 1, prompt);
- | ^~~~~~~~~
-cc1: some warnings being treated as errors
-make: *** [<builtin>: drawbar.o] Error 1
-```
-
-By explicitly adding the format `"%s"` this error is fixed.
-
-Signed-off-by: BlackEagle <ike.devolder AT gmail.com>
-Origin: Upstream
-Upstream-Status: Accepted [https://github.com/Atoptool/atop/pull/262]
-Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
----
- drawbar.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drawbar.c b/drawbar.c
-index 659ed6a..e013c6c 100644
---- a/drawbar.c
-+++ b/drawbar.c
-@@ -2055,7 +2055,7 @@ drawevent(struct perwindow *w, int line, int column,
int color,
-
- line -= 1;
- wattron(w->win, A_BOLD);
-- mvwprintw(w->win, line, column, text);
-+ mvwprintw(w->win, line, column, "%s", text);
- wattroff(w->win, A_BOLD);
-
- colorswoff(w->win, color);
-@@ -2105,7 +2105,7 @@ headergetch(time_t curtime, int nsecs, char
*statusmsg, int statuscol)
- {
- colorswon(headwin, statuscol);
- wattron(headwin, A_REVERSE);
-- mvwprintw(headwin, 0, statcol, statusmsg);
-+ mvwprintw(headwin, 0, statcol, "%s", statusmsg);
- wattroff(headwin, A_REVERSE);
- colorswoff(headwin, statuscol);
- }
-@@ -2328,7 +2328,7 @@ getwininput(char *prompt, char *answer, int maxanswer,
char numerical)
-
- // show the prompt
- //
-- mvwprintw(mywin, 1, 1, prompt);
-+ mvwprintw(mywin, 1, 1, "%s", prompt);
-
- // prepare reading input
- //
diff --git
a/utils/atop/patches/0001-Fix-includes-for-standard-compliance.patch
b/utils/atop/patches/0001-Fix-includes-for-standard-compliance.patch
deleted file mode 100644
index 016cfe0..0000000
--- a/utils/atop/patches/0001-Fix-includes-for-standard-compliance.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Enno Boland <gottox AT voidlinux.org>
-Date: Fri, 14 Jul 2023 23:06:40 +0200
-Subject: [PATCH] Fix includes for standard compliance
-
-- time_t is defined by <time.h>
-- malloc is defined by <stdlib.h>
-
-Fixes build against musl libc.
-
-Co-authored-by: Duncaen <duncaen AT voidlinux.org>
-Co-authored-by: psykose <alice AT ayaya.dev>
-Origin: Apline & Void Linux
-Upstream-Status: Unknown
-[ismael AT sourcemage.org: Normalised patch and added description]
-Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
----
- drawbar.c | 1 +
- procdbase.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
---- a/procdbase.c
-+++ b/procdbase.c
-@@ -39,7 +39,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
-
- #include "atop.h"
- #include "photoproc.h"
---- a/drawbar.c
-+++ b/drawbar.c
-@@ -110,6 +110,7 @@
- #include <unistd.h>
- #include <regex.h>
- #include <sys/utsname.h>
-+#include <time.h>
-
- #include "atop.h"
- #include "showgeneric.h"


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (b2db3088cf1a16a0c677987b6df684e4d89e06f4), Ismael Luceno, 12/29/2024

Archive powered by MHonArc 2.6.24.

Top of Page