[arch-commits] Commit in freemat/repos (18 files)

Balló György bgyorgy at archlinux.org
Tue Feb 7 14:55:26 UTC 2017


    Date: Tuesday, February 7, 2017 @ 14:55:25
  Author: bgyorgy
Revision: 210803

archrelease: copy trunk to community-i686, community-x86_64

Added:
  freemat/repos/community-i686/ChangeLog
    (from rev 210802, freemat/trunk/ChangeLog)
  freemat/repos/community-i686/PKGBUILD
    (from rev 210802, freemat/trunk/PKGBUILD)
  freemat/repos/community-i686/build-fix.patch
    (from rev 210802, freemat/trunk/build-fix.patch)
  freemat/repos/community-i686/freemat.install
    (from rev 210802, freemat/trunk/freemat.install)
  freemat/repos/community-i686/remove-qwebkit.patch
    (from rev 210802, freemat/trunk/remove-qwebkit.patch)
  freemat/repos/community-x86_64/ChangeLog
    (from rev 210802, freemat/trunk/ChangeLog)
  freemat/repos/community-x86_64/PKGBUILD
    (from rev 210802, freemat/trunk/PKGBUILD)
  freemat/repos/community-x86_64/build-fix.patch
    (from rev 210802, freemat/trunk/build-fix.patch)
  freemat/repos/community-x86_64/freemat.install
    (from rev 210802, freemat/trunk/freemat.install)
  freemat/repos/community-x86_64/remove-qwebkit.patch
    (from rev 210802, freemat/trunk/remove-qwebkit.patch)
Deleted:
  freemat/repos/community-i686/ChangeLog
  freemat/repos/community-i686/PKGBUILD
  freemat/repos/community-i686/build-fix.patch
  freemat/repos/community-i686/freemat.install
  freemat/repos/community-x86_64/ChangeLog
  freemat/repos/community-x86_64/PKGBUILD
  freemat/repos/community-x86_64/build-fix.patch
  freemat/repos/community-x86_64/freemat.install

---------------------------------------+
 /ChangeLog                            |    6 +
 /PKGBUILD                             |  104 ++++++++++++++++++++++++
 /build-fix.patch                      |   42 +++++++++
 /freemat.install                      |   14 +++
 community-i686/ChangeLog              |    3 
 community-i686/PKGBUILD               |   49 -----------
 community-i686/build-fix.patch        |   21 ----
 community-i686/freemat.install        |    7 -
 community-i686/remove-qwebkit.patch   |  138 ++++++++++++++++++++++++++++++++
 community-x86_64/ChangeLog            |    3 
 community-x86_64/PKGBUILD             |   49 -----------
 community-x86_64/build-fix.patch      |   21 ----
 community-x86_64/freemat.install      |    7 -
 community-x86_64/remove-qwebkit.patch |  138 ++++++++++++++++++++++++++++++++
 14 files changed, 442 insertions(+), 160 deletions(-)

Deleted: community-i686/ChangeLog
===================================================================
--- community-i686/ChangeLog	2017-02-07 14:55:16 UTC (rev 210802)
+++ community-i686/ChangeLog	2017-02-07 14:55:25 UTC (rev 210803)
@@ -1,3 +0,0 @@
-2007-06-27 tardo <tardo at nagi-fanboi.net>
-* Built for x86_64
-

Copied: freemat/repos/community-i686/ChangeLog (from rev 210802, freemat/trunk/ChangeLog)
===================================================================
--- community-i686/ChangeLog	                        (rev 0)
+++ community-i686/ChangeLog	2017-02-07 14:55:25 UTC (rev 210803)
@@ -0,0 +1,3 @@
+2007-06-27 tardo <tardo at nagi-fanboi.net>
+* Built for x86_64
+

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-02-07 14:55:16 UTC (rev 210802)
+++ community-i686/PKGBUILD	2017-02-07 14:55:25 UTC (rev 210803)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=freemat
-pkgver=4.2
-pkgrel=6
-pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
-arch=('i686' 'x86_64')
-url="http://freemat.sourceforge.net"
-license=('GPL')
-depends=('arpack' 'fftw' 'glu' 'portaudio' 'qtwebkit' 'qt4' 'libffi')
-makedepends=('cmake' 'python2' 'suitesparse' 'doxygen' 'gcc-fortran')
-install=freemat.install
-source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
-	build-fix.patch)
-md5sums=('ace147e49273ae935d363da8e2a56d4d'
-         '042f43dcae863e3fc4c9a10b46761344')
-
-prepare() {
-  cd $srcdir/FreeMat-$pkgver-Source
-  patch -p1 <$srcdir/build-fix.patch
-}
-
-build() {
-  cd $srcdir/FreeMat-$pkgver-Source
-  unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
-  rm -f CMakeCache.txt
-  find . -type f -name '*.moc.cpp' -exec rm -f {} \;
-  find . -type f -name 'add.so' -exec rm -f {} \;
-  echo >libs/libMatC/CJitFuncClang.hpp
-  echo >libs/libMatC/CJitFuncClang.cpp
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DUSE_LLVM=OFF \
-	-DFORCE_BUNDLED_UMFPACK=ON \
-	-DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \
-	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-	.
-  make
-}
-package() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  make DESTDIR=$pkgdir install -j1
-  sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install
-  rm $pkgdir/usr/bin/blas.ini
-}

