svn commit: r378497 - in head/math/wxMaxima: . files

[Nicola Vitale]

Author: nivit
Date: Thu Feb  5 22:40:37 2015
New Revision: 378497
URL: https://svnweb.freebsd.org/changeset/ports/378497
QAT: https://qat.redports.org/buildarchive/r378497/

Log:
  - Fix build on FreeBSD-9.3-RELEASE [1] with a couple of
    patches provided upstream
  - Remove textproc/libxml2 from dependencies, and so
    bump PORTREVISION
  
  Reported by:	pkg-fallout [1]

Added:
  head/math/wxMaxima/files/patch-src_MathCtrl.cpp   (contents, props changed)
  head/math/wxMaxima/files/patch-src_MathCtrl.h   (contents, props changed)
Modified:
  head/math/wxMaxima/Makefile

Modified: head/math/wxMaxima/Makefile
==============================================================================
--- head/math/wxMaxima/Makefile	Thu Feb  5 22:23:00 2015	(r378496)
+++ head/math/wxMaxima/Makefile	Thu Feb  5 22:40:37 2015	(r378497)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wxMaxima
 PORTVERSION=	14.12.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
@@ -23,7 +23,6 @@ GNU_CONFIGURE=	yes
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
 
 USES=		desktop-file-utils gettext
-USE_GNOME=	libxml2
 USE_WX=		2.8
 
 WANT_UNICODE=	yes

Added: head/math/wxMaxima/files/patch-src_MathCtrl.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/wxMaxima/files/patch-src_MathCtrl.cpp	Thu Feb  5 22:40:37 2015	(r378497)
@@ -0,0 +1,20 @@
+--- src/MathCtrl.cpp.orig	2015-02-05 22:22:12 UTC
++++ src/MathCtrl.cpp
+@@ -1563,7 +1563,7 @@ void MathCtrl::OnCharInActive(wxKeyEvent
+  * We have a wxKeyEvent with no active editor, shift is down and
+  * keycode (ccode) is WXK_UP/WXK_DOWN
+  */
+-void MathCtrl::SelectWithChar(wxChar ccode) {
++void MathCtrl::SelectWithChar(int ccode) {
+   // start making a selection
+   // m_hCaretPositionStart is the first group selected
+   // m_hCaretPositionEnd is tle last group selected
+@@ -1646,7 +1646,7 @@ void MathCtrl::SelectEditable(EditorCell
+ }
+ 
+ void MathCtrl::OnCharNoActive(wxKeyEvent& event) {
+-  wxChar ccode = event.GetKeyCode();
++  int ccode = event.GetKeyCode();
+   wxString txt; // Usually we open an Editor Cell with initial content txt
+ 
+   // If Shift is down we are selecting with WXK_UP and WXK_DOWN

Added: head/math/wxMaxima/files/patch-src_MathCtrl.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/wxMaxima/files/patch-src_MathCtrl.h	Thu Feb  5 22:40:37 2015	(r378497)
@@ -0,0 +1,11 @@
+--- src/MathCtrl.h.orig	2015-02-05 22:22:16 UTC
++++ src/MathCtrl.h
+@@ -211,7 +211,7 @@ protected:
+   void OnCharNoActive(wxKeyEvent& event);
+   void OnChar(wxKeyEvent& event);
+   void SelectEditable(EditorCell *editor, bool up);
+-  void SelectWithChar(wxChar ccode);
++  void SelectWithChar(int ccode);
+   void ClickNDrag(wxPoint down, wxPoint up);
+   void AdjustSize();
+   void OnEraseBackground(wxEraseEvent& event) { }