commit: 9417931a14d9b4bc715936b5cf523d39492b2b27
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 5 17:30:25 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Jul 5 17:48:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9417931a
sci-biology/treeviewx: drop 0.5.1-r3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
sci-biology/treeviewx/Manifest | 1 -
.../files/treeviewx-0.5.1-70_choose_tree.patch | 11 ----
.../files/treeviewx-0.5.1-fix_loading_crash.patch | 40 -----------
.../treeviewx/files/treeviewx-0.5.1-gcc4.3.patch | 77 ----------------------
.../treeviewx/files/treeviewx-0.5.1-svg.patch | 30 ---------
.../treeviewx-0.5.1-treeview-xpm-not-xbm.patch | 16 -----
.../treeviewx/files/treeviewx-0.5.1-wx30.patch | 66 -------------------
.../files/treeviewx-0.5.1-wxstring-maxlen.patch | 34 ----------
sci-biology/treeviewx/files/treeviewx-wxt.patch | 50 --------------
sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild | 42 ------------
10 files changed, 367 deletions(-)
diff --git a/sci-biology/treeviewx/Manifest b/sci-biology/treeviewx/Manifest
index 35a6577e59df..94642c569971 100644
--- a/sci-biology/treeviewx/Manifest
+++ b/sci-biology/treeviewx/Manifest
@@ -1,4 +1,3 @@
DIST treeviewx-0.5.1.20100823_p4.tar.gz 358644 BLAKE2B
3b7291415ab536230ac95decdc028dfdf60edcd986c91f76f7dacf5ec65fc31234c4d7023a9ec0fa420b68c9fe85278f8ae25106daa050872750dc5127362c46
SHA512
aec1351cfe58e1d11053c8bd3edbdf2ca74fb4bb5453bde72aa2a1b14623c69540fe7cef20f506291dad0b9358f6c37ea59feb493376b20dbdf3f7fb7df9844e
DIST treeviewx_0.5.1+git20100823.7e4d0e9-4.debian.tar.xz 13880 BLAKE2B
6ab73fa79fe9a07dde17ae771edcee8d4f4e1aa25aef5fff66de4a86ee8e24c0edf9c8a4b721c12e1675083b493c65fadfff8bc79d50f28cb54a5b2cd47104a4
SHA512
4e3dbf0fd0383a0a07f924d2e59e9ed74b20c03fe57edc8e728f99dfff0a28f1c366f8a38f52f637d104b1abf98f8023abcdaff7394045642e53f5d7bb6723fd
DIST treeviewx_128.png 16298 BLAKE2B
4a5f08352cd21f30e69f77403ecb79d95e8610e672979bbc46b72059bfe02edb711206260bb0b11eb733c544d584df7c9e778fe20ab2f768f18c49362cb72f11
SHA512
4986f86b7a0d4f57bd16aecb504a743ae060c2c5d3015ab2a6057e9df52ab132e6d071b5f992fc2de88529b5166f119654cbfb6c952e16d7e02d18f6d6143ee8
-DIST tv-0.5.1.tar.gz 426745 BLAKE2B
080c4e09f441fd83da3406990bbe97f9e29fa531f47a65533ca887580f8a3ec561bb4766e66e2ef4764f68eee86fdabf48481cece56ddda90f9ffdc3c80b3a1a
SHA512
45a7ac6dff5b22771e4428d6b1ee528c0039956a462658d28d4f588b6df32620d8f69b3bcf5ca23643e2bdd5361da00625fcb1495bcf4f74d44ee22022c63143
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch
b/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch
deleted file mode 100644
index 7a614edff72e..000000000000
--- a/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tview.cpp
-+++ b/tview.cpp
-@@ -208,7 +208,7 @@
- pictureFileName, wxT("SVG vector picture files (*.svg)|*.svg"),
- wxSAVE|wxOVERWRITE_PROMPT);
-
-- if (dialog.ShowModal() == wxID_OK)
-+ if ((dialog.ShowModal() == wxID_OK) && (p.GetNumTrees() != 0))
- {
- wxSVGFileDC pictureDC (dialog.GetPath(), 600, 650) ;
- OnDraw (&pictureDC);
diff --git
a/sci-biology/treeviewx/files/treeviewx-0.5.1-fix_loading_crash.patch
b/sci-biology/treeviewx/files/treeviewx-0.5.1-fix_loading_crash.patch
deleted file mode 100644
index c136539726a3..000000000000
--- a/sci-biology/treeviewx/files/treeviewx-0.5.1-fix_loading_crash.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Bug: http://code.google.com/p/treeviewx/issues/detail?id=1
-Description: fix crash on loading tree file.
-Author: Tim Booth
---- tv-0.5.orig/tview.cpp
-+++ tv-0.5/tview.cpp
-@@ -278,7 +278,7 @@
- char buf[256];
- strcpy (buf, p->GetLabel().c_str());
- wchar_t wbuf[256];
-- mbstowcs (wbuf, buf, size_t(wbuf));
-+ mbstowcs (wbuf, buf, 256);
- s << wbuf;
- #else
- s << p->GetLabel().c_str();
-@@ -563,7 +563,7 @@
- char buf[256];
- strcpy (buf, t.GetName().c_str());
- wchar_t wbuf[256];
-- mbstowcs (wbuf, buf, size_t(wbuf));
-+ mbstowcs (wbuf, buf, 256);
- txt << wbuf;
- #else
- txt << t.GetName().c_str();
-@@ -712,7 +712,7 @@
- char buf[256];
- strcpy (buf, p.GetIthTreeName(i).c_str());
- wchar_t wbuf[256];
-- mbstowcs (wbuf, buf, size_t(wbuf));
-+ mbstowcs (wbuf, buf, 256);
-
- std::wstring tname = wbuf;
-
-@@ -1046,6 +1046,7 @@
- void MyCanvas::OnSize(wxSizeEvent& event)
- {
- Resize ();
-+ Refresh();
- event.Skip();
- }
-
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch
b/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch
deleted file mode 100644
index 33bd3b1741f6..000000000000
--- a/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Naur tv-0.5.1/TreeLib/Parse.cpp tv-0.5.1.new/TreeLib/Parse.cpp
---- tv-0.5.1/TreeLib/Parse.cpp 2002-02-23 07:22:32.000000000 -0500
-+++ tv-0.5.1.new/TreeLib/Parse.cpp 2008-06-17 06:08:24.000000000 -0400
-@@ -24,6 +24,11 @@
- #include <ctype.h>
- #include "Parse.h"
-
-+
-+
-+
-+#include <cstring>
-+
- // Return the next token in the string
- tokentype Parser::NextToken ()
- {
-diff -Naur tv-0.5.1/TreeLib/TreeLib.cpp tv-0.5.1.new/TreeLib/TreeLib.cpp
---- tv-0.5.1/TreeLib/TreeLib.cpp 2004-05-13 08:22:11.000000000 -0400
-+++ tv-0.5.1.new/TreeLib/TreeLib.cpp 2008-06-17 05:58:17.000000000 -0400
-@@ -24,6 +24,8 @@
- #include "TreeLib.h"
- #include "Parse.h"
-
-+
-+#include <cstdlib>
- #include <vector>
-
-
-diff -Naur tv-0.5.1/TreeLib/treereader.cpp tv-0.5.1.new/TreeLib/treereader.cpp
---- tv-0.5.1/TreeLib/treereader.cpp 2003-09-10 08:58:16.000000000 -0400
-+++ tv-0.5.1.new/TreeLib/treereader.cpp 2008-06-17 06:07:15.000000000
-0400
-@@ -28,6 +28,9 @@
- #include <stdlib.h>
- #endif
-
-+#include <cstring>
-+#include <cstdlib>
-+
-
//------------------------------------------------------------------------------
- TreeReader::TreeReader (Tokeniser &p) : parser (p)
- {
-diff -Naur tv-0.5.1/ncl-2.0/src/charactersblock.cpp
tv-0.5.1.new/ncl-2.0/src/charactersblock.cpp
---- tv-0.5.1/ncl-2.0/src/charactersblock.cpp 2002-12-10 06:35:49.000000000
-0500
-+++ tv-0.5.1.new/ncl-2.0/src/charactersblock.cpp 2008-06-17
05:58:17.000000000 -0400
-@@ -1,3 +1,5 @@
-+
-+#include <cstring>
- #include "nexusdefs.h"
- #include "xnexus.h"
- #include "nexustoken.h"
-diff -Naur tv-0.5.1/ncl-2.0/src/nexus.cpp tv-0.5.1.new/ncl-2.0/src/nexus.cpp
---- tv-0.5.1/ncl-2.0/src/nexus.cpp 2002-12-10 06:35:50.000000000 -0500
-+++ tv-0.5.1.new/ncl-2.0/src/nexus.cpp 2008-06-17 05:58:17.000000000 -0400
-@@ -1,3 +1,5 @@
-+
-+#include <cstring>
- #include "nexusdefs.h"
- #include "xnexus.h"
- #include "nexustoken.h"
-diff -Naur tv-0.5.1/ncl-2.0/src/nexustoken.cpp
tv-0.5.1.new/ncl-2.0/src/nexustoken.cpp
---- tv-0.5.1/ncl-2.0/src/nexustoken.cpp 2005-04-29 10:28:17.000000000
-0400
-+++ tv-0.5.1.new/ncl-2.0/src/nexustoken.cpp 2008-06-17 05:58:17.000000000
-0400
-@@ -1,3 +1,5 @@
-+
-+#include <cstring>
- #include "nexusdefs.h"
- #include "xnexus.h"
- #include "nexustoken.h"
-diff -Naur tv-0.5.1/ncl-2.0/src/nxsstring.cpp
tv-0.5.1.new/ncl-2.0/src/nxsstring.cpp
---- tv-0.5.1/ncl-2.0/src/nxsstring.cpp 2001-02-02 07:55:40.000000000 -0500
-+++ tv-0.5.1.new/ncl-2.0/src/nxsstring.cpp 2008-06-17 05:58:17.000000000
-0400
-@@ -1,3 +1,6 @@
-+
-+#include <cstring>
-+
- #ifdef __BORLANDC__
- // Undefine __MINMAX_DEFINED so that min and max are correctly defined
- #ifdef __MINMAX_DEFINED
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch
b/sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch
deleted file mode 100644
index 67a62179bb87..000000000000
--- a/sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Olly Betts <o...@survex.com>
-Description: Update configure.in to match what it must have said when
configure was generated.
- One thing I should probably explain about the patch as my change may
- seem odd otherwise - upstream's configure.in says "USE_SVG=0" but the
- generated configure says "USE_SVG=1", so I've simply updated
- configure.in to match what it must have said when configure was
- generated.
-Forwarded: no
---- tv-0.5.orig/configure.in
-+++ tv-0.5/configure.in
-@@ -66,7 +66,9 @@
- case "$wx_version" in
- 2.4.*) WX_SVG_LIB=[`$WX_CONFIG --basename`_dcsvg-`echo ${wx_version} |
sed -e "s:\.[0-9]\{1,\}$::"`]
- ;;
-- *) WX_SVG_LIB=[`$WX_CONFIG --basename`_svg-`echo ${wx_version} | sed
-e "s:\.[0-9]\{1,\}$::"`]
-+ 2.*) WX_SVG_LIB=[`$WX_CONFIG --basename`_svg-`echo ${wx_version} | sed
-e "s:\.[0-9]\{1,\}$::"`]
-+ ;;
-+ *) WX_SVG_LIB=
- ;;
- esac
-
-@@ -76,7 +78,7 @@
-
- if test "$USE_SVG" = 1 ; then
- CXXFLAGS="$CXXFLAGS -DUSE_SVG"
-- LIBS="$LIBS -l$WX_SVG_LIB"
-+ test -n "$WX_SVG_LIB" && LIBS="$LIBS -l$WX_SVG_LIB"
- fi
-
- AC_OUTPUT(Makefile ncl-2.0/Makefile ncl-2.0/src/Makefile TreeLib/Makefile
tv.spec)
diff --git
a/sci-biology/treeviewx/files/treeviewx-0.5.1-treeview-xpm-not-xbm.patch
b/sci-biology/treeviewx/files/treeviewx-0.5.1-treeview-xpm-not-xbm.patch
deleted file mode 100644
index a57ae19aaf26..000000000000
--- a/sci-biology/treeviewx/files/treeviewx-0.5.1-treeview-xpm-not-xbm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix the extension of the icon
-Author: Olly Betts <o...@survex.com>
-Last-Update: 2014-06-21
-Forwarded: http://code.google.com/p/treeviewx/issues/detail?id=4
-
---- tv-0.5.orig/tv.cpp
-+++ tv-0.5/tv.cpp
-@@ -215,7 +215,7 @@
- frame->SetIcon(wxIcon("app")); // use the name of the icon in the
resource file
- #endif
- #if defined(__WXGTK__) || defined(__WXMOTIF__)
-- frame->SetIcon(wxIcon(wxT("bitmaps/treeview.xbm")));
-+ frame->SetIcon(wxIcon(wxT("/usr/share/pixmaps/treeviewx.xpm")));
- #endif
-
- #ifdef __WXMAC__
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
b/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
deleted file mode 100644
index a1cfd906f176..000000000000
--- a/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/tv.cpp
-+++ b/tv.cpp
-@@ -163,9 +163,9 @@
- {
- // Optional command line argument is name of file to open
- #if wxUSE_UNICODE
-- wchar_t *InputFile = NULL;
-+ const wchar_t *InputFile = NULL;
- #else
-- char *InputFile = NULL;
-+ const char *InputFile = NULL;
- #endif
- // Read input/output files
- if (argc > 1)
---- a/tview.cpp
-+++ b/tview.cpp
-@@ -62,9 +62,13 @@
- #ifdef __WXMSW__
- #else
- #ifdef USE_SVG
-+#if wxMAJOR_VERSION >= 3
-+ #include <wx/dcsvg.h>
-+#else
- #include <wx/svg/dcsvg.h>
- #endif
- #endif
-+#endif
-
- // GUI interface
- #include "tv.h"
-@@ -186,7 +190,7 @@
- wxFrame *f = GetMainFrame();
- wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""),
- pictureFileName, wxT("Enhanced metafile (*.emf)|*.emf"),
-- wxSAVE|wxOVERWRITE_PROMPT);
-+ wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
-
- if (dialog.ShowModal() == wxID_OK)
- {
-@@ -206,7 +210,7 @@
- #endif
- wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""),
- pictureFileName, wxT("SVG vector picture files (*.svg)|*.svg"),
-- wxSAVE|wxOVERWRITE_PROMPT);
-+ wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
-
- if ((dialog.ShowModal() == wxID_OK) && (p.GetNumTrees() != 0))
- {
-@@ -361,7 +365,7 @@
-
- // Clear the canvas in case we're in single-window mode,
- // and the canvas stays.
--#if (wxMINOR_VERSION > 4) // from 2.5 Clear is deprecated
-+#if (wxMAJOR_VERSION >= 3 || wxMINOR_VERSION > 4) // from 2.5 Clear is
deprecated
- canvas->ClearBackground();
- #else
- canvas->Clear();
-@@ -686,7 +690,7 @@
- wxFontData data;
- data.SetInitialFont (LeafFont);
-
--#ifdef __WXMAC__
-+#if wxMAJOR_VERSION >= 3 || defined __WXMAC__
- wxFontDialog dialog((wxWindow *)GetFrame(), data);
- #else
- wxFontDialog dialog((wxWindow *)GetMainFrame(), &data);
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-wxstring-maxlen.patch
b/sci-biology/treeviewx/files/treeviewx-0.5.1-wxstring-maxlen.patch
deleted file mode 100644
index 2c5179f778ca..000000000000
--- a/sci-biology/treeviewx/files/treeviewx-0.5.1-wxstring-maxlen.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Remove wxSTRING_MAXLEN (removed in wx3.0) and incomp. definition.
- The definition wxSTRING_MAXLEN was removed from the public API of wxWidgets.
- Its meaning was basically "take all the string", whenever a string length was
- expected. The missing definition didn't raise a compilation error because
- TreeLib's treedrawer.h contained a fall-back definition, which is however
- incompatible with the original definition of wxWidgets and therefore is
- interpreted by wxWidgets as a number representing the real string length.
- This patch gets rid of the dangerous fall-back definition and of all of its
- uses by using alternative wxString constructors that achieve the same
- behavior.
-Author: Martin Steghöfer <mar...@steghoefer.eu>
-Last-Update: Sun, 10 Aug 2014 14:06:42 +0200
-Bug-Debian: http://bugs.debian.org/751255
-
---- tv-0.5.orig/TreeLib/treedrawer.cpp
-+++ tv-0.5/TreeLib/treedrawer.cpp
-@@ -245,7 +245,7 @@
- // error in gcc, which is probably a gcc bug
- {
- wxCoord w, h, descent;
-- wxString s (formatedString.c_str(), wxSTRING_MAXLEN);
-+ wxString s (formatedString.c_str());
- pt.x += dc->GetCharWidth();
- pt.y -= dc->GetCharHeight()/2;
- dc->DrawText (s, (int)pt.x, (int)pt.y);
-@@ -566,7 +566,7 @@
-
- #if USE_WXWINDOWS
- wxCoord w, h;
-- wxString s (buf, wxSTRING_MAXLEN);
-+ wxString s (buf);
- dc->GetTextExtent (s, &w, &h);
- int x = (int)pt2.x;
- int y = (int)pt2.y;
diff --git a/sci-biology/treeviewx/files/treeviewx-wxt.patch
b/sci-biology/treeviewx/files/treeviewx-wxt.patch
deleted file mode 100644
index a971e1a85074..000000000000
--- a/sci-biology/treeviewx/files/treeviewx-wxt.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/tv.cpp
-+++ b/tv.cpp
-@@ -312,11 +312,15 @@
- {
- #ifdef __WXMSW__
- file_menu->AppendSeparator();
-- file_menu->Append(SAVEAS_PICTURE_CMD, "Save As Picture..."),
wxT("Save picture of tree to metafile");
-+ file_menu->Append(SAVEAS_PICTURE_CMD,
-+ wxT("Save As Picture...")),
-+ wxT("Save picture of tree to metafile");
- #else
- #ifdef USE_SVG
- file_menu->AppendSeparator();
-- file_menu->Append(SAVEAS_PICTURE_CMD, "Save As Picture..."),
wxT("Save picture of tree to SVG file");
-+ file_menu->Append(SAVEAS_PICTURE_CMD,
-+ wxT("Save As Picture...")),
-+ wxT("Save picture of tree to SVG file");
- #endif
- #endif
- file_menu->AppendSeparator();
---- a/tview.cpp
-+++ b/tview.cpp
-@@ -184,10 +184,10 @@
- wxString pictureFileName = GetFrame()->GetTitle();
- pictureFileName += wxT(".emf");
- wxFrame *f = GetMainFrame();
-- wxFileDialog dialog((wxWindow *)f, "Save Picture as", "",
pictureFileName,
-- "Enhanced metafile (*.emf)|*.emf",
-- wxSAVE|wxOVERWRITE_PROMPT);
--
-+ wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""),
-+ pictureFileName, wxT("Enhanced metafile (*.emf)|*.emf"),
-+ wxSAVE|wxOVERWRITE_PROMPT);
-+
- if (dialog.ShowModal() == wxID_OK)
- {
- wxMetafileDC pictureDC (dialog.GetPath(), 600, 650) ;
-@@ -204,9 +204,9 @@
- #else
- wxFrame *f = GetMainFrame();
- #endif
-- wxFileDialog dialog((wxWindow *)f, "Save Picture as", "", pictureFileName,
-- "SVG vector picture files (*.svg)|*.svg",
-- wxSAVE|wxOVERWRITE_PROMPT);
-+ wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""),
-+ pictureFileName, wxT("SVG vector picture files (*.svg)|*.svg"),
-+ wxSAVE|wxOVERWRITE_PROMPT);
-
- if (dialog.ShowModal() == wxID_OK)
- {
diff --git a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
deleted file mode 100644
index ada60056715e..000000000000
--- a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0"
-inherit autotools wxwidgets
-
-DESCRIPTION="A phylogenetic tree viewer"
-HOMEPAGE="http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/";
-SRC_URI="http://darwin.zoology.gla.ac.uk/~rpage/${PN}/download/$(ver_cut
1-2)/tv-${PV}.tar.gz"
-S="${WORKDIR}/tv-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-wxt.patch
- "${FILESDIR}"/${P}-gcc4.3.patch
- "${FILESDIR}"/${P}-70_choose_tree.patch
- "${FILESDIR}"/${P}-fix_loading_crash.patch
- "${FILESDIR}"/${P}-wx30.patch
- "${FILESDIR}"/${P}-svg.patch
- "${FILESDIR}"/${P}-treeview-xpm-not-xbm.patch
- "${FILESDIR}"/${P}-wxstring-maxlen.patch
- "${FILESDIR}"/${P}-AM_PROG_AR.patch
-)
-
-src_prepare() {
- default
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_configure() {
- setup-wxwidgets
- default
-}