Copied: freemat/repos/community-i686/PKGBUILD (from rev 210802, freemat/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-02-07 14:55:25 UTC (rev 210803)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=freemat
+pkgver=4.2
+pkgrel=7
+pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
+arch=('i686' 'x86_64')
+url="http://freemat.sourceforge.net"
+license=('GPL')
+depends=('arpack' 'fftw' 'glu' 'portaudio' 'qt4' 'libffi')
+makedepends=('cmake' 'python2' 'suitesparse' 'doxygen' 'gcc-fortran')
+install=freemat.install
+source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
+	build-fix.patch
+	remove-qwebkit.patch)
+md5sums=('ace147e49273ae935d363da8e2a56d4d'
+         '042f43dcae863e3fc4c9a10b46761344'
+         '5e37816fafe46a79cc157549f5bec554')
+
+prepare() {
+  cd "$srcdir"/FreeMat-$pkgver-Source
+  patch -p1 <"$srcdir"/build-fix.patch
+  patch -p1 <"$srcdir"/remove-qwebkit.patch
+}
+
+build() {
+  cd "$srcdir"/FreeMat-$pkgver-Source
+  unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
+  rm -f CMakeCache.txt
+  find . -type f -name '*.moc.cpp' -exec rm -f {} \;
+  find . -type f -name 'add.so' -exec rm -f {} \;
+  echo >libs/libMatC/CJitFuncClang.hpp
+  echo >libs/libMatC/CJitFuncClang.cpp
+
+  cmake \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DUSE_LLVM=OFF \
+	-DFORCE_BUNDLED_UMFPACK=ON \
+	-DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \
+	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
+	.
+  make
+}
+package() {
+  cd "$srcdir"/FreeMat-$pkgver-Source
+
+  make DESTDIR="$pkgdir" install -j1
+  sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install
+  rm "$pkgdir"/usr/bin/blas.ini
+}

Deleted: community-i686/build-fix.patch
===================================================================
--- community-i686/build-fix.patch	2017-02-07 14:55:16 UTC (rev 210802)
+++ community-i686/build-fix.patch	2017-02-07 14:55:25 UTC (rev 210803)
@@ -1,21 +0,0 @@
-diff -wbBur FreeMat-4.2-Source/CMakeLists.txt FreeMat-4.2-Source.q/CMakeLists.txt
---- FreeMat-4.2-Source/CMakeLists.txt	2013-07-28 01:27:12.000000000 +0400
-+++ FreeMat-4.2-Source.q/CMakeLists.txt	2014-05-29 21:13:35.263893395 +0400
-@@ -250,17 +250,6 @@
- ######################################################################
- OPTION(USE_LLVM "Build with LLVM support?" ON)
- 
--FIND_PACKAGE(LLVM)
--FIND_PACKAGE(CLANG)
--
--IF (LLVM_FOUND AND CLANG_FOUND)
--  add_definitions(-DHAVE_LLVM)
--  include_directories(${LLVM_INCLUDE_DIRS})
--  link_directories(${LLVM_LIBRARY_DIRS})
--  llvm_map_components_to_libraries(REQ_LLVM_LIBRARIES jit interpreter nativecodegen asmparser bitreader bitwriter codegen ipo linker selectiondag instrumentation)
--  set(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBRARIES})
--ENDIF()
--
- ##############################################################################
- #Extra libraries
- IF(NOT WIN32)

