* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/xoscope/files/
@ 2020-12-26 22:05 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-12-26 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 852db23be9b33a0c0b223fcde0a658a45125c7fe
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Dec 13 08:30:04 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 22:04:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=852db23b
sci-electronics/xoscope: remove unused patch
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch b/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch
deleted file mode 100644
index f00cd8c2545..00000000000
--- a/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xoscope-2.1/configure.ac
-+++ xoscope-2.1/configure.ac
-@@ -132,7 +132,7 @@
-
- AC_DEFINE(MSECREFRESH, 30, [minimum number of milliseconds between refresh on libsx version])
-
--AC_DEFINE(HELPCOMMAND, "man -Tutf8 xoscope 2>&1", [shell command for X11 help])
-+AC_DEFINE(HELPCOMMAND, "man xoscope 2>&1", [shell command for X11 help])
-
- AC_DEFINE(FILENAME, "oscope.dat", [default file name])
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/xoscope/files/
@ 2021-01-18 10:14 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-01-18 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 37b7f3f167b988a5a2018e0e413c6fc6ba5d126d
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Jan 18 10:14:34 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 10:14:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37b7f3f1
sci-electronics/xoscope: Remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/19092
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../xoscope/files/xoscope-2.0-comedi_compile.patch | 32 ----
.../xoscope/files/xoscope-2.0-implicit_decls.patch | 29 ---
.../xoscope/files/xoscope-2.0-man_no_-Tutf8.patch | 11 --
.../xoscope-2.0-remove_bundled_gtkdatabox.patch | 205 ---------------------
4 files changed, 277 deletions(-)
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch b/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
deleted file mode 100644
index 75d3820dad8..00000000000
--- a/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- xoscope-2.0/comedi.c
-+++ xoscope-2.0/comedi.c
-@@ -27,7 +27,7 @@
- #include <sys/ioctl.h>
- #include <sys/time.h>
- #include <sys/poll.h>
--#include <asm/page.h>
-+//#include <asm/page.h>
- #include <comedilib.h>
- #include "oscope.h" /* program defaults */
- #include "func.h"
-@@ -184,7 +184,9 @@
- * avoid the bug. This is the only reason we need <asm/page.h> in
- * our include list.
- */
-- comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK;
-+ //comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK;
-+ comedi_bufsize = (comedi_bufsize + sysconf(_SC_PAGE_SIZE) - 1) &
-+ (sysconf(_SC_PAGE_SIZE) - 1);
- ret = comedi_set_buffer_size(comedi_dev, comedi_subdevice, comedi_bufsize);
- if (ret < 0) {
- comedi_error = comedi_errno();
-@@ -505,7 +507,7 @@
- unsigned int chan;
- int ret;
-
-- ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0);
-+ ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0, 1);
-
- if (ret >= 0) {
- chan = CR_PACK(4,0,AREF_DIFF);
-
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch b/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch
deleted file mode 100644
index 473243f2ec1..00000000000
--- a/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- xoscope-2.0/proscope.c
-+++ xoscope-2.0/proscope.c
-@@ -11,6 +11,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include "proscope.h"
- #include "oscope.h"
---- xoscope-2.0/oscope.c
-+++ xoscope-2.0/oscope.c
-@@ -408,7 +408,15 @@
- */
-
- displayed_samples = p->signal ? samples(p->signal->rate) : 0;
-- max_samples = p->signal ? max(samples(p->signal->rate), p->signal->num) : 0;
-+ if ( p->signal ) {
-+ if ( samples(p->signal->rate) > p->signal->num ) {
-+ max_samples = samples(p->signal->rate);
-+ } else {
-+ max_samples = p->signal->num;
-+ }
-+ } else {
-+ max_samples = 0;
-+ }
-
- if (c >= 'A' && c <= 'Z') {
- if (p->signal) {
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch b/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch
deleted file mode 100644
index 5cba9546e91..00000000000
--- a/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xoscope-2.0/acconfig.h
-+++ xoscope-2.0/acconfig.h
-@@ -61,7 +61,7 @@
- interactive response time as the X server becomes too busy */
-
- /* bourne shell command for X11 Help ("man -Tutf8 xoscope 2>&1") */
--#define HELPCOMMAND "man -Tutf8 xoscope 2>&1"
-+#define HELPCOMMAND "man xoscope 2>&1"
-
- /* default file name ("oscope.dat") */
- #define FILENAME "oscope.dat"
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch b/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch
deleted file mode 100644
index 3ae541011b3..00000000000
--- a/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch
+++ /dev/null
@@ -1,205 +0,0 @@
---- xoscope-2.0/configure.in
-+++ xoscope-2.0/configure.in
-@@ -17,7 +17,7 @@
-
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2)
-
--#PKG_CHECK_MODULES(GTKDATABOX, gtkdatabox)
-+PKG_CHECK_MODULES(GTKDATABOX, gtkdatabox)
- #AC_CONFIG_SUBDIRS(gtkdatabox-0.6.0.0)
-
- dnl Set PACKAGE_DATA_DIR in config.h.
-@@ -106,5 +106,4 @@
- AC_OUTPUT([
- operl
- Makefile
--gtkdatabox-0.6.0.0/gtk/Makefile
- ])
---- xoscope-2.0/Makefile.am
-+++ xoscope-2.0/Makefile.am
-@@ -40,9 +40,6 @@
- comedisrc =
- endif
-
--GTKDATABOX_CFLAGS = -I $(top_srcdir)/gtkdatabox-0.6.0.0/gtk
--GTKDATABOX_LIBS = $(top_builddir)/gtkdatabox-0.6.0.0/gtk/libgtkdatabox.a
--
- # Some bit of explaination is needed here for GUI_LIB. automake won't
- # let us include source files in a subdirectory on a _SOURCES line,
- # and we do want all the auto-magically generated glade stuff confined
-@@ -52,7 +49,6 @@
- # trick used in things like comedi.c (see comments there) won't work
- # for a library. So we put .o files in.
-
--SUBDIRS = gtkdatabox-0.6.0.0/gtk
- INCLUDES = @GTK_CFLAGS@ $(GTKDATABOX_CFLAGS)
- GUI_LIB = callbacks.c callbacks.h interface.c interface.h support.c support.h
-
---- xoscope-2.0/Makefile.in
-+++ xoscope-2.0/Makefile.in
-@@ -232,8 +232,6 @@
-
- @COMEDI_FALSE@comedisrc =
- @COMEDI_TRUE@comedisrc = comedi.c
--GTKDATABOX_CFLAGS = -I $(top_srcdir)/gtkdatabox-0.6.0.0/gtk
--GTKDATABOX_LIBS = $(top_builddir)/gtkdatabox-0.6.0.0/gtk/libgtkdatabox.a
-
- # Some bit of explaination is needed here for GUI_LIB. automake won't
- # let us include source files in a subdirectory on a _SOURCES line,
-@@ -243,7 +241,6 @@
- # they get built as one, because then the weak attribute override
- # trick used in things like comedi.c (see comments there) won't work
- # for a library. So we put .o files in.
--SUBDIRS = gtkdatabox-0.6.0.0/gtk
- INCLUDES = @GTK_CFLAGS@ $(GTKDATABOX_CFLAGS)
- INCLUDES = @GTK_CFLAGS@
- GUI_LIB = callbacks.c callbacks.h interface.c interface.h support.c support.h
---- xoscope-2.0/display.c
-+++ xoscope-2.0/display.c
-@@ -27,7 +27,7 @@
- #include <gtkdatabox_points.h>
- #include <gtkdatabox_lines.h>
- #include <gtkdatabox_grid.h>
--#include <gtkdatabox_marker.h>
-+#include <gtkdatabox_markers.h>
-
- extern GtkWidget *databox;
-
---- xoscope-2.0/display.c
-+++ xoscope-2.0/display.c
-@@ -56,7 +56,7 @@
- gboolean clear_message_callback(gpointer ignored)
- {
- gtk_databox_graph_remove (GTK_DATABOX(databox), databox_message);
-- gtk_databox_redraw (GTK_DATABOX (databox));
-+ gtk_widget_queue_draw (databox);
- return FALSE;
- }
-
-@@ -66,15 +66,15 @@
- if (databox_message == NULL) {
- GdkColor gcolor;
- gcolor.red = gcolor.green = gcolor.blue = 65535;
-- databox_message = gtk_databox_marker_new(1, &databox_message_X,
-+ databox_message = gtk_databox_markers_new(1, &databox_message_X,
- &databox_message_Y, &gcolor, 0,
-- GTK_DATABOX_MARKER_NONE);
-+ GTK_DATABOX_MARKERS_NONE);
- }
-
-- gtk_databox_marker_set_label(GTK_DATABOX_MARKER(databox_message), 0,
-- GTK_DATABOX_TEXT_N, message, FALSE);
-+ gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(databox_message), 0,
-+ GTK_DATABOX_MARKERS_TEXT_N, message, FALSE);
- gtk_databox_graph_add (GTK_DATABOX(databox), databox_message);
-- gtk_databox_redraw (GTK_DATABOX (databox));
-+ gtk_widget_queue_draw (databox);
-
- g_timeout_add (2000, clear_message_callback, NULL);
- }
-@@ -620,10 +620,10 @@
- graticule_minor_graph = gtk_databox_grid_new (9, 9, &gcolor, 1);
- graticule_major_graph = gtk_databox_grid_new (1, 1, &gcolor, 1);
-
-- gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_major_graph),
-- GTK_DATABOX_GRID_SOLID_LINES);
-- gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_minor_graph),
-- GTK_DATABOX_GRID_DOTTED_LINES);
-+ //gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_major_graph),
-+ // GTK_DATABOX_GRID_SOLID_LINES);
-+ //gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_minor_graph),
-+ // GTK_DATABOX_GRID_DOTTED_LINES);
-
- recompute_graticule();
- }
-@@ -675,7 +675,7 @@
-
- void configure_databox(void)
- {
-- GtkDataboxValue topleft, bottomright;
-+ GtkDataboxValueRectangle rect;
- gfloat upper_time_limit;
- int j;
-
-@@ -723,24 +723,26 @@
-
- /* Now set the total canvas size of the databox */
-
-- topleft.x = 0;
-- topleft.y = 1;
-+ rect.x1 = 0;
-+ rect.y1 = 1;
-
-- bottomright.x = total_horizontal_divisions
-+ rect.x2 = total_horizontal_divisions
- * 0.001 * (gfloat) scope.div / scope.scale;
-- bottomright.y = -1;
-+ rect.y2 = -1;
-
-- gtk_databox_set_canvas(GTK_DATABOX(databox), topleft, bottomright);
-+ gtk_databox_set_total_limits(GTK_DATABOX(databox),
-+ rect.x1, rect.x2, rect.y1, rect.y2);
-
- /* A slight adjustment gets us our visible area. Note that this
- * call also resets the databox viewport to its left most position.
- */
-
-- bottomright.x = 10 * 0.001 * (gfloat) scope.div / scope.scale;
-- gtk_databox_set_visible_canvas(GTK_DATABOX(databox), topleft, bottomright);
-+ rect.x2 = 10 * 0.001 * (gfloat) scope.div / scope.scale;
-+ gtk_databox_set_visible_limits(GTK_DATABOX(databox),
-+ rect.x1, rect.x2, rect.y1, rect.y2);
-
- /* Temporary message is always centered on screen */
-- databox_message_X = bottomright.x / 2;
-+ databox_message_X = rect.x2 / 2;
-
- /* Decide if we need a scrollbar or not */
-
-@@ -1208,7 +1210,7 @@
- draw_graticule();
- }
-
-- gtk_databox_redraw (GTK_DATABOX (databox));
-+ gtk_widget_queue_draw (databox);
- }
-
- /* animate() - get and plot some data
---- xoscope-2.0/gr_gtk.c
-+++ xoscope-2.0/gr_gtk.c
-@@ -1049,7 +1049,7 @@
- l = p->signal->delay * num / 10000;
-
- if (scope.curs) {
--#if 1
-+#if 0
- GtkDataboxCoord coord;
- GtkDataboxValue value;
- coord.x = event->x;
-@@ -1057,7 +1057,7 @@
- value = gtk_databox_value_from_coord (GTK_DATABOX(databox), coord);
- x = value.x;
- #else
-- x = gtk_databox_pixel_to_value_x (databox, event->x);
-+ x = gtk_databox_pixel_to_value_x (GTK_DATABOX(databox), event->x);
- #endif
- cursor = rintf((x - l) / num) + 1;
- #if 0
-@@ -1205,7 +1205,7 @@
-
- glade_window = create_main_window();
-
-- setup_help_text(glade_window);
-+ //setup_help_text(glade_window);
-
- #if 0
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-@@ -1217,7 +1217,7 @@
- gtk_box_reorder_child(GTK_BOX(LU("vbox1")), menubar, 0);
- gtk_widget_show(menubar);
-
-- gtk_databox_set_hadjustment (GTK_DATABOX (databox),
-+ gtk_databox_set_adjustment_x (GTK_DATABOX (databox),
- gtk_range_get_adjustment (GTK_RANGE (LU("databox_hscrollbar"))));
-
- gtk_widget_show(glade_window);
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-18 10:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-26 22:05 [gentoo-commits] repo/gentoo:master commit in: sci-electronics/xoscope/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-01-18 10:14 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox