commit: 35e74a126cee1741c98a8324ea272ee53395e20f Author: Mike Auty <ikelos <AT> gentoo <DOT> org> AuthorDate: Tue Aug 4 14:11:09 2020 +0000 Commit: Mike Auty <ikelos <AT> gentoo <DOT> org> CommitDate: Tue Aug 4 14:13:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e74a12
dev-util/bless: Disambiguate Range Also removes very old versions of bless Closes: https://bugs.gentoo.org/733166 Signed-off-by: Mike Auty <ikelos <AT> gentoo.org> dev-util/bless/Manifest | 1 - dev-util/bless/bless-0.6.0-r3.ebuild | 52 ------ dev-util/bless/bless-0.6.0-r4.ebuild | 52 ------ dev-util/bless/bless-0.6.2-r1.ebuild | 3 +- dev-util/bless/files/bless-0.6.0-docpath.patch | 71 -------- dev-util/bless/files/bless-0.6.0-mono-4.patch | 36 ---- dev-util/bless/files/bless-0.6.0-pixmap.patch | 20 -- .../files/bless-0.6.2-range-disambiguation.patch | 202 +++++++++++++++++++++ 8 files changed, 204 insertions(+), 233 deletions(-) diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest index befbc79aed6..06151ce3678 100644 --- a/dev-util/bless/Manifest +++ b/dev-util/bless/Manifest @@ -1,2 +1 @@ -DIST bless-0.6.0.tar.gz 745694 BLAKE2B eb23edf3fd9c45b9848810ff022a7e9b7d760c22444426bbbaf63d69ee45754d085eb105c4951c0d57fce7b284c6b0a8fb9b7e061219a55d109c9ef844b61c35 SHA512 69d2279b64503b97c8a67991c2a7a527d872835e3acfad7eafa8d87e376d2cecf3fa27de9e12726680a8f3c8ac92b888a4895a1f342c4beeaceef9e1f3ededdb DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5 diff --git a/dev-util/bless/bless-0.6.0-r3.ebuild b/dev-util/bless/bless-0.6.0-r3.ebuild deleted file mode 100644 index d4c3ef7205f..00000000000 --- a/dev-util/bless/bless-0.6.0-r3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2 mono-env - -DESCRIPTION="GTK# Hex Editor" -HOMEPAGE="https://github.com/bwrsandman/Bless/"; -SRC_URI="https://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=" - >=dev-lang/mono-1.1.14 - >=dev-dotnet/gtk-sharp-2.12.21 -" -DEPEND="${RDEPEND} - app-text/rarian - >=sys-devel/gettext-0.15 - virtual/pkgconfig -" - -# See bug 278162 -# Waiting on nunit ebuild entering the tree -RESTRICT="test" - -pkg_setup() { - # Stolen from enlightenment.eclass - cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize" - sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" - - mono-env_pkg_setup -} - -src_prepare() { - einfo "Running gettextize -f --no-changelog..." - ( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed" - eapply "${FILESDIR}/${P}-pixmap.patch" - eapply "${FILESDIR}/${P}-docpath.patch" - eapply "${FILESDIR}/${P}-mono-4.patch" - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --enable-unix-specific \ - $(use_enable debug) -} diff --git a/dev-util/bless/bless-0.6.0-r4.ebuild b/dev-util/bless/bless-0.6.0-r4.ebuild deleted file mode 100644 index e7ae88c0e92..00000000000 --- a/dev-util/bless/bless-0.6.0-r4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2 mono-env - -DESCRIPTION="GTK# Hex Editor" -HOMEPAGE="https://github.com/bwrsandman/Bless/"; -SRC_URI="https://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=" - >=dev-lang/mono-1.1.14 - >=dev-dotnet/gtk-sharp-2.12.21:2 -" -DEPEND="${RDEPEND} - app-text/rarian - >=sys-devel/gettext-0.15 - virtual/pkgconfig -" - -# See bug 278162 -# Waiting on nunit ebuild entering the tree -RESTRICT="test" - -pkg_setup() { - # Stolen from enlightenment.eclass - cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize" - sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" - - mono-env_pkg_setup -} - -src_prepare() { - einfo "Running gettextize -f --no-changelog..." - ( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed" - eapply "${FILESDIR}/${P}-pixmap.patch" - eapply "${FILESDIR}/${P}-docpath.patch" - eapply "${FILESDIR}/${P}-mono-4.patch" - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --enable-unix-specific \ - $(use_enable debug) -} diff --git a/dev-util/bless/bless-0.6.2-r1.ebuild b/dev-util/bless/bless-0.6.2-r1.ebuild index 06741696a4d..92feecfe962 100644 --- a/dev-util/bless/bless-0.6.2-r1.ebuild +++ b/dev-util/bless/bless-0.6.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,6 +28,7 @@ DEPEND="${RDEPEND} # See bug 278162 # Waiting on nunit ebuild entering the tree RESTRICT="test" +PATCHES=("${FILESDIR}/bless-0.6.2-range-disambiguation.patch") pkg_setup() { mono-env_pkg_setup diff --git a/dev-util/bless/files/bless-0.6.0-docpath.patch b/dev-util/bless/files/bless-0.6.0-docpath.patch deleted file mode 100644 index b1121424d88..00000000000 --- a/dev-util/bless/files/bless-0.6.0-docpath.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 33f265b..346326d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,9 @@ - EXTRA_DIST = AUTHORS COPYING NEWS README README.packaging \ - bless.mdp bless.mds bless.spec autogen.sh bless.mi - -+doc_DATA = AUTHORS COPYING INSTALL ChangeLog NEWS \ -+ README README.packaging bless.spec -+ - SUBDIRS = po builder src bin data doc . tests - - DIST_SUBDIRS= po builder src bin doc data tests -@@ -34,11 +37,5 @@ bless-builder: - dist-hook: - bzr log > $(distdir)/ChangeLog - --install-data-local: -- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) -- $(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \ -- README README.packaging bless.spec \ -- $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) -- - uninstall-local: - rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME) -diff --git a/doc/Makefile.am b/doc/Makefile.am -index b18e94a..d7eecc6 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,4 +1 @@ - SUBDIRS= developer user -- --uninstall-local: -- rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) -diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am -index 729b295..58a1358 100644 ---- a/doc/user/Makefile.am -+++ b/doc/user/Makefile.am -@@ -7,6 +7,11 @@ CLEANFILES=$(OMF) - - noinst_SCRIPTS=$(OMF) - -+docmandir=$(docdir)/user -+docfigsdir=$(docmandir)/figures -+ -+docfigs_DATA=$(FIGURES) -+docman_DATA=$(DOCS) $(wildcard *.html) - - $(OMF): $(OMF).in - if [ -x `which scrollkeeper-preinstall` ]; then \ -@@ -27,11 +32,6 @@ dist-hook: doc - rm html_file_list - - install-data-local: -- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user -- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures -- $(INSTALL_DATA) $(DOCS) $(wildcard *.html) \ -- $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user -- $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures - $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) - $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) - if WITH_SCROLLKEEPER -@@ -39,7 +39,6 @@ if WITH_SCROLLKEEPER - endif - - uninstall-local: -- rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user - rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF) - if WITH_SCROLLKEEPER - scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) diff --git a/dev-util/bless/files/bless-0.6.0-mono-4.patch b/dev-util/bless/files/bless-0.6.0-mono-4.patch deleted file mode 100644 index 92b1100cf0e..00000000000 --- a/dev-util/bless/files/bless-0.6.0-mono-4.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/builder/ModuleBuilder.cs b/builder/ModuleBuilder.cs -index 0f62e92..7edb1ab 100644 ---- a/builder/ModuleBuilder.cs -+++ b/builder/ModuleBuilder.cs -@@ -119,7 +119,7 @@ public class ModuleBuilder - //System.Console.WriteLine("gmcs {0}", sb.ToString()); - System.Console.WriteLine(">> Building module {0}...", module.Name); - -- Process buildProcess = Process.Start("gmcs", sb.ToString()); -+ Process buildProcess = Process.Start("mcs", sb.ToString()); - buildProcess.WaitForExit(); - - if (buildProcess.ExitCode == 0) { -@@ -137,4 +137,4 @@ public class ModuleBuilder - } - - --} -\ No newline at end of file -+} -diff --git a/configure.ac b/configure.ac -index 415cc64..a8e527c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -24,9 +24,9 @@ if test "x$PKG_CONFIG" = "xno"; then - fi - - # C# compiler --AC_PATH_PROG(MCS, gmcs, no) -+AC_PATH_PROG(MCS, mcs, no) - --CS="gmcs C#" -+CS="mcs C#" - if test "x$MCS" = "xno" ; then - AC_MSG_ERROR([No $CS compiler found]) - fi diff --git a/dev-util/bless/files/bless-0.6.0-pixmap.patch b/dev-util/bless/files/bless-0.6.0-pixmap.patch deleted file mode 100644 index de77cb84e75..00000000000 --- a/dev-util/bless/files/bless-0.6.0-pixmap.patch +++ /dev/null @@ -1,20 +0,0 @@ -=== modified file 'src/gui/drawers/HexDrawer.cs' ---- a/src/gui/drawers/HexDrawer.cs 2007-06-13 12:20:53 +0000 -+++ b/src/gui/drawers/HexDrawer.cs 2009-04-10 23:21:41 +0000 -@@ -57,11 +57,14 @@ - - //System.Console.WriteLine(s); - -- pangoLayout.SetText(s); -+ pangoLayout.SetText(s.Substring(0,256)); - - - gc.RgbFgColor = fg; - pix.DrawLayout(gc, 0, 0, pangoLayout); -+ -+ pangoLayout.SetText(s.Substring(256,256)); -+ pix.DrawLayout(gc, 128*2*width, 0, pangoLayout); - - return pix; - } - diff --git a/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch b/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch new file mode 100644 index 00000000000..788a57866cb --- /dev/null +++ b/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch @@ -0,0 +1,202 @@ +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
