pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #135906 from yl3dy/xoscope

xoscope: 2.0 -> 2.3

authored by

Sandro and committed by
GitHub 83eef438 c80b1155

+33 -75
unified split
+17 -9
pkgs/applications/science/electronics/xoscope/default.nix
··· 1 - {lib, stdenv, fetchurl, gtk2, pkg-config}: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , gtk3 5 + , gtkdatabox 6 + , fftw 7 + , gnum4 8 + , comedilib 9 + , alsa-lib 10 + , pkg-config 11 + }: 2 12 3 13 stdenv.mkDerivation rec { 4 - name = "xoscope-2.0"; 14 + pname = "xoscope"; 15 + version = "2.3"; 5 16 6 17 src = fetchurl { 7 - url = "mirror://sourceforge/xoscope/${name}.tgz"; 8 - sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; 18 + url = "mirror://sourceforge/xoscope/${pname}-${version}.tar.gz"; 19 + sha256 = "0a5ycfc1qdmibvagc82r2mhv2i99m6pndy5i6ixas3j2297g6pgq"; 9 20 }; 10 21 11 - nativeBuildInputs = [ pkg-config ]; 12 - buildInputs = [ gtk2 ]; 13 - 14 - # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 15 - patches = [ ./gtkdepre.diff ]; 22 + nativeBuildInputs = [ pkg-config gnum4 ]; 23 + buildInputs = [ gtk3 gtkdatabox fftw comedilib alsa-lib ]; 16 24 17 25 meta = { 18 26 description = "Oscilloscope through the sound card";
-58
pkgs/applications/science/electronics/xoscope/gtkdepre.diff
··· 1 - diff -ru xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2 - --- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:42:24.000000000 +0200 3 - +++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:45:40.000000000 +0200 4 - @@ -661,7 +661,7 @@ 5 - static void 6 - gtk_databox_calculate_hcanvas (GtkDatabox *box) 7 - { 8 - - if (!GTK_WIDGET_VISIBLE (box)) 9 - + if (!gtk_widget_get_visible (box)) 10 - return; 11 - 12 - if (box->priv->adjX->page_size == 1.0) 13 - @@ -698,7 +698,7 @@ 14 - static void 15 - gtk_databox_calculate_vcanvas (GtkDatabox *box) 16 - { 17 - - if (!GTK_WIDGET_VISIBLE (box)) 18 - + if (!gtk_widget_get_visible (box)) 19 - return; 20 - 21 - if (box->priv->adjY->page_size == 1.0) 22 - @@ -780,7 +780,7 @@ 23 - gtk_databox_draw (box, event); 24 - 25 - gdk_draw_drawable (widget->window, 26 - - widget->style->fg_gc[GTK_WIDGET_STATE (widget)], 27 - + widget->style->fg_gc[gtk_widget_get_state (widget)], 28 - box->priv->canvas.pixmap, event->area.x, event->area.y, 29 - event->area.x, event->area.y, event->area.width, 30 - event->area.height); 31 - @@ -940,7 +940,7 @@ 32 - GtkWidget *widget = GTK_WIDGET (box); 33 - 34 - g_return_if_fail (GTK_IS_DATABOX (box)); 35 - - g_return_if_fail (GTK_WIDGET_VISIBLE (widget)); 36 - + g_return_if_fail (gtk_widget_get_visible (widget)); 37 - 38 - gdk_draw_rectangle (box->priv->canvas.pixmap, widget->style->bg_gc[0], 39 - TRUE, 0, 0, 40 - @@ -1150,7 +1150,7 @@ 41 - /* Copy a part of the pixmap to the screen */ 42 - if (pixmapCopyRect) 43 - gdk_draw_drawable (widget->window, 44 - - widget->style->fg_gc[GTK_WIDGET_STATE (box)], 45 - + widget->style->fg_gc[gtk_widget_get_state (box)], 46 - box->priv->canvas.pixmap, 47 - pixmapCopyRect->x, 48 - pixmapCopyRect->y, 49 - --- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:43.000000000 +0200 50 - +++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:57.000000000 +0200 51 - @@ -196,7 +196,6 @@ 52 - -DG_DISABLE_DEPRECATED\ 53 - -DGDK_DISABLE_DEPRECATED\ 54 - -DGDK_PIXBUF_DISABLE_DEPRECATED\ 55 - - -DGTK_DISABLE_DEPRECATED\ 56 - `pkg-config gtk+-2.0 --cflags` 57 - 58 - all: all-am
+16 -8
pkgs/development/libraries/gtkdatabox/default.nix
··· 1 - { lib, stdenv, fetchurl, pkg-config, gtk2 }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , pkg-config 5 + , gtk3 6 + , pango 7 + , cairo 8 + }: 2 9 3 10 stdenv.mkDerivation rec { 4 - name = "gtkdatabox-0.9.3.1"; 11 + pname = "gtkdatabox"; 12 + version = "1.0.0"; 5 13 6 14 src = fetchurl { 7 - url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz"; 8 - sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh"; 15 + url = "mirror://sourceforge/gtkdatabox/${pname}-${version}.tar.gz"; 16 + sha256 = "1qykm551bx8j8pfgxs60l2vhpi8lv4r8va69zvn2594lchh71vlb"; 9 17 }; 10 18 11 19 nativeBuildInputs = [ pkg-config ]; 12 20 13 - propagatedBuildInputs = [ gtk2 ]; 21 + propagatedBuildInputs = [ gtk3 pango cairo ]; 14 22 15 23 meta = { 16 24 description = "GTK widget for displaying large amounts of numerical data"; 17 - 18 - license = lib.licenses.lgpl2; 19 - 25 + homepage = "https://gtkdatabox.sourceforge.io/"; 26 + license = lib.licenses.lgpl2Only; 20 27 platforms = lib.platforms.unix; 28 + maintainers = with lib.maintainers; [ yl3dy ]; 21 29 }; 22 30 }