Hello community, here is the log from the commit of package bless for openSUSE:Factory checked in at 2020-03-18 12:41:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bless (Old) and /work/SRC/openSUSE:Factory/.bless.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bless" Wed Mar 18 12:41:24 2020 rev:3 rq:785989 version:0.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/bless/bless.changes 2019-07-26 12:40:21.093908592 +0200 +++ /work/SRC/openSUSE:Factory/.bless.new.3160/bless.changes 2020-03-18 12:45:56.348975429 +0100 @@ -1,0 +2,8 @@ +Tue Mar 17 15:41:41 UTC 2020 - Marguerite Su <i...@marguerite.su> + +- update version 0.6.2 + * see git commits +- add bless-0.6.2-Range-ambiguous-reference.patch + * Fix building error CS0104: 'Range' is an ambiguous reference + +------------------------------------------------------------------- Old: ---- alf82-key.gpg bless-0.6.0.tar.gz bless-0.6.0.tar.gz.sig New: ---- bless-0.6.2-Range-ambiguous-reference.patch bless-0.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bless.spec ++++++ --- /var/tmp/diff_new_pack.v8wPgK/_old 2020-03-18 12:45:57.452976127 +0100 +++ /var/tmp/diff_new_pack.v8wPgK/_new 2020-03-18 12:45:57.456976129 +0100 @@ -1,7 +1,7 @@ # # spec file for package bless # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,17 @@ Name: bless -Version: 0.6.0 +Version: 0.6.2 Release: 0 Summary: Gtk#-based Hex-editor written in C# License: GPL-2.0-only Group: Development/Tools/Other -Url: http://home.gna.org/bless -Source: http://download.gna.org/bless/%{name}-%{version}.tar.gz -Source1: http://download.gna.org/bless/bless-0.6.0.tar.gz.sig -Source2: http://gna.org/people/viewgpg.php?user_id=1269#/alf82-key.gpg +URL: https://github.com/afrantzis/bless +Source: https://github.com/afrantzis/bless/archive/v%{version}/%{name}-%{version}.tar.gz #PATCH-FIX-UPSTREAM jbi...@debian.org - build without scrollkeeper/rarian -Patch: dont-require-rarian.patch +Patch0: dont-require-rarian.patch +#PATCH-FIX-UPSTREAM Fix building error CS0104: 'Range' is an ambiguous reference +Patch1: bless-0.6.2-Range-ambiguous-reference.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes @@ -36,7 +36,6 @@ BuildRequires: pkgconfig(glade-sharp-2.0) BuildRequires: pkgconfig(gtk-sharp-2.0) BuildRequires: pkgconfig(mono) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Bless is a hex editor written in Mono/Gtk#. It features: @@ -62,15 +61,18 @@ This package contains the documentation. %prep -%autosetup -p1 +%setup -q +%patch -p1 +%patch1 -p1 +./autogen.sh # Fix Build for Mono 4.0 -sed -i 's/gmcs/mcs/' configure{,.ac} builder/ModuleBuilder.cs -autoreconf -fi +sed -i 's/gmcs/mcs/' configure builder/ModuleBuilder.cs +#autoreconf -fi %build %configure --without-scrollkeeper sed -i 's/$(MKDIR_P)/mkdir -p/' po/Makefile -make %{?_smp_mflags} +%make_build %install %make_install @@ -85,8 +87,8 @@ %desktop_database_postun %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_bindir}/bless %{_libdir}/bless %{_datadir}/applications/bless.desktop @@ -94,7 +96,6 @@ %{_datadir}/pixmaps/* %files doc -%defattr(-,root,root) %{_datadir}/doc/bless/ %{_datadir}/doc/bless/user/ %{_datadir}/doc/bless/user/figures/ ++++++ bless-0.6.2-Range-ambiguous-reference.patch ++++++ >From 84801988f908e51d9843c3e0ee8f2cd05c0a2d97 Mon Sep 17 00:00:00 2001 From: davidcim <da...@cimaware.com> Date: Thu, 3 Oct 2019 12:38:25 +0200 Subject: [PATCH] Fix building error CS0104: 'Range' is an ambiguous reference --- src/buffers/ByteBuffer.cs | 2 +- src/gui/DataBookFinder.cs | 4 ++-- src/gui/areas/AreaGroup.cs | 20 ++++++++++---------- src/tools/find/FindOperations.cs | 6 +++--- src/tools/find/IFindStrategy.cs | 10 +++++----- src/tools/find/IFinder.cs | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/buffers/ByteBuffer.cs b/src/buffers/ByteBuffer.cs index b9d9a24..72c1b42 100644 --- a/src/buffers/ByteBuffer.cs +++ b/src/buffers/ByteBuffer.cs @@ -671,7 +671,7 @@ public byte[] RangeToByteArray(IRange range) /// Returns as a SegmentCollection the data contained in /// the specified range in the buffer. ///</summary> - public SegmentCollection RangeToSegmentCollection(Range range) + public SegmentCollection RangeToSegmentCollection(Util.Range range) { if (range.Size == 0) return null; diff --git a/src/gui/DataBookFinder.cs b/src/gui/DataBookFinder.cs index 50b5034..3248d3a 100644 --- a/src/gui/DataBookFinder.cs +++ b/src/gui/DataBookFinder.cs @@ -234,7 +234,7 @@ void FindAsyncCallback(IAsyncResult ar) { GenericFindOperation state = (GenericFindOperation)ar.AsyncState; ThreadedAsyncOperation.OperationResult result = state.Result; - Range match = state.Match; + Util.Range match = state.Match; DataView dv = null; @@ -381,7 +381,7 @@ void ReplaceAllAsyncCallback(IAsyncResult ar) { ReplaceAllOperation state = (ReplaceAllOperation)ar.AsyncState; ThreadedAsyncOperation.OperationResult result = state.Result; - Range firstMatch = state.FirstMatch; + Util.Range firstMatch = state.FirstMatch; DataView dv = null; diff --git a/src/gui/areas/AreaGroup.cs b/src/gui/areas/AreaGroup.cs index 58ee147..4a27190 100644 --- a/src/gui/areas/AreaGroup.cs +++ b/src/gui/areas/AreaGroup.cs @@ -198,7 +198,7 @@ enum Changes { Offset = 1, Cursor = 2, Highlights = 4} set { drawingArea = value; } } - public Range Selection { + public Util.Range Selection { get { return selection; } set { if (selection == value) @@ -251,7 +251,7 @@ public AreaGroup() /// Get the range of bytes and the number of rows that /// are displayed in the current view. /// </summary> - public Range GetViewRange(out int nrows) + public Util.Range GetViewRange(out int nrows) { // find out number of rows, bytes in current view @@ -271,9 +271,9 @@ public Range GetViewRange(out int nrows) // make sure we get an empty clipping Range when bleft==0 if (bleft > 0) - return new Range(offset, offset + bleft - 1); + return new Util.Range(offset, offset + bleft - 1); else - return new Range(); + return new Util.Range(); } /// <summary> @@ -381,7 +381,7 @@ private void ClearHighlights() private void SetupBufferCache() { int nrows; - Range view = GetViewRange(out nrows); + Util.Range view = GetViewRange(out nrows); if (view.Size != bufferCache.Length) bufferCache = new byte[view.Size]; @@ -444,7 +444,7 @@ private void RenderExtra() } } /// <summary> - /// Renders a <see cref="Range"/> of data using a specified <see cref="Drawer.HighlightType"/> + /// Renders a <see cref="Util.Range"/> of data using a specified <see cref="Drawer.HighlightType"/> /// </summary> private void RenderHighlight(AtomicHighlight h) { @@ -474,12 +474,12 @@ private AtomicHighlight[] SplitAtomicPrioritized(AtomicHighlight q, Highlight r) if (q.Type > r.Type) { ha = new AtomicHighlight[3]{new AtomicHighlight(r), new AtomicHighlight(q), new AtomicHighlight(r)}; - Range.SplitAtomic(ha, r, q); + Util.Range.SplitAtomic(ha, r, q); ha[1].AddContainer(r); } else { ha = new AtomicHighlight[3]{new AtomicHighlight(q), new AtomicHighlight(r), new AtomicHighlight(q)}; - Range.SplitAtomic(ha, q, r); + Util.Range.SplitAtomic(ha, q, r); foreach (Highlight h in q.Containers) ha[1].AddContainer(h); } @@ -533,7 +533,7 @@ private IntervalTree<AtomicHighlight> BreakDownHighlights(Highlight s, IList<Hig private IntervalTree<AtomicHighlight> GetAtomicHighlights() { int nrows; - Range clip = GetViewRange(out nrows); + Util.Range clip = GetViewRange(out nrows); Highlight view = new Highlight(clip, Drawer.HighlightType.Normal); // get all highlights in current view @@ -618,7 +618,7 @@ private void RenderCursor(IntervalTree<AtomicHighlight> atomicHighlights) // if we don't find an overlap this means that either // 1. the prev cursor position is not visible on the screen // 2. the prev cursor position is at or beyond the end of the file - IList<AtomicHighlight> overlaps = atomicHighlights.SearchOverlap(new Range(prevCursorOffset, prevCursorOffset)); + IList<AtomicHighlight> overlaps = atomicHighlights.SearchOverlap(new Util.Range(prevCursorOffset, prevCursorOffset)); AtomicHighlight h = null; diff --git a/src/tools/find/FindOperations.cs b/src/tools/find/FindOperations.cs index 0351efd..e5984f9 100644 --- a/src/tools/find/FindOperations.cs +++ b/src/tools/find/FindOperations.cs @@ -146,8 +146,8 @@ public class ReplaceAllOperation: GenericFindOperation protected override void DoOperation() { - Range m; - match = new Range(); + Util.Range m; + match = new Util.Range(); firstMatch = null; numReplaced = 0; @@ -159,7 +159,7 @@ protected override void DoOperation() while ((m = strategy.FindNext()) != null) { if (firstMatch == null) { - firstMatch = new Range(m); + firstMatch = new Util.Range(m); } match.Start = m.Start; diff --git a/src/tools/find/IFindStrategy.cs b/src/tools/find/IFindStrategy.cs index bdf7a87..bc2b21b 100644 --- a/src/tools/find/IFindStrategy.cs +++ b/src/tools/find/IFindStrategy.cs @@ -31,13 +31,13 @@ public interface IFindStrategy ByteBuffer Buffer { get; set; } long Position { get; set; } - Range FindNext(); - Range FindPrevious(); + Util.Range FindNext(); + Util.Range FindPrevious(); - Range FindNext(long limit); - Range FindPrevious(long limit); + Util.Range FindNext(long limit); + Util.Range FindPrevious(long limit); bool Cancelled { get; set; } } -} // end namespace \ No newline at end of file +} // end namespace diff --git a/src/tools/find/IFinder.cs b/src/tools/find/IFinder.cs index 594de22..a29a8fd 100644 --- a/src/tools/find/IFinder.cs +++ b/src/tools/find/IFinder.cs @@ -30,7 +30,7 @@ namespace Bless.Tools.Find { public interface IFinder { IFindStrategy Strategy { get; set; } - Range LastFound { get; set; } + Util.Range LastFound { get; set; } event FirstFindHandler FirstFind; @@ -41,4 +41,4 @@ public interface IFinder IAsyncResult ReplaceAll(byte[] ba, AsyncCallback ac); } -} // end namespace \ No newline at end of file +} // end namespace ++++++ bless-0.6.0.tar.gz -> bless-0.6.2.tar.gz ++++++ ++++ 31813 lines of diff (skipped)
