packages: xoscope/xoscope.spec, xoscope/xoscope-2.0-3.1-nmu.diff (NEW), xos...
draenog
draenog at pld-linux.org
Tue Jul 20 16:01:26 CEST 2010
Author: draenog Date: Tue Jul 20 14:01:26 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.0
- remove needless pmake.patch
- add patch for TK_WIDGET_STATE undefined error
(taken from Debian)
---- Files affected:
packages/xoscope:
xoscope.spec (1.8 -> 1.9) , xoscope-2.0-3.1-nmu.diff (NONE -> 1.1) (NEW), xoscope-pmake.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/xoscope/xoscope.spec
diff -u packages/xoscope/xoscope.spec:1.8 packages/xoscope/xoscope.spec:1.9
--- packages/xoscope/xoscope.spec:1.8 Fri Jan 1 23:33:08 2010
+++ packages/xoscope/xoscope.spec Tue Jul 20 16:01:17 2010
@@ -4,18 +4,18 @@
Summary: xoscope - digital oscilloscope on PC
Summary(pl.UTF-8): xoscope - cyfrowy oscyloskop na PC
Name: xoscope
-Version: 1.12
+Version: 2.0
Release: 0.2
License: GPL
Group: X11/Applications
Source0: http://dl.sourceforge.net/xoscope/%{name}-%{version}.tgz
-# Source0-md5: 89f8019a772713a976b634305d29cfe5
-Patch0: xoscope-pmake.patch
+# Source0-md5: f1430ccee4ee0f6f478c2cd209549741
+Patch0: xoscope-2.0-3.1-nmu.diff
URL: http://xoscope.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: esound-devel
-BuildRequires: gtk+-devel
+BuildRequires: gtk+2-devel >= 2.2
BuildRequires: libtool
BuildRequires: perl-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -32,7 +32,7 @@
%prep
%setup -q
-%patch0 -p1
+%patch -p1
%build
%{__aclocal}
@@ -53,9 +53,8 @@
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog HARDWARE INTERNALS NEWS README TODO
+%doc AUTHORS ChangeLog hardware/HARDWARE NEWS README TODO
%attr(755,root,root) %{_bindir}/*
-%{_libdir}/%{name}
%{_mandir}/*/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -64,6 +63,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.9 2010/07/20 14:01:17 draenog
+- up to 2.0
+- remove needless pmake.patch
+- add patch for TK_WIDGET_STATE undefined error
+ (taken from Debian)
+
Revision 1.8 2010/01/01 22:33:08 sparky
- BR capitalization
================================================================
Index: packages/xoscope/xoscope-2.0-3.1-nmu.diff
diff -u /dev/null packages/xoscope/xoscope-2.0-3.1-nmu.diff:1.1
--- /dev/null Tue Jul 20 16:01:26 2010
+++ packages/xoscope/xoscope-2.0-3.1-nmu.diff Tue Jul 20 16:01:17 2010
@@ -0,0 +1,47 @@
+--- xoscope-2.0.orig/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-05-08 02:06:19.060429808 +0200
++++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-05-08 02:06:14.624423484 +0200
+@@ -661,7 +661,7 @@
+ static void
+ gtk_databox_calculate_hcanvas (GtkDatabox *box)
+ {
+- if (!GTK_WIDGET_VISIBLE (box))
++ if (!gtk_widget_get_visible (box))
+ return;
+
+ if (box->priv->adjX->page_size == 1.0)
+@@ -698,7 +698,7 @@
+ static void
+ gtk_databox_calculate_vcanvas (GtkDatabox *box)
+ {
+- if (!GTK_WIDGET_VISIBLE (box))
++ if (!gtk_widget_get_visible (box))
+ return;
+
+ if (box->priv->adjY->page_size == 1.0)
+@@ -780,7 +780,7 @@
+ gtk_databox_draw (box, event);
+
+ gdk_draw_drawable (widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++ widget->style->fg_gc[gtk_widget_get_state (widget)],
+ box->priv->canvas.pixmap, event->area.x, event->area.y,
+ event->area.x, event->area.y, event->area.width,
+ event->area.height);
+@@ -940,7 +940,7 @@
+ GtkWidget *widget = GTK_WIDGET (box);
+
+ g_return_if_fail (GTK_IS_DATABOX (box));
+- g_return_if_fail (GTK_WIDGET_VISIBLE (widget));
++ g_return_if_fail (gtk_widget_get_visible (widget));
+
+ gdk_draw_rectangle (box->priv->canvas.pixmap, widget->style->bg_gc[0],
+ TRUE, 0, 0,
+@@ -1150,7 +1150,7 @@
+ /* Copy a part of the pixmap to the screen */
+ if (pixmapCopyRect)
+ gdk_draw_drawable (widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (box)],
++ widget->style->fg_gc[gtk_widget_get_state (box)],
+ box->priv->canvas.pixmap,
+ pixmapCopyRect->x,
+ pixmapCopyRect->y,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xoscope/xoscope.spec?r1=1.8&r2=1.9&f=u
More information about the pld-cvs-commit
mailing list