Hello community, here is the log from the commit of package wxMaxima for openSUSE:Factory checked in at 2016-08-10 19:56:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxMaxima (Old) and /work/SRC/openSUSE:Factory/.wxMaxima.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxMaxima" Changes: -------- --- /work/SRC/openSUSE:Factory/wxMaxima/wxMaxima.changes 2016-07-20 09:21:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wxMaxima.new/wxMaxima.changes 2016-08-10 19:56:05.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 9 12:17:11 UTC 2016 - [email protected] + +- Version update to 16.04.2: + * various small bugfixes +- Sort with spec-cleaner + +------------------------------------------------------------------- Old: ---- wxmaxima-16.04.1.tar.gz New: ---- wxmaxima-16.04.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxMaxima.spec ++++++ --- /var/tmp/diff_new_pack.2GrT9b/_old 2016-08-10 19:56:07.000000000 +0200 +++ /var/tmp/diff_new_pack.2GrT9b/_new 2016-08-10 19:56:07.000000000 +0200 @@ -17,9 +17,8 @@ %define tarname wxmaxima - Name: wxMaxima -Version: 16.04.1 +Version: 16.04.2 Release: 0 Summary: Graphical User Interface for the maxima Computer Algebra System License: GPL-2.0+ @@ -30,26 +29,23 @@ Source2: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM wxMaxima-appstream-xml-filename.patch [email protected] -- Fix the appstream xml file name (must be identical to .desktop file name w/o ext) and the reference to the .desktop file therein (refers to wxmaxima.desktop while installing wxMaxima.desktop); reported upstream Patch0: wxMaxima-appstream-xml-filename.patch -BuildRequires: hicolor-icon-theme -# REQUIRED TO GENERATE HI-RES ICONS -BuildRequires: fdupes # REQUIRED FOR PATCH0 BuildRequires: autoconf BuildRequires: automake +BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: hicolor-icon-theme BuildRequires: inkscape BuildRequires: maxima >= 5.30.0 -BuildRequires: wxWidgets-devel >= 3 -%if 0%{?suse_version} BuildRequires: update-desktop-files -%endif +BuildRequires: wxWidgets-devel >= 3 # gnuplot is needed for plotting Requires: gnuplot # libgnomeprint is needed for printing Requires: libgnomeprint Requires: maxima >= 5.30.0 -Requires(post): %install_info_prereq -Requires(preun): %install_info_prereq +Requires(post): %{install_info_prereq} +Requires(preun): %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: ppc64 ppc64le @@ -77,7 +73,7 @@ %patch0 -p1 %build -autoreconf -i +autoreconf -fvi %configure \ --enable-printing \ --enable-unicode-glyphs \ @@ -85,7 +81,7 @@ make %{?_smp_mflags} %install -%makeinstall +%make_install # REMOVE UPSTREAM INSTALLED DESKTOP FILE BECAUSE IT IS INCOMPLETE... rm %{buildroot}%{_datadir}/applications/wxMaxima.desktop # ...THEN INSTALL OURS @@ -102,29 +98,25 @@ # REMOVE UNNECESSARY ICONS OUT OF PIXMAPS rm %{buildroot}%{_datadir}/pixmaps/wxmaxima* -%if 0%{?suse_version} %suse_update_desktop_file wxMaxima -%endif -%if 0%{?suse_version} %fdupes %{buildroot}%{_prefix} -%endif -%find_lang %name +%find_lang %{name} %post %desktop_database_post %icon_theme_cache_post %mime_database_post -%install_info --info-dir=%{_infodir} %{_infodir}/wxmaxima.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/wxmaxima.info%{ext_info} %postun %desktop_database_postun %icon_theme_cache_postun %mime_database_postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/wxmaxima.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/wxmaxima.info%{ext_info} -%files -f %name.lang +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README.md ChangeLog %{_bindir}/* @@ -138,8 +130,8 @@ %endif %{_datadir}/bash-completion/completions/wxmaxima %{_datadir}/appdata/wxMaxima.appdata.xml -%{_mandir}/man1/wxmaxima*.gz -%{_infodir}/wxmaxima.info.gz +%{_mandir}/man1/wxmaxima*%{ext_man} +%{_infodir}/wxmaxima.info%{ext_info} %{_datadir}/mime/packages/*.xml %{_datadir}/pixmaps/*.svg ++++++ wxmaxima-16.04.1.tar.gz -> wxmaxima-16.04.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxmaxima-16.04.1/configure new/wxmaxima-16.04.2/configure --- old/wxmaxima-16.04.1/configure 2016-04-06 12:11:25.000000000 +0200 +++ new/wxmaxima-16.04.2/configure 2016-05-11 08:35:37.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wxMaxima 16.04.1. +# Generated by GNU Autoconf 2.69 for wxMaxima 16.04.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='wxMaxima' PACKAGE_TARNAME='wxmaxima' -PACKAGE_VERSION='16.04.1' -PACKAGE_STRING='wxMaxima 16.04.1' +PACKAGE_VERSION='16.04.2' +PACKAGE_STRING='wxMaxima 16.04.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1279,7 +1279,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxMaxima 16.04.1 to adapt to many kinds of systems. +\`configure' configures wxMaxima 16.04.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1349,7 +1349,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxMaxima 16.04.1:";; + short | recursive ) echo "Configuration of wxMaxima 16.04.2:";; esac cat <<\_ACEOF @@ -1457,7 +1457,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxMaxima configure 16.04.1 +wxMaxima configure 16.04.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1595,7 +1595,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxMaxima $as_me 16.04.1, which was +It was created by wxMaxima $as_me 16.04.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2459,7 +2459,7 @@ # Define the identity of the package. PACKAGE='wxmaxima' - VERSION='16.04.1' + VERSION='16.04.2' cat >>confdefs.h <<_ACEOF @@ -4962,7 +4962,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxMaxima $as_me 16.04.1, which was +This file was extended by wxMaxima $as_me 16.04.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5028,7 +5028,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wxMaxima config.status 16.04.1 +wxMaxima config.status 16.04.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxmaxima-16.04.1/configure.ac new/wxmaxima-16.04.2/configure.ac --- old/wxmaxima-16.04.1/configure.ac 2016-04-06 09:08:03.000000000 +0200 +++ new/wxmaxima-16.04.2/configure.ac 2016-05-11 08:35:04.000000000 +0200 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([wxMaxima], [16.04.1]) +AC_INIT([wxMaxima], [16.04.2]) AC_CONFIG_SRCDIR([src/wxMaxima.cpp]) AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxmaxima-16.04.1/data/wxmathml.lisp new/wxmaxima-16.04.2/data/wxmathml.lisp --- old/wxmaxima-16.04.1/data/wxmathml.lisp 2016-04-06 09:08:16.000000000 +0200 +++ new/wxmaxima-16.04.2/data/wxmathml.lisp 2016-05-11 08:34:55.000000000 +0200 @@ -56,7 +56,7 @@ #+clisp `(let ((custom:*suppress-check-redefinition* t)) ,form) #-(or sbcl clisp) `(progn ,form)) -($put '$wxmaxima `((mlist simp) 16 4 1) '$version) +($put '$wxmaxima `((mlist simp) 16 4 2) '$version) (defun $wxbuild_info () (let ((wxmaxima-version (cdr ($get '$wxmaxima '$version))) Files old/wxmaxima-16.04.1/src/._wxMaximaFrame.cpp and new/wxmaxima-16.04.2/src/._wxMaximaFrame.cpp differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxmaxima-16.04.1/src/EditorCell.cpp new/wxmaxima-16.04.2/src/EditorCell.cpp --- old/wxmaxima-16.04.1/src/EditorCell.cpp 2016-04-02 10:33:28.000000000 +0200 +++ new/wxmaxima-16.04.2/src/EditorCell.cpp 2016-05-10 18:02:46.000000000 +0200 @@ -2799,7 +2799,7 @@ if(m_firstLineOnly) { - size_t newlinepos = textToStyle.find(wxT("\nd")); + size_t newlinepos = textToStyle.Find(wxT("\n")); if(newlinepos != wxNOT_FOUND) { textToStyle = textToStyle.Left(newlinepos) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxmaxima-16.04.1/src/GroupCell.cpp new/wxmaxima-16.04.2/src/GroupCell.cpp --- old/wxmaxima-16.04.1/src/GroupCell.cpp 2016-04-04 09:39:04.000000000 +0200 +++ new/wxmaxima-16.04.2/src/GroupCell.cpp 2016-05-10 18:02:46.000000000 +0200 @@ -458,6 +458,9 @@ m_currentPoint.y = dynamic_cast<GroupCell*>(m_previous) -> m_currentPoint.y + dynamic_cast<GroupCell*>(m_previous) -> GetMaxDrop() + GetMaxCenter() + MC_GROUP_SKIP; } + + if(m_input) + m_input->m_currentPoint = m_currentPoint; } // We assume that appended cells will be in a new line! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxmaxima-16.04.1/src/IntCell.cpp new/wxmaxima-16.04.2/src/IntCell.cpp --- old/wxmaxima-16.04.1/src/IntCell.cpp 2016-03-07 13:44:14.000000000 +0100 +++ new/wxmaxima-16.04.2/src/IntCell.cpp 2016-05-10 21:31:45.000000000 +0200 @@ -442,28 +442,25 @@ wxString IntCell::ToXML() { - MathCell* tmp = m_base; - wxString base = _T("<r>") + tmp->ListToXML() + _T("</r>"); - - tmp = m_var; - wxString var = ( tmp == NULL )? wxEmptyString : _T("<r>"); - var += tmp->ListToXML(); - var += ( var == wxEmptyString )? wxEmptyString : _T("</r>"); - wxString from; - tmp = m_under; - if(tmp != NULL) - from = _T("<r>") + tmp->ListToXML() + _T("</r>"); - else - from = _T("<r></r>"); - + if(m_under != NULL) + from = m_under->ListToXML(); + from = wxT("<r>")+from+wxT("</r>"); wxString to; - tmp = m_over; - if(tmp != NULL) - from = _T("<r>") + tmp->ListToXML() + _T("</r>"); - else - from = _T("<r></r>"); + if(m_over != NULL) + to = m_over->ListToXML(); + to = wxT("<r>")+to+wxT("</r>"); + + wxString base; + if(m_base != NULL) + base = m_base->ListToXML(); + base = wxT("<r>")+base+wxT("</r>"); + + wxString var; + if(m_var != NULL) + var = m_var->ListToXML(); + var = wxT("<r>")+var+wxT("</r>"); if (m_intStyle == INT_DEF) return wxT("<in>") + from + to + base + var + wxT("</in>"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxmaxima-16.04.1/src/MathCtrl.cpp new/wxmaxima-16.04.2/src/MathCtrl.cpp --- old/wxmaxima-16.04.1/src/MathCtrl.cpp 2016-03-31 20:41:03.000000000 +0200 +++ new/wxmaxima-16.04.2/src/MathCtrl.cpp 2016-05-10 18:02:46.000000000 +0200 @@ -1618,6 +1618,7 @@ ); TreeUndo_ClearRedoActionList(); m_selectionStart = m_selectionEnd = NULL; + UpdateTableOfContents(); } void MathCtrl::DeleteCurrentCell() @@ -4880,11 +4881,16 @@ void MathCtrl::AddToEvaluationQueue(GroupCell *cell) { - // Gray out the output of the cell in order to mark it as "not current". - if(cell->GetInput()) - cell->GetInput()->ContainsChanges(true); - // ...and add it to the evaluation queue - m_evaluationQueue->AddToQueue(cell); + if(cell->GetGroupType() == GC_TYPE_CODE) + { + // Gray out the output of the cell in order to mark it as "not current". + if(cell->GetInput()) + { + cell->GetInput()->ContainsChanges(true); + // ...and add it to the evaluation queue + m_evaluationQueue->AddToQueue(cell); + } + } } /** @@ -5041,7 +5047,10 @@ void MathCtrl::Undo() { if(CanUndoInsideCell()) + { UndoInsideCell(); + RecalculateForce(); + } else { if(CanTreeUndo()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxmaxima-16.04.1/src/MathParser.cpp new/wxmaxima-16.04.2/src/MathParser.cpp --- old/wxmaxima-16.04.1/src/MathParser.cpp 2016-04-02 10:33:28.000000000 +0200 +++ new/wxmaxima-16.04.2/src/MathParser.cpp 2016-05-10 21:31:45.000000000 +0200 @@ -260,23 +260,30 @@ child = SkipWhitespaceNode(child); if (child) { - frac->SetNum(ParseTag(child, false)); + MathCell *enumerator = ParseTag(child, false); + if(enumerator==NULL) + return NULL; + frac->SetNum(enumerator); child = GetNextTag(child); - - if (child) + child = SkipWhitespaceNode(child); + if ((child != NULL) && (enumerator != NULL)) { - frac->SetDenom(ParseTag(child, false)); - frac->SetStyle(TS_VARIABLE); - - if(node->GetAttribute(wxT("line")) == wxT("no")) + MathCell *denominator = ParseTag(child, false); + if(denominator != NULL) { - frac->SetFracStyle(FracCell::FC_CHOOSE); + frac->SetDenom(denominator); + frac->SetStyle(TS_VARIABLE); + + if(node->GetAttribute(wxT("line")) == wxT("no")) + { + frac->SetFracStyle(FracCell::FC_CHOOSE); + } + if(node->GetAttribute(wxT("diffstyle")) == wxT("yes")) + frac->SetFracStyle(FracCell::FC_DIFF); + frac->SetType(m_ParserStyle); + frac->SetupBreakUps(); + return frac; } - if(node->GetAttribute(wxT("diffstyle")) == wxT("yes")) - frac->SetFracStyle(FracCell::FC_DIFF); - frac->SetType(m_ParserStyle); - frac->SetupBreakUps(); - return frac; } } @@ -658,8 +665,26 @@ wxXmlNode* child = node->GetChildren(); child = SkipWhitespaceNode(child); in->SetHighlight(m_highlight); - if (node->GetAttributes() == NULL) + wxString definiteAtt=node->GetAttribute(wxT("def"),wxT("true")); + if (definiteAtt != wxT("true")) { + // A indefinite integral + if (child) + { + in->SetBase(ParseTag(child, false)); + child = GetNextTag(child); + if (child) + { + in->SetVar(ParseTag(child, true)); + in->SetType(m_ParserStyle); + in->SetStyle(TS_VARIABLE); + return in; + } + } + } + else + { + // A Definite integral in->SetIntStyle(IntCell::INT_DEF); if (child) { @@ -684,21 +709,6 @@ } } } - else - { - if (child) - { - in->SetBase(ParseTag(child, false)); - child = GetNextTag(child); - if (child) - { - in->SetVar(ParseTag(child, true)); - in->SetType(m_ParserStyle); - in->SetStyle(TS_VARIABLE); - return in; - } - } - } delete in; return NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxmaxima-16.04.1/src/XmlInspector.cpp new/wxmaxima-16.04.2/src/XmlInspector.cpp --- old/wxmaxima-16.04.1/src/XmlInspector.cpp 2015-09-10 15:05:32.000000000 +0200 +++ new/wxmaxima-16.04.2/src/XmlInspector.cpp 2016-05-10 21:31:45.000000000 +0200 @@ -55,16 +55,20 @@ { wxChar ch = text[index]; - if(m_lastChar == wxT('<')) - { - if (ch == wxT('/')) - { + // Assume that all tags add indentation + if(ch == wxT('>')) + m_indentLevel ++; + + // A closing tag needs to remove the indentation of the opening tag + // plus the indentation of the closing tag + if((m_lastChar == wxT('<')) && (ch == wxT('/'))) m_indentLevel -= 2; - } - else - m_indentLevel ++; - } + + // Self-closing Tags remove their own indentation + if((m_lastChar == wxT('/'))&&(ch == wxT('>'))) + m_indentLevel -= 1; + // Add a linebreak and indent if we are at the space between 2 tags if((m_lastChar == wxT('>')) && (ch == wxT('<'))) { text = text.Left(index) + wxT ("\n") + IndentString(m_indentLevel) + text.Right(text.Length()-index); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxmaxima-16.04.1/src/main.cpp new/wxmaxima-16.04.2/src/main.cpp --- old/wxmaxima-16.04.1/src/main.cpp 2016-03-31 20:41:03.000000000 +0200 +++ new/wxmaxima-16.04.2/src/main.cpp 2016-05-10 17:58:13.000000000 +0200 @@ -114,6 +114,12 @@ wxSetEnv(wxT("LANG"), m_locale.GetName()); if (!wxGetEnv(wxT("BUILD_DIR"), NULL)) wxSetWorkingDirectory(wxPathOnly(wxString(argv[0]))); + /* Add private jsMath fonts, if they exist */ + if (wxFileExists("fonts/jsMath-cmex10.ttf")) AddFontResource(wxT("fonts/jsMath-cmex10.ttf")); + if (wxFileExists("fonts/jsMath-cmsy10.ttf")) AddFontResource(wxT("fonts/jsMath-cmsy10.ttf")); + if (wxFileExists("fonts/jsMath-cmr10.ttf")) AddFontResource(wxT("fonts/jsMath-cmr10.ttf")); + if (wxFileExists("fonts/jsMath-cmmi10.ttf")) AddFontResource(wxT("fonts/jsMath-cmmi10.ttf")); + if (wxFileExists("fonts/jsMath-cmti10.ttf")) AddFontResource(wxT("fonts/jsMath-cmti10.ttf")); #endif m_locale.AddCatalogLookupPathPrefix(dirstructure.LocaleDir()); @@ -185,6 +191,17 @@ return true; } +#if defined (__WXMSW__) +int MyApp::OnExit() +{ + if (wxFileExists("fonts/jsMath-cmex10.ttf")) RemoveFontResource(wxT("fonts/jsMath-cmex10.ttf")); + if (wxFileExists("fonts/jsMath-cmsy10.ttf")) RemoveFontResource(wxT("fonts/jsMath-cmsy10.ttf")); + if (wxFileExists("fonts/jsMath-cmr10.ttf")) RemoveFontResource(wxT("fonts/jsMath-cmr10.ttf")); + if (wxFileExists("fonts/jsMath-cmmi10.ttf")) RemoveFontResource(wxT("fonts/jsMath-cmmi10.ttf")); + if (wxFileExists("fonts/jsMath-cmti10.ttf")) RemoveFontResource(wxT("fonts/jsMath-cmti10.ttf")); +} +#endif + #if defined __WXMAC__ int window_counter = 0; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxmaxima-16.04.1/src/wxMaxima.h new/wxmaxima-16.04.2/src/wxMaxima.h --- old/wxmaxima-16.04.1/src/wxMaxima.h 2016-03-31 20:41:04.000000000 +0200 +++ new/wxmaxima-16.04.2/src/wxMaxima.h 2016-05-10 17:58:13.000000000 +0200 @@ -419,6 +419,9 @@ { public: virtual bool OnInit(); +#if defined (__WXMSW__) + virtual int OnExit(); +#endif wxLocale m_locale; /*! Create a new window
