20150829.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Ponce · Aug 29, 2015 · 38d341f · 38d341f
1 parent 2c3fa87
commit 38d341f
Show file tree

Hide file tree

Showing 573 changed files with 7,204 additions and 6,256 deletions.
diff --git a/README b/README
@@ -1,3 +1,19 @@
+SBo-git - slackbuilds repository for slackware-current
+- - -
+
+this is a unofficial fork of master branch from slackbuilds.org's
+git repository (http://slackbuilds.org/cgit/slackbuilds/).
+
+here I put my unofficial mods to their slackbuilds to run on
+slackware-current with sbopkg (http://www.sbopkg.org).
+
+Check https://github.com/Ponce/slackbuilds/wiki for additional informations.
+
+See https://github.com/Ponce/slackbuilds/wiki/configuring-the-current-repository-with-sbopkg
+for instructions on how to use this repository with sbopkg.
+
+original README from slackbuilds.org follows:
+---------------------------------------------
 
 See http://slackbuilds.org/howto/ for instructions on 
 how to use the contents of this directory.

diff --git a/academic/QtiPlot/QtiPlot.SlackBuild b/academic/QtiPlot/QtiPlot.SlackBuild
@@ -90,6 +90,9 @@ cp -a $UNOFPLUGIN/qtiplot/src/plugins $SRCNAM-$VERSION/qtiplot/src
 cp -a $UNOFPLUGIN/qtiplot/importOPJ.pro $SRCNAM-$VERSION/qtiplot
 cd $SRCNAM-$VERSION
 
+# Patch for recent libpng (thanks to slack_jack, ponce and Arch)
+patch -p0 -d 3rdparty/qwtplot3d < $CWD/qwtplot3d-libpng15.patch
+
 # Use the custom build.conf
 cp $CWD/build.conf.slack build.conf
 

diff --git a/academic/QtiPlot/qwtplot3d-libpng15.patch b/academic/QtiPlot/qwtplot3d-libpng15.patch
@@ -0,0 +1,10 @@
+--- 3rdparty/gl2ps/gl2ps.c.orig	2012-01-29 18:15:34.000000000 -0500
++++ 3rdparty/gl2ps/gl2ps.c	2012-01-29 18:16:08.000000000 -0500
+@@ -47,6 +47,7 @@
+ #endif
+
+ #if defined(GL2PS_HAVE_LIBPNG)
++#include <zlib.h>
+ #include <png.h>
+ #endif
+
diff --git a/academic/avogadro/avogadro-1.1.1-eigen3.patch b/academic/avogadro/avogadro-1.1.1-eigen3.patch
@@ -0,0 +1,51 @@
+--- avogadro-1.1.1/CMakeLists.txt.omv~	2014-01-30 13:58:22.999443609 +0100
++++ avogadro-1.1.1/CMakeLists.txt	2014-01-30 13:59:31.086106925 +0100
+@@ -230,13 +230,15 @@ if(NOT Linguist_FOUND)
+   message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations")
+ endif()
+
+-find_package(Eigen3) # find and setup Eigen3 if available
++find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available
+ if(NOT EIGEN3_FOUND)
+    message(STATUS "Cannot find Eigen3, trying Eigen2")
+-   find_package(Eigen2 REQUIRED) # Some version is required
++   find_package(Eigen2) # Some version is required
+ else()
+ # Use Stage10 Eigen3 support
+    set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE)
++   add_definitions (-DEIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API)
++   set (EIGEN2_INCLUDE_DIR ${EIGEN3_INCLUDE_DIR})
+ endif()
+
+ find_package(ZLIB REQUIRED)
+--- avogadro-1.1.1/libavogadro/src/extensions/qtaim/CMakeLists.txt.omv~	2014-01-30 14:12:33.859401753 +0100
++++ avogadro-1.1.1/libavogadro/src/extensions/qtaim/CMakeLists.txt	2014-01-30 14:15:07.652727522 +0100
+@@ -4,6 +4,8 @@ set(LINK_LIBS avogadro)
+ set(PLUGIN_LABEL extensions)
+ set(PLUGIN_TARGET extensions)
+
++add_definitions(-DEIGEN2_SUPPORT_STAGE20_RESOLVE_API_CONFLICTS -std=gnu++11)
++
+ set(qtaimextension_SRCS
+     qtaimextension.cpp
+ #    qtaimdialog.cpp
+--- avogadro-1.1.1/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt.omv~	2014-01-30 13:59:05.889441500 +0100
++++ avogadro-1.1.1/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt	2014-01-30 13:59:08.832774688 +0100
+@@ -1,5 +1,5 @@
+ find_package(Qt4 4.6 REQUIRED)
+-find_package(Eigen2 REQUIRED)
++find_package(Eigen3 REQUIRED)
+
+ include_directories(${QT_INCLUDE_DIR} ${EIGEN2_INCLUDE_DIR})
+
+--- avogadro-1.1.1/cmake/modules/AvogadroUse.cmake.orig	2014-10-13 20:13:59.909828034 +0100
++++ avogadro-1.1.1/cmake/modules/AvogadroUse.cmake	2014-10-13 20:15:09.492822908 +0100
+@@ -12,7 +12,7 @@
+
+ # Add the Avogadro modules directory to the CMake module path
+ set(CMAKE_MODULE_PATH ${Avogadro_PLUGIN_DIR}/cmake ${CMAKE_MODULE_PATH})
+-find_package(Eigen2 REQUIRED)
++find_package(Eigen3 REQUIRED)
+ include_directories(${EIGEN2_INCLUDE_DIR})
+ if(Avogadro_ENABLE_GLSL)
+   find_package(GLEW)
diff --git a/academic/avogadro/avogadro.SlackBuild b/academic/avogadro/avogadro.SlackBuild
@@ -76,6 +76,10 @@ patch -p1 < $CWD/boost-1.53.patch
 # Fix manpage directory.
 sed -i 's|share/man|man|' doc/CMakeLists.txt
 
+# Fix eigen3 support (thanks slack_jack, ponce and Fedora)
+# http://pkgs.fedoraproject.org/cgit/avogadro.git/plain/avogadro-1.1.1-eigen3.patch
+patch -p1 < $CWD/avogadro-1.1.1-eigen3.patch
+
 mkdir -p build
 cd build
   cmake \

diff --git a/academic/celestia/celestia-1.6.1-libpng15.patch b/academic/celestia/celestia-1.6.1-libpng15.patch
@@ -0,0 +1,14 @@
+imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
+
+--- src/celestia/imagecapture.cpp
++++ src/celestia/imagecapture.cpp
+@@ -31,6 +31,9 @@
+ #include "png.h"
+ #endif
+
++// Z_BEST_COMPRESSION
++#include <zlib.h>
++
+ // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
+ #ifndef png_jmpbuf
+ #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
diff --git a/academic/celestia/celestia-1.6.1-libpng16.patch b/academic/celestia/celestia-1.6.1-libpng16.patch
@@ -0,0 +1,25 @@
+image.cpp:530:61: error: ‘memcpy’ was not declared in this scope
+
+https://bugs.gentoo.org/show_bug.cgi?id=464764
+
+Patch written by Lars Wendler <polynomial-c@gentoo.org>
+--- a/celestia/src/celengine/image.cpp
++++ b/celestia/src/celengine/image.cpp
+@@ -42,6 +42,7 @@ extern "C" {
+ #include "jpeglib.h"
+ #else
+ #include <cstdio>
++#include <string.h>
+ #include <jpeglib.h>
+ #endif
+ }
+--- a/celestia/src/celengine/texture.cpp
++++ b/celestia/src/celengine/texture.cpp
+@@ -28,6 +28,7 @@
+ #include <cstdlib>
+ #include <cstdio>
+ #include <cassert>
++#include <string.h>
+
+ #ifndef _WIN32
+ #ifndef TARGET_OS_MAC
diff --git a/academic/celestia/celestia.SlackBuild b/academic/celestia/celestia.SlackBuild
@@ -72,9 +72,13 @@ find -L . \
 # Note that the kde frontend will only build with kde3
 FRONTEND=${FRONTEND:-gtk}
 
-# Fix incomatibility with gcc 4.7
+# Fix incompatibility with gcc 4.7
 patch -p1 -i $CWD/celestia-1.6.1-gcc47.patch
 
+# Fix libpng incompatibilities (thanks to Arch Linux)
+patch -p0 -i $CWD/celestia-1.6.1-libpng15.patch
+patch -p2 -i $CWD/celestia-1.6.1-libpng16.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \

diff --git a/academic/flashqard/flashqard-0.15.0_qt-4.8.7.patch b/academic/flashqard/flashqard-0.15.0_qt-4.8.7.patch
@@ -0,0 +1,22 @@
+diff -u -r flashqard-0.15.0/src/PrettyButton.cpp flashqard-0.15.0-patched/src/PrettyButton.cpp
+--- flashqard-0.15.0/src/PrettyButton.cpp	2009-09-08 22:56:54.000000000 +0100
++++ flashqard-0.15.0-patched/src/PrettyButton.cpp	2015-07-28 11:49:56.506872447 +0100
+@@ -25,6 +25,7 @@
+ #include "PrettyButton.h"
+ #include "TextEditor.h"
+ #include "MimeData.h"
++#include <QApplication>
+ #include <QPainter>
+ #include <QTimerEvent>
+ #include <QDropEvent>
+diff -u -r flashqard-0.15.0/src/Utilities.cpp flashqard-0.15.0-patched/src/Utilities.cpp
+--- flashqard-0.15.0/src/Utilities.cpp	2009-09-08 22:56:54.000000000 +0100
++++ flashqard-0.15.0-patched/src/Utilities.cpp	2015-07-28 11:45:33.484870666 +0100
+@@ -22,6 +22,7 @@
+ // | Author:  Shahab Shirazi <shahab@flashqard-project.org>                  |
+ // +-------------------------------------------------------------------------+
+
++#include <QDir>
+ #include <QRegExp>
+ #include <QToolBar>
+ #include <QMessageBox>
diff --git a/academic/flashqard/flashqard.SlackBuild b/academic/flashqard/flashqard.SlackBuild
@@ -18,8 +18,8 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-OUTPUT=${OUTPUT:-/tmp}
 PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -40,29 +40,40 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $TMP/$PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Patch for missing includes with qt-4.8.7
+patch -p1 < $CWD/flashqard-0.15.0_qt-4.8.7.patch
 
-mkdir build
+mkdir -p build
 cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-  make VERBOSE=1
-  make install VERBOSE=1 DESTDIR=$PKG
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
 cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog README AUTHORS INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/flashqard.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/flashqard.SlackBuild
+cp -a \
+  COPYING ChangeLog README AUTHORS INSTALL \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc

diff --git a/academic/itex2mml/bison3-fix.patch b/academic/itex2mml/bison3-fix.patch
@@ -0,0 +1,21 @@
+diff -wbBur itexToMML/itex-src/itex2MML.y itexToMML.my/itex-src/itex2MML.y
+--- itexToMML/itex-src/itex2MML.y	2014-01-05 21:56:04.000000000 +0400
++++ itexToMML.my/itex-src/itex2MML.y	2014-02-03 21:21:16.455644069 +0400
+@@ -2,6 +2,8 @@
+  *   itex2MML.y last modified 1/5/2014
+  */
+
++%parse-param {char **ret_str}
++
+ %{
+ #include <stdio.h>
+ #include <string.h>
+@@ -27,7 +29,7 @@
+
+  void (*itex2MML_error) (const char * msg) = itex2MML_default_error;
+
+- static void yyerror (char * s)
++ static void yyerror (char **ret_str, char * s)
+    {
+      char * msg = itex2MML_copy3 (s, " at token ", yytext);
+      if (itex2MML_error)
diff --git a/academic/itex2mml/itex2mml.SlackBuild b/academic/itex2mml/itex2mml.SlackBuild
@@ -5,7 +5,7 @@
 # Public domain.
 
 PRGNAM=itex2mml
-VERSION=${VERSION:-1.4.11}
+VERSION=${VERSION:-1.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,14 +48,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [[ "$RUBY" = "YES" ]]; then
-  MYRARCH=$(ruby -e 'print RbConfig::CONFIG["arch"]')
+# Fix for bison-3 (thanks to Arch ;-)
+patch -p2 < $CWD/bison3-fix.patch
+
+if [ "$RUBY" = "YES" ]; then
+  sed -i \
+    -e 's|require "rbconfig"; ||' \
+    -e 's|-I\$(RUBYDIR)|& -I$(RUBYHDRDIR)/$(RUBY_ARCH)|' \
+    Makefile
 fi
-# This fixes ruby bindings build, BINDIR,
+
 sed -i \
-  -e "s|require\ \"rbconfig\";\ print\ |print Rb|" \
-  -e "s|RUBYDIR)|RUBYDIR) -I/usr/include/ruby-1.9.1/${MYRARCH}|" \
-  -e "s|local/||" \
+  -e "s|BINDIR=/usr/local/bin|BINDIR=/usr/bin|" \
   Makefile
 
 make clean
@@ -65,7 +69,7 @@ make
 mkdir -p $PKG/usr/bin
 make install BINDIR=$PKG/usr/bin
 
-if [[ "$RUBY" = "YES" ]]; then
+if [ "$RUBY" = "YES" ]; then
   make ruby
   ARCHDIR="$PKG$(ruby -e 'print RbConfig::CONFIG["sitearchdir"]')"
   SITEDIR="$PKG$(ruby -e 'print RbConfig::CONFIG["sitelibdir"]')"

diff --git a/academic/itex2mml/itex2mml.info b/academic/itex2mml/itex2mml.info
@@ -1,5 +1,5 @@
 PRGNAM="itex2mml"
-VERSION="1.4.11"
+VERSION="1.5.1"
 HOMEPAGE="http://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
 DOWNLOAD="http://golem.ph.utexas.edu/~distler/blog/files/itexToMML.tar.gz"
 MD5SUM="a0bd9fc5439499f12d0c2c3bee74c9a0"

diff --git a/academic/pspp/pspp.SlackBuild b/academic/pspp/pspp.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pspp
-VERSION=${VERSION:-0.8.2}
+VERSION=${VERSION:-0.8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,8 +67,9 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+LDFLAGS="-ltermcap" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \

diff --git a/academic/pspp/pspp.info b/academic/pspp/pspp.info
@@ -1,8 +1,8 @@
 PRGNAM="pspp"
-VERSION="0.8.2"
+VERSION="0.8.5"
 HOMEPAGE="http://www.gnu.org/software/pspp/"
-DOWNLOAD="http://ftp.gnu.org/gnu/pspp/pspp-0.8.2.tar.gz"
-MD5SUM="cba0b161bb69e1bbd71612d09694b0ec"
+DOWNLOAD="http://ftp.gnu.org/gnu/pspp/pspp-0.8.5.tar.gz"
+MD5SUM="7600234a8a968c513a2e5c5dbecfc392"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gsl gtksourceview"

diff --git a/academic/root/root.SlackBuild b/academic/root/root.SlackBuild
@@ -18,7 +18,7 @@
 # Modified by the slackbuilds.org project
 
 PRGNAM=root
-VERSION=${VERSION:-5.34.03}
+VERSION=${VERSION:-5.34.32}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 

diff --git a/academic/root/root.info b/academic/root/root.info
@@ -1,8 +1,8 @@
 PRGNAM="root"
-VERSION="5.34.03"
+VERSION="5.34.32"
 HOMEPAGE="http://root.cern.ch/drupal/"
-DOWNLOAD="ftp://root.cern.ch/root/root_v5.34.03.source.tar.gz"
-MD5SUM="b732dab3abab6d2a223d278041b3e1fe"
+DOWNLOAD="ftp://root.cern.ch/root/root_v5.34.32.source.tar.gz"
+MD5SUM="292a0b95063053699b3273bd50515b0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ftgl"

diff --git a/audio/Pd-extended/Pd-extended.SlackBuild b/audio/Pd-extended/Pd-extended.SlackBuild
@@ -56,6 +56,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix build failure ("'OBJCXX' is undefined") thanks to Arch Linux
+patch externals/Gem/configure.ac < $CWD/change_gem_configure_file.patch
+
 # videodev.h has moved
 sed -i "s|linux/videodev\.h|libv4l1-videodev.h|" \
   externals/pdp/configure.ac \
@@ -78,7 +81,7 @@ sed -i \
   externals/loaders/tclpd/Makefile || exit 1
 
 cd packages/linux_make
-  make -j1 install \
+  make install \
     prefix="/usr" \
     libdir="/usr/lib$LIBDIRSUFFIX" \
     mandir="/usr/man" \