[packages/ucblogo] - fix build with wzWidgets 3.0 - rel 3

baggins baggins at pld-linux.org
Sat Jan 18 17:24:19 CET 2014


commit 4ffabd4aa70fe812d395dbabbdbb9cefcd3a4c9f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jan 18 17:24:05 2014 +0100

    - fix build with wzWidgets 3.0
    - rel 3

 ucblogo.spec     |  4 +++-
 wxWidgets3.patch | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/ucblogo.spec b/ucblogo.spec
index 5b3c3af..3a97da6 100644
--- a/ucblogo.spec
+++ b/ucblogo.spec
@@ -2,7 +2,7 @@ Summary:	Berkeley LOGO interpreter
 Summary(pl.UTF-8):	Interpreter Berkeley LOGO
 Name:		ucblogo
 Version:	6.0
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Development/Languages
 Source0:	ftp://anarres.cs.berkeley.edu/pub/ucblogo/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@ Patch0:		%{name}-signals.patch
 Patch1:		%{name}-make.patch
 Patch2:		%{name}-wx.patch
 Patch3:		%{name}-lp64.patch
+Patch4:		wxWidgets3.patch
 URL:		http://www.cs.berkeley.edu/~bh/logo.html
 BuildRequires:	ncurses-devel
 BuildRequires:	wxGTK2-unicode-devel
@@ -47,6 +48,7 @@ plot i wiele innych.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__rm} -r csls/CVS
 
diff --git a/wxWidgets3.patch b/wxWidgets3.patch
new file mode 100644
index 0000000..dc19f23
--- /dev/null
+++ b/wxWidgets3.patch
@@ -0,0 +1,20 @@
+--- ucblogo-6.0/wxTerminal.cpp.orig	2014-01-18 16:49:02.000000000 +0100
++++ ucblogo-6.0/wxTerminal.cpp	2014-01-18 17:20:01.188770053 +0100
+@@ -506,7 +507,7 @@
+ #else
+ 			      wxStandardPaths::Get().GetDocumentsDir() :
+ #endif
+-			      *wxEmptyString),
++			      ""),
+ 			    wxEmptyString,
+ 			    _T("Logo workspaces(*.lg)|*.lg|All files(*)|*"),
+ //			    "*",
+@@ -542,7 +543,7 @@
+ #else
+ 	    wxStandardPaths::Get().GetDocumentsDir() :
+ #endif
+-			  *wxEmptyString),
++			  ""),
+ 	 wxEmptyString,
+ 	 _T("Logo workspaces(*.lg)|*.lg|All files(*)|*"),
+ //	 "*",
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ucblogo.git/commitdiff/4ffabd4aa70fe812d395dbabbdbb9cefcd3a4c9f



More information about the pld-cvs-commit mailing list