[gentoo-commits] repo/gentoo:master commit in: sci-biology/treeviewx/, sci-biology/treeviewx/files/

2021-04-04 Thread David Seifert 
commit: a8db9aed5f492023188313c5e4f9aa1f7f090066
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr  4 21:10:47 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr  4 21:10:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8db9aed

sci-biology/treeviewx: Port to EAPI 7

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 .../files/treeviewx-0.5.1-70_choose_tree.patch | 11 
 .../treeviewx/files/treeviewx-0.5.1-wx30.patch | 24 +
 sci-biology/treeviewx/files/treeviewx-wxt.patch|  8 +++---
 sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild| 30 --
 4 files changed, 31 insertions(+), 42 deletions(-)

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
index ed5aa43e23c..7a614edff72 100644
--- 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
@@ -1,9 +1,8 @@
-## 70_choose_tree.dpatch by William Alexander Grant 

 tv-0.5.orig/tview.cpp
-+++ tv-0.5/tview.cpp
-@@ -209,7 +209,7 @@
- wxT("SVG vector picture files (*.svg)|*.svg"),
- wxSAVE|wxOVERWRITE_PROMPT);
+--- 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))

diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch 
b/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
index b1db5749990..a1cfd906f17 100644
--- a/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
@@ -1,14 +1,6 @@
- tv.cpp|  4 ++--
- tview.cpp | 12 
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/tv.cpp b/tv.cpp
-old mode 100755
-new mode 100644
-index 1abe90b..0df45a8
 --- a/tv.cpp
 +++ b/tv.cpp
-@@ -163,9 +163,9 @@ bool MyApp::OnInit(void)
+@@ -163,9 +163,9 @@
  {
// Optional command line argument is name of file to open
  #if wxUSE_UNICODE
@@ -20,10 +12,6 @@ index 1abe90b..0df45a8
  #endif
// Read input/output files
if (argc > 1)
-diff --git a/tview.cpp b/tview.cpp
-old mode 100755
-new mode 100644
-index 93972c3..4b2d593
 --- a/tview.cpp
 +++ b/tview.cpp
 @@ -62,9 +62,13 @@
@@ -40,7 +28,7 @@ index 93972c3..4b2d593
  
  // GUI interface
  #include "tv.h"
-@@ -186,7 +190,7 @@ void TView::OnSavePicture (wxCommandEvent& WXUNUSED(event))
+@@ -186,7 +190,7 @@
wxFrame *f = GetMainFrame();
wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""),
pictureFileName, wxT("Enhanced metafile (*.emf)|*.emf"),
@@ -49,16 +37,16 @@ index 93972c3..4b2d593
  
  if (dialog.ShowModal() == wxID_OK)
  {
-@@ -206,7 +210,7 @@ void TView::OnSavePicture (wxCommandEvent& WXUNUSED(event))
+@@ -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)
+ if ((dialog.ShowModal() == wxID_OK) && (p.GetNumTrees() != 0))
  {
-@@ -361,7 +365,7 @@ bool TView::OnClose(bool deleteWindow)
+@@ -361,7 +365,7 @@
  
// Clear the canvas in  case we're in single-window mode,
// and the canvas stays.
@@ -67,7 +55,7 @@ index 93972c3..4b2d593
canvas->ClearBackground();
  #else
canvas->Clear();
-@@ -686,7 +690,7 @@ void TView::OnLeafFont (wxCommandEvent& WXUNUSED(event))
+@@ -686,7 +690,7 @@
wxFontData data;
data.SetInitialFont (LeafFont);
  

diff --git a/sci-biology/treeviewx/files/treeviewx-wxt.patch 
b/sci-biology/treeviewx/files/treeviewx-wxt.patch
index b1c03bbb39f..a971e1a8507 100644
--- a/sci-biology/treeviewx/files/treeviewx-wxt.patch
+++ b/sci-biology/treeviewx/files/treeviewx-wxt.patch
@@ -1,5 +1,5 @@
 tv.cpp~2005-10-01 16:47:35.0 -0400
-+++ tv.cpp 2005-10-01 16:52:30.0 -0400
+--- a/tv.cpp
 b/tv.cpp
 @@ -312,11 +312,15 @@
{
  #ifdef __WXMSW__
@@ -18,8 +18,8 @@
#endif
  #endif
file_menu->AppendSeparator();
 tview.cpp~ 2005-10-01 16:47:45.0 -0400
-+++ tview.cpp  2005-10-01 16:50:42.0 -0400
+--- a/tview.cpp
 b/tview.cpp
 @@ -184,10 +184,10 @@
wxString pictureFileName = GetFrame()->GetTitle();
pictureFileName += wxT(".emf");

diff --git a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild 
b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
index 7d1fe1c773e..6ef3961e4df 100644
--- a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
+++

[gentoo-commits] repo/gentoo:master commit in: sci-biology/treeviewx/, sci-biology/treeviewx/files/

2015-10-25 Thread Justin Lecher 
commit: f7f14ed9a6fd3fabc6f01c792ef2afecefaeb84e
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Oct 25 09:07:05 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Oct 25 09:24:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f14ed9

sci-biology/treeviewx: Import debian patchset for wxgtk-3.0 support

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563970

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 .../files/treeviewx-0.5.1-70_choose_tree.patch | 12 
 .../files/treeviewx-0.5.1-fix_loading_crash.patch  | 40 +++
 .../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 | 78 ++
 .../files/treeviewx-0.5.1-wxstring-maxlen.patch| 34 ++
 .../treeviewx/files/treeviewx-gcc-3.4.patch| 73 
 sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild| 40 +++
 8 files changed, 250 insertions(+), 73 deletions(-)

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
new file mode 100644
index 000..ed5aa43
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch
@@ -0,0 +1,12 @@
+## 70_choose_tree.dpatch by William Alexander Grant 

+--- tv-0.5.orig/tview.cpp
 tv-0.5/tview.cpp
+@@ -209,7 +209,7 @@
+ 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 ();

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
new file mode 100644
index 000..c136539
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-fix_loading_crash.patch
@@ -0,0 +1,40 @@
+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-svg.patch 
b/sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch
new file mode 100644
index 000..67a6217
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-svg.patch
@@ -0,0 +1,30 @@
+Author: Olly Betts 
+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