- updated to current git master (version is 0.2) to build with mono 4

- removed obsolete unicode-dot,build,fix patches
- added wrapper patch (install heap-shot-gui wrapper script again)

diff --git a/heap-shot-build.patch b/heap-shot-build.patch
deleted file mode 100644 (file)
index dae0bcc..0000000
--- a/heap-shot-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- heap-shot/profiler/outfile-writer.c.orig   2010-05-07 22:34:43.028272974 +0200
-+++ heap-shot/profiler/outfile-writer.c        2010-05-07 22:34:47.115353979 +0200
-@@ -26,6 +26,8 @@
- #include <string.h>
- #include <time.h>
- 
-+#include <mono/metadata/debug-helpers.h>
-+
- #include "outfile-writer.h"
- 
- #define MAGIC_NUMBER 0x4eabfdd1

diff --git a/heap-shot-fix.patch b/heap-shot-fix.patch
deleted file mode 100644 (file)
index 47e67d1..0000000
--- a/heap-shot-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- heap-shot/HeapShot.Gui.Widgets/ReferenceTreeViewer.cs.orig 2010-05-07 20:20:25.000000000 +0200
-+++ heap-shot/HeapShot.Gui.Widgets/ReferenceTreeViewer.cs      2013-10-21 20:33:54.693743484 +0200
-@@ -426,7 +426,7 @@
-                                               } else
-                                                       return string.Format ("There are <b>{0:n0}</b> bytes of <b>{1}</b> objects", node.TotalMemory, GetShortName (node.TypeName));
-                                       }
--                                      case 6:
-+                                      case 6: {
-                                               string pname = GetParentType (iter);
-                                               if (pname != null) {
-                                                       if (InverseReferences)
-@@ -435,6 +435,7 @@
-                                                               return string.Format ("Objects of type <b>{0}</b> referenced by <b>{2}</b> objects have an average size of <b>{1:n0}</b> bytes", GetShortName (node.TypeName), node.AverageSize, pname);
-                                               } else
-                                                       return string.Format ("Objects of type <b>{0}</b> have an average size of <b>{1:n0}</b> bytes", GetShortName (node.TypeName), node.AverageSize);
-+                                      }
-                               }
-                       } else {
-                               FieldReference fr = (FieldReference) ob;

diff --git a/heap-shot-unicode-dot.patch b/heap-shot-unicode-dot.patch
deleted file mode 100644 (file)
index 2259cc2..0000000
--- a/heap-shot-unicode-dot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- heap-shot/HeapShot.Gui.Widgets/gtk-gui/HeapShot.Gui.Widgets.ReferenceTreeViewer.cs.orig    2010-05-07 20:06:58.000000000 +0200
-+++ heap-shot/HeapShot.Gui.Widgets/gtk-gui/HeapShot.Gui.Widgets.ReferenceTreeViewer.cs 2010-05-07 20:17:20.905783337 +0200
-@@ -69,7 +69,7 @@
-             this.entryFilter.CanFocus = true;
-             this.entryFilter.Name = "entryFilter";
-             this.entryFilter.IsEditable = true;
--            this.entryFilter.InvisibleChar = '●';
-+            this.entryFilter.InvisibleChar = '\u25cf';
-             this.boxFilter.Add(this.entryFilter);
-             Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.boxFilter[this.entryFilter]));
-             w3.Position = 0;

diff --git a/heap-shot-wrapper.patch b/heap-shot-wrapper.patch
new file mode 100644 (file)
index 0000000..c75f02a
--- /dev/null
+++ b/heap-shot-wrapper.patch
@@ -0,0 +1,10 @@
+--- heap-shot-84033f7b9c19972b761ad0203c391b70fcf9c1a7/HeapShot.Gui/Makefile.am.orig   2015-10-21 13:56:03.000000000 +0200
++++ heap-shot-84033f7b9c19972b761ad0203c391b70fcf9c1a7/HeapShot.Gui/Makefile.am        2016-01-29 17:19:38.030007975 +0100
+@@ -1,6 +1,7 @@
+ NAME = HeapShot.Gui
+ TARGET = $(NAME).exe
+ CSPROJ = $(NAME).csproj
++WRAPPER = heap-shot-gui
+ XBUILD = xbuild
+ XBUILD_ARGS = "/property:Configuration=Debug" $(CSPROJ)
+ 

diff --git a/heap-shot.spec b/heap-shot.spec
index 42189b903bbcf2b4ded19c57439a9f1c2822a65c..41af4f552c167f9565966e2f34496181275759f4 100644 (file)
--- a/heap-shot.spec
+++ b/heap-shot.spec
@@ -4,24 +4,21 @@
 Summary:       A profiler to explore live objects in the heap
 Summary(pl.UTF-8):     Profiler do podglądania żywych obiektów na stercie
 Name:          heap-shot
-Version:       0.1
-Release:       5
+Version:       0.2
+%define        snap    20151022
+%define        gitref  84033f7b9c19972b761ad0203c391b70fcf9c1a7
+%define        rel     1
+Release:       0.%{gitref}.%{rel}
 License:       GPL v3
 Group:         Development/Tools
-# git clone http://github.com/mono/heap-shot.git
-Source0:       %{name}.tar.bz2
-# Source0-md5: 976f917b5703eb321b7acac42e6f9000
-Patch0:                %{name}-unicode-dot.patch
-Patch1:                %{name}-build.patch
-Patch2:                %{name}-fix.patch
+Source0:       https://github.com/mono/heap-shot/archive/%{gitref}/%{name}-%{snap}.tar.gz
+# Source0-md5: 57a49b9f83d3d5cb079b5d710398719e
+Patch0:                %{name}-wrapper.patch
 URL:           http://www.mono-project.com/HeapShot
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: dotnet-gtk-sharp2-devel >= 2
-BuildRequires: glib2-devel >= 2.0
-BuildRequires: libtool
 BuildRequires: mono-csharp >= 2.8
-BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,18 +44,14 @@ migawkę pamięci z jakiejś chwili, albo porównywać obiekty między
 dwiema różnymi chwilami.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{gitref}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure \
-       --disable-static
+%configure
 
 %{__make} -j1
 
@@ -68,21 +61,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# mono dlopens profiler library by libmono-profiler-NAME.so
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/heap-shot
+%doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/heap-shot-gui
-%attr(755,root,root) %{_libdir}/libmono-profiler-heap-shot.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmono-profiler-heap-shot.so.0
-%attr(755,root,root) %{_libdir}/libmono-profiler-heap-shot.so
 %{_prefix}/lib/%{name}