commit 255d852960976449f0db3fc75d706ee126850f7f
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Jul 11 08:34:21 2013 +0200
- up to final 0.1.0
pulseview-build.patch | 68 ---------------------------------------------------
pulseview.spec | 17 +++++--------
2 files changed, 6 insertions(+), 79 deletions(-)
---
diff --git a/pulseview.spec b/pulseview.spec
index 3664f76..b9cc36c 100644
--- a/pulseview.spec
+++ b/pulseview.spec
@@ -1,25 +1,21 @@
#
%bcond_without tests
#
-%define snap a7553da
-#
Summary: Qt based logic analyzer GUI for sigrok
Name: pulseview
-Version: 0.1
-Release: 0.%{snap}.3
+Version: 0.1.0
+Release: 1
License: GPL
Group: X11/Applications/Graphics
-# Source0:
http://sigrok.org/gitweb/?p=pulseview.git;a=snapshot;h=%{snap};sf=tgz;/%{name}-%{snap}.tar.gz
-Source0: %{name}-%{snap}.tar.gz
-# Source0-md5: 52527a78a1ee676546d63615bf1c1c8d
-Patch0: %{name}-build.patch
+Source0:
http://www.sigrok.org/download/source/pulseview/%{name}-%{version}.tar.gz
+# Source0-md5: 0b462664854f4186c67ce1aae78b6d06
URL: http://sigrok.org/wiki/PulseView
BuildRequires: boost-devel
%{?with_tests:BuildRequires: boost-test}
BuildRequires: boost-thread
BuildRequires: cmake
BuildRequires: glib2-devel
-BuildRequires: libsigrok-devel >= 0.2.0
+BuildRequires: libsigrok-devel >= 0.2.0-1
BuildRequires: libsigrokdecode-devel >= 0.1.0
BuildRequires: pkgconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -28,8 +24,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Qt based logic analyzer GUI for sigrok.
%prep
-%setup -q -n %{name}-%{snap}
-%patch0 -p1
+%setup -q
%build
install -d build
diff --git a/pulseview-build.patch b/pulseview-build.patch
deleted file mode 100644
index b874f78..0000000
--- a/pulseview-build.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- pulseview-a7553da/pv/sigsession.cpp~ 2013-03-09 16:09:28.000000000
+0100
-+++ pulseview-a7553da/pv/sigsession.cpp 2013-03-09 16:45:26.008835730
+0100
-@@ -172,7 +172,7 @@
- void SigSession::feed_in_header(const sr_dev_inst *sdi)
- {
- shared_ptr<view::Signal> signal;
-- uint64_t *sample_rate;
-+ uint64_t *sample_rate = NULL;
- unsigned int logic_probe_count = 0;
- unsigned int analog_probe_count = 0;
-
---- pulseview-a7553da/pv/view/viewport.cpp~ 2013-03-09 16:09:28.000000000
+0100
-+++ pulseview-a7553da/pv/view/viewport.cpp 2013-03-09 17:23:03.369361232
+0100
-@@ -104,11 +104,6 @@
- }
- }
-
--void Viewport::mouseReleaseEvent(QMouseEvent *event)
--{
-- assert(event);
--}
--
- void Viewport::wheelEvent(QWheelEvent *event)
- {
- assert(event);
---- pulseview-a7553da/pv/view/viewport.h~ 2013-03-09 16:09:28.000000000
+0100
-+++ pulseview-a7553da/pv/view/viewport.h 2013-03-09 17:23:07.126116283
+0100
-@@ -48,7 +48,6 @@
- private:
- void mousePressEvent(QMouseEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
-- void mouseReleaseEvent(QMouseEvent *event);
- void wheelEvent(QWheelEvent *event);
-
- private:
---- pulseview-a7553da/test/CMakeLists.txt~ 2013-03-09 16:09:28.000000000
+0100
-+++ pulseview-a7553da/test/CMakeLists.txt 2013-03-09 17:27:36.806516037
+0100
-@@ -35,6 +35,7 @@
-
- set(PULSEVIEW_LINK_LIBS
- ${Boost_LIBRARIES}
-+ ${CMAKE_THREAD_LIBS_INIT}
- )
-
- add_executable(pulseview-test
-commit 4b963e7f126d2a13c4a4156fe1cfa8000c00fec0
-Author: Joel Holdsworth <[email protected]>
-Date: Sat Mar 9 16:52:04 2013 +0000
-
- Ensure sr_config_get is called even when assert is compiled out
-
-diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
-index a9da7bf..8f482f6 100644
---- a/pv/sigsession.cpp
-+++ b/pv/sigsession.cpp
-@@ -195,8 +195,10 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi)
-
- // Read out the sample rate
- assert(sdi->driver);
-- assert(sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-- (const void**)&sample_rate, sdi) == SR_OK);
-+
-+ const int ret = sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-+ (const void**)&sample_rate, sdi);
-+ assert(ret == SR_OK);
-
- // Create data containers for the coming data snapshots
- {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pulseview.git/commitdiff/255d852960976449f0db3fc75d706ee126850f7f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
