gentoo resync : 22.01.2021

5 files changed, 0 insertions, 281 deletions

diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index decd22e8f1f9..31aecee2c66e 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -1,7 +1,3 @@
-AUX xoscope-2.0-comedi_compile.patch 1068 BLAKE2B 23ed9dcbd18c897735da631853364e3cff5d348962bf8861b02847ed67ac32abd1c5489b4b0df27315606107cf9a62f95a66f6f80510f46f2a694df544864135 SHA512 00263be40f823610743fc69c74fb0ac69d58cc33bf21fde27f7d4f11923f7cae24138439706b1c478795e574d38f30f35f6e5dc955b3ca70ace829e00b432877
-AUX xoscope-2.0-implicit_decls.patch 687 BLAKE2B 9dfbb8f802c51d1eb1450673253246d6b8be5aa172929f73527de600862098f2de517fcb663b4c1a3568dc57b1548fe21b4dc759c0173ed1bb6d680b803fe73b SHA512 47e46ac1b2fa27a1b3378b65a0b5370045058d0d43a73a31f38ce01c3e0c551aa221e6dc2e2fbb8ff8c0263e5a31caa07adba8bdea7530d2af0196eebf0210b0
-AUX xoscope-2.0-man_no_-Tutf8.patch 369 BLAKE2B 7deae1551cda55e640f65f51ecf0f5e41ddcf7d234c1d8931b868f3e865332e23bf153f4dd662e08d81eb3dcb6db77d8db27ab823b4623932989acbc770524e4 SHA512 fcd9522fb8d45a565983d1da4cfdb9239cf2c5c994069ca2fa934fee9ec23d99b9e877bfdca5b0baf01f9722f7fdff791c99f468d088947961758fbb75bc2a0a
-AUX xoscope-2.0-remove_bundled_gtkdatabox.patch 6577 BLAKE2B 4e76e0eabbd7125be9a3c28eda71a9aa8f77f0d47bef3aeb00a5256ffffe70f12294ffab4a5365a30fa801bb0f82e05a6ed187c99c2f3c96bc9760426c1f39c7 SHA512 1a64615e99cfd160d28d9e1da04a000fe538b52b770b77db6fcbd907306aa67172c6848edccb6467f2b2e008bd243fc2c12949c91087fc17deb7b9bbc3980b9a
 AUX xoscope-2.2-fno-common.patch 489 BLAKE2B 3496854eb8a9437181178e7e78724a8fec2f11bbe2db0404395ccc09563219ce0088a14aef6494a518ed007c7a1892d81212e49020d5804ac20abaeeaa543be1 SHA512 bbc722fd45b999415e912a35ecf0be0ab9f8ec3e0d8a046bf3a094256d85eeb655d4a358b8dd942b9bafbd8175d8e3d0dfc74acb9ae4fd4d74498827ace5f42a
 AUX xoscope-2.2-man_no_-Tutf8.patch 421 BLAKE2B b8ba8523d7d6d717de4e4fb1a60061c1f929b095cdb9349b624ad589b39abae48f59cef33aa67486c3550594945b0260b8be494a950c6fad73dd597d1826b99d SHA512 54b39e8565cd464e014d111441edc8d191d85d07d4bd04679df3c771b9e28b3d7b619ae90ee532dcf8ebda6e79b5a3452130fc7157f79619e74cc8b3600d398d
 DIST xoscope-2.2.tar.gz 307319 BLAKE2B 860fe234e5958a005ff0cff5143fcc0711d69b958e2f6277589d08074001872b065ecb435493285231ff0c61aea1b50b221aa36127b25947184e059e951a70ec SHA512 77a1d7d673af3d82e5a3d563d6901c3d6f5a16a1d889e9b95ac2d7d10c8036461a94fb841266b6d131e96303d4fce47b4bc8255b3855690e9148ead6c38b74cd
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 75d3820dad81..000000000000
--- 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 473243f2ec15..000000000000
--- 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 5cba9546e91d..000000000000
--- 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 3ae541011b3b..000000000000
--- 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);