Copied: freemat/repos/community-i686/build-fix.patch (from rev 210802, freemat/trunk/build-fix.patch)
===================================================================
--- community-i686/build-fix.patch	                        (rev 0)
+++ community-i686/build-fix.patch	2017-02-07 14:55:25 UTC (rev 210803)
@@ -0,0 +1,21 @@
+diff -wbBur FreeMat-4.2-Source/CMakeLists.txt FreeMat-4.2-Source.q/CMakeLists.txt
+--- FreeMat-4.2-Source/CMakeLists.txt	2013-07-28 01:27:12.000000000 +0400
++++ FreeMat-4.2-Source.q/CMakeLists.txt	2014-05-29 21:13:35.263893395 +0400
+@@ -250,17 +250,6 @@
+ ######################################################################
+ OPTION(USE_LLVM "Build with LLVM support?" ON)
+ 
+-FIND_PACKAGE(LLVM)
+-FIND_PACKAGE(CLANG)
+-
+-IF (LLVM_FOUND AND CLANG_FOUND)
+-  add_definitions(-DHAVE_LLVM)
+-  include_directories(${LLVM_INCLUDE_DIRS})
+-  link_directories(${LLVM_LIBRARY_DIRS})
+-  llvm_map_components_to_libraries(REQ_LLVM_LIBRARIES jit interpreter nativecodegen asmparser bitreader bitwriter codegen ipo linker selectiondag instrumentation)
+-  set(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBRARIES})
+-ENDIF()
+-
+ ##############################################################################
+ #Extra libraries
+ IF(NOT WIN32)

Deleted: community-i686/freemat.install
===================================================================
--- community-i686/freemat.install	2017-02-07 14:55:16 UTC (rev 210802)
+++ community-i686/freemat.install	2017-02-07 14:55:25 UTC (rev 210803)
@@ -1,7 +0,0 @@
-post_install() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.2/ to adjust docs location"
-}
-
-post_upgrade() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.2/ to adjust docs location"
-}

Copied: freemat/repos/community-i686/freemat.install (from rev 210802, freemat/trunk/freemat.install)
===================================================================
--- community-i686/freemat.install	                        (rev 0)
+++ community-i686/freemat.install	2017-02-07 14:55:25 UTC (rev 210803)
@@ -0,0 +1,7 @@
+post_install() {
+  echo "-- Use FreeMat -i /usr/share/FreeMat-4.2/ to adjust docs location"
+}
+
+post_upgrade() {
+  echo "-- Use FreeMat -i /usr/share/FreeMat-4.2/ to adjust docs location"
+}

Copied: freemat/repos/community-i686/remove-qwebkit.patch (from rev 210802, freemat/trunk/remove-qwebkit.patch)
===================================================================
--- community-i686/remove-qwebkit.patch	                        (rev 0)
+++ community-i686/remove-qwebkit.patch	2017-02-07 14:55:25 UTC (rev 210803)
@@ -0,0 +1,138 @@
+Description: Remove qwebkit dependencies.
+ This is bad patch, because it disables the functionality
+ of help-menu. But it can only be fixed, when FreeMat will
+ be ported on Qt5. Qt4-Webkit will be removed soon, so we
+ do not have any choice.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2016-01-22
+
+Index: FreeMat-4.2-Source/libs/libCore/helpwidget.cpp
+===================================================================
+--- FreeMat-4.2-Source.orig/libs/libCore/helpwidget.cpp
++++ FreeMat-4.2-Source/libs/libCore/helpwidget.cpp
+@@ -85,7 +85,6 @@ void HelpWindow::activateModule(QListWid
+   QRegExp modname_pattern("^\\s*(\\b\\w+\\b)\\s*\\((\\b\\w+\\b)\\)");
+   if (modname_pattern.indexIn(name_and_section) < 0)
+     return;
+-  tb->load(QUrl::fromLocalFile(m_initial+"/"+modname_pattern.cap(2) + "_" + modname_pattern.cap(1)+".html"));
+ }
+ 
+ void HelpWindow::activateModuleSearch(QListWidgetItem* item) {
+@@ -93,11 +92,6 @@ void HelpWindow::activateModuleSearch(QL
+   QRegExp modname_pattern("^\\s*(\\b\\w+\\b)\\s*\\((\\b\\w+\\b)\\)");
+   if (modname_pattern.indexIn(name_and_section) < 0)
+     return;
+-  tb->load(QUrl::fromLocalFile(m_initial+"/"+modname_pattern.cap(2) + "_" + modname_pattern.cap(1)+".html"));
+-
+-  /* Highlight search text*/
+-  if (!searchString.isEmpty())
+-    tb->findText(searchString,QWebPage::HighlightAllOccurrences);
+ }
+ 
+ void HelpWindow::activateModule(QTreeWidgetItem* item, int) {
+@@ -106,7 +100,6 @@ void HelpWindow::activateModule(QTreeWid
+   if (modname.indexIn(fulltext) < 0)
+     return;
+   QString module(modname.cap(1).toLower());
+-  tb->load(QUrl::fromLocalFile(m_initial+"/"+item->text(1)+"_"+module+".html"));
+ }
+ 
+ void HelpWindow::helpText(QString fulltext) {
+@@ -122,7 +115,6 @@ void HelpWindow::helpText(QString fullte
+   QRegExp modname_pattern("^\\s*(\\b\\w+\\b)\\s*\\((\\b\\w+\\b)\\)");
+   if (modname_pattern.indexIn(name_and_section) < 0)
+     return;
+-  tb->load(QUrl::fromLocalFile(m_initial+"/"+modname_pattern.cap(2) + "_" + modname_pattern.cap(1)+".html"));
+   m_helpwidget->m_flist->setCurrentItem(item);
+ }
+ 
+@@ -156,9 +148,6 @@ HelpWindow::HelpWindow(QString url) {
+   setWindowIcon(QPixmap(":/images/freemat_help_small_mod_64.png"));
+   setWindowTitle(QString(Interpreter::getVersionString()) + " Online Help");
+   m_initial = url;
+-  tb = new QWebView(this);
+-  tb->load(QUrl::fromLocalFile(m_initial+"/index.html"));
+-  setCentralWidget(tb);
+   m_helpwidget = new HelpWidget(url,this);
+   addDockWidget(Qt::LeftDockWidgetArea,m_helpwidget);
+   createActions();
+@@ -196,29 +185,23 @@ void HelpWindow::createActions() {
+ 
+   zoominAct = new QAction(QIcon(":/images/zoomin.png"),"Zoom &In",this);
+   zoominAct->setShortcut(Qt::Key_Plus | Qt::CTRL); 
+-  connect(zoominAct,SIGNAL(triggered()),tb,SLOT(zoomIn()));
+   zoomoutAct = new QAction(QIcon(":/images/zoomout.png"),"Zoom &Out",this);
+   zoomoutAct->setShortcut(Qt::Key_Minus | Qt::CTRL); 
+-  connect(zoomoutAct,SIGNAL(triggered()),tb,SLOT(zoomOut()));
+   copyAct = new QAction(QIcon(":/images/copy.png"),"&Copy Selection",this);
+   stemp.clear();
+   stemp.push_back(QKeySequence(Qt::Key_C | Qt::CTRL));
+   stemp.push_back(QKeySequence(Qt::Key_Insert | Qt::CTRL));
+   copyAct->setShortcuts(stemp);
+ 
+-  connect(copyAct,SIGNAL(triggered()),tb,SLOT(copy()));
+   exitAct = new QAction(QIcon(":/images/quit.png"),"&Exit Help",this);
+   exitAct->setShortcut(Qt::Key_Q | Qt::CTRL); 
+   connect(exitAct,SIGNAL(triggered()),this,SLOT(close()));
+   forwardAct = new QAction(QIcon(":/images/next.png"),"&Next",this);
+   forwardAct->setShortcut(Qt::Key_Right | Qt::Key_Alt); 
+-  connect(forwardAct,SIGNAL(triggered()),tb,SLOT(forward()));
+   backAct = new QAction(QIcon(":/images/previous.png"),"&Previous",this);
+   backAct->setShortcut(Qt::Key_Left | Qt::Key_Alt); 
+-  connect(backAct,SIGNAL(triggered()),tb,SLOT(back()));
+   homeAct = new QAction(QIcon(":/images/home.png"),"&Home",this);
+   homeAct->setShortcut(Qt::Key_Home | Qt::CTRL); 
+-  connect(homeAct,SIGNAL(triggered()),tb,SLOT(home()));
+   executeSelectionAct = new QAction(QIcon(":/images/player_playselection.png"),"&Execute Selection",this);
+   executeSelectionAct->setShortcut(Qt::Key_F9); 
+   connect(executeSelectionAct,SIGNAL(triggered()),this,SLOT(execSelected()));
+@@ -226,9 +209,7 @@ void HelpWindow::createActions() {
+   helpOnSelectionAct->setShortcut(Qt::Key_F2);
+   connect(helpOnSelectionAct,SIGNAL(triggered()),this,SLOT(helpOnSelection()));
+   
+-  connect(tb,SIGNAL(forwardAvailable(bool)),forwardAct,SLOT(setEnabled(bool)));
+   forwardAct->setEnabled(false);
+-  connect(tb,SIGNAL(backwardAvailable(bool)),backAct,SLOT(setEnabled(bool)));
+   backAct->setEnabled(false);
+ }
+ 
+@@ -267,19 +248,9 @@ void HelpWindow::createStatusBar() {
+ }
+ 
+ void HelpWindow::execSelected() {
+-  QString executeText = tb->selectedText();
+-  executeText.remove("--> ");
+-  executeText.remove("-> ");
+-  executeText = executeText.trimmed();
+-  if (!executeText.isEmpty())
+-    emit EvaluateText(executeText + "\n");
+ }
+ 
+ void HelpWindow::helpOnSelection() {
+-  QString executeText = tb->selectedText();
+-  executeText = executeText.trimmed();
+-  if (!executeText.isEmpty())
+-    helpText(executeText);
+ }
+ 
+ 
+Index: FreeMat-4.2-Source/libs/libCore/helpwidget.hpp
+===================================================================
+--- FreeMat-4.2-Source.orig/libs/libCore/helpwidget.hpp
++++ FreeMat-4.2-Source/libs/libCore/helpwidget.hpp
+@@ -23,7 +23,6 @@
+ #include <QObject>
+ #include <QMainWindow>
+ #include <QDockWidget>
+-#include <QWebView>
+ #include <QMenu>
+ #include <QToolBar>
+ #include <QAction>
+@@ -80,7 +79,6 @@ private:
+   void readSettings();
+   void closeEvent(QCloseEvent* ce);
+ 
+-  QWebView *tb;
+   HelpWidget *m_helpwidget;
+   QMenu *fileMenu, *editMenu, *goMenu, *helpMenu;
+   QToolBar *editToolBar;

Deleted: community-x86_64/ChangeLog
===================================================================
--- community-x86_64/ChangeLog	2017-02-07 14:55:16 UTC (rev 210802)
+++ community-x86_64/ChangeLog	2017-02-07 14:55:25 UTC (rev 210803)
@@ -1,3 +0,0 @@
-2007-06-27 tardo <tardo at nagi-fanboi.net>
-* Built for x86_64
-

Copied: freemat/repos/community-x86_64/ChangeLog (from rev 210802, freemat/trunk/ChangeLog)
===================================================================
--- community-x86_64/ChangeLog	                        (rev 0)
+++ community-x86_64/ChangeLog	2017-02-07 14:55:25 UTC (rev 210803)
@@ -0,0 +1,3 @@
+2007-06-27 tardo <tardo at nagi-fanboi.net>
+* Built for x86_64
+

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-02-07 14:55:16 UTC (rev 210802)
+++ community-x86_64/PKGBUILD	2017-02-07 14:55:25 UTC (rev 210803)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=freemat
-pkgver=4.2
-pkgrel=6
-pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
-arch=('i686' 'x86_64')
-url="http://freemat.sourceforge.net"
-license=('GPL')
-depends=('arpack' 'fftw' 'glu' 'portaudio' 'qtwebkit' 'qt4' 'libffi')
-makedepends=('cmake' 'python2' 'suitesparse' 'doxygen' 'gcc-fortran')
-install=freemat.install
-source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
-	build-fix.patch)
-md5sums=('ace147e49273ae935d363da8e2a56d4d'
-         '042f43dcae863e3fc4c9a10b46761344')
-
-prepare() {
-  cd $srcdir/FreeMat-$pkgver-Source
-  patch -p1 <$srcdir/build-fix.patch
-}
-
-build() {
-  cd $srcdir/FreeMat-$pkgver-Source
-  unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
-  rm -f CMakeCache.txt
-  find . -type f -name '*.moc.cpp' -exec rm -f {} \;
-  find . -type f -name 'add.so' -exec rm -f {} \;
-  echo >libs/libMatC/CJitFuncClang.hpp
-  echo >libs/libMatC/CJitFuncClang.cpp
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DUSE_LLVM=OFF \
-	-DFORCE_BUNDLED_UMFPACK=ON \
-	-DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \
-	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-	.
-  make
-}
-package() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  make DESTDIR=$pkgdir install -j1
-  sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install
-  rm $pkgdir/usr/bin/blas.ini
-}

Copied: freemat/repos/community-x86_64/PKGBUILD (from rev 210802, freemat/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-02-07 14:55:25 UTC (rev 210803)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=freemat
+pkgver=4.2
+pkgrel=7
+pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
+arch=('i686' 'x86_64')
+url="http://freemat.sourceforge.net"
+license=('GPL')
+depends=('arpack' 'fftw' 'glu' 'portaudio' 'qt4' 'libffi')
+makedepends=('cmake' 'python2' 'suitesparse' 'doxygen' 'gcc-fortran')
+install=freemat.install
+source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
+	build-fix.patch
+	remove-qwebkit.patch)
+md5sums=('ace147e49273ae935d363da8e2a56d4d'
+         '042f43dcae863e3fc4c9a10b46761344'
+         '5e37816fafe46a79cc157549f5bec554')
+
+prepare() {
+  cd "$srcdir"/FreeMat-$pkgver-Source
+  patch -p1 <"$srcdir"/build-fix.patch
+  patch -p1 <"$srcdir"/remove-qwebkit.patch
+}
+
+build() {
+  cd "$srcdir"/FreeMat-$pkgver-Source
+  unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
+  rm -f CMakeCache.txt
+  find . -type f -name '*.moc.cpp' -exec rm -f {} \;
+  find . -type f -name 'add.so' -exec rm -f {} \;
+  echo >libs/libMatC/CJitFuncClang.hpp
+  echo >libs/libMatC/CJitFuncClang.cpp
+
+  cmake \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DUSE_LLVM=OFF \
+	-DFORCE_BUNDLED_UMFPACK=ON \
+	-DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \
+	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
+	.
+  make
+}
+package() {
+  cd "$srcdir"/FreeMat-$pkgver-Source
+
+  make DESTDIR="$pkgdir" install -j1
+  sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install
+  rm "$pkgdir"/usr/bin/blas.ini
+}

Deleted: community-x86_64/build-fix.patch
===================================================================
--- community-x86_64/build-fix.patch	2017-02-07 14:55:16 UTC (rev 210802)
+++ community-x86_64/build-fix.patch	2017-02-07 14:55:25 UTC (rev 210803)
@@ -1,21 +0,0 @@
-diff -wbBur FreeMat-4.2-Source/CMakeLists.txt FreeMat-4.2-Source.q/CMakeLists.txt
---- FreeMat-4.2-Source/CMakeLists.txt	2013-07-28 01:27:12.000000000 +0400
-+++ FreeMat-4.2-Source.q/CMakeLists.txt	2014-05-29 21:13:35.263893395 +0400
-@@ -250,17 +250,6 @@
- ######################################################################
- OPTION(USE_LLVM "Build with LLVM support?" ON)
- 
--FIND_PACKAGE(LLVM)
--FIND_PACKAGE(CLANG)
--
--IF (LLVM_FOUND AND CLANG_FOUND)
--  add_definitions(-DHAVE_LLVM)
--  include_directories(${LLVM_INCLUDE_DIRS})
--  link_directories(${LLVM_LIBRARY_DIRS})
--  llvm_map_components_to_libraries(REQ_LLVM_LIBRARIES jit interpreter nativecodegen asmparser bitreader bitwriter codegen ipo linker selectiondag instrumentation)
--  set(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBRARIES})
--ENDIF()
--
- ##############################################################################
- #Extra libraries
- IF(NOT WIN32)

Copied: freemat/repos/community-x86_64/build-fix.patch (from rev 210802, freemat/trunk/build-fix.patch)
===================================================================
--- community-x86_64/build-fix.patch	                        (rev 0)
+++ community-x86_64/build-fix.patch	2017-02-07 14:55:25 UTC (rev 210803)
@@ -0,0 +1,21 @@
+diff -wbBur FreeMat-4.2-Source/CMakeLists.txt FreeMat-4.2-Source.q/CMakeLists.txt
+--- FreeMat-4.2-Source/CMakeLists.txt	2013-07-28 01:27:12.000000000 +0400
++++ FreeMat-4.2-Source.q/CMakeLists.txt	2014-05-29 21:13:35.263893395 +0400
+@@ -250,17 +250,6 @@
+ ######################################################################
+ OPTION(USE_LLVM "Build with LLVM support?" ON)
+ 
+-FIND_PACKAGE(LLVM)
+-FIND_PACKAGE(CLANG)
+-
+-IF (LLVM_FOUND AND CLANG_FOUND)
+-  add_definitions(-DHAVE_LLVM)
+-  include_directories(${LLVM_INCLUDE_DIRS})
+-  link_directories(${LLVM_LIBRARY_DIRS})
+-  llvm_map_components_to_libraries(REQ_LLVM_LIBRARIES jit interpreter nativecodegen asmparser bitreader bitwriter codegen ipo linker selectiondag instrumentation)
+-  set(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBRARIES})
+-ENDIF()
+-
+ ##############################################################################
+ #Extra libraries
+ IF(NOT WIN32)

Deleted: community-x86_64/freemat.install
===================================================================
--- community-x86_64/freemat.install	2017-02-07 14:55:16 UTC (rev 210802)
+++ community-x86_64/freemat.install	2017-02-07 14:55:25 UTC (rev 210803)
@@ -1,7 +0,0 @@
-post_install() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.2/ to adjust docs location"
-}
-
-post_upgrade() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.2/ to adjust docs location"
-}

Copied: freemat/repos/community-x86_64/freemat.install (from rev 210802, freemat/trunk/freemat.install)
===================================================================
--- community-x86_64/freemat.install	                        (rev 0)
+++ community-x86_64/freemat.install	2017-02-07 14:55:25 UTC (rev 210803)
@@ -0,0 +1,7 @@
+post_install() {
+  echo "-- Use FreeMat -i /usr/share/FreeMat-4.2/ to adjust docs location"
+}
+
+post_upgrade() {
+  echo "-- Use FreeMat -i /usr/share/FreeMat-4.2/ to adjust docs location"
+}

Copied: freemat/repos/community-x86_64/remove-qwebkit.patch (from rev 210802, freemat/trunk/remove-qwebkit.patch)
===================================================================
--- community-x86_64/remove-qwebkit.patch	                        (rev 0)
+++ community-x86_64/remove-qwebkit.patch	2017-02-07 14:55:25 UTC (rev 210803)
@@ -0,0 +1,138 @@
+Description: Remove qwebkit dependencies.
+ This is bad patch, because it disables the functionality
+ of help-menu. But it can only be fixed, when FreeMat will
+ be ported on Qt5. Qt4-Webkit will be removed soon, so we
+ do not have any choice.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2016-01-22
+
+Index: FreeMat-4.2-Source/libs/libCore/helpwidget.cpp
+===================================================================
+--- FreeMat-4.2-Source.orig/libs/libCore/helpwidget.cpp
++++ FreeMat-4.2-Source/libs/libCore/helpwidget.cpp
+@@ -85,7 +85,6 @@ void HelpWindow::activateModule(QListWid
+   QRegExp modname_pattern("^\\s*(\\b\\w+\\b)\\s*\\((\\b\\w+\\b)\\)");
+   if (modname_pattern.indexIn(name_and_section) < 0)
+     return;
+-  tb->load(QUrl::fromLocalFile(m_initial+"/"+modname_pattern.cap(2) + "_" + modname_pattern.cap(1)+".html"));
+ }
+ 
+ void HelpWindow::activateModuleSearch(QListWidgetItem* item) {
+@@ -93,11 +92,6 @@ void HelpWindow::activateModuleSearch(QL
+   QRegExp modname_pattern("^\\s*(\\b\\w+\\b)\\s*\\((\\b\\w+\\b)\\)");
+   if (modname_pattern.indexIn(name_and_section) < 0)
+     return;
+-  tb->load(QUrl::fromLocalFile(m_initial+"/"+modname_pattern.cap(2) + "_" + modname_pattern.cap(1)+".html"));
+-
+-  /* Highlight search text*/
+-  if (!searchString.isEmpty())
+-    tb->findText(searchString,QWebPage::HighlightAllOccurrences);
+ }
+ 
+ void HelpWindow::activateModule(QTreeWidgetItem* item, int) {
+@@ -106,7 +100,6 @@ void HelpWindow::activateModule(QTreeWid
+   if (modname.indexIn(fulltext) < 0)
+     return;
+   QString module(modname.cap(1).toLower());
+-  tb->load(QUrl::fromLocalFile(m_initial+"/"+item->text(1)+"_"+module+".html"));
+ }
+ 
+ void HelpWindow::helpText(QString fulltext) {
+@@ -122,7 +115,6 @@ void HelpWindow::helpText(QString fullte
+   QRegExp modname_pattern("^\\s*(\\b\\w+\\b)\\s*\\((\\b\\w+\\b)\\)");
+   if (modname_pattern.indexIn(name_and_section) < 0)
+     return;
+-  tb->load(QUrl::fromLocalFile(m_initial+"/"+modname_pattern.cap(2) + "_" + modname_pattern.cap(1)+".html"));
+   m_helpwidget->m_flist->setCurrentItem(item);
+ }
+ 
+@@ -156,9 +148,6 @@ HelpWindow::HelpWindow(QString url) {
+   setWindowIcon(QPixmap(":/images/freemat_help_small_mod_64.png"));
+   setWindowTitle(QString(Interpreter::getVersionString()) + " Online Help");
+   m_initial = url;
+-  tb = new QWebView(this);
+-  tb->load(QUrl::fromLocalFile(m_initial+"/index.html"));
+-  setCentralWidget(tb);
+   m_helpwidget = new HelpWidget(url,this);
+   addDockWidget(Qt::LeftDockWidgetArea,m_helpwidget);
+   createActions();
+@@ -196,29 +185,23 @@ void HelpWindow::createActions() {
+ 
+   zoominAct = new QAction(QIcon(":/images/zoomin.png"),"Zoom &In",this);
+   zoominAct->setShortcut(Qt::Key_Plus | Qt::CTRL); 
+-  connect(zoominAct,SIGNAL(triggered()),tb,SLOT(zoomIn()));
+   zoomoutAct = new QAction(QIcon(":/images/zoomout.png"),"Zoom &Out",this);
+   zoomoutAct->setShortcut(Qt::Key_Minus | Qt::CTRL); 
+-  connect(zoomoutAct,SIGNAL(triggered()),tb,SLOT(zoomOut()));
+   copyAct = new QAction(QIcon(":/images/copy.png"),"&Copy Selection",this);
+   stemp.clear();
+   stemp.push_back(QKeySequence(Qt::Key_C | Qt::CTRL));
+   stemp.push_back(QKeySequence(Qt::Key_Insert | Qt::CTRL));
+   copyAct->setShortcuts(stemp);
+ 
+-  connect(copyAct,SIGNAL(triggered()),tb,SLOT(copy()));
+   exitAct = new QAction(QIcon(":/images/quit.png"),"&Exit Help",this);
+   exitAct->setShortcut(Qt::Key_Q | Qt::CTRL); 
+   connect(exitAct,SIGNAL(triggered()),this,SLOT(close()));
+   forwardAct = new QAction(QIcon(":/images/next.png"),"&Next",this);
+   forwardAct->setShortcut(Qt::Key_Right | Qt::Key_Alt); 
+-  connect(forwardAct,SIGNAL(triggered()),tb,SLOT(forward()));
+   backAct = new QAction(QIcon(":/images/previous.png"),"&Previous",this);
+   backAct->setShortcut(Qt::Key_Left | Qt::Key_Alt); 
+-  connect(backAct,SIGNAL(triggered()),tb,SLOT(back()));
+   homeAct = new QAction(QIcon(":/images/home.png"),"&Home",this);
+   homeAct->setShortcut(Qt::Key_Home | Qt::CTRL); 
+-  connect(homeAct,SIGNAL(triggered()),tb,SLOT(home()));
+   executeSelectionAct = new QAction(QIcon(":/images/player_playselection.png"),"&Execute Selection",this);
+   executeSelectionAct->setShortcut(Qt::Key_F9); 
+   connect(executeSelectionAct,SIGNAL(triggered()),this,SLOT(execSelected()));
+@@ -226,9 +209,7 @@ void HelpWindow::createActions() {
+   helpOnSelectionAct->setShortcut(Qt::Key_F2);
+   connect(helpOnSelectionAct,SIGNAL(triggered()),this,SLOT(helpOnSelection()));
+   
+-  connect(tb,SIGNAL(forwardAvailable(bool)),forwardAct,SLOT(setEnabled(bool)));
+   forwardAct->setEnabled(false);
+-  connect(tb,SIGNAL(backwardAvailable(bool)),backAct,SLOT(setEnabled(bool)));
+   backAct->setEnabled(false);
+ }
+ 
+@@ -267,19 +248,9 @@ void HelpWindow::createStatusBar() {
+ }
+ 
+ void HelpWindow::execSelected() {
+-  QString executeText = tb->selectedText();
+-  executeText.remove("--> ");
+-  executeText.remove("-> ");
+-  executeText = executeText.trimmed();
+-  if (!executeText.isEmpty())
+-    emit EvaluateText(executeText + "\n");
+ }
+ 
+ void HelpWindow::helpOnSelection() {
+-  QString executeText = tb->selectedText();
+-  executeText = executeText.trimmed();
+-  if (!executeText.isEmpty())
+-    helpText(executeText);
+ }
+ 
+ 
+Index: FreeMat-4.2-Source/libs/libCore/helpwidget.hpp
+===================================================================
+--- FreeMat-4.2-Source.orig/libs/libCore/helpwidget.hpp
++++ FreeMat-4.2-Source/libs/libCore/helpwidget.hpp
+@@ -23,7 +23,6 @@
+ #include <QObject>
+ #include <QMainWindow>
+ #include <QDockWidget>
+-#include <QWebView>
+ #include <QMenu>
+ #include <QToolBar>
+ #include <QAction>
+@@ -80,7 +79,6 @@ private:
+   void readSettings();
+   void closeEvent(QCloseEvent* ce);
+ 
+-  QWebView *tb;
+   HelpWidget *m_helpwidget;
+   QMenu *fileMenu, *editMenu, *goMenu, *helpMenu;
+   QToolBar *editToolBar;



More information about the arch-commits mailing list